Skip to content

Commit

Permalink
fix user in chart
Browse files Browse the repository at this point in the history
  • Loading branch information
joelclems committed Jun 8, 2021
1 parent b43ccad commit 5d639f4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
3 changes: 3 additions & 0 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ TODO
- bug (en cours)
- cartes, ne charger qu'une seule fois les layers

- in
- resultats select foireux a passer en bouton

- chasse
- formulaire
- titre
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import vuetify from "@/plugins/vuetify"; // path to vuetify export
import VueSession from "vue-session";

import Highcharts from 'highcharts'
// import More from 'highcharts/highcharts-more'
import More from 'highcharts/highcharts-more'
import exporting from 'highcharts/modules/exporting';
import HighchartsVue from 'highcharts-vue'

// More(Highcharts);
More(Highcharts);
exporting(Highcharts);

Vue.config.productionTip = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,18 @@ export default {
},
degat_gravite_label: {
text: "Dégâts - gravité",
order: ["Faibles", "Modérés", "Importants"],
order: ["Faibles", "Modérés", "Importants", "Indéfini"],
colors: {
Importants: "red",
Modérés: "orange",
Faibles: "yellow"
Faibles: "yellow",
}
},
degat_etendue_label: {
text: "Dégâts - étendue",
order: ["Généralisés", "Localisés"],
colors: {
"Généralisés": "red",
// Modérés: "orange",
"Localisés": "yellow"
}
},
Expand Down
4 changes: 1 addition & 3 deletions frontend/src/modules/user/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,8 @@ const STORE = {
}
// check date
const date = new Date(state._user.expires);
const date1 = new Date(date.toString().split(" ")[0]);
const now = new Date();
console.log(state._user.expires, date1, now)
return !!(state._user && state._user.id_role && date1 >= now);
return !!(state._user && state._user.id_role && date >= now);
},
/**
* Nom complet
Expand Down

0 comments on commit 5d639f4

Please sign in to comment.