X-Git-Url: https://git.auder.net/pieces/Cwda/n_white_knight.svg?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChallengeList.vue;h=f6d3090e0206dca954be463b7c6338e799516539;hb=ae2c49bb0bbaac3953f63be5b720e9c6835f00b6;hp=a52e0cae57ee7fdb4fe39580759790a09b5be2d9;hpb=85e5b5c1e6192a134fa69182e8c077605fdb969f;p=vchess.git

diff --git a/client/src/components/ChallengeList.vue b/client/src/components/ChallengeList.vue
index a52e0cae..f6d3090e 100644
--- a/client/src/components/ChallengeList.vue
+++ b/client/src/components/ChallengeList.vue
@@ -1,36 +1,58 @@
 <template lang="pug">
-table
-  tr
-    th(v-if="showVariant") Variant
-    th From
-    th To
-    th Cadence
-    th(v-if="showNbPlayers") Number of players
-  tr(v-for="c in challenges" @click="$emit('click-challenge',c)")
-    td(v-if="showVariant") {{ c.variant }}
-    td {{ c.from.name }}
-    td
-      span(v-for="p in c.to") {{ p.name }}
-      td {{ c.mainTime }} + {{ c.increment }}
-      td(v-if="showNbPlayers") {{ c.nbPlayers }}
+div
+  table
+    thead
+      tr
+        th {{ st.tr["Variant"] }}
+        th {{ st.tr["From"] }}
+        th {{ st.tr["Cadence"] }}
+    tbody
+      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"],
-	computed: {
-		showVariant: function() {
-			this.challenges.length > 0 && !!this.challenges[0].variant;
-		},
-		showNbPlayers: function() {
-			this.challenges.length > 0 && !!this.challenges[0].nbPlayers;
-		},
-	},
+  props: ["challenges"],
+  data: function() {
+    return {
+      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 && 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;
+        if (c.added < minAdded)
+          minAdded = c.added;
+        if (c.added > maxAdded)
+          maxAdded = c.added
+        return Object.assign({}, c, {priority: priority});
+      });
+      const deltaAdded = maxAdded - minAdded;
+      return augmentedChalls.sort((c1,c2) => {
+        return c2.priority - c1.priority + (c2.added - c1.added) / deltaAdded;
+      });
+    },
+  },
 };
-// TODO: challenge format from/to ou uid/players ............
 </script>
 
-<style lang="sass">
-// TODO: affichage bizarre sur petits écrans <=767px
+<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>