From 0962795c0a2fdabc6b7b1e62e22eb3edcf28e84a Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 25 May 2022 12:49:13 +0200
Subject: [PATCH] Added checkbox for broadcastMessage
---
index.html | 2 +-
src/components/Observation.vue | 6 ++++--
src/components/Sync.vue | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/index.html b/index.html
index 9b76a04..540392e 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
<!--meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' https://code.jquery.com 'unsafe-inline' 'unsafe-eval'; media-src *; img-src 'self' http://opencache.statkart.no ; connect-src 'self' http://logic.vips.nibio.no https://logic.vips.nibio.no http://vipslogic-local.no https://opencache.statkart.no;"-->
-<meta http-equiv="Content-Security-Policy" content="default-src * data: blob: 'unsafe-inline' 'unsafe-eval';worker-src blob:">
+<meta http-equiv="Content-Security-Policy" content="default-src * data: blob: 'unsafe-inline' 'unsafe-eval';worker-src blob:;connect-src 'self' *">
<meta name="description" content="">
<meta name="author" content="Tor-Einar Skog">
<title>VIPS Feltobservasjoner</title>
diff --git a/src/components/Observation.vue b/src/components/Observation.vue
index fea2367..6a6b62f 100644
--- a/src/components/Observation.vue
+++ b/src/components/Observation.vue
@@ -115,7 +115,7 @@
<div class="form-group">
<div class="checkbox">
<label>
- <input type="checkbox" v-model="observation.broadcastMessage" name="broadcastMessage" checked="checked">
+ <input type="checkbox" v-model="observation.broadcastMessage" name="broadcastMessage">
</label>
{{ $t("observation.broadcast.label") }}
<font-awesome-icon icon="fa-solid fa-circle-question" class="helpIcon" onclick="document.getElementById('infoModal').style.display = 'block';"/>
@@ -162,7 +162,8 @@
isQuantification: false,
isMounted: false,
msg: this.$i18n.t("observation.msg"),
- observation: {},
+ observation: {
+ },
selectedCropId: -1,
crops: [],
pests: [],
@@ -761,6 +762,7 @@
newObservationId = this.getNewObservationId(lstObservations);
this.observation.observationId = newObservationId;
this.observation.observationData = '';
+ this.observation.broadcastMessage = true;
this.getNewObservation();
this.observation.observationIllustrationSet = [];
}
diff --git a/src/components/Sync.vue b/src/components/Sync.vue
index b738f4a..0bff52e 100644
--- a/src/components/Sync.vue
+++ b/src/components/Sync.vue
@@ -711,7 +711,7 @@
.then((data) => {
if (data) {
-
+ //console.info(data);
let updatedObservation = JSON.parse(data);
if (observation.observationId < 0) {
--
GitLab