diff --git a/src/components/feature/FeatureAttachmentForm.vue b/src/components/feature/FeatureAttachmentForm.vue index 397b0a47a4e2a31a23ddd0bd3e4c65452452ce85..7e9ef3a1d2aa912bb6292cd6e6c8c7c82ddec024 100644 --- a/src/components/feature/FeatureAttachmentForm.vue +++ b/src/components/feature/FeatureAttachmentForm.vue @@ -33,7 +33,7 @@ </div> <div class="required field"> <label>Fichier (PDF, PNG, JPEG)</label> - // todo : mettre en place la sélection de fichier + <!-- // todo : mettre en place la sélection de fichier --> <label @click="selectFile" class="ui icon button" @@ -45,7 +45,7 @@ }}</span> <span v-else class="label">Sélectionner un fichier ...</span> </label> - // todo: récupérer la valeur :accept="IMAGE_FORMAT" + <!-- // todo: récupérer la valeur :accept="IMAGE_FORMAT" --> <!-- @change="processImgData" --> <input type="file" diff --git a/src/store/modules/feature.js b/src/store/modules/feature.js index 646832c55ddd1c2a57172209203fd0fa89371dfb..ebe1fc1171ded28cb7f5f91efebe4878731e9634 100644 --- a/src/store/modules/feature.js +++ b/src/store/modules/feature.js @@ -8,47 +8,7 @@ const feature = { linkedFormset: [], features: [], form: null, - extra_form: [ - { - field_type: "char", - name: "deplacement_frontiere", - label: "Déplacement frontière" - }, - { - field_type: "list", - name: "deplacement_status", - label: "Statut du déplacement", - choices: [ - "à confirmer", - "confirmé" - ] - }, - { - field_type: "integer", - name: "deplacement_value", - label: "Mesure du déplacement" - }, - { - field_type: "boolean", - name: "is_deplacement", - label: "Déplacement confirmé" - }, - { - field_type: "date", - name: "deplacement_date", - label: "Date de déplacement" - }, - { - field_type: "decimal", - name: "deplacement_decimal", - label: "Importance de déplacement" - }, - { - field_type: "text", - name: "deplacement_description", - label: "Déscription du déplacement" - }, - ] + extra_form: [] }, mutations: { SET_FEATURES(state, features) { @@ -91,7 +51,6 @@ const feature = { .then((response) => { const features = response.data.features; commit("SET_FEATURES", features); - //dispatch("map/ADD_FEATURES", features, { root: true }); }) .catch((error) => { throw error; diff --git a/src/views/feature/Feature_detail.vue b/src/views/feature/Feature_detail.vue index fd24d87e57acfbec5a9f9c5d1b9b8512840c027d..2f1ae36aa82ee3f13e455cbf288194aa12629e56 100644 --- a/src/views/feature/Feature_detail.vue +++ b/src/views/feature/Feature_detail.vue @@ -51,8 +51,8 @@ <div class="row"> <div class="seven wide column"> <table class="ui very basic table"> - <tbody> - <tr v-for="field in feature_data" :key="field.label"> + <tbody>test + <tr v-for="field in feature.feature_data" :key="field.label"> <td> <b>{{ field.label }}</b> </td> @@ -300,7 +300,7 @@ : "Sélectionner un fichier ..." }}</span> </label> - // todo : get image from "C:\\fakepath\..." + <!-- // todo : get image from "C:\\fakepath\..." --> <input type="file" accept="application/pdf, image/jpeg, image/png" @@ -383,15 +383,6 @@ export default { data() { return { isCanceling: false, - feature_data: [ - { - field: { - label: "Publié", - field_type: "Boolean", - value: true, - }, - }, - ], mock_linked_features: [ /* { relation_type: "Doublon", diff --git a/src/views/feature/Feature_list.vue b/src/views/feature/Feature_list.vue index fcaadc5ff438b58ff9147e318cbe70c42954ab57..1475ee5faecf3da4e5ce1430a1f161bc8e0f9e0d 100644 --- a/src/views/feature/Feature_list.vue +++ b/src/views/feature/Feature_list.vue @@ -220,7 +220,7 @@ export default { data() { return { - showMap: false, + showMap: true, showAddSignal: false, form: { type: { @@ -253,6 +253,10 @@ export default { }, title: null, }, + pagination: { + start: 0, + end: 10, + }, }; }, @@ -280,6 +284,9 @@ export default { } return results; }, + paginatedFeatures: function () { + return this.features.slice(this.pagination.start, this.pagination.end); + }, }, created() { diff --git a/src/views/feature_type/Feature_type_detail.vue b/src/views/feature_type/Feature_type_detail.vue index ce8b1a2cde3e1a7162991ff6d108ba352fbd1bad..599de9b7a7639bb5cee696f7ddba42c87ac203a5 100644 --- a/src/views/feature_type/Feature_type_detail.vue +++ b/src/views/feature_type/Feature_type_detail.vue @@ -53,7 +53,7 @@ </div> <div class="ui bottom attached secondary segment"> - // ToDo : gérer permissions + <!-- // ToDo : gérer permissions --> <!-- <div v-if="permissions.can_create_feature" class="ui styled accordion"> --> <div class="ui styled accordion"> <div @@ -111,7 +111,7 @@ > <i class="download icon"></i> Exporter </button> - // todo gérer export + <!-- // todo gérer export --> </div> </div> </div> @@ -119,7 +119,7 @@ <div class="nine wide column"> <h3 class="ui header">Derniers signalements</h3> <div - v-for="(feature, index) in features" + v-for="(feature, index) in lastFeatures" :key="feature.feature_id + index" class="ui small header" > @@ -153,7 +153,9 @@ <div class="sub header"> <div> {{ - feature.description ? feature.description.substring(0, 200) : "Pas de description disponible" + feature.description + ? feature.description.substring(0, 200) + : "Pas de description disponible" }} </div> <div> @@ -182,7 +184,7 @@ > Ajouter un signalement </router-link> - <br />// ToDo : gérer permissions + <br /><!-- // ToDo : gérer permissions --> </div> </div> </template> @@ -202,10 +204,16 @@ export default { ...mapState("feature_type", ["feature_types", "importFeatureTypeData"]), structure: function () { // * je ne sais pas pourquoi ça s'appelle structure - return this.feature_types.find( - (el) => el.slug === this.$route.params.feature_type_slug - ); + if (this.feature_types) { + return this.feature_types.find( + (el) => el.slug === this.$route.params.feature_type_slug + ); + } + return null }, + lastFeatures: function() { + return this.features.slice(0, 5) + } }, watch: {