ajout embargo/confidentialite

abes-esr · Jul 27, 2023 · 13d3a6b · 13d3a6b
1 parent 3ea4bb7
commit 13d3a6b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/src/components/theses/ButtonsList.vue b/src/components/theses/ButtonsList.vue
@@ -13,10 +13,16 @@
         </button>
       </div>
     </div>
-    <div class="listButtons no-wrap-text" v-if="soutenue">
-      <v-btn color="primary" append-icon="mdi-arrow-right-circle" flat v-for="b in listButtons" :key="b"
-        :href="baseURL + b.url" target="_blank" :title="b.libelle" :aria-label="b.libelle">{{
-          b.libelle }}</v-btn>
+    <div v-if="soutenue">
+      <div class="listButtons no-wrap-text" v-for="b in listButtons" :key="b">
+        <v-btn v-if="b.url" color="primary" append-icon="mdi-arrow-right-circle" flat :href="baseURL + b.url"
+          target="_blank" :title="b.libelle" :aria-label="b.libelle">{{
+            b.libelle }}</v-btn>
+        <span v-else>
+          <span v-if="b.libelle === 'Embargo'">{{ $t("theseView.embargo") }} {{ b.dateFin }}</span>
+          <span v-if="b.libelle === 'Confidentialité'">{{ $t("theseView.confidentialite") }} {{ b.dateFin }}</span>
+        </span>
+      </div>
       <v-skeleton-loader v-if="loading" :key="i" type="list-item" class="skeleton"></v-skeleton-loader>
     </div>
   </div>

diff --git a/src/components/theses/ThesisTable.vue b/src/components/theses/ThesisTable.vue
@@ -6,7 +6,7 @@
         <span><strong>{{ $t('theseView.auteur') }}{{ '\xa0' }}</strong></span>
         <span>
           <template v-for="(auteur, index) in these.auteurs" :key="auteur.ppn">
-            <span :class="auteur.ppn ? 'clickable orange' : ''" @click="linkTo(auteur.ppn)">
+            <span :class="auteur.ppn ? 'clickable lightblue' : ''" @click="linkTo(auteur.ppn)">
               {{ auteur.prenom }} {{ auteur.nom }}
             </span>
             <template v-if="index < these.auteurs.length - 1">,{{ '\xa0' }}</template>
@@ -142,10 +142,6 @@ function linkTo(id) {
 <style lang="scss" scoped>
 @use 'vuetify/settings';
 
-.orange {
-  color: rgb(var(--v-theme-orange-abes));
-}
-
 .lightblue {
   color: rgb(var(--v-theme-secondary-darken-2));
 }
@@ -186,6 +182,5 @@ function linkTo(id) {
 .clickable {
   cursor: pointer;
   font-weight: bold;
-  text-decoration: underline;
 }
 </style>
diff --git a/src/locales/fr.json b/src/locales/fr.json
@@ -75,7 +75,9 @@
     "showMoreAbstract": "Afficher la suite du résumé",
     "showLessAbstract": "Afficher un extrait du résumé",
     "projet": "Projet de thèse",
-    "doctorat": "Thèse de doctorat"
+    "doctorat": "Thèse de doctorat",
+    "embargo": "Cette thèse est sous embargo jusqu’au ",
+    "confidentialite": "Cette thèse est confidentielle jusqu’au "
   },
   "results": {
     "facetsHeader": "Filtres",

diff --git a/src/views/ReportErrorView.vue b/src/views/ReportErrorView.vue
@@ -13,7 +13,7 @@
                 <v-text-field :label="$t('reportErrorView.mail')" v-model="mail" :rules="mailRule" variant="outlined"
                     density="compact" required></v-text-field>
             </div>
-            <div class="form-row half">
+            <div class="form-row shortened">
                 <v-select :label="$t('reportErrorView.domaine')" v-model="domaine" :rules=requiredRule :items="domainItems"
                     variant="outlined" density="compact" required></v-select>
             </div>

diff --git a/src/views/TheseView.vue b/src/views/TheseView.vue
@@ -50,7 +50,8 @@
   <div class="thesis-main-wrapper">
     <div v-if="!mobile" class="nav-bar">
       <!-- Futur composant boutons (barre de gauche)-->
-      <buttons-list :nnt="route.params.id" :soutenue="these.status === 'soutenue'"></buttons-list>
+      <buttons-list :nnt="route.params.id"
+        :soutenue="these.status === 'soutenue' && these.source !== 'step'"></buttons-list>
     </div>
     <div class="thesis-components">
       <thesis-component :nnt="route.params.id" :these="these" :data-ready="true"></thesis-component>