From 1b692cf15b31a67b57dc4b738d2d56b97aed8eb2 Mon Sep 17 00:00:00 2001
From: Eliasboss2006 <elias.patru@gmail.com>
Date: Tue, 27 Aug 2024 10:26:52 +0200
Subject: [PATCH 1/3] removing version button

---
 src/components/ComparisonOptionsPanel.vue | 11 ---------
 src/components/ComparisonSlider.vue       |  6 +----
 src/components/NetworkMap.vue             |  8 +++----
 src/store/sessionModule.ts                | 29 ++---------------------
 4 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/src/components/ComparisonOptionsPanel.vue b/src/components/ComparisonOptionsPanel.vue
index 5421e0e..b8a4031 100644
--- a/src/components/ComparisonOptionsPanel.vue
+++ b/src/components/ComparisonOptionsPanel.vue
@@ -70,13 +70,6 @@
                   <span>{{ t("duplicateversion") }}</span>
                 </button>
 
-                <button class="button" @click.stop="toggleChange">
-                  <span class="icon">
-                    <font-awesome-icon icon="exchange-alt" />
-                  </span>
-                  <span>{{ t("changeversion") }}</span>
-                </button>
-
                 <!-- TODO hide comparison button in the production code in main branch
                 <button class="button" @click.stop="toggleComparison" disabled>
                   <span class="icon">
@@ -245,10 +238,6 @@ export default defineComponent({
     };
 
     return {
-      nwkcomparison: computed(() => store.state.session.nwkcomparison),
-      nwkchange: computed(() => store.state.session.nwkchange),
-      toggleComparison: () => store.commit("session/toggle", "nwkcomparison"),
-      toggleChange: () => store.commit("session/toggle", "nwkchange"),
       editText: editText,
       isOpen: isOpen,
       newVersion: newVersion,
diff --git a/src/components/ComparisonSlider.vue b/src/components/ComparisonSlider.vue
index 125f201..6339934 100644
--- a/src/components/ComparisonSlider.vue
+++ b/src/components/ComparisonSlider.vue
@@ -1,5 +1,5 @@
 <template>
-  <g id="comparisonSlider">
+  <g id="comparisonSlider" v-if="versionMarks.length > 1">
     <line
       :x1="versionMarks[0].x"
       y1="-113"
@@ -12,7 +12,6 @@
       @click="() => handleCircleClick(mark.d.id)"
     >
       <circle
-        v-if="changeNWK"
         :cx="mark.x"
         cy="-113"
         r="2"
@@ -23,7 +22,6 @@
       />
       <!-- TODO check if different template elements necessary-->
       <circle
-        v-if="showComparison"
         :cx="mark.x"
         cy="-113"
         r="2"
@@ -121,8 +119,6 @@ export default defineComponent({
       versionMarks,
       handleCircleClick,
       handleComparisonClick,
-      showComparison: computed(() => store.state.session.nwkcomparison),
-      changeNWK: computed(() => store.state.session.nwkchange),
     };
   },
 });
diff --git a/src/components/NetworkMap.vue b/src/components/NetworkMap.vue
index ec09688..89de5e0 100644
--- a/src/components/NetworkMap.vue
+++ b/src/components/NetworkMap.vue
@@ -2,7 +2,7 @@
   <svg
     id="nwkmap"
     :viewBox="
-      showComparisonSlider && !isEditMode
+      !isEditMode
         ? '-110 -117 220 220'
         : '-106 -106 212 212'
     "
@@ -167,7 +167,7 @@
     <text :x="0" y="-102" text-anchor="middle" class="ego">
       {{ egoLabel }}
     </text>
-    <ComparisonSlider v-if="showComparisonSlider && !isEditMode" />
+    <ComparisonSlider/>
   </svg>
   <div id="zoomBtns">
     <button
@@ -774,9 +774,7 @@ export default defineComponent({
             /Apple Computer/.test(navigator.vendor)
           )
       ),
