From a7668fc070c560f6d2a0e946a7dbc577132e39e0 Mon Sep 17 00:00:00 2001
From: mytja <mytja@protonmail.com>
Date: Sun, 17 Apr 2022 21:13:31 +0200
Subject: [PATCH] A lot of improvements: - Principal & assistant principal role
 - Resolves https://github.com/MeetPlan/MeetPlanFrontend/issues/24 & Resolves
 https://github.com/MeetPlan/MeetPlanFrontend/issues/23 - Principal name in
 official documents - Linked to
 https://github.com/MeetPlan/MeetPlanFrontend/issues/15 - Start of school
 psychologist role - Linked to
 https://github.com/MeetPlan/MeetPlanFrontend/issues/22 - And a lot more small
 tweaks and big security updates

---
 src/Admin/Users.svelte    | 28 ++++++++++++++++++++++------
 src/ClassUser.svelte      |  8 +++++---
 src/Classes.svelte        |  2 +-
 src/Drawer.svelte         |  8 ++++----
 src/Meals.svelte          |  4 ++--
 src/Meeting.svelte        |  4 ++--
 src/Samotestiranje.svelte |  2 +-
 7 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/Admin/Users.svelte b/src/Admin/Users.svelte
index 48c2433..6229914 100644
--- a/src/Admin/Users.svelte
+++ b/src/Admin/Users.svelte
@@ -10,6 +10,8 @@
     let loaded: boolean = false;
     let items = [];
 
+    let principalId = undefined;
+
     loadThings();
 
     function loadThings() {
@@ -20,11 +22,18 @@
             .then((json) => {
                     items = json["data"];
                     loaded = true;
+                    for (let i in items) {
+                        let item = items[i]
+                        if (item.Role === "principal") {
+                            principalId = item.ID;
+                            break
+                        }
+                    }
                 },
             );
     }
 
-    let choices = ["student", "parent", "teacher", "admin"];
+    let choices = ["student", "parent", "teacher", "principal assistant", "principal"];
 
     import jwt_decode, { JwtPayload } from "jwt-decode";
     import { navigate } from "svelte-routing";
@@ -58,7 +67,7 @@
                     <Cell>{item["Name"]}</Cell>
                     <Cell>{item["Email"]}</Cell>
                     <Cell>
