X-Git-Url: https://git.auder.net/doc/screen_pairings_scoring.png?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=a48c8d4792027cbbb46e298e20e721fe1856adad;hb=f296c3d4d610e04f8c9b56dcee319b6d783a9290;hp=4eeb9862395b6118a0d6a07fc40fd017807c1b99;hpb=91777c2c0e68bbda334f06c482be64b20df1a380;p=vchess.git

diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue
index 4eeb9862..a48c8d47 100644
--- a/client/src/views/MyGames.vue
+++ b/client/src/views/MyGames.vue
@@ -23,10 +23,15 @@ main
         @show-game="showGame"
         @abortgame="abortGame"
       )
+      UploadGame(
+        v-show="display=='import'"
+        @game-uploaded="addGameImport"
+      )
       GameList(
         v-show="display=='import'"
         ref="importgames"
         :games="importGames"
+        :show-both="true"
         @show-game="showGame"
       )
       button#loadMoreBtn(
@@ -34,7 +39,6 @@ main
         @click="loadMore(display)"
       )
         | {{ st.tr["Load more"] }}
-      UploadGame(@game-uploaded="addGameImport")
 </template>
 
 <script>
@@ -150,12 +154,19 @@ export default {
               // Now ask completed games (partial list)
               this.loadMore(
                 "live",
-                () => this.loadMore("corr", adjustAndSetDisplay)
+                () => this.loadMore("corr", () => {
+                  this.loadMore("import", adjustAndSetDisplay);
+                })
               );
             }
           }
         );
-      } else this.loadMore("live", adjustAndSetDisplay);
+      }
+      else {
+        this.loadMore("live", () => {
+          this.loadMore("import", adjustAndSetDisplay);
+        });
+      }
     });
   },
   beforeDestroy: function() {
@@ -175,21 +186,30 @@ export default {
       let elt = e ? e.target : document.getElementById(type + "Games");
       elt.classList.add("active");
       elt.classList.remove("somethingnew"); //in case of
-      if (elt.previousElementSibling)
-        elt.previousElementSibling.classList.remove("active");
-      else elt.nextElementSibling.classList.remove("active");
+      for (let t of ["live","corr","import"]) {
+        if (t != type)
+          document.getElementById(t + "Games").classList.remove("active");
+      }
     },
     addGameImport(game) {
-      if (!game.id) {
-        alert(this.st.tr[
-          "No identifier found: use the upload button in analysis mode"]);
-      }
-      else this.importGames.push(game);
+      game.type = "import";
+      ImportgameStorage.add(game, (err) => {
+        if (!!err) {
+          if (err.message.indexOf("Key already exists") < 0) {
+            alert(this.st.tr["An error occurred. Try again!"]);
+            return;
+          }
+          // NOTE: since a random new ID is generated for imported games,
+          // this error will not occur.
+          else alert(this.st.tr["The game was already imported"]);
+        }
+        this.$router.push("/game/" + game.id);
+      });
     },
     tryShowNewsIndicator: function(type) {
       if (
-        (type == "live" && this.display == "corr") ||
-        (type == "corr" && this.display == "live")
+        (type == "live" && this.display != "live") ||
+        (type == "corr" && this.display != "corr")
       ) {
         document
           .getElementById(type + "Games")
@@ -373,16 +393,13 @@ export default {
 };
 </script>
 
-<style lang="sass">
+<style lang="sass" scoped>
 .active
   color: #42a983
 
 .tabbtn
   background-color: #f9faee
 
-table.game-list
-  max-height: 100%
-
 button#loadMoreBtn
   display: block
   margin: 0 auto
@@ -390,3 +407,9 @@ button#loadMoreBtn
 .somethingnew
   background-color: #c5fefe !important
 </style>
+
+<!-- Not scoped because acting on GameList -->
+<style lang="sass">
+table.game-list
+  max-height: 100%
+</style>