-      showComparisonSlider: computed(
-        () => store.state.session.nwkchange || store.state.session.nwkcomparison
-      ),
+      
     };
   },
 });
diff --git a/src/store/sessionModule.ts b/src/store/sessionModule.ts
index b955d86..90301f0 100644
--- a/src/store/sessionModule.ts
+++ b/src/store/sessionModule.ts
@@ -1,12 +1,9 @@
 export const TAB_BASE = "base";
 export const TAB_CONNECTIONS = "connections";
 
-export interface SessionFlags {
-  nwkchange: boolean;
-  nwkcomparison: boolean;
-}
 
-export interface SessionState extends SessionFlags {
+
+export interface SessionState {
   selected: Set<number>;
   editIndex: number | null;
   editTab: string;
@@ -14,9 +11,6 @@ export interface SessionState extends SessionFlags {
 
 export function initSessionState(): SessionState {
   return {
-    nwkcomparison: false,
-    nwkchange: false,
-
     selected: new Set<number>(),
     editIndex: null,
     editTab: "",
@@ -33,25 +27,6 @@ const getters = {
 };
 
 const mutations = {
-  updateFlag(
-    state: SessionState,
-    payload: { flag: keyof SessionFlags; value: boolean }
-  ) {
-    state[payload.flag] = payload.value;
-  },
-
-  enable(state: SessionState, flag: keyof SessionFlags): void {
-    state[flag] = true;
-  },
-
-  disable(state: SessionState, flag: keyof SessionFlags): void {
-    state[flag] = false;
-  },
-
-  toggle(state: SessionState, flag: keyof SessionFlags): void {
-    state[flag] = !state[flag];
-  },
-
   toggleAlterSelected(state: SessionState, alterId: number): void {
     if (state.selected.has(alterId)) {
       state.selected.delete(alterId);

From ba790661670c7f3539531269dcbc4ab4f8d09944 Mon Sep 17 00:00:00 2001
From: Eliasboss2006 <elias.patru@gmail.com>
Date: Wed, 28 Aug 2024 10:09:25 +0200
Subject: [PATCH 2/3] changed date format in pdf

---
 src/views/PdfView.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/views/PdfView.vue b/src/views/PdfView.vue
index cbc0cff..2516217 100644
--- a/src/views/PdfView.vue
+++ b/src/views/PdfView.vue
@@ -157,11 +157,7 @@ export default defineComponent({
         " " +
         visibleNWKVersion.value?.title +
         " " +
-        visibleNWKVersion.value?.date?.substring(8, 10) +
-        "." +
-        visibleNWKVersion.value?.date?.substring(5, 7) +
-        "." +
-        visibleNWKVersion.value?.date?.substring(0, 4) +
+        new Date(visibleNWKVersion.value!.date).toLocaleDateString("en-CA") +
         ".pdf"),
         window.print();
     };

From 82a5806742491c358483f5c850f6fe94dda582a7 Mon Sep 17 00:00:00 2001
From: Alexander Rind <1217527+alex-rind@users.noreply.github.com>
Date: Wed, 28 Aug 2024 17:09:13 +0200
Subject: [PATCH 3/3] style version slider, larger map when no slider, restore
 SessionFlags commented

---
 src/components/ComparisonSlider.vue | 24 ++++++++----------------
 src/components/NetworkMap.vue       |  6 +++---
 src/store/sessionModule.ts          | 24 +++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/components/ComparisonSlider.vue b/src/components/ComparisonSlider.vue
index 6339934..9b1770a 100644
--- a/src/components/ComparisonSlider.vue
+++ b/src/components/ComparisonSlider.vue
@@ -1,5 +1,5 @@
 <template>
-  <g id="comparisonSlider" v-if="versionMarks.length > 1">
+  <g id="comparisonSlider">
     <line
       :x1="versionMarks[0].x"
       y1="-113"
@@ -14,23 +14,13 @@
       <circle
         :cx="mark.x"
         cy="-113"
-        r="2"
+        r="1.5"
         :class="{
           comparisonCircle: !mark.selected,
           'comparisonCircle-selected': mark.selected,
         }"
       />
-      <!-- TODO check if different template elements necessary-->
-      <circle
-        :cx="mark.x"
-        cy="-113"
-        r="2"
-        :class="{
-          comparisonCircle: !mark.selected,
-          'comparisonCircle-selected': mark.selected,
-        }"
-        @click="() => handleComparisonClick(mark.d.id)"
-      />
+      <!-- TODO optionally a different shape/style if in juxtaposed version mode -->
       <text :x="mark.x" y="-108" text-anchor="middle" class="versionText">
         {{ mark.label }}
       </text>
@@ -97,9 +87,9 @@ export default defineComponent({
           versionId !== store.state.record.currentVersion
       );
       if (clickedVersion) {
-        console.log(`Clicked version: ${clickedVersion.title}`);
+        // console.log(`Clicked version: ${clickedVersion.title}`);
         store.commit("switchNWK", versionId);
-        console.log("Changed Version");
+        // console.log("Changed Version");
       }
     }
 
@@ -137,10 +127,12 @@ line {
 }
 
 .comparisonCircle {
-  fill: #d6dae9;
+  stroke: #d6dae9;
+  fill: white;
 }
 
 .comparisonCircle-selected {
+  stroke: $color-primary-1;
   fill: $color-primary-1;
 }
 </style>
diff --git a/src/components/NetworkMap.vue b/src/components/NetworkMap.vue
index 89de5e0..3eda983 100644
--- a/src/components/NetworkMap.vue
+++ b/src/components/NetworkMap.vue
@@ -2,7 +2,7 @@
   <svg
     id="nwkmap"
     :viewBox="
-      !isEditMode
+      showVersionSlider && !isEditMode
         ? '-110 -117 220 220'
         : '-106 -106 212 212'
     "
@@ -167,7 +167,7 @@
     <text :x="0" y="-102" text-anchor="middle" class="ego">
       {{ egoLabel }}
     </text>
-    <ComparisonSlider/>
+    <ComparisonSlider v-if="showVersionSlider && !isEditMode" />
   </svg>
   <div id="zoomBtns">
     <button
@@ -774,7 +774,7 @@ export default defineComponent({
             /Apple Computer/.test(navigator.vendor)
           )
       ),
-      
+      showVersionSlider: computed(() => store.state.record.versions.length > 1),
     };
   },
 });
diff --git a/src/store/sessionModule.ts b/src/store/sessionModule.ts
index 90301f0..aa777fd 100644
--- a/src/store/sessionModule.ts
+++ b/src/store/sessionModule.ts
@@ -1,7 +1,9 @@
 export const TAB_BASE = "base";
 export const TAB_CONNECTIONS = "connections";
 
-
+// export interface SessionFlags {
+//   versionComparison: boolean;
+// }
 
 export interface SessionState {
   selected: Set<number>;
@@ -11,6 +13,7 @@ export interface SessionState {
 
 export function initSessionState(): SessionState {
   return {
+    // versionComparison: false,
     selected: new Set<number>(),
     editIndex: null,
     editTab: "",
@@ -27,6 +30,25 @@ const getters = {
 };
 
 const mutations = {
+  /* updateFlag(
+    state: SessionState,
+    payload: { flag: keyof SessionFlags; value: boolean }
+  ) {
+    state[payload.flag] = payload.value;
+  },
+
+  enable(state: SessionState, flag: keyof SessionFlags): void {
+    state[flag] = true;
+  },
+
+  disable(state: SessionState, flag: keyof SessionFlags): void {
+    state[flag] = false;
+  },
+
+  toggle(state: SessionState, flag: keyof SessionFlags): void {
+    state[flag] = !state[flag];
+  }, */
+
   toggleAlterSelected(state: SessionState, alterId: number): void {
     if (state.selected.has(alterId)) {
       state.selected.delete(alterId);