Merge pull request #5698 from christianbeeznest/ofaj-21604

Internal: Update session course permissions and visibility indicators - refs BT#21604

Author: NicoDucou

.env.dist

@@ -16,9 +16,9 @@ DATABASE_PASSWORD='{{DATABASE_PASSWORD}}'
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/framework-bundle ###
-APP_ENV='dev'
+APP_ENV='{{APP_ENV}}'
 APP_SECRET='{{APP_SECRET}}'
-APP_DEBUG='1'
+APP_DEBUG='{{APP_DEBUG}}'
 #TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
 #TRUSTED_HOSTS='^(localhost|example\.com)$'
 ###< symfony/framework-bundle ###
@@ -29,28 +29,28 @@ APP_INSTALLED='{{APP_INSTALLED}}'
 ## Encrypt method bcrypt/sha1/md5
 APP_ENCRYPT_METHOD='{{APP_ENCRYPT_METHOD}}'
 
-APP_LOCALE='en_US'
+APP_LOCALE='{{APP_LOCALE}}'
 
-APP_CUSTOM_VUE_TEMPLATE='0'
+APP_CUSTOM_VUE_TEMPLATE='{{APP_CUSTOM_VUE_TEMPLATE}}'
 
-GOOGLE_MAPS_API_KEY=''
+GOOGLE_MAPS_API_KEY='{{GOOGLE_MAPS_API_KEY}}'
 
 #APP_API_PLATFORM_URL='http://localhost/api/' #deprecated
 
 ###< chamilo ###
 
 ###> symfony/mailer ###
-MAILER_DSN=sendmail://default
+MAILER_DSN='{{MAILER_DSN}}'
 ###< symfony/mailer ###
 
 ###> nelmio/cors-bundle ###
-CORS_ALLOW_ORIGIN=^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$
+CORS_ALLOW_ORIGIN='{{CORS_ALLOW_ORIGIN}}'
 ###< nelmio/cors-bundle ###
 
 ###> lexik/jwt-authentication-bundle ###
-JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
-JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
-JWT_PASSPHRASE=your_secret_passphrase
+JWT_SECRET_KEY='{{JWT_SECRET_KEY}}'
+JWT_PUBLIC_KEY='{{JWT_PUBLIC_KEY}}'
+JWT_PASSPHRASE='{{JWT_PASSPHRASE}}'
 ###< lexik/jwt-authentication-bundle ###
 
 ###> symfony/messenger ###
@@ -59,3 +59,12 @@ JWT_PASSPHRASE=your_secret_passphrase
 # MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
 # MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
 ###< symfony/messenger ###
+
+###> additional settings ###
+DB_MANAGER_ENABLED='{{DB_MANAGER_ENABLED}}'
+SECURITY_KEY='{{SECURITY_KEY}}'
+SOFTWARE_NAME='{{SOFTWARE_NAME}}'
+SOFTWARE_URL='{{SOFTWARE_URL}}'
+DENY_DELETE_USERS='{{DENY_DELETE_USERS}}'
+HOSTING_TOTAL_SIZE_LIMIT='{{HOSTING_TOTAL_SIZE_LIMIT}}'
+###< additional settings ###

assets/vue/components/assignments/AssignmentsForm.vue

@@ -101,7 +101,10 @@
       />
     </BaseAdvancedSettingsButton>
 
-    <BaseButton :label="t('Save')" :disabled="isFormLoading" icon="save" is-submit type="secondary" />
+    <div class="flex justify-end space-x-2 mt-4">
+      <BaseButton :label="t('Back')" type="white" icon="arrow-left" @click="goBack" />
+      <BaseButton :label="t('Save')" :disabled="isFormLoading" icon="save" is-submit type="secondary" />
+    </div>
   </form>
 </template>
 
@@ -118,8 +121,8 @@ import { computed, reactive, ref, watch, watchEffect } from "vue"
 import { maxValue, minValue, required } from "@vuelidate/validators";
 import { useI18n } from "vue-i18n";
 import { useCidReq } from "../../composables/cidReq";
