Limit functionalities by roles

2021-09-11 21:52:46 +03:00
parent 220f35b3db
commit 07eba6b4e0
14 changed files with 296 additions and 224 deletions
@@ -18,6 +18,7 @@
  } from '../../../components/Course/store';
  import { getLectureNo } from '../../../components/Course/function';
  import { fetchCourse } from '../../../utils/services/courses';
+  import { profile } from '../../../utils/store/user';
  import { lessons } from '../../../components/Course/components/Lesson/store/lessons';
  import { ROLE } from '../../../utils/constants/roles';
  import { takeAttendance } from '../../../utils/services/attendance';
@@ -29,6 +30,7 @@

  let borderBottomGrey = 'border-r-0 border-b border-l-0 border-gray-300';
  let students = [];
+  let isStudent;

  function setAttendance(courseData) {
    for (const attendanceItem of courseData.attendance) {
@@ -69,6 +71,16 @@
  $: students = $group.people.filter(
    (person) => !!person.profile && person.role_id === ROLE.STUDENT
  );
+
+  $: {
+    const user = $group.people.find(
+      (person) => person.profile_id === $profile.id
+    );
+
+    if (user) {
+      isStudent = user.role_id === 3;
+    }
+  }
 </script>

 <CourseContainer>
@@ -104,14 +116,17 @@
          {#each $lessons as lesson}
            <p class="col">
              <input
-                class="form-radio"
+                class="form-radio {isStudent && 'cursor-not-allowed'}"
                type="checkbox"
+                disabled={isStudent}
                checked={$attendance[student.id]
                  ? $attendance[student.id][lesson.id]
                    ? $attendance[student.id][lesson.id].is_present
                    : false
                  : false}
                on:change={(e) => {
+                  if (isStudent) return;
+
                  const attendanceItem = $attendance[student.id]
                    ? $attendance[student.id][lesson.id] || {}
                    : {};
@@ -23,6 +23,7 @@
  import CourseContainer from '../../../../../components/CourseContainer/index.svelte';

  import PrimaryButton from '../../../../../components/PrimaryButton/index.svelte';
+  import RoleBasedSecurity from '../../../../../components/RoleBasedSecurity/index.svelte';
  import PageNav from '../../../../../components/PageNav/index.svelte';
  import PageBody from '../../../../../components/PageBody/index.svelte';
  import Materials from '../../../../../components/Course/components/Lesson/Materials/index.svelte';
@@ -108,18 +109,20 @@
    ]}
  >
    <svelte:fragment slot="widget">
-      {#if isMaterialsTabActive}
-        <div class="flex items-center">
-          <PrimaryButton
-            className="mr-2"
-            label={mode === MODES.edit ? 'Save' : 'Edit'}
-            onClick={() => {
-              prevMode = mode;
-              mode = mode === MODES.edit ? MODES.view : MODES.edit;
-            }}
-          />
-        </div>
-      {/if}
+      <RoleBasedSecurity allowedRoles="[1,2]">
+        {#if isMaterialsTabActive}
+          <div class="flex items-center">
+            <PrimaryButton
+              className="mr-2"
+              label={mode === MODES.edit ? 'Save' : 'Edit'}
+              onClick={() => {
+                prevMode = mode;
+                mode = mode === MODES.edit ? MODES.view : MODES.edit;
+              }}
+            />
+          </div>
+        {/if}
+      </RoleBasedSecurity>
    </svelte:fragment>
  </PageNav>

@@ -13,6 +13,7 @@
  import Delete24 from 'carbon-icons-svelte/lib/Delete24';
  import CheckmarkFilled24 from 'carbon-icons-svelte/lib/CheckmarkFilled24';
  import PageNav from '../../../../components/PageNav/index.svelte';
+  import RoleBasedSecurity from '../../../../components/RoleBasedSecurity/index.svelte';
  import Box from '../../../../components/Box/index.svelte';
  import PageBody from '../../../../components/PageBody/index.svelte';
  import PrimaryButton from '../../../../components/PrimaryButton/index.svelte';
@@ -38,21 +39,6 @@
  let lessonEditing;
  let ref;

-  const resources = [
-    {
-      label: 'lesson',
-      value: 1,
-    },
-    {
-      label: 'quiz',
-      value: 1,
-    },
-    {
-      label: 'home task',
-      value: 2,
-    },
-  ];
-
  function formatDate(date) {
    const d = new Date(date);

@@ -87,13 +73,15 @@

 <CourseContainer>
  <PageNav title="Lessons">
-    <div slot="widget">
-      <PrimaryButton
-        label="Add"
-        onClick={addLesson}
-        isDisabled={!!lessonEditing}
-      />
-    </div>
+    <RoleBasedSecurity allowedRoles="[1,2]">
+      <div slot="widget">
+        <PrimaryButton
+          label="Add"
+          onClick={addLesson}
+          isDisabled={!!lessonEditing}
+        />
+      </div>
+    </RoleBasedSecurity>
  </PageNav>

  <PageBody>
@@ -104,42 +92,44 @@
          class="group relative m-auto rounded-md border-2 border-gray-100 py-3 px-5 mb-4 flex items-center hover:shadow-2xl shadow-md transition delay-150 duration-300 ease-in-out"
        >
          <!-- Complete or Not complete icon -->
-          <div class="absolute -left-6 -top-6 success">
-            <IconButton
-              onClick={() => {
-                lesson.is_complete = !lesson.is_complete;
-                handleSaveLesson(lesson, $course.id);
-              }}
-              toolTipProps={{
-                title: `Click to ${lesson.is_complete ? 'lock' : 'unlock'}`,
-                direction: 'right',
-              }}
-            >
-              {#if lesson.is_complete}
-                <CheckmarkFilled24 class="carbon-icon" />
-              {:else}
-                <span class="text-2xl">🔒</span>
-              {/if}
-            </IconButton>
-          </div>
-
-          <!-- Edit/Save -->
-          <div class="absolute top-2 right-0">
-            {#if lessonEditing === index}
+          <RoleBasedSecurity allowedRoles="[1,2]">
+            <div class="absolute -left-6 -top-6 success">
              <IconButton
                onClick={() => {
-                  lessonEditing = null;
+                  lesson.is_complete = !lesson.is_complete;
                  handleSaveLesson(lesson, $course.id);
                }}
+                toolTipProps={{
+                  title: `Click to ${lesson.is_complete ? 'lock' : 'unlock'}`,
+                  direction: 'right',
+                }}
              >
-                <Save24 class="carbon-icon" />
+                {#if lesson.is_complete}
+                  <CheckmarkFilled24 class="carbon-icon" />
+                {:else}
+                  <span class="text-2xl">🔒</span>
+                {/if}
              </IconButton>
-            {:else}
-              <IconButton onClick={() => (lessonEditing = index)}>
-                <Edit24 class="carbon-icon" />
-              </IconButton>
-            {/if}
-          </div>
+            </div>
+
+            <!-- Edit/Save -->
+            <div class="absolute top-2 right-0">
+              {#if lessonEditing === index}
+                <IconButton
+                  onClick={() => {
+                    lessonEditing = null;
+                    handleSaveLesson(lesson, $course.id);
+                  }}
+                >
+                  <Save24 class="carbon-icon" />
+                </IconButton>
+              {:else}
+                <IconButton onClick={() => (lessonEditing = index)}>
+                  <Edit24 class="carbon-icon" />
+                </IconButton>
+              {/if}
+            </div>
+          </RoleBasedSecurity>

          <div class="">
            <h3 class="text-3xl font-bold">{index + 1}.</h3>
@@ -173,10 +163,7 @@
              {:else if !lesson.profile}
                <p class="ml-2 text-sm">No tutor added</p>
              {:else}
-                <a
-                  href="courses/1/people"
-                  class="flex items-center hover:underline"
-                >
+                <a href="." class="flex items-center hover:underline">
                  <img
                    alt="Placeholder"
                    class="block rounded-full"
@@ -229,11 +216,13 @@
            </div>
          </div>

-          <div class="absolute bottom-2 right-0">
-            <IconButton onClick={handleDelete(lesson.id)}>
-              <Delete24 class="carbon-icon" />
-            </IconButton>
-          </div>
+          <RoleBasedSecurity allowedRoles="[1,2]">
+            <div class="absolute bottom-2 right-0">
+              <IconButton onClick={handleDelete(lesson.id)}>
+                <Delete24 class="carbon-icon" />
+              </IconButton>
+            </div>
+          </RoleBasedSecurity>
        </div>
      {:else}
        <Box>
@@ -85,11 +85,9 @@
  });

  $: {
-    // students = $group.people.filter((person) => !!person.profile);
    students = $group.people.filter(
      (person) => !!person.profile && person.role_id === ROLE.STUDENT
    );
-    console.log(`students`, students);
  }
 </script>

@@ -20,6 +20,7 @@
  import Select from '../../../components/Form/Select.svelte';
  import IconButton from '../../../components/IconButton/index.svelte';
  import PageBody from '../../../components/PageBody/index.svelte';
+  import RoleBasedSecurity from '../../../components/RoleBasedSecurity/index.svelte';
  import {
    setCourseData,
    course,
@@ -45,6 +46,7 @@
  let member: { id?: string; email?: string; profile?: { email: string } } = {};
  let shouldEditMemberId = false;
  let filterBy: ProfileRole = ROLES[0];
+  let isStudent = false;

  // function setPeople(people: Array<Person>) {
  //   if (!Array.isArray(people)) return;
@@ -54,8 +56,6 @@
  // }

  async function deletePerson() {
-    console.log(`member`, member);
-    console.log(`$group.people`, $group.people);
    $group.people = $group.people.filter(
      (person: { id: string }) => person.id !== member.id
    );
@@ -64,7 +64,6 @@
  }

  async function editMemberId(person: Person) {
-    console.log(`person`, person);
    await updatedGroupMember(
      { assigned_student_id: person.assigned_student_id },
      { id: person.id }
@@ -82,6 +81,10 @@
      .sort((a: Person, b: Person) => a.role_id - b.role_id);
  }

+  function handleEditStudentIdMode() {
+    shouldEditMemberId = true;
+  }
+
  onMount(async () => {
    if ($course.id) return;
    const { data } = await fetchCourse(courseId);
@@ -89,6 +92,15 @@
  });

  $: sortAndFilterPeople($group.people, filterBy);
+  $: {
+    const user: Person = $group.people.find(
+      (person: { profile_id: number }) => person.profile_id === $profile.id
+    )!;
+
+    if (user) {
+      isStudent = user.role_id === 3;
+    }
+  }
 </script>

 <InviationModal />
@@ -100,11 +112,13 @@
 <CourseContainer>
  <PageNav title="People" disableSticky={true}>
    <slot:fragment slot="widget">
-      <PrimaryButton
-        className="mr-2"
-        label="Add"
-        onClick={() => ($invitationModal.open = true)}
-      />
+      <RoleBasedSecurity allowedRoles={[1, 2]}>
+        <PrimaryButton
+          className="mr-2"
+          label="Add"
+          onClick={() => ($invitationModal.open = true)}
+        />
+      </RoleBasedSecurity>
    </slot:fragment>
  </PageNav>
  <PageBody className="">
@@ -125,17 +139,18 @@
        <!-- <span class="flex-grow" /> -->
        <p class="text-lg w-2/4">Name</p>
        <p class="text-lg w-1/4 ">Role</p>
-        <p class="text-lg w-20" />
+        <RoleBasedSecurity allowedRoles={[1, 2]}>
+          <p class="text-lg w-20" />
+        </RoleBasedSecurity>
      </div>

      {#each people as person, index}
-        <div
-          class="flex relative items-center p-3 cursor-pointer {borderBottomGrey}"
-        >
+        <div class="flex relative items-center p-3 {borderBottomGrey}">
          {#if !shouldEditMemberId}
            <p
-              class="mr-2 w-20 text-center hover:bg-gray-100 p-3"
-              on:click={() => (shouldEditMemberId = true)}
+              class="mr-2 w-20 text-center {!isStudent &&
+                'hover:bg-gray-100 cursor-pointer'} p-3"
+              on:click={() => !isStudent && handleEditStudentIdMode()}
            >
              {person.assigned_student_id || '-'}
            </p>
@@ -174,18 +189,20 @@

          <p class="text-lg w-1/4 ">{ROLE_LABEL[person.role_id]}</p>

-          <div class="w-20">
-            {#if person.profile_id !== $profile.id}
-              <IconButton
-                onClick={() => {
-                  member = person;
-                  $deleteMemberModal.open = true;
-                }}
-              >
-                <Delete24 class="carbon-icon" />
-              </IconButton>
-            {/if}
-          </div>
+          <RoleBasedSecurity allowedRoles={[1, 2]}>
+            <div class="w-20">
+              {#if person.profile_id !== $profile.id}
+                <IconButton
+                  onClick={() => {
+                    member = person;
+                    $deleteMemberModal.open = true;
+                  }}
+                >
+                  <Delete24 class="carbon-icon" />
+                </IconButton>
+              {/if}
+            </div>
+          </RoleBasedSecurity>
        </div>
      {/each}
    </div>
@@ -10,6 +10,7 @@
  import { dndzone } from 'svelte-dnd-action';
  import { stores, goto } from '@sapper/app';
  import PageNav from '../../../components/PageNav/index.svelte';
+  import RoleBasedSecurity from '../../../components/RoleBasedSecurity/index.svelte';
  import MarkExerciseModal from '../../../components/Course/components/Lesson/Exercise/MarkExerciseModal.svelte';
  import Chip from '../../../components/Chip/index.svelte';
  import PageBody from '../../../components/PageBody/index.svelte';
@@ -250,69 +251,71 @@
  {submissionId}
 />

-<CourseContainer>
-  <PageNav title="Submitted Exercises" />
+<RoleBasedSecurity allowedRoles="[1,2]">
+  <CourseContainer>
+    <PageNav title="Submitted Exercises" />

-  <PageBody width="w-11/12 overflow-x-auto overflow-y-hidden">
-    <div class="flex items-center w-full">
-      {#each sections as { id, title, items }, idx (id)}
-        <div
-          class="section rounded-md bg-gray-100 border border-gray-50 p-3 h-80 mr-3 overflow-hidden"
-          animate:flip={{ duration: flipDurationMs }}
-        >
-          <div class="flex items-center mb-2">
-            <Chip value={items.length} class="bg-set" />
-            <p class="ml-2 font-bold">{title}</p>
-          </div>
+    <PageBody width="w-11/12 overflow-x-auto overflow-y-hidden">
+      <div class="flex items-center w-full">
+        {#each sections as { id, title, items }, idx (id)}
          <div
-            class="content pr-2 overflow-y-auto mb-3"
-            use:dndzone={{
-              items,
-              flipDurationMs,
-              dropTargetStyle: { outline: 'blue' },
-            }}
-            on:consider={handleDndConsiderCards(idx)}
-            on:finalize={handleDndFinalizeCards(idx)}
+            class="section rounded-md bg-gray-100 border border-gray-50 p-3 h-80 mr-3 overflow-hidden"
+            animate:flip={{ duration: flipDurationMs }}
          >
-            {#each items as item (item.id)}
-              <div
-                class="border border-grey-700 w-full my-2 mx-0 rounded-md bg-white py-2 px-3"
-                animate:flip={{ duration: flipDurationMs }}
-              >
+            <div class="flex items-center mb-2">
+              <Chip value={items.length} class="bg-set" />
+              <p class="ml-2 font-bold">{title}</p>
+            </div>
+            <div
+              class="content pr-2 overflow-y-auto mb-3"
+              use:dndzone={{
+                items,
+                flipDurationMs,
+                dropTargetStyle: { outline: 'blue' },
+              }}
+              on:consider={handleDndConsiderCards(idx)}
+              on:finalize={handleDndFinalizeCards(idx)}
+            >
+              {#each items as item (item.id)}
                <div
-                  class="flex items-center no-underline hover:underline text-black mb-2"
+                  class="border border-grey-700 w-full my-2 mx-0 rounded-md bg-white py-2 px-3"
+                  animate:flip={{ duration: flipDurationMs }}
                >
-                  <img
-                    alt="Student avatar"
-                    class="block rounded-full h-6 w-6"
-                    src={item.student.avatar_url}
-                  />
-                  <p class="ml-2 text-sm">{item.student.username}</p>
+                  <div
+                    class="flex items-center no-underline hover:underline text-black mb-2"
+                  >
+                    <img
+                      alt="Student avatar"
+                      class="block rounded-full h-6 w-6"
+                      src={item.student.avatar_url}
+                    />
+                    <p class="ml-2 text-sm">{item.student.username}</p>
+                  </div>
+                  <a
+                    class="text-blue-700 text-md font-bold"
+                    href="{$page.path}?submissionId={item.id}"
+                  >
+                    {item.exercise.title}
+                  </a>
+                  <a
+                    class="flex items-center no-underline hover:underline text-black my-2"
+                    href="{$page.path.replace('submissions', 'lessons')}/{item
+                      .lesson.id}/exercises/{item.exercise.id}"
+                  >
+                    <p class="text-grey text-sm">
+                      #{item.lesson.title}
+                      {`${item.tutor ? 'created by' + item.tutor.name : ''}`}
+                    </p>
+                  </a>
                </div>
-                <a
-                  class="text-blue-700 text-md font-bold"
-                  href="{$page.path}?submissionId={item.id}"
-                >
-                  {item.exercise.title}
-                </a>
-                <a
-                  class="flex items-center no-underline hover:underline text-black my-2"
-                  href="{$page.path.replace('submissions', 'lessons')}/{item
-                    .lesson.id}/exercises/{item.exercise.id}"
-                >
-                  <p class="text-grey text-sm">
-                    #{item.lesson.title}
-                    {`${item.tutor ? 'created by' + item.tutor.name : ''}`}
-                  </p>
-                </a>
-              </div>
-            {/each}
+              {/each}
+            </div>
          </div>
-        </div>
-      {/each}
-    </div>
-  </PageBody>
-</CourseContainer>
+        {/each}
+      </div>
+    </PageBody>
+  </CourseContainer>
+</RoleBasedSecurity>

 <style>
  .section {