Delete schedule by todesj · Pull Request #108 · Student-Lyf/RamLife

todesj · 2021-11-08T00:40:02Z

No description provided.

Levi-Lesches

Looking good, just you need to use the database the way RamLife sets it up. Similar to using models, you don't just do User.name, you look up Models.instance.user.name, you're going to have to do the same type of thing with the database. Good news is you have plenty of examples.

Also, never import 1) a src folder, or 2) deep into a "layer" (anything deeper than lib). Either refer to the file by name if they're next to each other, or modify the lib/layer.dart to include that file

Levi-Lesches · 2021-11-08T00:46:34Z

lib/src/models/data/schedule.dart

 					day == null ? null : Day.fromJson(day)
 			]
 		];
+		Schedule.defaults = Map.from(await CloudCalendar.schedules.


You can't use the actual class Cloud Calendar here, you need to use an instance (look up static vs instance methods if you're confused). Get the database from:

Services.instance.database.schedule

And call default schedules on that. Of course, you'll need to implement that too, so look for how the database downloads the schedules and try to copy that.

Levi-Lesches · 2021-11-08T00:47:04Z

lib/src/models/data/schedule.dart

+import 'package:ramaz/src/services/databases/calendar/implementation.dart';
+import 'package:ramaz/src/services/firestore.dart';


Delete these, see below

Levi-Lesches · 2021-11-08T00:48:01Z

lib/src/models/view/calendar_editor.dart

+	/// This function rep
+	// Future<void> deleteSchedules(Map<DateTime,Day> days) async  {
+	// 	for (MapEntry<DateTime, Day> entry in days.entries){
+	// 		entry.value.schedule!=ScheduleViewModel.defatulSchedule[entry.value.name];
+	// 		await updateDay(day: entry.value, date: entry.key);
+	// 	}
+	// }


Delete this I guess, and the import above

lib/src/models/data/schedule.dart

Levi-Lesches · 2021-11-08T04:36:58Z

lib/src/data/schedule/schedule.dart

-
+
+	/// A Map of weekdays to their default schedule
+	static late Map<String, Schedule> defaults;


You can do this in three ways:

static late, which means there is no value until it's set

Map<String, Schedule>?, which means it's null until set

defaults = {};, which means it's empty until set.

While 3 is easier to work with, I think you should do 1 or 2, since it implies it's invalid to search up a default schedule before the data is loaded. You can follow my example and use late, which implies there should always be some data and not having data is an error, but I think you should use a nullable map since late is kinda hacky in Dart but null is much more "normal".

lib/src/models/data/schedule.dart

lib/src/models/view/calendar_editor.dart

Levi-Lesches · 2021-11-08T04:41:23Z

lib/src/services/databases/calendar/implementation.dart

 	);