-import { RESOURCE_LINK_PUBLISHED } from "../../constants/entity/resourcelink"
-import { useRoute } from "vue-router"
+import { useRoute, useRouter } from "vue-router";
+import { RESOURCE_LINK_PUBLISHED } from "../../constants/entity/resourcelink";
 
 const props = defineProps({
   defaultAssignment: {
@@ -137,6 +140,7 @@ const props = defineProps({
 const emit = defineEmits(["submit"]);
 
 const route = useRoute();
+const router = useRouter();
 const { t } = useI18n();
 const { cid, sid, gid } = useCidReq();
 
@@ -299,4 +303,8 @@ const onSubmit = async () => {
 
   emit("submit", publicationStudent);
 };
-</script>
+
+function goBack() {
+  router.push({ name: "AssignmentsList", query: { cid, sid, gid } })
+}
+</script>

assets/vue/components/assignments/TeacherAssignmentList.vue

@@ -23,7 +23,14 @@
       :header="t('Title')"
       :sortable="true"
       field="title"
-    />
+    >
+      <template #body="slotProps">
+        <div class="flex items-center">
+          <BaseIcon v-if="isAllowedToEdit && getSessionId(slotProps.data)" icon="session-star" size="small" class="mr-2" />
+          {{ slotProps.data.title }}
+        </div>
+      </template>
+    </Column>
     <Column
       :header="t('Send date')"
       :sortable="true"
@@ -55,43 +62,45 @@
       body-class="space-x-2"
     >
       <template #body="slotProps">
-        <BaseButton
-          :icon="
-            RESOURCE_LINK_PUBLISHED === slotProps.data.firstResourceLink.visibility
-              ? 'eye-on'
-              : RESOURCE_LINK_DRAFT === slotProps.data.firstResourceLink.visibility
-              ? 'eye-off'
-              : ''
-          "
-          :label="t('Visibility')"
-          only-icon
-          size="small"
-          type="black"
-          @click="onClickVisibility(slotProps.data)"
-        />
-        <BaseButton
-          :label="t('Upload corrections')"
-          icon="file-upload"
-          only-icon
-          size="small"
-          type="black"
-        />
-        <BaseButton
-          :disabled="0 === slotProps.data.uniqueStudentAttemptsTotal"
-          :label="t('Save')"
-          icon="download"
-          only-icon
-          size="small"
-          type="black"
-        />
-        <BaseButton
-          :label="t('Edit')"
-          icon="edit"
-          only-icon
-          size="small"
-          type="black"
-          @click="onClickEdit(slotProps.data)"
-        />
+        <div v-if="canEdit(slotProps.data)">
+          <BaseButton
+            :icon="
+              RESOURCE_LINK_PUBLISHED === slotProps.data.firstResourceLink.visibility
+                ? 'eye-on'
+                : RESOURCE_LINK_DRAFT === slotProps.data.firstResourceLink.visibility
+                ? 'eye-off'
+                : ''
+            "
+            :label="t('Visibility')"
+            only-icon
+            size="small"
+            type="black"
+            @click="onClickVisibility(slotProps.data)"
+          />
+          <BaseButton
+            :label="t('Upload corrections')"
+            icon="file-upload"
+            only-icon
+            size="small"
+            type="black"
+          />
+          <BaseButton
+            :disabled="0 === slotProps.data.uniqueStudentAttemptsTotal"
+            :label="t('Save')"
+            icon="download"
+            only-icon
+            size="small"
+            type="black"
+          />
+          <BaseButton
+            :label="t('Edit')"
+            icon="edit"
+            only-icon
+            size="small"
+            type="black"
+            @click="onClickEdit(slotProps.data)"
+          />
+        </div>
       </template>
     </Column>
 
@@ -110,20 +119,24 @@
 <script setup>
 import DataTable from "primevue/datatable"
 import Column from "primevue/column"
-import { onMounted, reactive, ref, watch } from "vue"
+import { onMounted, reactive, ref, watch, computed } from "vue"
 import { useI18n } from "vue-i18n"
 import cStudentPublicationService from "../../services/cstudentpublication"
 import { useCidReq } from "../../composables/cidReq"
 import { useFormatDate } from "../../composables/formatDate"
 import BaseTag from "../basecomponents/BaseTag.vue"
 import BaseButton from "../basecomponents/BaseButton.vue"
+import BaseIcon from "../basecomponents/BaseIcon.vue"
 import { RESOURCE_LINK_DRAFT, RESOURCE_LINK_PUBLISHED } from "../../constants/entity/resourcelink"
 import { useNotification } from "../../composables/notification"
 import { useConfirm } from "primevue/useconfirm"
 import resourceLinkService from "../../services/resourcelink"
-import { useRouter } from "vue-router"
+import { useRoute, useRouter } from "vue-router"
+import { checkIsAllowedToEdit } from "../../composables/userPermissions"
+import { useSecurityStore } from "../../store/securityStore"
 
 const { t } = useI18n()
+const route = useRoute();
 const router = useRouter()
 
 const assignments = ref([])
@@ -136,6 +149,8 @@ const { cid, sid, gid } = useCidReq()
 const notification = useNotification()
 
 const confirm = useConfirm()
+const securityStore = useSecurityStore()
+const isCurrentTeacher = computed(() => securityStore.isCurrentTeacher)
 
 const { abbreviatedDatetime } = useFormatDate()
 
@@ -145,20 +160,33 @@ const loadParams = reactive({
   itemsPerPage: 10,
 })
 
-function loadData() {
+const isAllowedToEdit = ref(false)
+
+onMounted(async () => {
+  isAllowedToEdit.value = await checkIsAllowedToEdit(true, true, true)
+  loadData()
+})
+
+watch(loadParams, () => {
+  loadData()
+})
+
+async function loadData() {
   loading.value = true
 
-  cStudentPublicationService
-    .findAll({
+  try {
+    const response = await cStudentPublicationService.findAll({
       params: { ...loadParams, cid, sid, gid },
     })
-    .then((response) => response.json())
-    .then((json) => {
-      assignments.value = json["hydra:member"]
-      totalRecords.value = json["hydra:totalItems"]
+    const json = await response.json()
 
-      loading.value = false
-    })
+    assignments.value = json["hydra:member"]
+    totalRecords.value = json["hydra:totalItems"]
+  } catch (error) {
+    notification.showErrorNotification(error)
+  } finally {
+    loading.value = false
+  }
 }
 
 const onPage = (event) => {
@@ -175,14 +203,6 @@ const onSort = (event) => {
   })
 }
 
-onMounted(() => {
-  loadData()
-})
-
-watch(loadParams, () => {
-  loadData()
-})
-
 function onClickMultipleDelete() {
   confirm.require({
     header: t("Confirmation"),
@@ -226,9 +246,37 @@ async function onClickVisibility(assignment) {
 }
 
 function onClickEdit(assignment) {
+  const assignmentId = parseInt(assignment["@id"].split('/').pop(), 10);
+
+  console.log('onClickEdit id :::', assignmentId);
+
   router.push({
-    name: "AssigmnentsUpdate",
-    query: { id: assignment["@id"], cid, sid, gid },
-  })
+    name: "AssignmentsUpdate",
+    params: { id: assignment["@id"] },
+    query: route.query,
+  });
+}
+
+const getSessionId = (item) => {
+  if (!item.firstResourceLink || !item.firstResourceLink.session) {
+    return null;
+  }
+
+  const sessionParts = item.firstResourceLink.session.split('/');
+  return parseInt(sessionParts[sessionParts.length - 1]);
+}
+
+const canEdit = (item) => {
+  const sessionId = getSessionId(item);
+
+  console.log('sessionId ::: ', sessionId)
+
+  const isSessionDocument = sessionId && sessionId === sid;
+  const isBaseCourse = !sessionId;
+
+  return (
+    (isSessionDocument && isAllowedToEdit.value) ||
+    (isBaseCourse && !sid && isCurrentTeacher.value)
+  );
 }
 </script>

assets/vue/components/basecomponents/ChamiloIcons.js

@@ -122,4 +122,5 @@ export const chamiloIconToClass = {
   "add-topic": "mdi mdi-forum-outline",
   "event-reminder": "mdi mdi-alarm",
   "add-event-reminder": "mdi mdi-alarm-plus",
+  "session-star": "mdi mdi-star",
 };

assets/vue/components/glossary/GlossaryForm.vue

@@ -126,7 +126,7 @@ const submitGlossaryForm = async () => {
     notification.showSuccessNotification(t("Glossary term saved"))
 
     await router.push({
-      title: "GlossaryList",
+      name: "GlossaryList",
       query: route.query,
     })
   } catch (error) {