X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChallengeList.vue;h=a1c46cdc400da3d4fe42854048a8e9af664e2d7f;hb=902378e6276422d38b45f7d79282c2462f1124b1;hp=a52e0cae57ee7fdb4fe39580759790a09b5be2d9;hpb=85e5b5c1e6192a134fa69182e8c077605fdb969f;p=vchess.git

diff --git a/client/src/components/ChallengeList.vue b/client/src/components/ChallengeList.vue
index a52e0cae..a1c46cdc 100644
--- a/client/src/components/ChallengeList.vue
+++ b/client/src/components/ChallengeList.vue
@@ -1,36 +1,96 @@
 <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(v-if="challenges.length > 0")
+    thead
+      tr
+        th {{ st.tr["Variant"] }}
+        th {{ st.tr["With"] }}
+        th {{ st.tr["Cadence"] }}
+        th {{ st.tr["Options"] }}
+    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 {{ withWho(c) }}
+        td {{ c.cadence }}
+        td(:class="getRandomnessClass(c)") {{ c.options.abridged || '' }}
+  p(v-else)
+    | {{ st.tr["No challenges found :( Click on 'New game'!"] }}
 </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 > 0 && 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({ priority: priority }, c);
+      });
+      const deltaAdded = maxAdded - minAdded;
+      return augmentedChalls.sort((c1, c2) => {
+        return c2.priority - c1.priority + (c2.added - c1.added) / deltaAdded;
+      });
+    }
+  },
+  methods: {
+    withWho: function(c) {
+      if (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id)
+        return c.to || this.st.tr["Any player"];
+      return c.from.name || "@nonymous";
+    },
+    // TODO: duplicated from Hall
+    getRandomnessClass: function(c) {
+      const opts = c.options;
+      if (opts.randomness === undefined && opts.random === undefined)
+        return {};
+      if (opts.randomness !== undefined)
+        return { ["random-" + opts.randomness]: true };
+      return { ["random-" + (opts.random ? 2 : 0)]: true };
+    }
+  }
 };
-// TODO: challenge format from/to ou uid/players ............
 </script>
 
-<style lang="sass">
-// TODO: affichage bizarre sur petits écrans <=767px
+<style lang="sass" scoped>
+p
+  text-align: center
+  font-weight: bold
+
+// NOTE: the style applied to <tr> element doesn't work
+tr.fromyou > td
+  font-style: italic
+tr.toyou > td
+  background-color: #fcd785
+
+tr > td:last-child
+  &.random-0
+    background-color: #FEAF9E
+  &.random-1
+    background-color: #9EB2FE
+  &.random-2
+    background-color: #A5FE9E
 </style>