From 2d5b6d039eb3d69ea713741841f9f478cb02e256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Tue, 30 Nov 2021 15:35:50 +0100
Subject: [PATCH] clean code
---
src/components/feature/FeatureListTable.vue | 70 ++++-----------------
src/store/index.js | 7 +--
src/views/feature/Feature_list.vue | 6 +-
3 files changed, 16 insertions(+), 67 deletions(-)
diff --git a/src/components/feature/FeatureListTable.vue b/src/components/feature/FeatureListTable.vue
index 7846bbc7..2787cb17 100644
--- a/src/components/feature/FeatureListTable.vue
+++ b/src/components/feature/FeatureListTable.vue
@@ -170,8 +170,8 @@
</tr>
</tbody>
</table>
- <!-- v-if="pageNumbers.length > 1" -->
<div
+ v-if="pageNumbers.length > 1"
id="table-features_info"
class="dataTables_info"
role="status"
@@ -187,7 +187,7 @@
class="dataTables_paginate paging_simple_numbers"
>
<a
- @click="toPreviousPage"
+ @click="$emit('update:page', 'previous');"
id="table-features_previous"
:class="[
'paginate_button previous',
@@ -202,7 +202,7 @@
<a
v-for="pageNumber in pageNumbers"
:key="'page' + pageNumber"
- @click="toPage(pageNumber)"
+ @click="$emit('update:page', pageNumber)"
:class="[
'paginate_button',
{ current: pageNumber === pagination.currentPage },
@@ -223,7 +223,7 @@
aria-controls="table-features"
data-dt-idx="7"
tabindex="0"
- @click="toNextPage"
+ @click="$emit('update:page', 'next');"
>Suivant</a
>
</div>
@@ -236,16 +236,16 @@ import { mapState, mapGetters } from "vuex";
export default {
name: "FeatureListTable",
- props: ["geojsonFeatures", "checkedFeatures", "featuresCount", "pagination", "pageNumbers"],
+ props: [
+ "geojsonFeatures",
+ "checkedFeatures",
+ "featuresCount",
+ "pagination",
+ "pageNumbers",
+ ],
data() {
return {
- /* pagination: {
- currentPage: 1,
- pagesize: 15,
- start: 0,
- end: 15,
- }, */
sort: {
column: "",
ascending: true,
@@ -305,16 +305,6 @@ export default {
return sortedFeatures;
},
-/* pageNumbers() {
- const totalPages = Math.ceil(
- this.featuresCount / this.pagination.pagesize
- );
- return [...Array(totalPages).keys()].map((pageNumb) => {
- ++pageNumb;
- return pageNumb;
- });
- }, */
-
checked: {
get() {
return this.checkedFeatures;
@@ -323,7 +313,7 @@ export default {
this.$store.commit("feature/UPDATE_CHECKED_FEATURES", newChecked);
},
},
-
+
displayedPageEnd() {
return this.featuresCount <= this.pagination.end
? this.featuresCount
@@ -358,42 +348,6 @@ export default {
this.sort.ascending = true;
}
},
-
- toPage(pageNumber) {
- console.log(pageNumber);
- this.$emit("update:page", pageNumber);
- /*
- const toAddOrRemove =
- (pageNumber - this.pagination.currentPage) * this.pagination.pagesize;
- this.pagination.start += toAddOrRemove;
- this.pagination.end += toAddOrRemove;
- this.pagination.currentPage = pageNumber;
- this.updateFeatures(); */
- },
-
- toPreviousPage() {
- this.$emit("update:page", "previous");
- /* if (this.pagination.currentPage !== 1) {
- if (this.pagination.start > 0) {
- this.pagination.start -= this.pagination.pagesize;
- this.pagination.end -= this.pagination.pagesize;
- this.pagination.currentPage -= 1;
- }
- this.updateFeatures(this.previous);
- } */
- },
-
- toNextPage() {
- this.$emit("update:page", "next");
- /* if (this.pagination.currentPage !== this.pageNumbers.length) {
- if (this.pagination.end < this.featuresCount) {
- this.pagination.start += this.pagination.pagesize;
- this.pagination.end += this.pagination.pagesize;
- this.pagination.currentPage += 1;
- }
- this.updateFeatures(this.next);
- } */
- },
},
};
</script>
diff --git a/src/store/index.js b/src/store/index.js
index 5e7e3c39..8ca73167 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -281,18 +281,13 @@ export default new Vuex.Store({
});
},
- async GET_PROJECT_INFO({ state, commit, dispatch }, slug/*, noFeatures */) {
+ async GET_PROJECT_INFO({ state, commit, dispatch }, slug) {
commit("SET_PROJECT_SLUG", slug);
let promises = [
dispatch("GET_PROJECT_LAST_MESSAGES", slug).then(response => response),
dispatch("feature_type/GET_PROJECT_FEATURE_TYPES", slug).then(response => response),
// dispatch("feature/GET_PROJECT_FEATURES", slug).then(response => response),
]
- /* console.log(noFeatures)
- if (!noFeatures) {
- promises.push(dispatch("feature/GET_PROJECT_FEATURES", slug).then(response => response))
- } */
- console.log(promises)
if (state.user) promises.push(dispatch("map/GET_BASEMAPS", slug).then(response => response))
const promiseResult = await Promise.all(promises)
diff --git a/src/views/feature/Feature_list.vue b/src/views/feature/Feature_list.vue
index e261289a..25dc7dfb 100644
--- a/src/views/feature/Feature_list.vue
+++ b/src/views/feature/Feature_list.vue
@@ -474,9 +474,9 @@ export default {
if (filterParams === "abort") return;
url += filterParams;
} else {
- //console.error("ONLY FOR DEV !!!!!!!!!!!!!");
- //params = params.replace("8000", "8010");
- //console.log(url);
+ console.error("ONLY FOR DEV !!!!!!!!!!!!!");
+ params = params.replace("8000", "8010");
+ console.log(url);
url = params;
}
}
--
GitLab