From df09e2ff9c6ef8e64bfb7d8c438192f8742e8fed Mon Sep 17 00:00:00 2001 From: Marc Rufener Date: Thu, 9 Mar 2023 12:23:16 +0100 Subject: [PATCH 1/5] update .env on front --- front/.env | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/front/.env b/front/.env index f6f5b09a..da6aa877 100644 --- a/front/.env +++ b/front/.env @@ -5,6 +5,31 @@ PUBLIC_PATH = "{PUBLIC_PATH}" VUE_APP_STATUS = "development" VUE_APP_VERSION = "1.0" + +#================================== +#======== MAP CONFIG ======== +#================================== +#Map infos +VUE_APP_MAP_PROJECTION = "EPSG:2056" +VUE_APP_MAP_DEFAULT_CENTER = {"x": 2555484, "y": 1204017} +VUE_APP_MAP_DEFAULT_ZOOM = 4 +VUE_APP_MAP_DEFAULT_AFFAIRE_ZOOM = 13 +VUE_APP_WMS_URL = "https://sitn.ne.ch/mapproxy95/service" +VUE_APP_WMS_LAYERS = "plan_cadastral_couleur" +VUE_APP_WMTS_LAYER = "plan_cadastral_couleur" +VUE_APP_WMTS_GETCAPABILITIES_URL = "https://sitn.ne.ch/web_getcapabilities/WMTSGetCapabilities95.xml" + + +#SITN search service +VUE_APP_SITN_SEARCH_SERVICE_URL = "https://sitn.ne.ch/search?limit=20&query=" +VUE_APP_SITN_SEARCH_CATEGORIES_ALIASES = {"ImmeublesCanton":"Biens-fonds","adresses_sitn":"Adresses","localite":"Localité"} + + +#SITN couches environnement et aménagement du territoire +VUE_APP_SITN_AMENAGEMENT_TERRITOIRE_URL = overwriteme +VUE_APP_SITN_CADASTRE_URL = overwriteme +VUE_APP_SITN_SITES_POLLUES_URL = overwriteme + #===================================== #======== URL ENDPOINTS ======== #===================================== @@ -199,31 +224,6 @@ VUE_APP_DATEFORMAT_CLIENT = "DD.MM.YYYY" VUE_APP_DATETIMEFORMAT_WS = "YYYY-MM-DD HH:mm:ss" -#================================== -#======== MAP CONFIG ======== -#================================== -#Map infos -VUE_APP_MAP_PROJECTION = "EPSG:2056" -VUE_APP_MAP_DEFAULT_CENTER = {"x": 2555484, "y": 1204017} -VUE_APP_MAP_DEFAULT_ZOOM = 4 -VUE_APP_MAP_DEFAULT_AFFAIRE_ZOOM = 13 -VUE_APP_WMS_URL = "https://sitn.ne.ch/mapproxy95/service" -VUE_APP_WMS_LAYERS = "plan_cadastral_couleur" -VUE_APP_WMTS_LAYER = "plan_cadastral_couleur" -VUE_APP_WMTS_GETCAPABILITIES_URL = "https://sitn.ne.ch/web_getcapabilities/WMTSGetCapabilities95.xml" - - -#SITN search service -VUE_APP_SITN_SEARCH_SERVICE_URL = "https://sitn.ne.ch/search?limit=20&query=" -VUE_APP_SITN_SEARCH_CATEGORIES_ALIASES = {"ImmeublesCanton":"Biens-fonds","adresses_sitn":"Adresses","localite":"Localité"} - - -#SITN couches environnement et aménagement du territoire -VUE_APP_SITN_AMENAGEMENT_TERRITOIRE_URL = "https://sitnintra.ne.ch/theme/amenagement_territoire?map_zoom=11&map_crosshair=true" -VUE_APP_SITN_CADASTRE_URL = "https://sitnintra.ne.ch/theme/cadastre" -VUE_APP_SITN_SITES_POLLUES_URL = "https://sitnintra.ne.ch/theme/canepo" - - #====================================== #======== VALEURS CONFIG ======== #====================================== From eb82f882edc6e67f0a1599473aecd7ab6eaa8c1c Mon Sep 17 00:00:00 2001 From: Marc Rufener Date: Thu, 9 Mar 2023 15:52:22 +0100 Subject: [PATCH 2/5] fix resising md-dialog when typing inside --- .../NumerosAffaire/ReferenceNumeros/referenceNumeros.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/front/src/components/Affaires/NumerosAffaire/ReferenceNumeros/referenceNumeros.css b/front/src/components/Affaires/NumerosAffaire/ReferenceNumeros/referenceNumeros.css index 001be6d3..995a02da 100644 --- a/front/src/components/Affaires/NumerosAffaire/ReferenceNumeros/referenceNumeros.css +++ b/front/src/components/Affaires/NumerosAffaire/ReferenceNumeros/referenceNumeros.css @@ -3,6 +3,11 @@ margin: auto; } +.referenceNumeros .md-dialog-container { + min-width: 750px; + width: 750px; + } + .referenceNumeros .md-card .simple { width: 100%; display: inline-block; From ce8808007fce86a6eabfd2deefee032e2ab947c8 Mon Sep 17 00:00:00 2001 From: Marc Rufener Date: Thu, 9 Mar 2023 16:07:23 +0100 Subject: [PATCH 3/5] fix error that made impossible to find little numbers --- back/infolica/views/numero.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/infolica/views/numero.py b/back/infolica/views/numero.py index e78cd09c..5ccc95e4 100644 --- a/back/infolica/views/numero.py +++ b/back/infolica/views/numero.py @@ -126,7 +126,7 @@ def numeros_search_view(request): # filter by conditions query = request.dbsession.query(VNumeros).order_by( VNumeros.cadastre, - VNumeros.numero.desc() + VNumeros.numero.asc() ).filter(*conditions) query = query.filter(VNumeros.type_numero_id <= 4) From e644f0d1669cdcb1f214d8100a7e20e91f7e54de Mon Sep 17 00:00:00 2001 From: Marc Rufener Date: Thu, 9 Mar 2023 16:50:08 +0100 Subject: [PATCH 4/5] use newStepSetter in new step setter in affaire + clean --- .../ActivationAffaire/activationAffaire.html | 2 +- front/src/components/Affaires/Etape/Etape.vue | 69 ++++++------------- front/src/components/Affaires/Etape/etape.css | 5 ++ .../src/components/Affaires/Etape/etape.html | 21 ++---- .../Utils/NewStepSetter/NewStepSetter.vue | 2 +- 5 files changed, 33 insertions(+), 66 deletions(-) diff --git a/front/src/components/Affaires/ActivationAffaire/activationAffaire.html b/front/src/components/Affaires/ActivationAffaire/activationAffaire.html index 91e697bb..d9b6764c 100644 --- a/front/src/components/Affaires/ActivationAffaire/activationAffaire.html +++ b/front/src/components/Affaires/ActivationAffaire/activationAffaire.html @@ -3,6 +3,7 @@ Réactivation de l'affaire +

En confirmant, les opérations suivantes seront réalisées:

    @@ -18,7 +19,6 @@ - Annuler Confirmer diff --git a/front/src/components/Affaires/Etape/Etape.vue b/front/src/components/Affaires/Etape/Etape.vue index 6bd6d506..0ca04683 100644 --- a/front/src/components/Affaires/Etape/Etape.vue +++ b/front/src/components/Affaires/Etape/Etape.vue @@ -1,4 +1,4 @@ - + @@ -6,9 +6,10 @@