Vincent GUFFON 3 yıl önce
ebeveyn
işleme
8df4222cb7

+ 2 - 2
lang/layout/fr-FR.js

@@ -2,7 +2,7 @@ export default (context, locale) => {
   return ({
     creative_assistant:'Assistant de création',
     what_do_you_want_to_create:'Que souhaitez-vous créer ?',
-    previous:'Précédent',
+    previous:'Étape précédente',
     cancel:'Annuler',
     add_any_type_material:'Ajoutez tout type de matériel ou de documents tels que des partitions à votre parc de matériel',
     a_materiel:'Un matériel',
@@ -173,7 +173,7 @@ export default (context, locale) => {
     no_bill_to_display: 'Aucune facture à afficher',
     my_account: 'Mon compte',
     my_schedule_page: "Mon planning",
-    attendance_bookings_menu: "Gestion des absences & fiches de présence",
+    attendance_bookings_menu: "Gestion des absences",
     my_attendance: "Mes absences",
     my_invitation: "Mes invitations",
     my_students: "Mes élèves",

+ 1 - 1
layouts/default.vue

@@ -11,7 +11,7 @@
       <v-main class="ot_content_color">
         <LayoutSubheader v-if="displayedSubHeader" />
 
-        <LayoutAlertbar class="mt-1"></LayoutAlertbar>
+<!--        <LayoutAlertbar class="mt-1"></LayoutAlertbar>-->
 
         <!-- Page will be rendered here-->
         <nuxt />

+ 1 - 1
layouts/error.vue

@@ -20,7 +20,7 @@ export default defineComponent({
     const {$config} = useContext()
     const baseLegacyUrl:string = $config.baseURL_adminLegacy
     if(process.client && props.error.statusCode === 404)
-      window.location.href= `${baseLegacyUrl}`
+      window.location.href= `${baseLegacyUrl}/dashboard`
 
     return {
       otherError: 'Une erreur est parvenue'

+ 1 - 1
pages/index.vue → pages/dashboard.vue

@@ -15,7 +15,7 @@
 import { defineComponent } from '@nuxtjs/composition-api'
 
 export default defineComponent({
-  name: 'Index',
+  name: 'Dashboard',
   setup () {
     return {
 

+ 8 - 8
use/layout/Menus/accountMenu.ts

@@ -34,31 +34,31 @@ class AccountMenu extends BaseMenu implements Menu {
     }
 
     if (this.$ability.can('display', 'attendance_bookings_page')) {
-      children.push(this.constructMenu('attendance_bookings_menu', undefined, '/attendance_bookings', true))
+      children.push(this.constructMenu('attendance_bookings_menu', undefined, '/own_attendance', true))
     }
 
     if (this.$ability.can('display', 'my_attendance_page')) {
-      children.push(this.constructMenu('my_attendance', undefined, '/my_attendances/list', true))
+      children.push(this.constructMenu('my_attendance', undefined, '/my_attendances/list/', true))
     }
 
     if (this.$ability.can('display', 'my_invitation_page')) {
-      children.push(this.constructMenu('my_invitation', undefined, '/my_invitations/list', true))
+      children.push(this.constructMenu('my_invitation', undefined, '/my_invitations/list/', true))
     }
 
     if (this.$ability.can('display', 'my_students_page')) {
-      children.push(this.constructMenu('my_students', undefined, '/my_students/list', true))
+      children.push(this.constructMenu('my_students', undefined, '/my_students/list/', true))
     }
 
     if (this.$ability.can('display', 'my_students_education_students_page')) {
-      children.push(this.constructMenu('my_students_education_students', undefined, '/my_students_education_students/list', true))
+      children.push(this.constructMenu('my_students_education_students', undefined, '/my_students_education_students/list/', true))
     }
 
     if (this.$ability.can('display', 'criteria_notations_page') || this.$ability.can('display', 'criteria_notations_page_from_account_menu')) {
-      children.push(this.constructMenu('criteria_notations', undefined, '/criteria_notations/list', true))
+      children.push(this.constructMenu('criteria_notations', undefined, '/criteria_notations/list/', true))
     }
 
     if (this.$ability.can('display', 'my_education_students_page')) {
-      children.push(this.constructMenu('my_education_students', undefined, `/main/my_profile/${this.$store.state.profile.access.id}/dashboard/my_education_students/list`, true))
+      children.push(this.constructMenu('my_education_students', undefined, `/main/my_profile/${this.$store.state.profile.access.id}/dashboard/my_education_students/list/`, true))
     }
 
     if (this.$ability.can('display', 'send_an_email_page')) {
@@ -86,7 +86,7 @@ class AccountMenu extends BaseMenu implements Menu {
     }
 
     if (this.$ability.can('display', 'cmf_licence_page')) {
-      children.push(this.constructMenu('print_my_licence', undefined, `/licence-cmf`, true))
+      children.push(this.constructMenu('print_my_licence', undefined, `/licence_cmf/user`, true))
     }
 
     const accountMenu = this.constructMenu('my_account', 'fa-user', undefined, undefined, children, false)

+ 4 - 5
use/layout/Menus/configurationMenu.ts

@@ -30,12 +30,11 @@ class ConfigurationMenu extends BaseMenu implements Menu {
     const children: ItemsMenu = []
 
     if (this.$ability.can('display', 'organization_page')) {
-      // children.push(this.constructMenu('organization_page', undefined, `/main/organization/${this.$store.state.profile.organization.id}/dashboard`, true))
-      children.push(this.constructMenu('organization_page', undefined, `/organization`))
+      children.push(this.constructMenu('organization_page', undefined, `/main/organizations/${this.$store.state.profile.organization.id}/dashboard`, true))
     }
 
     if (this.$ability.can('display', 'cmf_licence_page')) {
-      children.push(this.constructMenu('cmf_licence_generate', undefined, '/attendances/list/', true))
+      children.push(this.constructMenu('cmf_licence_generate', undefined, '/licence_cmf/organization', true))
     }
 
     if (this.$ability.can('display', 'parameters_page')) {
@@ -71,11 +70,11 @@ class ConfigurationMenu extends BaseMenu implements Menu {
     }
 
     if (this.$ability.can('display', 'transition_next_year_page')) {
-      children.push(this.constructMenu('transition_next_year', undefined, '/attendances/list/', true))
+      children.push(this.constructMenu('transition_next_year', undefined, '/transition_next_year', true))
     }
 
     if (this.$ability.can('display', 'course_duplication_page')) {
-      children.push(this.constructMenu('course_duplication', undefined, '/duplicate_courses/', true))
+      children.push(this.constructMenu('course_duplication', undefined, '/duplicate_courses', true))
     }
 
     if (this.$ability.can('display', 'import_page')) {

+ 1 - 1
use/layout/Menus/equipmentMenu.ts

@@ -26,7 +26,7 @@ class EquipmentMenu extends BaseMenu implements Menu {
    */
   getMenu (): ItemMenu | null {
     if (this.$ability.can('display', 'equipment_page')) {
-      return this.constructMenu('equipment', 'fa-cube', '/equipment/list', true)
+      return this.constructMenu('equipment', 'fa-cube', '/equipment/list/', true)
     }
     return null
   }

+ 1 - 1
use/layout/Menus/statsMenu.ts

@@ -32,7 +32,7 @@ class StatsMenu extends BaseMenu implements Menu {
     }
 
     if (this.$ability.can('display', 'education_quotas_page')) {
-      children.push(this.constructMenu('educations_quotas_by_education', 'fa-user-circle',  '/educations_quotas_by_education_year/list', true))
+      children.push(this.constructMenu('educations_quotas_by_education', 'fa-user-circle',  '/educations_quotas_by_education_year/list/', true))
     }
 
     if (this.$ability.can('display', 'fede_stats_page')) {