-
+	@override
+	Future<Map<String, String>> getDefaultSchedules() async => Map.from(


Suggested change

Future<Map<String, String>> getDefaultSchedules() async => Map.from(

Future<Map<String, String>> getDefaultSchedules() async =>

You don't need Map here, unless you need to cast to a Map<String, String> specifically (which you might).

Levi-Lesches · 2021-11-08T04:42:01Z

lib/src/services/databases/calendar/implementation.dart


 	@override
+	Future<Map<String, String>> getDefaultSchedules() => Idb.instance
+			.get("schedules","Monday") as Future<Map<String, String>>;


Suggested change

.get("schedules","Monday") as Future<Map<String, String>>;

.get("schedules","Monday");

No as, see above

Why Monday?

lib/src/services/databases/calendar/interface.dart

Levi-Lesches · 2021-11-08T04:44:38Z

lib/src/services/idb.dart

 	static const String scheduleStoreName = "schedules";

+	/// The name for the default schedules object store.
+	static const String defaultScheduleStoreName = "defaults";


Ah, okay here's something -- should this really be a separate data store? Think of it like a "table" in SQL or a "collection" in Firestore: can you really say this is a whole collection of similarly-formatted entries? I think this should be filed under "miscellaneous" data somehow -- maybe use the SharedPreferences service? Sure, it's a bit weird in that you're using one service from another but I think RamLife can handle it.

Levi-Lesches · 2021-11-08T04:44:57Z

lib/src/services/idb.dart

 							..createObjectStore(sportsStoreName, autoIncrement:  true)
-							..createObjectStore(scheduleStoreName, keyPath: "name");
+							..createObjectStore(scheduleStoreName, keyPath: "name")
+							..createObjectStore(defaultScheduleStoreName, keyPath: "Monday");


See above, I don't think this is the way to go about it.

This reverts commit e476f91.

CLAassistant · 2021-11-24T05:18:11Z

All committers have signed the CLA.

…tudent-Lyf#115)

Co-authored-by: todesj <70974284+todesj@users.noreply.github.com>

* Added schedule_search.dart * Added schedule search model * Update lib/src/models/view/schedule_search.dart Co-authored-by: Levi Lesches <levilesches@gmail.com> * Update lib/src/models/view/schedule_search.dart Co-authored-by: Levi Lesches <levilesches@gmail.com> * Fixes some formatting * Added docs and exported schedule_search.dart in lib/models.dart * Cleaned up schedule_search.dart * Cleaned up models.dart * Added Subject.id, PeriodData.name, PerioData.dayName * Update lib/src/data/schedule/subject.dart Co-authored-by: Levi Lesches <levilesches@gmail.com> * Add Period.dayName, and Period.name (Student-Lyf#81) * Converted firestore/lib/src/helpers to firestore-py/lib/utils * Ported firestore/lib/src/services to firestore-py/lib/services * Removed (and revoked) Firebase credentials * Cleanup * Cleaned up logging/Firebase issues * Added some __init__.py * Ported firebase/firestore/node/calendar.dart to firebase/firestore-py/bin/calendar.py * Ported firebase/firestore/node/admins.dart to firebase/firestore-py/bin/admins.py * Ported firebase/firestore/node/feedback.dart to firebase/firestore-py/bin/feedback.py * Added some data python files and sections python files * Continued translating more files (Note: some are incomplete!) lib/data/schedule lib/sections/reader edited lib/utils/dir to use constants from constants.yaml * Added bin/faculty, bin/secions, facultylogic and facultyreader python files Also added constants.py to get data from constants.yaml * Ported firebase/firestore/node/students.dart --> firebase/firestore-py/bin/students.py * Cleanup * Delete student.py * Fix students.py and uploading * Added some more python files. many variable should be converted to snake_case * Changed camel case variables to snake_case * small edits, opted for a different constants.py file too * Fixed some typos * Fixed bug where testers had no schedule (instead of a blank one) * --- * Finished scripts to upload data * Changed dayNames to a list rather than set * Make Fridays a Friday schedule by default * Modified feedback.py to actually output feedback * Added students reader * Cleanup * Fixed a bug in faculty/logic.py where a (Student-Lyf#101) teacher's periods weren't being added to theit schedule, instead the teacher's schedule was being set to contain only one period. Co-authored-by: todesj <josht2004@gmail.com> Co-authored-by: todesj <70974284+todesj@users.noreply.github.com> Co-authored-by: Brayden Kohler <brayk0hler@gmail.com> Co-authored-by: BraydenKO <58378705+BraydenKO@users.noreply.github.com>

* Enabled Emulator use * Fixed emulator error * Update lib/src/services/firebase_core.dart Added doc comment for `FirebaseCore.shouldUseEmulator` Co-authored-by: Levi Lesches <levilesches@gmail.com>

Makes the schedule icon appear in the dashboard when the side sheet is not persistently open

Adds Podfile.lock to the repo and updates XCode.

…-Lyf#123) * Moved Firebase initialization logic to main using flutterfire_cli * Removed manual Firebase initialization for Web * Moved Dart-only Firebase initialization to FirebaseCore.initializeFirebase * Updated Firebase dependencies to support flutterfire_cli * Removed old (manual) calls to FirebaseCore.init(), replaced with new flutterfire_cli initialization * Added try/catch for Firestore emulator Workaround for firebase/flutterfire#6216 * Cleanup

Co-authored-by: Levi Lesches <levilesches@gmail.com>

Levi-Lesches · 2022-01-19T03:44:18Z

I force-pushed to clean the history, now there are no merge conflicts

Levi-Lesches added 30 commits October 8, 2020 09:47

Fixed some text labels

27ec58d

Removed references to Letters from the code

c8bce1c

Fixed ClassList bug

2ecfcfa

Merge branch 'master' into web

3bd66d3

Released version 2.0.1+3

ae0ce00

Testing new Podfile to speed up iOS build time

6aefa54

Added dayNames to user profiles

e54b84c

Hid Sports page from master app

afb1eb9

Fixed reload logic

f2fc0d3

Set default Special to covid

3ff53e1

Automatically remove outdated reminders

8e0143d

Switched PeriodReminderTime to number period, not based on Special

cc3dc50

Merge branch 'master' into web

0f1d8de

Cleanup

3d88b20

Merge branch 'master' into web

f2adee1

Fixed faculty Firestore bug

9d719da

Created constants.testers

d5d371c

Added redundancy error checking

0da5a6b

Migrated to new Crashlytics SDK (Android)

d470a2d

Changed name to RamLife (iOS, Android)

daedce7

Migrated to new Android Embedding (v2)

42e4ec3

Made HomePage stateless

7e7830c

Cleaned Student.getPeriods

9918f25

Documented data library

b9b8de8

Organized Services into Services and Databases

6aba893

Fixed models to handle new Service and Database

a8df7ee

Fixed pages to handle new Service and Database

99d5bc6

Disable Crashlytics during debug mode

dfc2f97

Reinstated HomeModel, properly this time

939a9c7

Refactored login page logic

ca261cd

Android auth (Student-Lyf#106)

5fb1bd6

todesj requested a review from BraydenKO as a code owner November 8, 2021 00:40

Levi-Lesches reviewed Nov 8, 2021

View reviewed changes

Levi-Lesches added 3 commits November 10, 2021 01:56

Changed from the MIT license to the GPL v3.0

e476f91

Revert "Changed from the MIT license to the GPL v3.0"

8f9cbef

This reverts commit e476f91.

Added script to sign out all users

8377067

todesj and others added 17 commits January 8, 2022 18:12

Fixes bug where users refreshed page but period time did not update (S…

fbee891

…tudent-Lyf#115)

Tap for Schedule Touch Ups (Student-Lyf#114)

00fec0e

Co-authored-by: todesj <70974284+todesj@users.noreply.github.com>

New urls (Student-Lyf#111)

10c9bbb

Enabled support for Firbease Local Emulator Suite (Student-Lyf#116)

433e2d5

* Enabled Emulator use * Fixed emulator error * Update lib/src/services/firebase_core.dart Added doc comment for `FirebaseCore.shouldUseEmulator` Co-authored-by: Levi Lesches <levilesches@gmail.com>

Subject refresh (Student-Lyf#118)

6567137

Dashboard fix (Student-Lyf#119)

21f5bd5

Makes the schedule icon appear in the dashboard when the side sheet is not persistently open

Ios folder xcode changes (Student-Lyf#120)

d454518

Adds Podfile.lock to the repo and updates XCode.

Adds getDates to change function

d786403

Adds default schedules

16f9b62

Fixes Database implementation

56f8fb9

Update lib/src/models/data/schedule.dart

35a9401

Co-authored-by: Levi Lesches <levilesches@gmail.com>

Update lib/src/models/data/schedule.dart

14ba527

Co-authored-by: Levi Lesches <levilesches@gmail.com>

Update lib/src/models/data/schedule.dart

3ace7fb

Co-authored-by: Levi Lesches <levilesches@gmail.com>

Update lib/src/models/view/calendar_editor.dart

5054cba

Co-authored-by: Levi Lesches <levilesches@gmail.com>

Update lib/src/services/databases/calendar/interface.dart

7ba275b

Co-authored-by: Levi Lesches <levilesches@gmail.com>

Levi-Lesches force-pushed the delete_schedule branch from b22707a to 7ba275b Compare January 19, 2022 03:22

BraydenKO force-pushed the master branch from 6d714d9 to 16558f1 Compare October 25, 2023 03:08

BraydenKO requested a review from DavidTarrab as a code owner October 25, 2023 03:08

BraydenKO force-pushed the master branch from 16558f1 to 268f74a Compare October 25, 2023 03:18

		import 'package:ramaz/src/services/databases/calendar/implementation.dart';
		import 'package:ramaz/src/services/firestore.dart';



		/// A Map of weekdays to their default schedule
		static late Map<String, Schedule> defaults;

	Future<Map<String, String>> getDefaultSchedules() async => Map.from(
	Future<Map<String, String>> getDefaultSchedules() async =>

	.get("schedules","Monday") as Future<Map<String, String>>;
	.get("schedules","Monday");

Conversation

todesj commented Nov 8, 2021

Uh oh!

Levi-Lesches left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

CLAassistant commented Nov 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Levi-Lesches commented Jan 19, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

CLAassistant commented Nov 24, 2021 •

edited

Loading