chore: better code

kernoeb · Sep 23, 2023 · 5d35f42 · 5d35f42
1 parent d40d757
commit 5d35f42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/components/SelectPlanning.vue b/components/SelectPlanning.vue
@@ -388,7 +388,7 @@ export default {
     },
     getNames () {
       const list = [...(this.favorites || []), ...(this.groupFavorites || []).map(v => v.plannings).flat()]
-      if (list?.length) {
+      if (list.length) {
         this.$axios.$get('/api/v1/calendars/info', { params: { p: list.join(',') } }).then((data) => {
           this.planningNames = data
         }).catch(() => {

diff --git a/server/routes/calendar.js b/server/routes/calendar.js
@@ -41,7 +41,7 @@ router.get('/calendars', async (req, res) => {
     for (const c in customColorList) {
       if (typeof customColorList[c] !== 'string') delete customColorList[c]
     }
-    if (Object.keys(customColorList)?.length === 0) customColorList = null
+    if (Object.keys(customColorList).length === 0) customColorList = null
   } catch (e) {}
 
   // Highlight courses with teachers

diff --git a/server/util/utils.js b/server/util/utils.js
@@ -36,13 +36,13 @@ const getColor = (value, location, description, options = {}) => {
   if (options.highlightTeacher && checkHighlightTeacher({ description })) {
     return '#676767'
   } else if (value.includes('CM') || value.toUpperCase().includes('AMPHI') || location.toUpperCase().includes('AMPHI')) {
-    return options?.customColor?.amphi || '#efd6d8'
+    return options.customColor?.amphi || '#efd6d8'
   } else if (value.includes('TP') || value.includes('TDi') || value.trim().match(/\sG\d\.\d$/)) {
-    return options?.customColor?.tp || '#bbe0ff'
+    return options.customColor?.tp || '#bbe0ff'
   } else if ((value.includes('TD') || location.includes('V-B') || value.trim().match(/\sG\d$/)) && !/^S\d\.\d\d/.test(value) && !/contr[ôo]le/i.test(value)) {
-    return options?.customColor?.td || '#d4fbcc'
+    return options.customColor?.td || '#d4fbcc'
   } else {
-    return options?.customColor?.other || '#EDDD6E'
+    return options.customColor?.other || '#EDDD6E'
   }
 }