+
Tout cocher
+
Les objets du type : balcons, petits bâtiments, petites surfaces de nature respectent les normes (ne pas en saisir trop)
Pas de bâtiments ni de couverts digitalisés
diff --git a/front/src/components/Login/Login.vue b/front/src/components/Login/Login.vue
index 0f7a1443..01b65a10 100644
--- a/front/src/components/Login/Login.vue
+++ b/front/src/components/Login/Login.vue
@@ -40,7 +40,7 @@ export default {
if (process.env.VUE_APP_SERVICE_MO === response.data.service) {
this.$router.push(this.$route.query.redirect || { name: "Cockpit"});
} else {
- this.$router.push(this.$route.query.redirect || { name: "Preavis"});
+ this.$router.push(this.$route.query.redirect || { name: "Preavis"});
}
} else {
this.showProgess = false;
@@ -48,9 +48,9 @@ export default {
}
})
//Error
- .catch(err => {
+ .catch(() => {
this.showProgess = false;
- handleException(err, this);
+ this.$root.$emit('ShowError', "Le nom d'utilisateur ou le mot de passe est incorrect")
});
},
diff --git a/front/src/components/Utils/ClientSearch/ClientSearch.vue b/front/src/components/Utils/ClientSearch/ClientSearch.vue
index 0538922d..0388b894 100644
--- a/front/src/components/Utils/ClientSearch/ClientSearch.vue
+++ b/front/src/components/Utils/ClientSearch/ClientSearch.vue
@@ -21,6 +21,10 @@ export default {
type: Number,
default: null
},
+ client_id: {
+ type: Number,
+ default: null
+ },
label: {
type: String,
default: 'Client'
@@ -51,7 +55,6 @@ export default {
return {
client: null,
liste_clients: [],
- searchTerm: null
};
},
@@ -107,6 +110,11 @@ export default {
async getClientById(client_id) {
+ if (client_id === null) {
+ this.client = '';
+ return;
+ }
+
this.$http.get(
process.env.VUE_APP_API_URL + process.env.VUE_APP_CLIENT_AGGREGATED_BY_ID_ENDPOINT + '/' + client_id,
{
@@ -154,24 +162,6 @@ export default {
},
- computed: {
- value: {
- get() {
- return this.client_id;
- },
- set(value) {
- if (value && value.id) {
- this.client_id = value.id;
- this.$emit('update:client_id', value.id);
- }
- if (value === null || value === '') {
- this.client_id = value;
- this.$emit('update:client_id', value);
- }
- }
- }
- },
-
mounted: function() {
if (this.initial_client_id !== null) {
this.getClientById(this.initial_client_id);
@@ -179,6 +169,25 @@ export default {
this.$root.$on('resetSearchClientTerm', () => { document.querySelector('#clientSearchAutocomplete > button').click(); });
+ },
+
+ watch: {
+ client_id: function() {
+ if (this.client_id !== null) {
+ this.getClientById(this.client_id);
+ } else {
+ this.client = '';
+ }
+ },
+
+ client: function() {
+ if (this.client && this.client.id) {
+ this.$emit('update:client_id', this.client.id);
+ } else {
+ this.client_id = null;
+ this.$emit('update:client_id', null);
+ }
+ }
}
};
diff --git a/front/src/services/exceptionsHandler.js b/front/src/services/exceptionsHandler.js
index 220fe08a..6e06e797 100644
--- a/front/src/services/exceptionsHandler.js
+++ b/front/src/services/exceptionsHandler.js
@@ -12,12 +12,8 @@ export const handleException = function (error, component) {
}
//Not authorized
else if(code === 403){
- if(component.$router && component.$router.currentRoute && component.$router.currentRoute.name != 'Login') {
- component.$router.push({name: "Login", query: { redirect: component.$router.currentRoute.path }});
- component.$root.$emit("ShowError", "Veuillez vous connecter pour continuer");
- } else {
- component.$root.$emit("ShowError", "Le nom d'utilisateur ou le mot de passe est incorrect");
- }
+ let a = component.$router.push({name: "Login", query: { redirect: component.$router.currentRoute.path }});
+ a.then(() => { component.$root.$emit("ShowError", "Veuillez vous connecter pour continuer") });
}
//Custom error
else if(error && error.msg){
@@ -38,4 +34,3 @@ export const handleException = function (error, component) {
component.$root.$emit("ShowError", "Une erreur est survenue, contacter l'administrateur.");
}
};
-
diff --git a/front/src/services/helper.js b/front/src/services/helper.js
index 26376d67..4498c17b 100644
--- a/front/src/services/helper.js
+++ b/front/src/services/helper.js
@@ -8,8 +8,11 @@ export const checkLogged = function () {
var session_user = JSON.parse(localStorage.getItem('infolica_user')) || null;
//Set current user functions
- if(session_user)
+ if(session_user){
setCurrentUserFunctions();
+ } else {
+ alert("Veuillez vous connecter pour continuer");
+ }
return session_user !== null;
};