Skip to content

Commit 9db2898

Browse files
authored
Merge pull request #28 from filips123/improve-substitution-parsing-and-mobile-ui
2 parents 343eec5 + 1b7b860 commit 9db2898

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

API/gimvicurnik/updaters/eclassroom.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ def _normalize_teacher_name(name):
420420
return None
421421

422422
# Special case: Unknown teacher
423-
if name == "X" or name == "x" or name == "/":
423+
if name == "X" or name == "x" or name == "/" or name == "MANJKA":
424424
return None
425425

426426
# Special case: Multiple Krapež teachers
@@ -455,7 +455,7 @@ def _normalize_teacher_name(name):
455455
@staticmethod
456456
def _normalize_other_names(name):
457457
# Special case: Unknown entity
458-
if name == "X" or name == "x" or name == "/":
458+
if name == "X" or name == "x" or name == "/" or name == "MANJKA":
459459
return None
460460

461461
return name

website/src/components/timetable/TimetableDay.vue

+11-7
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,13 @@
3636
font-size: unset !important;
3737
}
3838

39-
// Disable background change on hover
40-
.timetable-day > .v-data-table__wrapper > table > tbody > tr:hover {
41-
background: transparent !important;
39+
// Change background change on hover
40+
.theme--light .timetable-day > .v-data-table__wrapper > table > tbody > tr:hover {
41+
background: #d9d9d9 !important;
42+
}
43+
44+
.theme--dark .timetable-day > .v-data-table__wrapper > table > tbody > tr:hover {
45+
background: #444 !important;
4246
}
4347

4448
// Move time cell a bit more to the left
@@ -111,7 +115,7 @@ export default class TimetableDay extends Vue {
111115
type: 'classroom',
112116
contents: displayedLesson.classrooms.filter(x => x)
113117
}
114-
].filter(x => x.contents.length)
118+
]
115119
})
116120
}
117121
}
@@ -135,7 +139,7 @@ export default class TimetableDay extends Vue {
135139
type: 'classroom',
136140
contents: displayedLesson.classrooms.filter(x => x)
137141
}
138-
].filter(x => x.contents.length)
142+
]
139143
})
140144
}
141145
}
@@ -159,7 +163,7 @@ export default class TimetableDay extends Vue {
159163
type: 'teacher',
160164
contents: displayedLesson.teachers
161165
}
162-
].filter(x => x.contents.length)
166+
]
163167
})
164168
}
165169
}
@@ -175,7 +179,7 @@ export default class TimetableDay extends Vue {
175179
type: 'classroom',
176180
contents: displayedLesson.classrooms.filter(x => x)
177181
}
178-
].filter(x => x.contents.length)
182+
]
179183
})
180184
}
181185
}

website/src/registerServiceWorker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if (process.env.NODE_ENV === 'production') {
1111
console.log('Service worker has been registered.')
1212

1313
// Routinely check for app updates by testing for a new service worker
14-
setInterval(() => { registration.update() }, 1000 * 60 * 60)
14+
setInterval(() => { registration.update().catch(() => { /* Ignore errors */ }) }, 1000 * 60 * 60)
1515
},
1616
cached () {
1717
console.log('Content has been cached for offline use.')

0 commit comments

Comments
 (0)