From 0355c829a10fa0784fefecac26c514ceb855dbae Mon Sep 17 00:00:00 2001
From: Tom Zhao <tom.zhao@dsv.su.se>
Date: Thu, 30 Jan 2025 14:27:20 +0100
Subject: [PATCH] 97: Remove old info from previous grading creterion
---
.../su/dsv/scipro/grading/TemplatePanel.html | 71 +++++++++----------
1 file changed, 33 insertions(+), 38 deletions(-)
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/TemplatePanel.html b/view/src/main/java/se/su/dsv/scipro/grading/TemplatePanel.html
index 06a3492e70..6d0555bf10 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/TemplatePanel.html
+++ b/view/src/main/java/se/su/dsv/scipro/grading/TemplatePanel.html
@@ -3,70 +3,65 @@
<body>
<wicket:panel>
<wicket:container wicket:id="from202411">
- <div wicket:id="bachelorContainer"><!-- todo ! -->
- <div class="card mb-3 bg-light">
- <div class="card-body p-2">
- <p>
- <strong>Omvandling från poäng till betyg för ett kandidatarbete görs enligt följande schema: (varför svenska här?)</strong>
- </p>
-
- <p>[A] 31-29, at least 1 point on components U1-U12 and Ö1-Ö4, Ö6?</p>
-
- <p>[B] 28-26, at least 1 point on components U1-U12 and Ö1-Ö3, Ö6?</p>
-
- <p>[C] 25-22, at least 1 point on components U1-U12 and Ö1-Ö3, Ö6?</p>
-
- <p>[D] 21-19, at least 1 point on components U1-U12 and Ö1-Ö3, Ö6?</p>
-
- <p>[E] 18-16, at least 1 point on components U1-U12 and Ö1-Ö3, Ö6?</p>
-
- <p>[Fx] ???at least 1 point on 8 of the components U1-U12 and at least 2 points altogether on components
- Ö1-Ö3???
- </p>
- </div>
- </div>
- </div>
-
- <div wicket:id="master15Container"><!-- todo ! -->
+ <div wicket:id="bachelorContainer">
<div class="card mb-3 bg-light">
<div class="card-body p-2">
<p>
<strong>Conversion from points to grades is done according to the following schema:</strong>
</p>
- <p>[A] 33-31, at least 1 point on components U1-U7, U10-U13 and Ö1-Ö4, Ö6, and at least 2 points on U8-U9?</p>
+ <p>[A] 31-29</p>
- <p>[B] 30-28, at least 1 point on components U1-U7, U10-U13 and Ö1-Ö3, Ö6, and at least 2 points on U8-U9?</p>
+ <p>[B] 28-26</p>
- <p>[C] 27-24, at least 1 point on components U1-U7, U10-U13 and Ö1-Ö3, Ö6, and at least 2 points on U8-U9?</p>
+ <p>[C] 25-22</p>
- <p>[D] 23-21, at least 1 point on components U1-U7, U10-U13 and Ö1-Ö3, Ö6, and at least 2 points on U8-U9?</p>
+ <p>[D] 21-19</p>
- <p>[E] 20-19, at least 1 point on components U1-U7, U10-U13 and Ö1-Ö3, Ö6, and at least 2 points on U8-U9?</p>
+ <p>[E] 18-16</p>
- <p>[Fx] ???at least 1 point on 10 of the components U1-U13 and at least 2 points altogether on components Ö1-Ö3???</p>
</div>
</div>
</div>
- <div wicket:id="master30Container"><!-- todo ! -->
+ <div wicket:id="master15Container">
<div class="card mb-3 bg-light">
<div class="card-body p-2">
<p>
<strong>Conversion from points to grades is done according to the following schema:</strong>
</p>
- <p>[A] 37-35, at least 1 point on components U1-U4, U10-U12, Ö1-Ö4, Ö6, and at least 2 points on U5-U9, U13?</p>
+ <p>[A] 33-31</p>
- <p>[B] 34-32, at least 1 point on components U1-U4, U10-U12, Ö1-Ö3, Ö6, and at least 2 points on U5-U9, U13?</p>
+ <p>[B] 30-28</p>
- <p>[C] 31-28, at least 1 point on components U1-U4, U10-U12, Ö1-Ö3, Ö6, and at least 2 points on U5-U9, U13?</p>
+ <p>[C] 27-24</p>
- <p>[D] 27-25, at least 1 point on components U1-U4, U10-U12, Ö1-Ö3, Ö6, and at least 2 points on U5-U9, U13?</p>
+ <p>[D] 23-21</p>
- <p>[E] 25-23, at least 1 point on components U1-U4, U10-U12, Ö1-Ö3, Ö6, and at least 2 points on U5-U9, U13?</p>
+ <p>[E] 20-19</p>
+
+ </div>
+ </div>
+ </div>
+
+ <div wicket:id="master30Container">
+ <div class="card mb-3 bg-light">
+ <div class="card-body p-2">
+ <p>
+ <strong>Conversion from points to grades is done according to the following schema:</strong>
+ </p>
+
+ <p>[A] 37-35</p>
+
+ <p>[B] 34-32</p>
+
+ <p>[C] 31-28</p>
+
+ <p>[D] 27-25</p>
+
+ <p>[E] 25-23</p>
- <p>[Fx] ???at least 1 point on 12 of the components U1-U13 and at least 2 points altogether on components Ö1-Ö3???</p>
</div>
</div>
</div>