Merge pull request #5 from Nyveon/marker-colors

Marker colors and persistence
Nyveon · Jan 24, 2025 · 7a5f1be · 7a5f1be
2 parents b10b124 + a8e882c
commit 7a5f1be
Show file tree

Hide file tree

Showing 14 changed files with 262 additions and 85 deletions.
diff --git a/src/css/main.css b/src/css/main.css
diff --git a/src/css/main.css.map b/src/css/main.css.map
diff --git a/src/data/dcc.json b/src/data/dcc.json
@@ -885,7 +885,7 @@
                             "type": "course",
                             "department": "CC"
                         },
-                        "XESPE-C": {
+                        "XESPE1-C": {
                             "name": "Electivos de Especialidad",
                             "plural": "Electivos de Especialidad",
                             "shortname": "Electivo Especialidad",
@@ -977,7 +977,7 @@
                             "postrequisites": [],
                             "department": "CC"
                         },
-                        "XESPE-C": {
+                        "XESPE2-C": {
                             "name": "Electivos de Especialidad",
                             "plural": "Electivos de Especialidad",
                             "shortname": "Electivo Especialidad",

diff --git a/src/data/process.py b/src/data/process.py
@@ -133,6 +133,8 @@ def main():
                         semester_courses[course_code]["type"] = "compactable"
                     malla[version][phase]["semesters"][
                         semester]["courses"][f"{code}-C"] = course_data
+
+    #todo: deduplicate compacted codes
 
     # Save dict as json file
     with open(f"{malla_code}.json", "w", encoding="utf-8") as f:

diff --git a/src/images/icons/broom-cleaning-icon.svg b/src/images/icons/broom-cleaning-icon.svg
diff --git a/src/images/icons/close-round-icon.svg b/src/images/icons/close-round-icon.svg
diff --git a/src/includes/_malla.njk b/src/includes/_malla.njk
@@ -13,9 +13,8 @@
                             'editable': editMode
                         }"
                         x-data="{
-                            element: $el,
                             mark() {
-                                semesterMarked($el, editMode);
+                                semesterMarked(this.$el, editMode, editModeColor);
                             }
                         }"
                         @click="mark();"
@@ -26,6 +25,7 @@
 						{% for index, course in semester.courses %}
 						<div
 							class="course {{ course.department }}"
+                            :class="courseMark && 'marked'"
 							id="{{ index }}"
 							tabindex="0"
 							role="listitem"
@@ -46,8 +46,12 @@
                                 select(event) {
                                     courseSelected($data, event, showLines, depthpre, depthpost, editMode);
                                 },
+                                courseMark: $persist(0).as('course-mark-{{ index }}'),
                                 mark() {
-                                    courseMarked($el, editMode);
+                                    const result = courseMarked($el, editMode, editModeColor, this.courseMark);
+                                    if (result != -1) {
+                                        this.courseMark = result;
+                                    }
                                 }
                             }"
 							@focus="select('mouseenter');"
@@ -58,6 +62,7 @@
 							x-show="shown();"
 							data-prereqs="{{ course.prerequisites }}"
 							data-postreqs="{{ course.postrequisites }}"
+                            :data-mark-color="courseMark"
 						>
 							<div class="course-bar" x-show="shown()">
 								<span class="course-code">{{ course.code }}</span>