From a38b7bca9a60b6817d8c1725d589a560da8ff3d3 Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Fri, 10 May 2024 15:14:22 +0200
Subject: [PATCH] feat: Add label to nb.json, deselect broadcast option for
pest 68
---
src/components/Observation.vue | 5 ++++-
src/locales/nb.json | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/components/Observation.vue b/src/components/Observation.vue
index 73e2abd..08c392b 100644
--- a/src/components/Observation.vue
+++ b/src/components/Observation.vue
@@ -83,7 +83,7 @@
<input id="strDateObservation" class="form-control" ref="strDateObservation" type="date"
:max="maxObservationDate" :min="minObservationDate" v-model="strDateObservation"
v-on:change="capturedTime($event)" placeholder="Dato for observasjon"/>
- <label for="strDateObservation">Dato for observasjon</label>
+ <label for="strDateObservation">{{ $t("observationTimeSeries.date.label") }}</label>
</div>
<div class="form-check form-switch mb-3 row">
@@ -519,6 +519,9 @@ export default {
this.observation.observationHeading = "";
this.useDefaultHeader = false;
this.observation.organismId = this.formData.pestId;
+
+ // Should be true by default for all but 68 (eplevikler)
+ this.observation.broadcastMessage = this.formData.pestId !== 68;
}
},
diff --git a/src/locales/nb.json b/src/locales/nb.json
index 414104f..97ef93c 100644
--- a/src/locales/nb.json
+++ b/src/locales/nb.json
@@ -14,6 +14,7 @@
"observationTimeSeries.selectcrop": "Velg kultur",
"observationTimeSeries.selectpest": "Velg skadegjører",
"observationTimeSeries.selectpoi": "Velg et forhåndsdefinert sted",
+ "observationTimeSeries.date.label": "Dato for observasjon",
"observationTimeSeries.detail.name.placeholder": "Tittel",
"observationTimeSeries.detail.description.placeholder": "Beskrivelse",
"observationTimeSeries.observation.add.not.available": "Observasjoner kan legges til så snart tidsserien er lagret til databasen. Forsøk igjen senere.",
--
GitLab