From: Benjamin Auder <benjamin.auder@somewhere>
Date: Tue, 4 Feb 2020 16:37:08 +0000 (+0100)
Subject: Some improvements on time controls + vid
X-Git-Url: https://git.auder.net/img/bundles/framework/images/css/rpsls.css?a=commitdiff_plain;h=25d183426e276870f57793f1f043c40a412d18c6;p=vchess.git

Some improvements on time controls + vid
---

diff --git a/TODO b/TODO
index 7851b9ff..b51e7056 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,4 @@
-Nouvelle partie en cours s'affiche pas pour les autres personnes restées dans le Hall
-myGames initial loading: live games aren't shown
 Checkered chess: need another FEN element, last non-capturing checkered move (if applicable)
   + need to stack these indicators for alpha beta search
 MarseilleChess: revise bot and test
-Cadences: uniformiser, tout en minutes + secondes (par défaut) ou days [corr, checkbox?]
 Translations (including About page), refresh rules
diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 0ade5e58..a2ce34d9 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -14,15 +14,21 @@ main
       fieldset
         label(for="selectVariant") {{ st.tr["Variant"] }}
         select#selectVariant(v-model="newchallenge.vid")
-          option(v-for="v in st.variants" :value="v.id") {{ v.name }}
+          option(v-for="v in st.variants" :value="v.id"
+              :selected="newchallenge.vid==v.id")
+            | {{ v.name }}
       fieldset
         label(for="timeControl") {{ st.tr["Time control"] }}
+        div#predefinedTimeControls
+          button 3+2
+          button 5+3
+          button 15+5
         input#timeControl(type="text" v-model="newchallenge.timeControl"
-          placeholder="3m+2s, 1h+30s, 7d+1d ...")
+          placeholder="5+0, 1h+30s, 7d+1d ...")
       fieldset(v-if="st.user.id > 0")
         label(for="selectPlayers") {{ st.tr["Play with? (optional)"] }}
         input#selectPlayers(type="text" v-model="newchallenge.to")
-      fieldset(v-if="st.user.id > 0")
+      fieldset(v-if="st.user.id > 0 && newchallenge.to.length > 0")
         label(for="inputFen") {{ st.tr["FEN (optional)"] }}
         input#inputFen(type="text" v-model="newchallenge.fen")
       button(@click="newChallenge") {{ st.tr["Send challenge"] }}
@@ -96,9 +102,9 @@ export default {
       infoMessage: "",
       newchallenge: {
         fen: "",
-        vid: 0,
+        vid: localStorage.getItem("vid") || "",
         to: "", //name of challenged player (if any)
-        timeControl: "", //"2m+2s" ...etc
+        timeControl: localStorage.getItem("timeControl") || "",
       },
     };
   },
@@ -201,6 +207,13 @@ export default {
     };
     this.st.conn.onclose = socketCloseListener;
   },
+  mounted: function() {
+    document.querySelectorAll("#predefinedTimeControls > button").forEach(
+      (b) => { b.addEventListener("click",
+        () => { this.newchallenge.timeControl = b.innerHTML; }
+      )}
+    );
+  },
   methods: {
     // Helpers:
     filterChallenges: function(type) {
@@ -452,6 +465,8 @@ export default {
       };
     },
     newChallenge: async function() {
+      if (this.newchallenge.vid == "")
+		    return alert("Please select a variant");
       const vname = this.getVname(this.newchallenge.vid);
       const vModule = await import("@/variants/" + vname + ".js");
       window.V = vModule.VariantRules;
@@ -503,6 +518,9 @@ export default {
         this.challenges.push(chall);
         if (ctype == "live")
           localStorage.setItem("challenge", JSON.stringify(chall));
+        // Also remember timeControl  + vid for quicker further challenges:
+        localStorage.setItem("timeControl", chall.timeControl);
+        localStorage.setItem("vid", chall.vid);
         document.getElementById("modalNewgame").checked = false;
       };
       if (ctype == "live")
diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue
index a8d9e127..c24e7203 100644
--- a/client/src/views/MyGames.vue
+++ b/client/src/views/MyGames.vue
@@ -32,7 +32,8 @@ export default {
   created: function() {
     GameStorage.getAll((localGames) => {
       localGames.forEach((g) => g.type = this.classifyObject(g));
-      Array.prototype.push.apply(this.games, localGames);
+      //Array.prototype.push.apply(this.games, localGames); /TODO: Vue3...
+      this.games = this.games.concat(localGames);
     });
     if (this.st.user.id > 0)
     {