Merge pull request #18 from x3388638/patch-getTime

Adjust getTime & isOK logic

js/components/coursesList.vue

@@ -8,35 +8,25 @@ var coursesList = {
     },
     methods: {
         'getTime': function (timeString) {
-            if (timeString == null) {
+            let num;
-                return ""
+            const timeRegex = new RegExp(/^\d[\da-z]*[a-z]$/);
-            }
+            return timeRegex.test(timeString)
-
+                ? [...timeString].reduce((res, c) => {
-            ans = []
+                    if (Number.isInteger(+c)) {
-            number = ""
+                        num = c;
-            for (var i of timeString) {
+                        return res;
-                if (i >= "0" && i <= "9") {
+                    } else {
-                    number = i
+                        return [...res, num + c];
-                } else if (i >= "a" && i <= "z") {
+                    }
-                    ans.push(number + i)
+                }, [])
-                }
+                : [];
-                else {
-                    ans.push(timeString)
-                    break
-                }
-            }
-            return ans
         },
         'isOK': function (course) {
             var time = this.getTime(course.time)
             // console.log(course.name, " ", time)
-            for (t of time) {
+            const isConflict = time.some((t) => this.selectedTime.includes(t))
-                for (st of this.selectedTime) {
+
-                    if (t == st)
+            return time.length && !isConflict
-                        return false
-                }
-            }
-            return true
         },
         'log': function (name, data) {
             console.log(name, data)

js/components/main.vue

@@ -134,20 +134,18 @@ var mainWindow = {
             }
         },
         'getTime': function (timeString) {
-            ans = []
+            let num;
-            number = ""
+            const timeRegex = new RegExp(/^\d[\da-z]*[a-z]$/);
-            for (var i of timeString) {
+            return timeRegex.test(timeString)
-                if (i >= "0" && i <= "9") {
+                ? [...timeString].reduce((res, c) => {
-                    number = i
+                    if (Number.isInteger(+c)) {
-                } else if (i >= "a" && i <= "z") {
+                        num = c;
-                    ans.push(number + i)
+                        return res;
-                }
+                    } else {
-                else {
+                        return [...res, num + c];
-                    ans.push(timeString)
+                    }
-                    break
+                }, [])
-                }
+                : [];
-            }
-            return ans
         },
         'select': function (department) {
             this.selectDepartment = department