feat: add conflict logic

Author: stadial

logic/classes.ts

@@ -1,20 +1,23 @@
 // too lazy to  add types ;)
 export function buttonOptions(todo: any) {
-	let tooltips = todo.conflicts.time
-	let color = 'success'
+	let tooltips: String[] = []
+	let color = 'grey'
 	let icon = 'mdi-plus'
 
 	let sameCourse = todo.conflicts.sameCourse
 	// course already added
 	if (sameCourse) {
 		// same class
 		if (sameCourse.crn == todo.crn) {
-			icon = 'mdi-minus'
+			icon = 'mdi-check'
 			tooltips = ['Remove']
-			color = 'red'
+			color = 'success'
+		} else if (todo.conflicts._any) {
+			icon = 'mdi-alert-circle'
+			tooltips = todo.conflicts.time.map((c: any) => 'Conflict: ' + c.name)
+			color = 'error'
 		} else {
-			color = 'grey'
-			console.log(sameCourse)
+			color = 'lime'
 			tooltips = ['Course added in Section: ' + sameCourse.section, 'Replace?']
 		}
 	}
@@ -27,14 +30,33 @@ export function buttonOptions(todo: any) {
 	}
 	return { ...todo, buttonOptions }
 }
-export function findConflicts(checkClass: any, selectedClasses: any) {
+export function findConflicts(checkClass: any, selectedClasses: any[]) {
 	// same course
-	let time: String[] = []
 	let sameCourse: any = selectedClasses.filter(
 		(c: any) => c.code == checkClass.code
 	)[0]
+
+	// get rid of memory leak!
+	if (sameCourse) {
+		sameCourse.conflicts = {}
+		sameCourse.buttonOptions = {}
+	}
+
+	// time conflicts
+	let time: any[] = []
+	time = selectedClasses.filter((sc) => {
+		return (
+			checkConflict(sc, checkClass) &&
+			// can't conflict with itself or other same courses
+			(sc.crn != checkClass.crn || sc.code != checkClass.code)
+		)
+	})
 	let _any = time.length > 0
 	let conflicts = { _any, time, sameCourse }
 
 	return { ...checkClass, conflicts }
 }
+
+function checkConflict(c1: any, c2: any): boolean {
+	return JSON.stringify(c1.days) == JSON.stringify(c2.days)
+}

nuxt.config.js

@@ -36,7 +36,7 @@ export default {
 		'@nuxt/typescript-build',
 		// https://go.nuxtjs.dev/vuetify
 		'@nuxtjs/vuetify',
-		'nuxt-compress'
+		'nuxt-compress',
 	],
 
 	// Modules: https://go.nuxtjs.dev/config-modules

pages/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div>
-    {{ selectedClasses }}
+    <pre>
+    {{ selectedClasses.map((c) => ({ name: c.name, crn: c.crn })) }}
+    <!-- {{ selectedClasses }} -->
+    </pre>
     <!-- <ClassesCalendar /> -->
     <!-- <ClassesSelectedStats /> -->
     <ClassesFilters
@@ -106,7 +109,19 @@ export default {
       console.log(e)
       if (this.selectedClasses.find((c) => c.crn == e.crn)) {
         this.snackbarActive = !this.snackbarActive
-        this.snackbarText = `Already added ${e.name}`
+        this.snackbarText = `Removing ${e.name}`
+        this.selectedClasses = this.selectedClasses.filter(
+          (c) => c.code != e.code
+        )
+        //
+      } else if (this.selectedClasses.find((c) => c.code == e.code)) {
+        this.snackbarActive = !this.snackbarActive
+        this.snackbarText = `Removing Other Section`
+        this.selectedClasses = this.selectedClasses.filter(
+          (c) => c.code != e.code
+        )
+        this.selectedClasses.push(e)
+        //
       } else {
         this.selectedClasses.push(e)
       }