[Merge] branch 'fix/gestColumns' into 'master'

UI and UX problems on gest columns

Closes #12, #16, #28, and #38

See merge request !21

Gestion/src/views/ApplicationsView.vue

@@ -96,15 +96,15 @@
             <td>{{ props.item.applicant_scolarity_end }}</td>
             <td>{{ getFormatedDate(props.item.applicant_application_date) }}</td>
             <td v-if="!$store.getters['moduleUser/userIsResponsible']">
-              <div v-if="props.item.marker_value !== null">
-                <span>{{props.item.marker_value}}</span>
+              <span v-if="props.item.marker_value !== null" class="d-flex">
+                {{ props.item.marker_value }}
                 <v-icon inline small>star_rating</v-icon>
-              </div>
-              <div v-else>
-                <span>-</span>
-              </div>
+              </span>
+              <span v-else>
+                -
+              </span>
             </td>
-            <td>
+            <td v-if="$store.getters['moduleUser/userIsResponsible']">
               <v-select
                 :items="$store.state.moduleApplications.available_status"
                 item-text="status_value"
@@ -150,8 +150,14 @@ export default {
         { text: 'Langues', value: 'applicant_languages', sortable: false },
         { text: 'Fin de scolarité', value: 'applicant_scolarity_end' },
         { text: 'Date postulation', value: 'applicant_application_date' },
-        { text: 'note', value: 'marker_value', sortable: true },
-        { text: 'Statut', value: 'fk_status' }
+        ...(this.$store.getters['moduleUser/userIsResponsible']
+        ? []
+        : [{ text: 'Note', value: 'marker_value' }]
+        ),
+        ...(this.$store.getters['moduleUser/userIsResponsible']
+        ? [{ text: 'Statut', value: 'fk_status' }]
+        : []
+        )
       ],
       pagination: { sortBy: 'applicant_application_date', descending: true, rowsPerPage: 25 },
       mail_dialog_opened: false
@@ -159,9 +165,6 @@ export default {
   },
   created () {
     this.loadApplications()
-    if (!this.$store.getters['moduleUser/userIsResponsible']) {
-      this.headers.splice(this.headers.length - 1, 0, { text: 'Note', value: 'applicant_marker' })
-    }
   },
   computed: {
     hasSelected () { return this.selected.length > 0 }