From 78e0d0bc850e40dec5972acd6068eb906780db26 Mon Sep 17 00:00:00 2001
From: sebastien <dupuy@datakode.fr>
Date: Tue, 3 Jan 2023 14:04:47 +0100
Subject: [PATCH] =?UTF-8?q?correctif=20sur=20les=20mesures=20pr=C3=A9conis?=
=?UTF-8?q?=C3=A9es=20qui=20ne=20s=20affichent=20pas=20correctement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/mix-manifest.json | 6 +-----
.../Single/Components/Step4/MeasureActionForm.vue | 9 +++++++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index ff3cc075..c0737e97 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -12,9 +12,5 @@
"/images/soluris-logo-white.png": "/images/soluris-logo-white.png",
"/images/vendor/leaflet/dist/layers-2x.png": "/images/vendor/leaflet/dist/layers-2x.png",
"/images/vendor/leaflet/dist/layers.png": "/images/vendor/leaflet/dist/layers.png",
- "/images/vendor/leaflet/dist/marker-icon.png": "/images/vendor/leaflet/dist/marker-icon.png",
- "/images/vendor/vuejs-datatable/docs/icons.png": "/images/vendor/vuejs-datatable/docs/icons.png",
- "/images/vendor/vuejs-datatable/docs/icons@2x.png": "/images/vendor/vuejs-datatable/docs/icons@2x.png",
- "/images/vendor/vuejs-datatable/docs/widgets.png": "/images/vendor/vuejs-datatable/docs/widgets.png",
- "/images/vendor/vuejs-datatable/docs/widgets@2x.png": "/images/vendor/vuejs-datatable/docs/widgets@2x.png"
+ "/images/vendor/leaflet/dist/marker-icon.png": "/images/vendor/leaflet/dist/marker-icon.png"
}
diff --git a/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue b/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue
index ffb5fa0d..dc4e6bf1 100644
--- a/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue
+++ b/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue
@@ -2,8 +2,7 @@
<div>
<label class="mt-2" :for="`expected_level${measure.id}`"> Choisir le niveau visé</label>
<select :id="`expected_level${measure.id}`" v-model="expected_level" class="form-select form-control-sm" :disabled="!isEditable || level == 3"> <!-- v-model="measure.expected_level" -->
- <option :value="0"> </option>
- <option v-for="level in expectedLevelAvailable" :key="level" :value="level">{{ level }}</option>
+ <option v-for="(level,index) in expectedLevelAvailable" :key="level" :value="level">{{ level }}</option>
</select>
<div v-if="expected_level > level">
@@ -69,6 +68,12 @@ export default {
firstDay: 1
},
newLevel: this.measureLevel.expected_level,
+ defaultLevel : this.level+1,
+ }
+ },
+ mounted() {
+ if (this.measureLevel.expected_level === null){
+ this.measureLevel.expected_level = this.level + 1;
}
},
computed : {
--
GitLab