Skip to content
Snippets Groups Projects
Commit 931afd9e authored by Sébastien DA ROCHA's avatar Sébastien DA ROCHA :bicyclist:
Browse files

Merge branch 'redmine-issue/13365' into 'develop' 

REDMINE_ISSUE-13365

See merge request geocontrib/geocontrib-frontend!338
parents 00eaf4a8 4142ed47
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/components/ImportTask.vue
+ 4
− 1
View file @ 931afd9e
...@@ -145,13 +145,16 @@ export default { ...@@ -145,13 +145,16 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.sync { .sync {
cursor: pointer; cursor: pointer;
} }
#table-imports { #table-imports {
padding-top: 1em; padding-top: 1em;
table {
width: 100%;
}
} }
i.icon { i.icon {
......
src/components/Project/Detail/ProjectFeatureTypes.vue
+ 4
− 1
View file @ 931afd9e
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
<i <i
class="close icon" class="close icon"
aria-hidden="true" aria-hidden="true"
@click="csvError = null" @click="csvError = null; csvFileToImport = { name: '', size: 0 }"
/> />
{{ csvError }} {{ csvError }}
</div> </div>
...@@ -521,6 +521,9 @@ export default { ...@@ -521,6 +521,9 @@ export default {
}, },
methods: { methods: {
...mapMutations([
'SET_RELOAD_INTERVAL_ID'
]),
...mapMutations('feature-type', [ ...mapMutations('feature-type', [
'SET_FILE_TO_IMPORT' 'SET_FILE_TO_IMPORT'
]), ]),
......
src/store/index.js
+ 0
− 1
View file @ 931afd9e
...@@ -45,7 +45,6 @@ export default new Vuex.Store({ ...@@ -45,7 +45,6 @@ export default new Vuex.Store({
mutations: { mutations: {
SET_IS_ONLINE(state, payload) { SET_IS_ONLINE(state, payload) {
state.isOnline = payload; state.isOnline = payload;
console.log(state.isOnline);
}, },
SET_USER(state, payload) { SET_USER(state, payload) {
state.user = payload; state.user = payload;
......
src/views/FeatureType/FeatureTypeDetail.vue
+ 72
− 152
View file @ 931afd9e
...@@ -71,21 +71,18 @@ ...@@ -71,21 +71,18 @@
</div> </div>
<div class="ui bottom attached secondary segment"> <div class="ui bottom attached secondary segment">
<div <div class="ui styled accordion">
:class="['title', { active: showImport && isOnline, nohover: !isOnline }]"
@click="toggleShowImport"
>
<i
class="dropdown icon"
aria-hidden="true"
/>
Importer des signalements
</div>
<div :class="['content', { active: showImport && isOnline }]">
<div <div
:class="['title', { active: showImport }]" :class="['title', { active: showImport && isOnline, nohover: !isOnline }]"
@click="toggleShowImport" @click="toggleShowImport"
> >
<i
class="dropdown icon"
aria-hidden="true"
/>
Importer des signalements
</div>
<div :class="['content', { active: showImport && isOnline }]">
<div class="field"> <div class="field">
<label <label
class="ui icon button ellipsis" class="ui icon button ellipsis"
...@@ -106,7 +103,6 @@ ...@@ -106,7 +103,6 @@
@change="onGeojsonFileChange" @change="onGeojsonFileChange"
> >
</div> </div>
<div class="field"> <div class="field">
<label <label
class="ui icon button ellipsis" class="ui icon button ellipsis"
...@@ -127,7 +123,6 @@ ...@@ -127,7 +123,6 @@
@change="onCsvFileChange" @change="onCsvFileChange"
> >
</div> </div>
<router-link <router-link
v-if=" v-if="
IDGO && IDGO &&
...@@ -145,84 +140,40 @@ ...@@ -145,84 +140,40 @@
> >
Importer les signalements à partir de {{ CATALOG_NAME|| 'IDGO' }} Importer les signalements à partir de {{ CATALOG_NAME|| 'IDGO' }}
</router-link> </router-link>
<div
v-if="$route.params.geojson" <ul
class="ui button import-catalog basic active teal nohover" v-if="importError"
class="errorlist"
> >
<div class="field"> <li>
<label {{ importError }}
class="ui icon button ellipsis" </li>
for="json_file" </ul>
>
<i
class="file icon"
aria-hidden="true"
/>
<span class="label">{{ fileToImport.name }}</span>
</label>
<input
id="json_file"
type="file"
accept="application/json, .json, .geojson"
style="display: none"
name="json_file"
@change="onFileChange"
>
</div>
<router-link <button
v-if=" :disabled="
IDGO && (geojsonFileToImport.size === 0 && !$route.params.geojson) &&
permissions && (csvFileToImport.size === 0 && !$route.params.csv)
permissions.can_create_feature "
" class="ui fluid teal icon button"
:to="{ @click="geojsonFileToImport.size !== 0 ? importGeoJson() : importCSV()"
name: 'catalog-import', >
params: { <i
slug, class="upload icon"
feature_type_slug: $route.params.feature_type_slug aria-hidden="true"
},
}"
class="ui icon button import-catalog"
>
Importer les signalements à partir de {{ CATALOG_NAME|| 'IDGO' }}
</router-link>
<div
v-if="$route.params.geojson"
class="ui button import-catalog basic active teal no-hover"
>
Ressource {{ $route.params.geojson.name }}
</div>
<ul
v-if="importError"
class="errorlist"
>
<li>
{{ importError }}
</li>
</ul>
<button
:disabled="fileToImport.size === 0 && !$route.params.geojson"
class="ui fluid teal icon button"
@click="importGeoJson"
>
<i
class="upload icon"
aria-hidden="true"
/>
Lancer l'import
</button>
<ImportTask
v-if="importFeatureTypeData && importFeatureTypeData.length"
:data="importFeatureTypeData"
:reloading="reloadingImport"
/> />
</div> Lancer l'import
</button>
<ImportTask
v-if="importFeatureTypeData && importFeatureTypeData.length"
:data="importFeatureTypeData"
:reloading="reloadingImport"
/>
</div> </div>
</div> </div>
<div class="ui styled accordion"> <div class="ui styled accordion">
<div <div
:class="['title', { active: !showImport }]" :class="['title', { active: !showImport && isOnline, nohover: !isOnline }]"
@click="toggleShowImport" @click="toggleShowImport"
> >
<i <i
...@@ -231,18 +182,27 @@ ...@@ -231,18 +182,27 @@
/> />
Exporter les signalements Exporter les signalements
</div> </div>
<div :class="['content', { active: !showImport }]"> <div :class="['content', { active: !showImport && isOnline }]">
<p> <p>
Vous pouvez télécharger tous les signalements qui vous sont Vous pouvez télécharger tous les signalements qui vous sont
accessibles. accessibles.
</p> </p>
<select
v-model="exportFormat"
class="ui fluid dropdown"
style="margin-bottom: 1em;"
>
<option value="GeoJSON">
GeoJSON
</option>
<option value="CSV">
CSV
</option>
</select>
<button <button
:disabled=" type="button"
(geojsonFileToImport.size === 0 && !$route.params.geojson) &&
(csvFileToImport.size === 0 && !$route.params.csv)
"
class="ui fluid teal icon button" class="ui fluid teal icon button"
@click="geojsonFileToImport.size !== 0 ? importGeoJson() : importCSV()" @click="exportFeatures"
> >
<i <i
class="download icon" class="download icon"
...@@ -253,59 +213,6 @@ ...@@ -253,59 +213,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ui styled accordion">
<div
:class="['title', { active: !showImport && isOnline, nohover: !isOnline }]"
@click="toggleShowImport"
>
<i
class="dropdown icon"
aria-hidden="true"
/>
Exporter les signalements
</div>
<div :class="['content', { active: !showImport && isOnline}]">
<p>
Vous pouvez télécharger tous les signalements qui vous sont
accessibles.
</p>
<!-- <div class="ui selection dropdown fluid">
<input type="hidden" name="format">
<i class="dropdown icon"></em>
<div class="default text">Format</div>
<div class="menu">
<div class="item" data-value="1">GeoJSON</div>
<div class="item" data-value="2">CSV</div>
</div>
</div> -->
<select
v-model="exportFormat"
class="ui fluid dropdown"
style="margin-bottom: 1em;"
>
<option value="GeoJSON">
GeoJSON
</option>
<option value="CSV">
CSV
</option>
</select>
<button
type="button"
class="ui fluid teal icon button"
@click="exportFeatures"
>
<i
class="download icon"
aria-hidden="true"
/>
Exporter
</button>
</div>
</div>
</div> </div>
<div class="nine wide column"> <div class="nine wide column">
...@@ -605,9 +512,11 @@ export default { ...@@ -605,9 +512,11 @@ export default {
methods: { methods: {
...mapMutations('feature-type', [ ...mapMutations('feature-type', [
'SET_CURRENT_FEATURE_TYPE_SLUG' 'SET_CURRENT_FEATURE_TYPE_SLUG',
'SET_FILE_TO_IMPORT'
]), ]),
...mapActions('feature-type', [ ...mapActions('feature-type', [
'SEND_FEATURES_FROM_CSV',
'GET_IMPORTS' 'GET_IMPORTS'
]), ]),
...mapActions('feature', [ ...mapActions('feature', [
...@@ -636,7 +545,7 @@ export default { ...@@ -636,7 +545,7 @@ export default {
date instanceof Date && date instanceof Date &&
!isNaN(date.valueOf()) !isNaN(date.valueOf())
) { ) {
return 'date'; return 'char';
} else if (type === 'number' && !isNaN(parseFloat(prop))) { } else if (type === 'number' && !isNaN(parseFloat(prop))) {
return 'decimal'; return 'decimal';
} }
...@@ -754,8 +663,7 @@ export default { ...@@ -754,8 +663,7 @@ export default {
if (jsonValidity) { if (jsonValidity) {
this.geojsonFileToImport = files[0]; // todo : remove this value from state as it stored (first attempt didn't work) this.geojsonFileToImport = files[0]; // todo : remove this value from state as it stored (first attempt didn't work)
this.$store.commit( this.SET_FILE_TO_IMPORT(
'feature_type/SET_FILE_TO_IMPORT',
this.geojsonFileToImport this.geojsonFileToImport
); );
} }
...@@ -784,8 +692,7 @@ export default { ...@@ -784,8 +692,7 @@ export default {
if (csvValidity) { if (csvValidity) {
this.csvFileToImport = files[0]; // todo : remove this value from state as it stored (first attempt didn't work) this.csvFileToImport = files[0]; // todo : remove this value from state as it stored (first attempt didn't work)
this.$store.commit( this.SET_FILE_TO_IMPORT(
'feature_type/SET_FILE_TO_IMPORT',
this.csvFileToImport this.csvFileToImport
); );
} }
...@@ -828,7 +735,7 @@ export default { ...@@ -828,7 +735,7 @@ export default {
this.importError = "La ressource n'a pas pu être récupéré."; this.importError = "La ressource n'a pas pu être récupéré.";
return; return;
} }
this.$store.dispatch('feature_type/SEND_FEATURES_FROM_CSV', payload) this.SEND_FEATURES_FROM_CSV(payload)
.then(() => { .then(() => {
this.waitMessage = false; this.waitMessage = false;
}); });
...@@ -863,7 +770,7 @@ export default { ...@@ -863,7 +770,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped lang="less">
.margin-25 { .margin-25 {
margin: 0 0.25em 0.25em 0 !important; margin: 0 0.25em 0.25em 0 !important;
} }
...@@ -879,4 +786,17 @@ export default { ...@@ -879,4 +786,17 @@ export default {
.ui.styled.accordion .nohover.title:hover { .ui.styled.accordion .nohover.title:hover {
color: rgba(0, 0, 0, .4); color: rgba(0, 0, 0, .4);
} }
.ui.styled.accordion {
.content {
.field {
label {
width: 100%;
}
}
.import-catalog {
width: 100%;
}
}
}
</style> </style>
\ No newline at end of file
src/views/FeatureType/FeatureTypeEdit.vue
+ 0
− 1
View file @ 931afd9e
...@@ -823,7 +823,6 @@ export default { ...@@ -823,7 +823,6 @@ export default {
// y:false // y:false
// }; // };
// }); // });
for (const [key, val] of Object.entries(this.csv[0])) { for (const [key, val] of Object.entries(this.csv[0])) {
//* check that the property is not a keyword from the backend or map style //* check that the property is not a keyword from the backend or map style
// todo: add map style keywords // todo: add map style keywords
......
src/views/Project/ProjectDetail.vue
+ 0
− 1
View file @ 931afd9e
...@@ -241,7 +241,6 @@ export default { ...@@ -241,7 +241,6 @@ export default {
methods: { methods: {
...mapMutations([ ...mapMutations([
'SET_RELOAD_INTERVAL_ID',
'CLEAR_RELOAD_INTERVAL_ID', 'CLEAR_RELOAD_INTERVAL_ID',
'DISPLAY_MESSAGE', 'DISPLAY_MESSAGE',
'DISPLAY_LOADER', 'DISPLAY_LOADER',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment