modul z ocenjevanji

MeetPlan · Nov 1, 2024 · 8b0fce3 · 8b0fce3
1 parent 3c17c91
commit 8b0fce3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/ClassUser.svelte b/src/ClassUser.svelte
@@ -140,7 +140,7 @@
 </script>
 
 {#if userData}
-    <h1>{userData.Name}</h1>
+    <h1>{userData.Name} {userData.Surname}</h1>
 {/if}
 {#if localStorage.getItem("role") === "admin" || localStorage.getItem("role") === "principal" || localStorage.getItem("role") === "principal assistant" || localStorage.getItem("role") === "school psychologist"}
     <Button on:click={async () => {
@@ -178,7 +178,7 @@
                                     <div style="display:inline-block; width: 5px;"/>
                                     {#each period.Grades as grade}
                                         <Wrapper>
-                                            <span style="color: {gradeColors[grade.Grade - 1]}; display:inline-block; font-size: 20px;">{grade.Grade}</span>
+                                            <span style="color: {grade.Counts ? gradeColors[grade.Grade - 1] : 'gray'}; display:inline-block; font-size: {grade.Counts ? 20 : 15}px;">{grade.Grade}</span>
                                             <Tooltip>
                                                 {#if grade.Description !== ''}
                                                     Opis ocene: {grade.Description}<br>

diff --git a/src/Widgets/GradesTable.svelte b/src/Widgets/GradesTable.svelte
@@ -184,7 +184,7 @@
             {#each grades["Users"] as user}
                 <Row>
                     <Cell class="sameline">
-                        <div style="display:inline-block;">{user.Name}</div>
+                        <div style="display:inline-block;">{user.Name} {user.Surname}</div>
                         <div style="display:inline-block; font-size: 20px; float:right; color: gray;">{user.Average.toFixed(2)}</div>
                     </Cell>
                     {#each user.Periods as period, i}
@@ -201,7 +201,7 @@
                             <div class="sameline">
                                 <div style="display:inline-block; width: 5px;"/>
                                 {#each period.Grades as grade}
-                                    <div style="color: {gradeColors[grade.Grade - 1]}; display:inline-block; font-size: 20px;" on:click={(e) => {
+                                    <div style="color: {grade.Counts ? gradeColors[grade.Grade - 1] : 'gray'}; display:inline-block; font-size: {grade.Counts ? 20 : 15}px;" on:click={(e) => {
                                         e.stopPropagation();
                                         if (user.Final === 0 && grade.CanPatch === true) {
                                             toPatch = grade.ID;