-
+
-
+
MAILING LIST
+COMPTES MIGRÉS
@@ -125,10 +125,10 @@
@@ -138,7 +138,7 @@
- {{ `${stats.users.mailing}/${stats.users.total}` }}
+ {{ `${stats.users.migrated}/${stats.users.total - stats.users.neverMigrated}` }}
- {{ `(${Math.ceil(stats.users.mailing/stats.users.total*100)}%)` }}
+ {{ `(${Math.ceil(stats.users.migrated/(stats.users.total - stats.users.neverMigrated) * 100)}%)` }}
+
@@ -156,13 +156,13 @@
-
+
INSCRITS EN BTS
+ANCIENS COMPTES
@@ -171,10 +171,10 @@
@@ -184,7 +184,7 @@
- {{ `${stats.users.bts}/${stats.users.total}` }}
+ {{ `${stats.users.neverMigrated}/${stats.users.total}` }}
- {{ `(${Math.ceil(stats.users.bts/stats.users.total*100)}%)` }}
+ {{ `(${Math.ceil(stats.users.neverMigrated/stats.users.total*100)}%)` }}
+
@@ -217,10 +217,10 @@
@@ -317,11 +317,146 @@
- {{ `${activeUsers === 1 ? `${stats.users.activeAccount.lastDay}` : activeUsers === 3 ? `${stats.users.activeAccount.lastThreeDays}` : `${stats.users.activeAccount.lastWeek}`}/${stats.users.total}` }}
+ {{ `${activeUsers === 1 ? `${stats.users.activeAccount.lastDay}` : activeUsers === 3 ? `${stats.users.activeAccount.lastThreeDays}` : `${stats.users.activeAccount.lastWeek}`}/${stats.users.total - stats.users.neverMigrated - stats.users.inactive}` }}
- {{ `(${Math.ceil(`${activeUsers === 1 ? `${stats.users.activeAccount.lastDay}` : activeUsers === 3 ? `${stats.users.activeAccount.lastThreeDays}` : `${stats.users.activeAccount.lastWeek}`}`/stats.users.total*100)}%)` }}
+ {{ `(${Math.ceil(`${activeUsers === 1 ? `${stats.users.activeAccount.lastDay}` : activeUsers === 3 ? `${stats.users.activeAccount.lastThreeDays}` : `${stats.users.activeAccount.lastWeek}`}`/(stats.users.total - stats.users.neverMigrated - stats.users.inactive)*100)}%)` }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ RÉPARTITION ÉCOLES
+
+
+
+
+
+
+
+
+
+ {{ `EPSI : ${stats.users.epsi} / WIS : ${stats.users.wis}` }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INSCRITS EN BTS
+
+
+
+
+
+
+
+
+
+ {{ `${stats.users.bts}/${stats.users.total}` }}
+
+
+ {{ `(${Math.ceil(stats.users.bts/stats.users.total*100)}%)` }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MAILING LIST
+
+
+
+
+
+
+
+
+
+ {{ `${stats.users.mailing}/${stats.users.total}` }}
+
+
+ {{ `(${Math.ceil(stats.users.mailing/stats.users.total*100)}%)` }}
+
+
+
+
+
+
+
+
+
+
+
@@ -423,9 +558,10 @@ export default {
barChartStacked () {
return {
chartData: {
- labels: ['Arras', 'Auxerre', 'Bordeaux', 'Brest', 'Grenoble', 'Lille', 'Lyon', 'Montpellier', 'Nantes', 'Paris', 'Dakar'],
+ labels: ['Arras', 'Auxerre', 'Bordeaux', 'Brest', 'Grenoble', 'Lille', 'Lyon', 'Montpellier', 'Nantes', 'Rennes', 'Toulouse', 'Paris', 'Dakar'],
datasets: [{
label: 'B1',
+ maxBarThickness: 10,
backgroundColor: Charts.colors.theme['info'],
data: [
this.stats.cities ? this.stats.cities.arras.b1 : 0,
@@ -437,11 +573,14 @@ export default {
this.stats.cities ? this.stats.cities.lyon.b1 : 0,
this.stats.cities ? this.stats.cities.montpellier.b1 : 0,
this.stats.cities ? this.stats.cities.nantes.b1 : 0,
+ this.stats.cities ? this.stats.cities.rennes.b1 : 0,
+ this.stats.cities ? this.stats.cities.toulouse.b1 : 0,
this.stats.cities ? this.stats.cities.paris.b1 : 0,
this.stats.cities ? this.stats.cities.dakar.b1 : 0
]
}, {
label: 'B2',
+ maxBarThickness: 10,
backgroundColor: Charts.colors.theme['primary'],
data: [
this.stats.cities ? this.stats.cities.arras.b2 : 0,
@@ -453,11 +592,14 @@ export default {
this.stats.cities ? this.stats.cities.lyon.b2 : 0,
this.stats.cities ? this.stats.cities.montpellier.b2 : 0,
this.stats.cities ? this.stats.cities.nantes.b2 : 0,
+ this.stats.cities ? this.stats.cities.rennes.b2 : 0,
+ this.stats.cities ? this.stats.cities.toulouse.b2 : 0,
this.stats.cities ? this.stats.cities.paris.b2 : 0,
this.stats.cities ? this.stats.cities.dakar.b2 : 0
]
}, {
label: 'B3',
+ maxBarThickness: 10,
backgroundColor: Charts.colors.theme['success'],
data: [
this.stats.cities ? this.stats.cities.arras.b3 : 0,
@@ -469,11 +611,14 @@ export default {
this.stats.cities ? this.stats.cities.lyon.b3 : 0,
this.stats.cities ? this.stats.cities.montpellier.b3 : 0,
this.stats.cities ? this.stats.cities.nantes.b3 : 0,
+ this.stats.cities ? this.stats.cities.rennes.b3 : 0,
+ this.stats.cities ? this.stats.cities.toulouse.b3 : 0,
this.stats.cities ? this.stats.cities.paris.b3 : 0,
this.stats.cities ? this.stats.cities.dakar.b3 : 0
]
}, {
label: 'I1 ',
+ maxBarThickness: 10,
backgroundColor: Charts.colors.theme['warning'],
data: [
this.stats.cities ? this.stats.cities.arras.i1 : 0,
@@ -485,11 +630,14 @@ export default {
this.stats.cities ? this.stats.cities.lyon.i1 : 0,
this.stats.cities ? this.stats.cities.montpellier.i1 : 0,
this.stats.cities ? this.stats.cities.nantes.i1 : 0,
+ this.stats.cities ? this.stats.cities.rennes.i1 : 0,
+ this.stats.cities ? this.stats.cities.toulouse.i1 : 0,
this.stats.cities ? this.stats.cities.paris.i1 : 0,
this.stats.cities ? this.stats.cities.dakar.i1 : 0
]
}, {
label: 'I2 ',
+ maxBarThickness: 10,
backgroundColor: Charts.colors.theme['danger'],
data: [
this.stats.cities ? this.stats.cities.arras.i2 : 0,
@@ -501,6 +649,8 @@ export default {
this.stats.cities ? this.stats.cities.lyon.i2 : 0,
this.stats.cities ? this.stats.cities.montpellier.i2 : 0,
this.stats.cities ? this.stats.cities.nantes.i2 : 0,
+ this.stats.cities ? this.stats.cities.rennes.i2 : 0,
+ this.stats.cities ? this.stats.cities.toulouse.i2 : 0,
this.stats.cities ? this.stats.cities.paris.i2 : 0,
this.stats.cities ? this.stats.cities.dakar.i2 : 0
]
diff --git a/src/views/Pages/Dashboard/Admin/Widgets/DisconnectUsers.vue b/src/views/Pages/Dashboard/Admin/Widgets/DisconnectUsers.vue
index 24c7672..d765db8 100644
--- a/src/views/Pages/Dashboard/Admin/Widgets/DisconnectUsers.vue
+++ b/src/views/Pages/Dashboard/Admin/Widgets/DisconnectUsers.vue
@@ -9,19 +9,13 @@
@@ -48,26 +42,42 @@
diff --git a/src/views/Pages/Dashboard/Calendar.vue b/src/views/Pages/Dashboard/Calendar.vue
index 11e24d7..437f45a 100644
--- a/src/views/Pages/Dashboard/Calendar.vue
+++ b/src/views/Pages/Dashboard/Calendar.vue
@@ -80,6 +80,16 @@
@click="changeView('timeGridDay')">
Jour
+
+
+
+
+
DÉCONNECTER LES UTILISATEURS
- Cliquez
-
+ Lancer déconnexion
+
-
- Déconnecter
-
-
+ ${this.timeToHour(element.event.start)} - ${this.timeToHour(element.event.end)}
+ ${element.event.extendedProps.bts ? 'BTS
' : ''}
${element.event.title}
${this.capitalizeFirstLetterEachWords(element.event.extendedProps.professor)}
${element.event.extendedProps.room}
@@ -540,6 +551,7 @@ export default {
html += `
${this.timeToHour(element.event.start)} - ${this.timeToHour(element.event.end)}
+ ${element.event.extendedProps.bts ? 'BTS' : ''}
${element.event.title}
${this.capitalizeFirstLetterEachWords(element.event.extendedProps.professor)}
${element.event.extendedProps.room}
@@ -548,6 +560,7 @@ export default {
html += `
${this.timeToHour(element.event.start)} - ${this.timeToHour(element.event.end)}
+ ${element.event.extendedProps.bts ? 'BTS' : ''}
${element.event.title}
${this.capitalizeFirstLetterEachWords(element.event.extendedProps.professor)}
${element.event.extendedProps.room}
@@ -710,6 +723,11 @@ export default {
if (e.keyCode === 39 && !this.showSearchInput) this.next()
if (e.keyCode === 37 && !this.showSearchInput) this.prev()
},
+ reload () {
+ const date = this.dateToMonthDayYear(this.activeDate)
+ this.$store.dispatch('calendar/resetFetchedWeeks')
+ this.$store.dispatch('calendar/fetchDate', { date: date, force: true })
+ },
// ===========================================
// == Task functions
// ===========================================
@@ -780,6 +798,7 @@ export default {
}
}
+
diff --git a/src/views/Pages/Dashboard/Profile.vue b/src/views/Pages/Dashboard/Profile.vue
index 16cad7a..ccf45ec 100644
--- a/src/views/Pages/Dashboard/Profile.vue
+++ b/src/views/Pages/Dashboard/Profile.vue
@@ -340,9 +340,9 @@ export default {
if (!valid) return
swal.fire({
+ icon: 'warning',
title: 'Êtes-vous sûr de vouloir changer votre mot de passe ?',
text: 'Vous serez déconnecté du site !',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning',
cancelButton: 'btn btn-secondary'
diff --git a/src/views/Pages/Dashboard/Settings.vue b/src/views/Pages/Dashboard/Settings.vue
index b99346d..2d0d096 100644
--- a/src/views/Pages/Dashboard/Settings.vue
+++ b/src/views/Pages/Dashboard/Settings.vue
@@ -350,9 +350,9 @@ export default {
},
deleteAccount () {
swal.fire({
+ icon: 'warning',
title: `Êtes-vous sûr de vouloir supprimer votre compte ?`,
text: 'Vous pourrez toujours vous réinscrire plus tard, mais toutes vos données seront perdues...',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning mt-2',
cancelButton: 'btn btn-secondary mt-2'
diff --git a/src/views/Pages/Dashboard/Tasks.vue b/src/views/Pages/Dashboard/Tasks.vue
index 5100661..7771981 100644
--- a/src/views/Pages/Dashboard/Tasks.vue
+++ b/src/views/Pages/Dashboard/Tasks.vue
@@ -726,9 +726,9 @@ export default {
},
deleteTask (taskId) {
swal.fire({
+ icon: 'warning',
title: `Êtes-vous sûr de vouloir supprimer cette tâche ?`,
text: 'Elle ne sera plus visible pour aucun des utilisateurs qui lui sont associés.',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning mt-2',
cancelButton: 'btn btn-secondary mt-2'
diff --git a/src/views/Pages/Home.vue b/src/views/Pages/Home.vue
index eb216f2..c78be07 100755
--- a/src/views/Pages/Home.vue
+++ b/src/views/Pages/Home.vue
@@ -152,6 +152,41 @@
2€
+
+
+ Ils nous aident à financer Calendz
+
+
+
+ 
+
+
+
+
+ 
+
+
+
+
+ 
+
+
+
${element.event.extendedProps.room}
@@ -540,6 +551,7 @@ export default {
html += `
${this.timeToHour(element.event.start)} - ${this.timeToHour(element.event.end)}
+ ${element.event.extendedProps.bts ? 'BTS' : ''}
${element.event.title}
${this.capitalizeFirstLetterEachWords(element.event.extendedProps.professor)}
${element.event.extendedProps.room}
@@ -548,6 +560,7 @@ export default {
html += `
${this.timeToHour(element.event.start)} - ${this.timeToHour(element.event.end)}
+ ${element.event.extendedProps.bts ? 'BTS' : ''}
${element.event.title}
${this.capitalizeFirstLetterEachWords(element.event.extendedProps.professor)}
${element.event.extendedProps.room}
@@ -710,6 +723,11 @@ export default {
if (e.keyCode === 39 && !this.showSearchInput) this.next()
if (e.keyCode === 37 && !this.showSearchInput) this.prev()
},
+ reload () {
+ const date = this.dateToMonthDayYear(this.activeDate)
+ this.$store.dispatch('calendar/resetFetchedWeeks')
+ this.$store.dispatch('calendar/fetchDate', { date: date, force: true })
+ },
// ===========================================
// == Task functions
// ===========================================
@@ -780,6 +798,7 @@ export default {
}
}
+
diff --git a/src/views/Pages/Dashboard/Profile.vue b/src/views/Pages/Dashboard/Profile.vue
index 16cad7a..ccf45ec 100644
--- a/src/views/Pages/Dashboard/Profile.vue
+++ b/src/views/Pages/Dashboard/Profile.vue
@@ -340,9 +340,9 @@ export default {
if (!valid) return
swal.fire({
+ icon: 'warning',
title: 'Êtes-vous sûr de vouloir changer votre mot de passe ?',
text: 'Vous serez déconnecté du site !',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning',
cancelButton: 'btn btn-secondary'
diff --git a/src/views/Pages/Dashboard/Settings.vue b/src/views/Pages/Dashboard/Settings.vue
index b99346d..2d0d096 100644
--- a/src/views/Pages/Dashboard/Settings.vue
+++ b/src/views/Pages/Dashboard/Settings.vue
@@ -350,9 +350,9 @@ export default {
},
deleteAccount () {
swal.fire({
+ icon: 'warning',
title: `Êtes-vous sûr de vouloir supprimer votre compte ?`,
text: 'Vous pourrez toujours vous réinscrire plus tard, mais toutes vos données seront perdues...',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning mt-2',
cancelButton: 'btn btn-secondary mt-2'
diff --git a/src/views/Pages/Dashboard/Tasks.vue b/src/views/Pages/Dashboard/Tasks.vue
index 5100661..7771981 100644
--- a/src/views/Pages/Dashboard/Tasks.vue
+++ b/src/views/Pages/Dashboard/Tasks.vue
@@ -726,9 +726,9 @@ export default {
},
deleteTask (taskId) {
swal.fire({
+ icon: 'warning',
title: `Êtes-vous sûr de vouloir supprimer cette tâche ?`,
text: 'Elle ne sera plus visible pour aucun des utilisateurs qui lui sont associés.',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning mt-2',
cancelButton: 'btn btn-secondary mt-2'
diff --git a/src/views/Pages/Home.vue b/src/views/Pages/Home.vue
index eb216f2..c78be07 100755
--- a/src/views/Pages/Home.vue
+++ b/src/views/Pages/Home.vue
@@ -152,6 +152,41 @@
2€
+
+
+ Ils nous aident à financer Calendz
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
${this.timeToHour(element.event.start)} - ${this.timeToHour(element.event.end)}
+ ${element.event.extendedProps.bts ? 'BTS
' : ''}
${element.event.title}
${this.capitalizeFirstLetterEachWords(element.event.extendedProps.professor)}
${element.event.extendedProps.room}
@@ -548,6 +560,7 @@ export default {
html += `
${this.timeToHour(element.event.start)} - ${this.timeToHour(element.event.end)}
+ ${element.event.extendedProps.bts ? 'BTS' : ''}
${element.event.title}
${this.capitalizeFirstLetterEachWords(element.event.extendedProps.professor)}
${element.event.extendedProps.room}
@@ -710,6 +723,11 @@ export default {
if (e.keyCode === 39 && !this.showSearchInput) this.next()
if (e.keyCode === 37 && !this.showSearchInput) this.prev()
},
+ reload () {
+ const date = this.dateToMonthDayYear(this.activeDate)
+ this.$store.dispatch('calendar/resetFetchedWeeks')
+ this.$store.dispatch('calendar/fetchDate', { date: date, force: true })
+ },
// ===========================================
// == Task functions
// ===========================================
@@ -780,6 +798,7 @@ export default {
}
}
+
diff --git a/src/views/Pages/Dashboard/Profile.vue b/src/views/Pages/Dashboard/Profile.vue
index 16cad7a..ccf45ec 100644
--- a/src/views/Pages/Dashboard/Profile.vue
+++ b/src/views/Pages/Dashboard/Profile.vue
@@ -340,9 +340,9 @@ export default {
if (!valid) return
swal.fire({
+ icon: 'warning',
title: 'Êtes-vous sûr de vouloir changer votre mot de passe ?',
text: 'Vous serez déconnecté du site !',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning',
cancelButton: 'btn btn-secondary'
diff --git a/src/views/Pages/Dashboard/Settings.vue b/src/views/Pages/Dashboard/Settings.vue
index b99346d..2d0d096 100644
--- a/src/views/Pages/Dashboard/Settings.vue
+++ b/src/views/Pages/Dashboard/Settings.vue
@@ -350,9 +350,9 @@ export default {
},
deleteAccount () {
swal.fire({
+ icon: 'warning',
title: `Êtes-vous sûr de vouloir supprimer votre compte ?`,
text: 'Vous pourrez toujours vous réinscrire plus tard, mais toutes vos données seront perdues...',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning mt-2',
cancelButton: 'btn btn-secondary mt-2'
diff --git a/src/views/Pages/Dashboard/Tasks.vue b/src/views/Pages/Dashboard/Tasks.vue
index 5100661..7771981 100644
--- a/src/views/Pages/Dashboard/Tasks.vue
+++ b/src/views/Pages/Dashboard/Tasks.vue
@@ -726,9 +726,9 @@ export default {
},
deleteTask (taskId) {
swal.fire({
+ icon: 'warning',
title: `Êtes-vous sûr de vouloir supprimer cette tâche ?`,
text: 'Elle ne sera plus visible pour aucun des utilisateurs qui lui sont associés.',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning mt-2',
cancelButton: 'btn btn-secondary mt-2'
diff --git a/src/views/Pages/Home.vue b/src/views/Pages/Home.vue
index eb216f2..c78be07 100755
--- a/src/views/Pages/Home.vue
+++ b/src/views/Pages/Home.vue
@@ -152,6 +152,41 @@
2€
+
+
+ Ils nous aident à financer Calendz
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
${element.event.extendedProps.room}
@@ -548,6 +560,7 @@ export default {
html += `
${this.timeToHour(element.event.start)} - ${this.timeToHour(element.event.end)}
+ ${element.event.extendedProps.bts ? 'BTS' : ''}
${element.event.title}
${this.capitalizeFirstLetterEachWords(element.event.extendedProps.professor)}
${element.event.extendedProps.room}
@@ -710,6 +723,11 @@ export default {
if (e.keyCode === 39 && !this.showSearchInput) this.next()
if (e.keyCode === 37 && !this.showSearchInput) this.prev()
},
+ reload () {
+ const date = this.dateToMonthDayYear(this.activeDate)
+ this.$store.dispatch('calendar/resetFetchedWeeks')
+ this.$store.dispatch('calendar/fetchDate', { date: date, force: true })
+ },
// ===========================================
// == Task functions
// ===========================================
@@ -780,6 +798,7 @@ export default {
}
}
+
diff --git a/src/views/Pages/Dashboard/Profile.vue b/src/views/Pages/Dashboard/Profile.vue
index 16cad7a..ccf45ec 100644
--- a/src/views/Pages/Dashboard/Profile.vue
+++ b/src/views/Pages/Dashboard/Profile.vue
@@ -340,9 +340,9 @@ export default {
if (!valid) return
swal.fire({
+ icon: 'warning',
title: 'Êtes-vous sûr de vouloir changer votre mot de passe ?',
text: 'Vous serez déconnecté du site !',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning',
cancelButton: 'btn btn-secondary'
diff --git a/src/views/Pages/Dashboard/Settings.vue b/src/views/Pages/Dashboard/Settings.vue
index b99346d..2d0d096 100644
--- a/src/views/Pages/Dashboard/Settings.vue
+++ b/src/views/Pages/Dashboard/Settings.vue
@@ -350,9 +350,9 @@ export default {
},
deleteAccount () {
swal.fire({
+ icon: 'warning',
title: `Êtes-vous sûr de vouloir supprimer votre compte ?`,
text: 'Vous pourrez toujours vous réinscrire plus tard, mais toutes vos données seront perdues...',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning mt-2',
cancelButton: 'btn btn-secondary mt-2'
diff --git a/src/views/Pages/Dashboard/Tasks.vue b/src/views/Pages/Dashboard/Tasks.vue
index 5100661..7771981 100644
--- a/src/views/Pages/Dashboard/Tasks.vue
+++ b/src/views/Pages/Dashboard/Tasks.vue
@@ -726,9 +726,9 @@ export default {
},
deleteTask (taskId) {
swal.fire({
+ icon: 'warning',
title: `Êtes-vous sûr de vouloir supprimer cette tâche ?`,
text: 'Elle ne sera plus visible pour aucun des utilisateurs qui lui sont associés.',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning mt-2',
cancelButton: 'btn btn-secondary mt-2'
diff --git a/src/views/Pages/Home.vue b/src/views/Pages/Home.vue
index eb216f2..c78be07 100755
--- a/src/views/Pages/Home.vue
+++ b/src/views/Pages/Home.vue
@@ -152,6 +152,41 @@
2€
+
+
+ Ils nous aident à financer Calendz
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
${this.timeToHour(element.event.start)} - ${this.timeToHour(element.event.end)}
+ ${element.event.extendedProps.bts ? 'BTS
' : ''}
${element.event.title}
${this.capitalizeFirstLetterEachWords(element.event.extendedProps.professor)}
${element.event.extendedProps.room}
@@ -710,6 +723,11 @@ export default {
if (e.keyCode === 39 && !this.showSearchInput) this.next()
if (e.keyCode === 37 && !this.showSearchInput) this.prev()
},
+ reload () {
+ const date = this.dateToMonthDayYear(this.activeDate)
+ this.$store.dispatch('calendar/resetFetchedWeeks')
+ this.$store.dispatch('calendar/fetchDate', { date: date, force: true })
+ },
// ===========================================
// == Task functions
// ===========================================
@@ -780,6 +798,7 @@ export default {
}
}
+
diff --git a/src/views/Pages/Dashboard/Profile.vue b/src/views/Pages/Dashboard/Profile.vue
index 16cad7a..ccf45ec 100644
--- a/src/views/Pages/Dashboard/Profile.vue
+++ b/src/views/Pages/Dashboard/Profile.vue
@@ -340,9 +340,9 @@ export default {
if (!valid) return
swal.fire({
+ icon: 'warning',
title: 'Êtes-vous sûr de vouloir changer votre mot de passe ?',
text: 'Vous serez déconnecté du site !',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning',
cancelButton: 'btn btn-secondary'
diff --git a/src/views/Pages/Dashboard/Settings.vue b/src/views/Pages/Dashboard/Settings.vue
index b99346d..2d0d096 100644
--- a/src/views/Pages/Dashboard/Settings.vue
+++ b/src/views/Pages/Dashboard/Settings.vue
@@ -350,9 +350,9 @@ export default {
},
deleteAccount () {
swal.fire({
+ icon: 'warning',
title: `Êtes-vous sûr de vouloir supprimer votre compte ?`,
text: 'Vous pourrez toujours vous réinscrire plus tard, mais toutes vos données seront perdues...',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning mt-2',
cancelButton: 'btn btn-secondary mt-2'
diff --git a/src/views/Pages/Dashboard/Tasks.vue b/src/views/Pages/Dashboard/Tasks.vue
index 5100661..7771981 100644
--- a/src/views/Pages/Dashboard/Tasks.vue
+++ b/src/views/Pages/Dashboard/Tasks.vue
@@ -726,9 +726,9 @@ export default {
},
deleteTask (taskId) {
swal.fire({
+ icon: 'warning',
title: `Êtes-vous sûr de vouloir supprimer cette tâche ?`,
text: 'Elle ne sera plus visible pour aucun des utilisateurs qui lui sont associés.',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning mt-2',
cancelButton: 'btn btn-secondary mt-2'
diff --git a/src/views/Pages/Home.vue b/src/views/Pages/Home.vue
index eb216f2..c78be07 100755
--- a/src/views/Pages/Home.vue
+++ b/src/views/Pages/Home.vue
@@ -152,6 +152,41 @@
2€
${element.event.extendedProps.room}
@@ -710,6 +723,11 @@ export default {
if (e.keyCode === 39 && !this.showSearchInput) this.next()
if (e.keyCode === 37 && !this.showSearchInput) this.prev()
},
+ reload () {
+ const date = this.dateToMonthDayYear(this.activeDate)
+ this.$store.dispatch('calendar/resetFetchedWeeks')
+ this.$store.dispatch('calendar/fetchDate', { date: date, force: true })
+ },
// ===========================================
// == Task functions
// ===========================================
@@ -780,6 +798,7 @@ export default {
}
}
+
diff --git a/src/views/Pages/Dashboard/Profile.vue b/src/views/Pages/Dashboard/Profile.vue
index 16cad7a..ccf45ec 100644
--- a/src/views/Pages/Dashboard/Profile.vue
+++ b/src/views/Pages/Dashboard/Profile.vue
@@ -340,9 +340,9 @@ export default {
if (!valid) return
swal.fire({
+ icon: 'warning',
title: 'Êtes-vous sûr de vouloir changer votre mot de passe ?',
text: 'Vous serez déconnecté du site !',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning',
cancelButton: 'btn btn-secondary'
diff --git a/src/views/Pages/Dashboard/Settings.vue b/src/views/Pages/Dashboard/Settings.vue
index b99346d..2d0d096 100644
--- a/src/views/Pages/Dashboard/Settings.vue
+++ b/src/views/Pages/Dashboard/Settings.vue
@@ -350,9 +350,9 @@ export default {
},
deleteAccount () {
swal.fire({
+ icon: 'warning',
title: `Êtes-vous sûr de vouloir supprimer votre compte ?`,
text: 'Vous pourrez toujours vous réinscrire plus tard, mais toutes vos données seront perdues...',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning mt-2',
cancelButton: 'btn btn-secondary mt-2'
diff --git a/src/views/Pages/Dashboard/Tasks.vue b/src/views/Pages/Dashboard/Tasks.vue
index 5100661..7771981 100644
--- a/src/views/Pages/Dashboard/Tasks.vue
+++ b/src/views/Pages/Dashboard/Tasks.vue
@@ -726,9 +726,9 @@ export default {
},
deleteTask (taskId) {
swal.fire({
+ icon: 'warning',
title: `Êtes-vous sûr de vouloir supprimer cette tâche ?`,
text: 'Elle ne sera plus visible pour aucun des utilisateurs qui lui sont associés.',
- type: 'warning',
customClass: {
confirmButton: 'btn btn-warning mt-2',
cancelButton: 'btn btn-secondary mt-2'
diff --git a/src/views/Pages/Home.vue b/src/views/Pages/Home.vue
index eb216f2..c78be07 100755
--- a/src/views/Pages/Home.vue
+++ b/src/views/Pages/Home.vue
@@ -152,6 +152,41 @@
2€
+
Ils nous aident à financer Calendz
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+