From d751533698f652764e39c99fc2e85008a78c05b5 Mon Sep 17 00:00:00 2001
From: "Petter H. Juliussen" <petter.juliussen@origo.oslo.kommune.no>
Date: Wed, 4 Oct 2023 10:53:51 +0200
Subject: [PATCH] Re-introduce weight adjustment for key results

---
 CHANGELOG.md                             |  2 ++
 src/components/drawers/EditKeyResult.vue | 11 +++++++++++
 src/locale/locales/en-US.json            |  5 ++++-
 src/locale/locales/nb-NO.json            |  5 ++++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b24273372..ba53e776b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,8 @@ All notable changes to this project will be documented in this file. The format
   attempted form submissions.
 - Administration of measurements has been moved to drawers and follows the same
   pattern as when editing OKRs and other items.
+- It is now again possible to adjust the weight of each key result used in the
+  calculation of overall progression of an objective.
 
 ### Removed
 
diff --git a/src/components/drawers/EditKeyResult.vue b/src/components/drawers/EditKeyResult.vue
index 63ace8eb2..8dbc47550 100644
--- a/src/components/drawers/EditKeyResult.vue
+++ b/src/components/drawers/EditKeyResult.vue
@@ -77,6 +77,17 @@
               class="pkt-cell pkt-cell--span6"
             />
           </div>
+
+          <form-component
+            v-model.number="thisKeyResult.weight"
+            input-type="input"
+            name="weight"
+            :label="$t('keyResult.weight.label')"
+            rules="required|decimal|positiveNotZero"
+            type="number"
+          >
+            <template #help><span v-html="$t('keyResult.weight.help')" /></template>
+          </form-component>
         </template>
 
         <template v-if="!keyResult?.archived" #actions="{ handleSubmit, submitDisabled }">
diff --git a/src/locale/locales/en-US.json b/src/locale/locales/en-US.json
index f7b2db6b9..5549f54d5 100644
--- a/src/locale/locales/en-US.json
+++ b/src/locale/locales/en-US.json
@@ -370,7 +370,10 @@
     "chooseDate": "Select date",
     "belongsTo": "Related objective",
     "numberOfUpdates": "Update count",
-    "weight": "Weight",
+    "weight": {
+      "label": "Weight",
+      "help": "Progression for each key result is by default weighted equally (`1`) when calculating the overall progression for an objective. It is possible to override this for each key result individually by changing the value below."
+    },
     "automatic": "Automatic",
     "autoHelpText": "The value for this key result gets updated automatically from Google Sheets.",
     "autoError": "Issue fetching data from Google Sheets:",
diff --git a/src/locale/locales/nb-NO.json b/src/locale/locales/nb-NO.json
index a3819aa2c..13e0fe3c2 100644
--- a/src/locale/locales/nb-NO.json
+++ b/src/locale/locales/nb-NO.json
@@ -370,7 +370,10 @@
     "chooseDate": "Velg dato",
     "belongsTo": "Tilhører mål",
     "numberOfUpdates": "Antall oppdateringer",
-    "weight": "Vekt",
+    "weight": {
+      "label": "Vekt",
+      "help": "I utregningen av samlet progresjon for et mål vektes i utgangspunktet progresjonen for hvert nøkkelresultat likt (`1`). Det er imidlertid mulig å overstyre dette for hvert enkelt nøkkelresultat ved å endre tallverdien under."
+    },
     "automatic": "Oppdateres automatisk",
     "autoHelpText": "Verdien til dette nøkkelresultatet oppdateres automatisk fra et Google Sheets-dokument.",
     "autoError": "Feil i henting av data fra Google Sheets:",