Merge branch '62-service-desk-from-ss-om-magseisfairfield-com-bug-report' into 'devel'

Resolve "Service Desk (from ss.om@magseisfairfield.com): Bug report"

Closes #62

See merge request wgp/dougal/software!4

lib/www/client/source/src/components/navigation.vue

@@ -4,7 +4,7 @@
     app
     clipped-left
   >
-    <v-img src="https://aaltronav.eu/media/aaltronav-logo.svg"
+    <v-img src="/wgp-logo.png"
       contain
       max-height="32px" max-width="32px"
     ></v-img>

lib/www/client/source/src/views/Plan.vue

@@ -58,6 +58,11 @@
                   single-line
                 >
                 </v-text-field>
+                <v-checkbox
+                  v-model="shiftAll"
+                  class="mt-0"
+                  label="Shift all planned sequences"
+                ></v-checkbox>
               </template>
             </v-edit-dialog>
           </template>
@@ -320,6 +325,7 @@ export default {
       queuedReload: false,
 
       plannerConfig: null,
+      shiftAll: false, // Shift all sequences checkbox
       
       // Context menu stuff
       contextMenuShow: false,
@@ -355,7 +361,11 @@ export default {
             await this.shiftTimesAfter(item, delta);
             await this.saveItem({sequence: item.sequence, key: 'ts1', value: ts1});
           } else if (oldVal.key == "sequence") {
-            await this.shiftSequences(oldVal.value-item.sequence);
+            if (this.shiftAll) {
+              await this.shiftSequences(oldVal.value-item.sequence);
+            } else {
+              await this.shiftSequence(item, oldVal.value);
+            }
           } else if (item[oldVal.key] != oldVal.value) {
             if (await this.saveItem(oldVal)) {
               item[oldVal.key] = oldVal.value;
@@ -449,6 +459,38 @@ export default {
       }
     },
 
+    async shiftSequence (item, newSequence) {
+
+      if (item.sequence == newSequence) {
+        // Nothing to do
+        return;
+      }
+
+      const conflict = this.items.find(i => i.sequence == newSequence)
+      if (conflict) {
+        this.showSnack([`Sequence ${newSequence} already exists`, "error"]);
+      } else {
+        // Cannot do this check at the moment as we would have to load the list of sequences.
+        // TODO We will do this after refactoring.
+        /*
+        if (this.sequences.find(i => i.sequence == newSequence)) {
+          this.showSnack([`Sequence ${newSequence} conflicts with a line that's already been acquired`, "warning"]);
+        }
+        */
+
+        const url = `/project/${this.$route.params.project}/plan/${item.sequence}`;
+        const init = {
+          method: "PATCH",
+          headers: {"Content-Type": "application/json"},
+          body: {
+            sequence: newSequence,
+            name: null
+          } // Setting name to null causes it to be regenerated
+        }
+        await this.api([url, init]);
+      }
+    },
+
     async shiftTimesAfter(item, delta) {
       const pos = this.items.indexOf(item)+1;
       if (pos != 0) {
@@ -546,7 +588,7 @@ export default {
         : item;
     },
 
-    ...mapActions(["api"])
+    ...mapActions(["api", "showSnack"])
   },
 
   async mounted () {

lib/www/client/source/vue.config.js

@@ -8,7 +8,7 @@ module.exports = {
         target: "http://localhost:3000",
       },
       "^/ws(/|$)": {
-        target: "http://localhost:3000",
+        target: "ws://localhost:3000",
         ws: true
       }
     }

lib/www/server/lib/db/plan/lib/index.js

@@ -19,14 +19,20 @@ async function getDistance (client, payload) {
 }
 
 async function getSequence (client) {
+	// Get the next free sequence from planned data
+	// if there is any planned lines, if not get the
+	// next available from raw lines
 	const text = `
-		SELECT max(sequence)+1 AS sequence
-		FROM (
-				SELECT sequence
-				FROM raw_lines
-				UNION SELECT sequence
-				FROM planned_lines
-		) t;
+		WITH p AS (
+			SELECT max(sequence) AS sequence
+			FROM planned_lines
+		),
+		r AS (
+			SELECT max(sequence) AS sequence
+			FROM raw_lines
+		)
+		SELECT COALESCE(p.sequence, r.sequence)+1 AS sequence
+		FROM p, r;
 	`;
 
 	const res = await client.query(text);