X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChallengeList.vue;h=92c42f7c30d334eac44c929f7ca648d4b6e9b80e;hb=6808d7a16ec1e761c6a2dffec2281c96953e4d89;hp=fd2a9015b6959e8e56058fdc11374b97564f86db;hpb=26f3a8879fb4b410ed8840c5a37397011c13bc1c;p=vchess.git

diff --git a/client/src/components/ChallengeList.vue b/client/src/components/ChallengeList.vue
index fd2a9015..92c42f7c 100644
--- a/client/src/components/ChallengeList.vue
+++ b/client/src/components/ChallengeList.vue
@@ -5,40 +5,51 @@ div
       tr
         th {{ st.tr["Variant"] }}
         th {{ st.tr["From"] }}
-        th {{ st.tr["To"] }}
-        th {{ st.tr["Time control"] }}
+        th {{ st.tr["Cadence"] }}
     tbody
-      tr(v-for="c in sortedChallenges" @click="$emit('click-challenge',c)")
-        td(data-label="Variant") {{ c.vname }}
-        td(data-label="From") {{ c.from.name || "@nonymous" }}
-        td(data-label="To") {{ c.to }}
-        td(data-label="Cadence") {{ c.timeControl }}
+      tr(v-for="c in sortedChallenges" :class="{toyou:c.priority==1,fromyou:c.priority==2}" @click="$emit('click-challenge',c)")
+        td {{ c.vname }}
+        td {{ c.from.name || "@nonymous" }}
+        td {{ c.cadence }}
 </template>
 
 <script>
 import { store } from "@/store";
-
 export default {
   name: "my-challenge-list",
   props: ["challenges"],
   data: function() {
     return {
-      st: store.state,
+      st: store.state
     };
   },
   computed: {
     sortedChallenges: function() {
       // Show in order: challenges I sent, challenges I received, other challenges
+      let minAdded = Number.MAX_SAFE_INTEGER;
+      let maxAdded = 0;
       let augmentedChalls = this.challenges.map(c => {
         let priority = 0;
-        if (c.to == this.st.user.name)
-          priority = 1;
-        else if (c.from.id == this.st.user.id || c.from.sid == this.st.user.sid)
+        if (!!c.to && c.to == this.st.user.name) priority = 1;
+        else if (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id)
           priority = 2;
-        return Object.assign({}, c, {priority: priority});
+        if (c.added < minAdded) minAdded = c.added;
+        if (c.added > maxAdded) maxAdded = c.added;
+        return Object.assign({}, c, { priority: priority });
       });
-      return augmentedChalls.sort((c1,c2) => { return c2.priority - c1.priority; });
-    },
-  },
+      const deltaAdded = maxAdded - minAdded;
+      return augmentedChalls.sort((c1, c2) => {
+        return c2.priority - c1.priority + (c2.added - c1.added) / deltaAdded;
+      });
+    }
+  }
 };
 </script>
+
+<style lang="sass" scoped>
+// TODO: understand why the style applied to <tr> element doesn't work
+tr.fromyou > td
+  font-style: italic
+tr.toyou > td
+  background-color: #fcd785
+</style>