X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FGameList.vue;h=d81a1de7036b9c9c5328da7fc3441be216d6ac91;hb=5fa88038b667df426472ef6f1ba5555320eaa1a4;hp=7160202802eb856449bf12674a605ea1bb889e00;hpb=e727fe31742dfb3e40eb222c94f4199e2be98453;p=vchess.git

diff --git a/client/src/components/GameList.vue b/client/src/components/GameList.vue
index 71602028..d81a1de7 100644
--- a/client/src/components/GameList.vue
+++ b/client/src/components/GameList.vue
@@ -9,7 +9,7 @@ div
         th {{ st.tr["Result"] }}
     tbody
       tr(
-        v-for="g in sortedGames"
+        v-for="g in sortedGames()"
         @click="$emit('show-game',g)"
         :class="{'my-turn': !!g.myTurn}"
       )
@@ -28,6 +28,7 @@ div
 <script>
 import { store } from "@/store";
 import { GameStorage } from "@/utils/gameStorage";
+import { ImportgameStorage } from "@/utils/importgameStorage";
 import { ajax } from "@/utils/ajax";
 export default {
   name: "my-game-list",
@@ -52,23 +53,6 @@ export default {
       }
     });
   },
-  computed: {
-    sortedGames: function() {
-      // Show in order: it's my turn, running games, completed games
-      let minCreated = Number.MAX_SAFE_INTEGER;
-      let maxCreated = 0;
-      this.games.forEach(g => {
-        if (g.created < minCreated) minCreated = g.created;
-        if (g.created > maxCreated) maxCreated = g.created;
-      });
-      const deltaCreated = maxCreated - minCreated;
-      return this.games.sort((g1, g2) => {
-        return (
-          g2.priority - g1.priority + (g2.created - g1.created) / deltaCreated
-        );
-      });
-    },
-  },
   methods: {
     player_s: function(g) {
       if (this.showBoth)
@@ -79,11 +63,36 @@ export default {
         );
       if (
         this.st.user.sid == g.players[0].sid ||
-        this.st.user.id == g.players[0].uid
-      )
+        this.st.user.id == g.players[0].id
+      ) {
         return g.players[1].name || "@nonymous";
+      }
       return g.players[0].name || "@nonymous";
     },
+    sortedGames: function() {
+      // Show in order: it's my turn, running games, completed games
+      let minCreated = Number.MAX_SAFE_INTEGER;
+      let maxCreated = 0;
+      let remGames = this.games.filter(g => !this.deleted[g.id]);
+      remGames.forEach(g => {
+        if (g.created < minCreated) minCreated = g.created;
+        if (g.created > maxCreated) maxCreated = g.created;
+        g.priority = 0;
+        if (g.score == "*") {
+          g.priority++;
+          if (!!g.myColor) g.priority++;
+          if (!!g.myTurn) g.priority++;
+        }
+      });
+      const deltaCreated = maxCreated - minCreated;
+      return remGames.sort((g1, g2) => {
+        return (
+          g2.priority - g1.priority +
+          // Modulate with creation time (value in ]0,1[)
+          (g2.created - g1.created) / (deltaCreated + 1)
+        );
+      });
+    },
     scoreClass: function(g) {
       if (g.score == "*" || !g.myColor) return {};
       // Ok it's my finished game: determine if I won, drew or lost.
@@ -108,8 +117,7 @@ export default {
       if (
         // My game ?
         game.players.some(p =>
-          p.sid == this.st.user.sid ||
-          p.uid == this.st.user.id
+          p.sid == this.st.user.sid || p.id == this.st.user.id
         )
       ) {
         const message =
@@ -118,15 +126,18 @@ export default {
             : "Abort and remove game?";
         if (confirm(this.st.tr[message])) {
           const afterDelete = () => {
-            if (game.score == "*") this.$emit("abortgame", game);
+            if (game.score == "*" && game.type != "import")
+              this.$emit("abortgame", game);
             this.$set(this.deleted, game.id, true);
           };
           if (game.type == "live")
             // Effectively remove game:
             GameStorage.remove(game.id, afterDelete);
+          else if (game.type == "import")
+            ImportgameStorage.remove(game.id, afterDelete);
           else {
             const mySide =
-              game.players[0].uid == this.st.user.id
+              game.players[0].id == this.st.user.id
                 ? "White"
                 : "Black";
             game["deletedBy" + mySide] = true;