V8-2938

components/Layout/Alertbar.vue

@@ -7,7 +7,7 @@ Contient les différentes barre d'alertes qui s'affichent selon certains cas...
   <main>
     <client-only><LayoutAlertBarEnv></LayoutAlertBarEnv></client-only>
     <LayoutAlertBarSwitchUser></LayoutAlertBarSwitchUser>
-    <LayoutAlertBarCotisation v-if="isCmf && $can('manage', 'cotisation')"></LayoutAlertBarCotisation>
+    <client-only><LayoutAlertBarCotisation v-if="isCmf && $can('manage', 'cotisation')"></LayoutAlertBarCotisation></client-only>
     <LayoutAlertBarSwitchYear></LayoutAlertBarSwitchYear>
     <LayoutAlertBarSuperAdmin></LayoutAlertBarSuperAdmin>
   </main>

components/Layout/Header/Notification.vue

@@ -161,7 +161,7 @@ export default defineComponent({
            if(notification.message?.action)
              return `${i18n.t('your_message')} ${notification.message?.fileName} ${i18n.t('is_ready_to_be')} ${notification.message.action}`
 
-           return `${i18n.t('your_message')} ${notification.message?.about} ${i18n.t('has_been_sent')} `
+           return `${i18n.t('your_message')} ${notification.message?.about ?? ''} ${i18n.t('has_been_sent')} `
            break;
 
         case NOTIFICATION_TYPE.SYSTEM :

components/Layout/Subheader.vue

@@ -6,11 +6,11 @@ Contient entre autres le breadcrumb, les commandes de changement d'année et les
 <template>
   <main>
     <v-card
-      class="d-none d-sm-none d-md-flex ot_light_grey text-body-2"
+      class="d-md-flex ot_light_grey text-body-2"
       flat
       tile
     >
-      <LayoutSubHeaderBreadcrumbs class="mr-auto" />
+      <LayoutSubHeaderBreadcrumbs class="mr-auto d-sm-none d-md-flex d-none d-sm-flex" />
 
       <v-card
         class="d-md-flex ot_light_grey pt-2 mr-6  align-baseline"
@@ -18,22 +18,31 @@ Contient entre autres le breadcrumb, les commandes de changement d'année et les
         tile
       >
         <LayoutSubHeaderActivityYear v-if="!showDateTimeRange" class="activity-year" />
-        <LayoutSubHeaderDataTiming v-if="!showDateTimeRange" class="data-timing ml-2" />
-        <LayoutSubHeaderDataTimingRange class="data-timing-range ml-n1" @showDateTimeRange="showDateTimeRange=$event" />
-        <LayoutSubHeaderPersonnalizedList class="personalized-list ml-2" />
+        <div v-if="hasMenuOrIsTeacher" class="d-sm-none d-md-flex d-none d-sm-flex">
+          <LayoutSubHeaderDataTiming v-if="!showDateTimeRange" class="data-timing ml-2" />
+          <LayoutSubHeaderDataTimingRange class="data-timing-range ml-n1" @showDateTimeRange="showDateTimeRange=$event" />
+          <LayoutSubHeaderPersonnalizedList class="personalized-list ml-2" />
+        </div>
       </v-card>
     </v-card>
   </main>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, Ref } from '@nuxtjs/composition-api'
+import {computed, ComputedRef, defineComponent, ref, Ref, useContext} from '@nuxtjs/composition-api'
 
 export default defineComponent({
   setup () {
+    const {store} = useContext()
     const showDateTimeRange: Ref<boolean> = ref(false)
+
+    const hasMenuOrIsTeacher: ComputedRef<boolean> = computed(
+      () => store.state.profile.access.hasLateralMenu || store.state.profile.access.isTeacher
+    )
+
     return {
-      showDateTimeRange
+      showDateTimeRange,
+      hasMenuOrIsTeacher
     }
   }
 })

layouts/default.vue

@@ -9,7 +9,7 @@
       <LayoutHeader @handle-open-menu-click="handleOpenMenu" />
 
       <v-main class="ot_content_color">
-        <LayoutSubheader v-if="displayedSubHeader" />
+        <LayoutSubheader />
 
         <LayoutAlertbar class="mt-1"></LayoutAlertbar>
 
@@ -40,9 +40,6 @@ export default defineComponent({
     })
 
     const displayedMenu: ComputedRef<boolean> = computed(() => store.state.profile.access.hasLateralMenu)
-    const displayedSubHeader: ComputedRef<boolean> = computed(
-      () => store.state.profile.access.hasLateralMenu || store.state.profile.access.isTeacher
-    )
 
     const handleOpenMenu = (miniVariant: boolean) => {
       properties.miniVariant = miniVariant
@@ -52,7 +49,6 @@ export default defineComponent({
       properties,
       menu,
       displayedMenu,
-      displayedSubHeader,
       handleOpenMenu
     }
   }