New default picture of meals & Sort exams

hft-app · Jul 15, 2020 · eb53e4e · eb53e4e
1 parent 27319ff
commit eb53e4e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/components/MealPicture.vue b/src/components/MealPicture.vue
@@ -2,7 +2,7 @@
   <div class="fullscreen">
     <div class="photo">
       <img :src="'https://sws2.maxmanager.xyz/assets/' + (meal.photo? meal.photo:
-             'fotos/musikhochschule/Speisefotos/0-1/27816947m_dummy_speisen.jpg')"
+             'fotos/dummies/foto-kommt-noch.jpg')"
            :alt="$t('page.meals.imageNotLoaded')">
       <fa-icon icon="times" class="lu-icon lu-times-circle close" @click="$router.back()" />
     </div>

diff --git a/src/components/Meals.vue b/src/components/Meals.vue
@@ -22,7 +22,7 @@
           <div v-for="meal in meals" class="meal article">
             <router-link :to="{name: 'mealpicture', params: {meal}}" class="photo">
               <div :style="'background-image: url(\'https://sws2.maxmanager.xyz/assets/' + (meal.photo? meal.photo:
-                     'fotos/musikhochschule/Speisefotos/0-1/27816947m_dummy_speisen.jpg') +'\')'"
+                     'fotos/dummies/foto-kommt-noch.jpg') +'\')'"
                    :alt="$t('page.meals.imageNotLoaded')" loading="lazy" class="img" />
             </router-link>
             <div class="data">

diff --git a/src/stores/lsf.js b/src/stores/lsf.js
@@ -64,6 +64,9 @@ export const Client = {
       let columns = rows[rowIndex].children;
       if (columns[0].className === 'qis_kontoOnTop') continue;
 
+      const semesterParts = columns[2].textContent.trim().split(' ');
+      const semester = semesterParts[semesterParts.length - 1];
+
       exams.push({
         id: columns[0].textContent.trim(),
         title: columns[1].textContent.trim(),
@@ -72,10 +75,12 @@ export const Client = {
         cp: parseFloat(columns[5].textContent.trim()),
         try: parseInt(columns[7].textContent.trim()),
         date: columns[8].textContent.trim() || null,
+        semester,
       });
     }
 
-    exams = exams.reverse();
+    exams = exams.sort((a, b) => a.date && b.date ? b.date - a.date : 0);
+    exams = exams.sort((a, b) => b.semester.localeCompare(a.semester));
 
     return {exams, fullname};
   },
@@ -117,7 +122,7 @@ export const Client = {
       const row = rows[rowIndex + 2];
 
       const columns = row.children;
-      let skip = rowIndex  % 4 ? 1 : 2;
+      let skip = rowIndex % 4 ? 1 : 2;
 
       for (let columnIndex = skip; columnIndex < columns.length; columnIndex++) {
         const column = columns[columnIndex];
@@ -172,7 +177,7 @@ export const Client = {
         }
       }
     }
-    return lectures.sort((a,b) => a.start - b.start);
+    return lectures.sort((a, b) => a.start - b.start);
   },
 
   async loadSubjects() {
@@ -211,7 +216,7 @@ export const Client = {
       '&breadcrumb=schedule&topitem=lectures');
     const url = dom.querySelector('.content_max > form').getAttribute('action');
 
-    await fetchDOM(url + '&par=old&PlanSpeichern=PlanSpeichern &'+
+    await fetchDOM(url + '&par=old&PlanSpeichern=PlanSpeichern &' +
       courses.map(ref => `&add.${ref.id}=${ref.subjectId}`).join(''))
   }
 };