feat: split events in past and upcoming - dashboard

AEGEE · Mar 13, 2020 · fb48b32 · fb48b32
1 parent 7e57005
commit fb48b32
Showing 1 changed file with 62 additions and 6 deletions.
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
@@ -28,20 +28,36 @@
             </article>
           </div>
 
-          <div class="tile is-4 is-parent">
+          <div class="tile is-4 is-parent is-vertical">
             <article class="tile is-child box">
-              <p class="title">Events you’ve applied to</p>
-              <div class="content" v-show="events.length > 0">
+              <p class="title">Upcoming events you’ve applied to</p>
+              <div class="content" v-show="eventsUpcoming.length > 0">
                 <ul>
-                  <li v-for="event in events" v-bind:key="event.id">
+                  <li v-for="event in eventsUpcoming" v-bind:key="event.id">
                     <router-link :to="{ name: 'oms.events.view', params: { id: event.url || event.id } }">
                       {{ event.name }} - {{ event.starts | date }}
                     </router-link>
                   </li>
                 </ul>
               </div>
-              <div class="content" v-show="events.length === 0">
-                <p><i>You haven't applied to any event yet.</i></p>
+              <div class="content" v-show="eventsUpcoming.length === 0">
+                <p><i>You haven't applied to any upcoming events yet.</i></p>
+              </div>
+            </article>
+
+            <article class="tile is-child box">
+              <p class="title">Past events you've applied to</p>
+              <div class="content" v-show="eventsOld.length > 0">
+                <ul>
+                <li v-for="event in eventsOld" v-bind:key="event.id">
+                  <router-link :to="{ name: 'oms.eventsOld.view', params: { id: event.url || event.id } }">
+                    {{ event.name }}
+                  </router-link>
+                </li>
+                </ul>
+              </div>
+              <div class="content" v-show="eventsOld.length === 0">
+                <p><i>You haven't attented any past events yet.</i></p>
               </div>
               <b-loading :is-full-page="false" :active.sync="isLoading.events"></b-loading>
             </article>
@@ -174,6 +190,46 @@ export default {
         }
       }
       return this.user.bodies
+    },
+    eventsOld () {
+      var eventsOld = []
+
+      var today = new Date()
+      var dd = String(today.getDate()).padStart(2, '0')
+      var mm = String(today.getMonth() + 1).padStart(2, '0')
+      var yyyy = today.getFullYear()
+      today = yyyy + "-" + mm + "-" + dd
+
+      for (const event of this.events.concat(this.statutory)) {
+        if (event != null) {
+          if (event.starts < today) {
+            console.log("adding " + event + " to pastEvents")
+            eventsOld.push(event)
+          }
+        }
+      }
+      eventsOld.sort((a,b) => (a.starts > b.starts) ? 1 : ((b.starts > a.starts) ? -1 : 0))
+      return eventsOld
+    },
+    eventsUpcoming () {
+      var eventsUpcoming = []
+
+      var today = new Date()
+      var dd = String(today.getDate()).padStart(2, '0')
+      var mm = String(today.getMonth() + 1).padStart(2, '0')
+      var yyyy = today.getFullYear()
+      today = yyyy + "-" + mm + "-" + dd
+
+      for (const event of this.events.concat(this.statutory)) {
+        if (event != null) {
+          if (event.starts >= today) {
+            console.log("adding " + event + " to upcomingEvents")
+            eventsUpcoming.push(event)
+          }
+        }
+      }
+      eventsUpcoming.sort((a,b) => (a.starts > b.starts) ? 1 : ((b.starts > a.starts) ? -1 : 0))
+      return eventsUpcoming
     }
   }
 }