diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..496ee2c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
diff --git a/js/components/chooseDepartment.vue b/js/components/chooseDepartment.vue
index 2ffa748..1e3ea35 100644
--- a/js/components/chooseDepartment.vue
+++ b/js/components/chooseDepartment.vue
@@ -19,19 +19,24 @@ var chooseDepartment = {
},
template: `
-
-
1. 「課程名稱」直接搜尋
-
-
或
-
1. 選擇類別
-
-
+
+
+
1. 「課程名稱」直接搜尋
+
+
+
+
或
+
+
+
1. 選擇類別
+
+
`,
}
\ No newline at end of file
diff --git a/js/components/coursesList.vue b/js/components/coursesList.vue
index b2aae64..f576c3b 100644
--- a/js/components/coursesList.vue
+++ b/js/components/coursesList.vue
@@ -1,61 +1,61 @@
var coursesList = {
props: ['courses', 'selected_d', 'selected_c', 'find_name'],
- data: function(){
+ data: function () {
return {
selectedTime: [],
foundedCourses: []
}
},
methods: {
- 'getTime': function(timeString){
- if(timeString==null){
+ 'getTime': function (timeString) {
+ if (timeString == null) {
return ""
}
-
+
ans = []
number = ""
- for(var i of timeString){
- if(i>="0" && i<="9"){
+ for (var i of timeString) {
+ if (i >= "0" && i <= "9") {
number = i
- }else if(i>="a" && i<="z"){
- ans.push(number+i)
+ } else if (i >= "a" && i <= "z") {
+ ans.push(number + i)
}
- else{
+ else {
ans.push(timeString)
break
}
}
return ans
},
- 'isOK': function(course){
+ 'isOK': function (course) {
var time = this.getTime(course.time)
// console.log(course.name, " ", time)
- for(t of time){
- for(st of this.selectedTime){
- if(t==st)
+ for (t of time) {
+ for (st of this.selectedTime) {
+ if (t == st)
return false
}
}
return true
},
- 'log': function(name, data){
+ 'log': function (name, data) {
console.log(name, data)
}
},
watch: {
- 'selected_c': function(){
+ 'selected_c': function () {
var temp = []
- for(var c of this.selected_c){
- if(c.temp==false){
+ for (var c of this.selected_c) {
+ if (c.temp == false) {
temp.push(c.time)
}
}
this.selectedTime = temp
},
- 'find_name': function(){
+ 'find_name': function () {
var temp = []
- for(var c of this.courses){
- if(c.name.indexOf(this.find_name) != -1){
+ for (var c of this.courses) {
+ if (c.name.indexOf(this.find_name) != -1) {
temp.push(c)
}
}
@@ -63,7 +63,7 @@ var coursesList = {
}
},
template: `
-
+
2. 安排課程
※ 已套用「名稱」搜尋:
{{find_name}}
@@ -72,20 +72,18 @@ var coursesList = {
-
-
+
+
{{ course.name }} (詳)
—— {{ (course.department.indexOf(', ')!=-1) ?(course.department.split(', ')[1]) :(course.department) }}
-
-
- {{ course.teacher }} ‧ {{ course.time }}
-
-
-
-
+
+ {{ course.teacher }} ‧ {{ course.time }}
+
+
+
|
@@ -96,21 +94,19 @@ var coursesList = {
v-if="course.department == selected_d"
v-on:mouseenter="$emit('show-temp', course)" v-on:mouseleave="$emit('delete-temp', course)">
-
-
- {{ course.name }} (詳)
-
-
-
- {{ course.teacher }} ‧ {{ course.time }}
-
-
-
-
-
-
+
+
+ {{ course.name }} (詳)
+
+
+ {{ course.teacher }} ‧ {{ course.time }}
+
+
+
+
+
|
diff --git a/js/components/main.vue b/js/components/main.vue
index ebee8bb..a271e99 100644
--- a/js/components/main.vue
+++ b/js/components/main.vue
@@ -263,16 +263,16 @@ var mainWindow = {