feat: date based conflict detection!

Author: stadial

logic/classes.ts

@@ -1,15 +1,16 @@
+import { areIntervalsOverlapping } from 'date-fns'
 // too lazy to  add types ;)
-export function buttonOptions(todo: any) {
+export function buttonOptions(checkClass: any) {
 	let tooltips: String[] = []
 	let color = 'grey'
 	let icon = 'mdi-plus'
 	let disabled = false
 
-	let sameCourse = todo.conflicts.sameCourse
+	let sameCourse = checkClass.conflicts.sameCourse
 	// course already added
 	if (sameCourse) {
 		// same class
-		if (sameCourse.crn == todo.crn) {
+		if (sameCourse.crn == checkClass.crn) {
 			icon = 'mdi-check'
 			tooltips = ['Remove']
 			color = 'success'
@@ -19,9 +20,9 @@ export function buttonOptions(todo: any) {
 			icon = 'mdi-plus'
 		}
 	}
-	if (todo.conflicts._any) {
+	if (checkClass.conflicts._any) {
 		icon = 'mdi-alert-circle'
-		tooltips = todo.conflicts.time.map((c: any) => 'Conflict: ' + c.name)
+		tooltips = checkClass.conflicts.time.map((c: any) => 'Conflict: ' + c.name)
 		color = 'error'
 		disabled = true
 	}
@@ -32,7 +33,7 @@ export function buttonOptions(todo: any) {
 		color,
 		tooltips,
 	}
-	return { ...todo, buttonOptions }
+	return { ...checkClass, buttonOptions }
 }
 export function findConflicts(checkClass: any, selectedClasses: any[]) {
 	// same course
@@ -62,6 +63,20 @@ export function findConflicts(checkClass: any, selectedClasses: any[]) {
 	return { ...checkClass, conflicts }
 }
 
-function checkConflict(c1: any, c2: any): boolean {
-	return JSON.stringify(c1.days) == JSON.stringify(c2.days)
+function checkConflict(c1s: any, c2s: any): boolean {
+	let intersection = c1s.days.filter((dayc1: any) => c2s.days.includes(dayc1))
+	if (intersection.length > 0) {
+		let c1time = c1s.time.split('-')
+		let c2time = c2s.time.split('-')
+		let c1t1: number = parseInt(c1time[0])
+		let c1t2: number = parseInt(c1time[1])
+		let c2t1: number = parseInt(c2time[0])
+		let c2t2: number = parseInt(c2time[1])
+
+		return areIntervalsOverlapping(
+			{ start: new Date(c1t1), end: new Date(c1t2) },
+			{ start: new Date(c2t1), end: new Date(c2t2) }
+		)
+	}
+	return false
 }

package.json

@@ -17,6 +17,7 @@
     "@nuxtjs/axios": "^5.13.6",
     "@nuxtjs/pwa": "^3.3.5",
     "core-js": "^3.19.3",
+    "date-fns": "^2.28.0",
     "nuxt": "^2.15.8",
     "vue": "^2.6.14",
     "vue-server-renderer": "^2.6.14",

yarn.lock

@@ -4101,6 +4101,11 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
+date-fns@^2.28.0:
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
+  integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"