-                        {#if decoded["email"] !== item["Email"]}
+                        {#if decoded["user_id"] !== item["ID"]}
                             <SegmentedButton segments={choices} let:segment singleSelect on:change={(e) => {
                                 e.stopPropagation();
                                 console.log(e);
@@ -66,6 +75,8 @@
                                 let fd = new FormData();
                                 fd.append("role", e.detail.segmentId);
 
+                                principalId = undefined;
+
                                 fetch(`${baseurl}/user/role/update/${item["ID"]}`, {
                                     headers: {"Authorization": "Bearer " + localStorage.getItem("key")},
                                     body: fd,
@@ -77,10 +88,15 @@
                                         },
                                     );
                             }} bind:selected="{item['Role']}">
-                                <!-- Note: the `segment` property is required! -->
-                                <Segment {segment}>
-                                    <Label>{segment}</Label>
-                                </Segment>
+                                {#if
+                                    (decoded["role"] !== "principal assistant" && segment !== "principal") ||
+                                    (decoded["role"] !== "principal assistant" && segment !== "principal assistant")}
+                                    {#if !(segment === "principal" && principalId !== undefined && principalId !== item.ID)}
+                                        <Segment {segment}>
+                                            <Label>{segment}</Label>
+                                        </Segment>
+                                    {/if}
+                                {/if}
                             </SegmentedButton>
                         {/if}
                     </Cell>
diff --git a/src/ClassUser.svelte b/src/ClassUser.svelte
index 1573d3f..477c8df 100644
--- a/src/ClassUser.svelte
+++ b/src/ClassUser.svelte
@@ -74,7 +74,9 @@
         fetch(`${baseurl}/my/grades?studentId=${studentId}`, {headers: {"Authorization": "Bearer " + localStorage.getItem("key")}})
             .then((r) => r.json())
             .then((r) => {
-                grades = r["data"];
+                if (grades.data !== "Forbidden") {
+                    grades = r["data"];
+                }
             });
     }
 
@@ -138,7 +140,7 @@
         {#if userData}
             <h1>{userData.Name}</h1>
         {/if}
-        {#if decoded.role === "admin"}
+        {#if decoded.role === "admin" || decoded.role === "principal" || decoded.role === "principal assistant" || decoded.role === "school psychologist"}
             <Button on:click={() => {
                 fetch(`${baseurl}/user/get/certificate_of_schooling/${studentId}`, {headers: {"Authorization": "Bearer " + localStorage.getItem("key")}})
                     .then((response) => response.blob())
@@ -199,7 +201,7 @@
         {:else}
             Sistemski administrator je izključil vpogled v ocene otroka za vse starše.
         {/if}
-        {#if decoded.role === "teacher" || decoded.role === "admin"}
+        {#if decoded.role === "teacher" || decoded.role === "admin" || decoded.role === "principal" || decoded.role === "principal assistant"}
             <p/>
             <Button on:click={() => {
                 fetch(`${baseurl}/user/get/ending_certificate/${studentId}`, {headers: {"Authorization": "Bearer " + localStorage.getItem("key")}})
diff --git a/src/Classes.svelte b/src/Classes.svelte
index 36d3737..a2f9770 100644
--- a/src/Classes.svelte
+++ b/src/Classes.svelte
@@ -76,7 +76,7 @@
         <Textfield label="Nov razred" bind:value={nclass}>
             <HelperText slot="helper">Vpišite prosimo ime novega razreda</HelperText>
         </Textfield>
-        <Textfield label="Dolgo ime predmeta" bind:value={classYear} style="width: 100%;" on:change={() => patchClass()}>
+        <Textfield label="Šolsko leto" bind:value={classYear} style="width: 100%;" on:change={() => patchClass()}>
             <HelperText slot="helper">Vpišite prosimo šolsko leto - to ime se bo prikazalo na spričevalu, zato bodite še posebej previdni (primer - 2021/2022)</HelperText>
         </Textfield>
         <Select bind:teacherId label="Izberite razrednika" variant="outlined">
diff --git a/src/Drawer.svelte b/src/Drawer.svelte
index 2fe66b4..8efb00a 100644
--- a/src/Drawer.svelte
+++ b/src/Drawer.svelte
@@ -79,7 +79,7 @@
                     <Text>Pregled</Text>
                 </Item>
                 {#if meetingActive === -1}
-                    {#if decoded.role === "admin" || decoded.role === "teacher" || decoded.role === "student"}
+                    {#if decoded.role === "admin" || decoded.role === "principal" || decoded.role === "principal assistant" || decoded.role === "teacher" || decoded.role === "student"}
                         <Item
                                 href="javascript:void(0)"
                                 on:click={() => navigate('/samotestiranje')}
@@ -133,7 +133,7 @@
                             </Item>
                         {/each}
                     {/if}
-                    {#if decoded["role"] === "teacher" || decoded["role"] === "admin"}
+                    {#if decoded["role"] === "teacher" || decoded.role === "principal" || decoded.role === "principal assistant" || decoded["role"] === "admin"}
                         <Item
                                 href="javascript:void(0)"
                                 on:click={() => navigate('/new/meeting')}
@@ -169,7 +169,7 @@
                             <Text>Redovalnica</Text>
                         </Item>-->
                     {/if}
-                    {#if decoded["role"] === "admin"}
+                    {#if decoded["role"] === "admin" || decoded.role === "principal" || decoded.role === "principal assistant"}
                         <Item
                                 href="javascript:void(0)"
                                 on:click={() => navigate('/users')}
@@ -212,7 +212,7 @@
                         </Item>
                     {/if}
                 {/if}
-                {#if meetingActive !== -1 && (decoded["role"] === "admin" || decoded["role"] === "teacher")}
+                {#if meetingActive !== -1 && (decoded["role"] === "admin" || decoded["role"] === "teacher" || decoded.role === "principal" || decoded.role === "principal assistant")}
                     <Item
                             href="javascript:void(0)"
                             on:click={() => navigate(`/meeting/${meetingActive}`)}
diff --git a/src/Meals.svelte b/src/Meals.svelte
index b1b8794..2fb5789 100644
--- a/src/Meals.svelte
+++ b/src/Meals.svelte
@@ -144,7 +144,7 @@
 <Drawer active="meals" />
 <AppContent class="app-content">
     <main class="main-content">
-        {#if decoded.role === "admin"}
+        {#if decoded.role === "admin" || decoded.role === "principal" || decoded.role === "principal assistant" || decoded.role === "food organizer"}
             <h1>Dodaj nov meni</h1>
             <Textfield bind:value={date} label="Datum menija" type="date" required on:click={() => date = ""}>
                 <Icon class="material-icons" slot="leadingIcon">event</Icon>
@@ -267,7 +267,7 @@
                                 {/if}
                                 <p/>
                             {/if}
-                            {#if decoded.role === "admin"}
+                            {#if decoded.role === "admin" || decoded.role === "principal" || decoded.role === "principal assistant" || decoded.role === "food organizer"}
                                 <Button on:click={() => {
                                     mealDescription = meal.Meals;
                                     date = meal.Date;
diff --git a/src/Meeting.svelte b/src/Meeting.svelte
index 083facf..deb23ad 100644
--- a/src/Meeting.svelte
+++ b/src/Meeting.svelte
@@ -89,7 +89,7 @@
 
     const decoded = jwt_decode<JwtPayload>(token);
 
-    if (decoded["role"] === "admin") {
+    if (decoded["role"] === "admin" || decoded["role"] === "principal" || decoded["role"] === "principal assistant") {
         getTeachers();
     }
 </script>
@@ -125,7 +125,7 @@
                     <Label>Izbriši</Label>
                 </Button>
             {/if}
-            {#if decoded["role"] === "admin"}
+            {#if decoded["role"] === "admin" || decoded.role === "principal" || decoded.role === "principal assistant"}
                 <p/>
                 <FormField>
                     <Switch bind:checked={isSubstitution} on:click={() => {
diff --git a/src/Samotestiranje.svelte b/src/Samotestiranje.svelte
index 722fed2..f52cc48 100644
--- a/src/Samotestiranje.svelte
+++ b/src/Samotestiranje.svelte
@@ -63,7 +63,7 @@
 </script>
 
 <Drawer active="samotestiranje" />
-{#if decoded.role === "teacher" || decoded.role === "admin"}
+{#if decoded.role === "teacher" || decoded.role === "admin" || decoded.role === "principal" || decoded.role === "principal assistant"}
     <AppContent class="app-content">
         <div
                 tabindex="0"