Merge pull request #5116 from christianbeeznest/GH-5074-3

Gradebook: Fixes and enhancements for certificate handling in documents and gradebook - #5074

Author: christianbeeznest

assets/vue/components/Toolbar.vue

@@ -1,6 +1,14 @@
 <template>
   <PrimeToolbar>
     <template #start>
+      <PrimeButton
+        v-if="handleBack"
+        :label="$t('Back')"
+        icon="mdi mdi-arrow-left"
+        class="p-button-outlined"
+        @click="backAction"
+      />
+
       <PrimeButton
         v-if="handleList"
         :label="$t('List')"
@@ -98,6 +106,10 @@ export default {
       type: Function,
       required: false
     },
+    handleBack: {
+      type: Function,
+      required: false
+    },
     handleSubmit: {
       type: Function,
       required: false
@@ -145,6 +157,11 @@ export default {
     }
   },
   methods: {
+    backAction() {
+      if (this.handleBack) {
+        this.handleBack();
+      }
+    },
     listItem() {
       if (this.handleList) {
         this.handleList();

assets/vue/components/basecomponents/ChamiloIcons.js

@@ -109,4 +109,6 @@ export const chamiloIconToClass = {
   "anonymous": "mdi mdi-incognito",
   "settings": "mdi mdi-tools",
   "ticket": "mdi mdi-ticket-account",
+  "certificate-selected": "mdi mdi-star",
+  "certificate-not-selected": "mdi mdi-star-outline",
 };

assets/vue/components/resource_links/ShowLinks.vue

@@ -4,48 +4,39 @@
     :key="index"
     class="field space-y-2"
   >
-    <div
-      v-if="link.course"
-      :class="{ 'text-right text-body-2': editStatus }"
-    >
-      <span class="mdi mdi-book" />
-      {{ t("Course: {0}", [link.course.resourceNode.title]) }}
+    <div v-if="link.course" :class="{ 'text-right text-body-2': editStatus }">
+      <span class="mdi mdi-book"></span>
+      {{ $t("Course") }}: {{ link.course.resourceNode.title }}
     </div>
 
     <div
       v-if="link.session"
       :class="{ 'text-right text-body-2': editStatus }"
     >
       <span class="mdi mdi-book-open" />
-      {{ t("Session: {0}", [link.session.title]) }}
+      {{ $t("Session") }}: {{ link.session.title }}
     </div>
 
     <div
       v-if="link.group"
       :class="{ 'text-right text-body-2': editStatus }"
     >
       <span class="mdi mdi-people" />
-      {{ t("Group: {0}", [link.group.resourceNode.title]) }}
+      {{ $t("Group") }}: {{ link.group.resourceNode.title }}
     </div>
 
-    <div
-      v-if="link.userGroup"
-      v-t="{ path: 'Class: {0}', args: [link.userGroup.resourceNode.title] }"
-    />
+    <div v-if="link.userGroup">
+      {{ $t("Class") }}: {{ link.userGroup.resourceNode.title }}
+    </div>
 
     <div v-if="link.user">
-      <span class="mdi mdi-account" />
-      <!--  @todo add avatar        -->
-      <!--  <q-avatar size="32px">-->
-      <!--    <img :src="link.user.illustrationUrl + '?w=80&h=80&fit=crop'" />-->
-      <!--  </q-avatar>-->
+      <span class="mdi mdi-account"></span>
       {{ link.user.username }}
     </div>
 
-    <div
-      v-if="showStatus"
-      v-t="{ path: 'Status: {0}', args: [link.visibilityName] }"
-    />
+    <div v-if="showStatus">
+      {{ $t("Status") }}: {{ link.visibilityName }}
+    </div>
 
     <div v-if="editStatus">
       <div class="p-float-label">
@@ -56,10 +47,7 @@
           option-label="label"
           option-value="value"
         />
-        <label
-          v-t="'Status'"
-          :for="`link-${link.id}-status`"
-        />
+        <label for="`link-${link.id}-status`">{{ $t("Status") }}</label>
       </div>
     </div>
   </div>

assets/vue/composables/datatableList.js

@@ -33,10 +33,10 @@ export function useDatatableList (servicePrefix) {
   function onUpdateOptions ({ page, itemsPerPage, sortBy, sortDesc }) {
     page = page || options.value.page
 
-    if (!isEmpty(route.query.cert) && route.query.cert === '1') {
-        filters.value.filetype = 'certificate'
+    if (!isEmpty(route.query.filetype) && route.query.filetype === 'certificate') {
+      filters.value.filetype = 'certificate';
     } else {
-        filters.value.filetype = ['file', 'folder']
+      filters.value.filetype = ['file', 'folder'];
     }
 
     let params = { ...filters.value }

assets/vue/views/documents/CreateFile.vue

@@ -2,6 +2,7 @@
   <Toolbar
     :handle-reset="resetForm"
     :handle-submit="onSendFormData"
+    :handle-back="handleBack"
   />
 
   <div class="documents-layout">
@@ -17,15 +18,14 @@
         :errors="violations"
         :values="item"
       />
+      <Panel
+        v-if="$route.query.filetype === 'certificate' "
+        :header="$t('Create your certificate copy-pasting the following tags. They will be replaced in the document by their student-specific value:')"
+      >
+        <div v-html="finalTags" />
+      </Panel>
     </div>
   </div>
-
-  <Panel
-    v-if="$route.query.cert === '1'"
-    :header="$t('Create your certificate copy-pasting the following tags. They will be replaced in the document by their student-specific value:')"
-  >
-    <div v-html="finalTags" />
-  </Panel>
   <Loading :visible="isLoading" />
 </template>
 
@@ -60,7 +60,7 @@ export default {
   },
   mixins: [CreateMixin],
   data() {
-    const filetype = this.$route.query.cert === '1' ? 'certificate' : 'file';
+    const filetype = this.$route.query.filetype === 'certificate' ? 'certificate' : 'file';
     const finalTags = this.getCertificateTags();
     return {
       item: {
@@ -90,6 +90,9 @@ export default {
   },
 
   methods: {
+      handleBack() {
+        this.$router.back();
+      },
       addTemplateToEditor(templateContent) {
         this.item.contentFile = templateContent;
       },