DMC/scipro
7
0
Fork 0
Code Issues 31 Pull Requests 3 Actions Projects 1 Wiki Activity

Grading Boundaries Wrong in Supervisor View #98

Open
tozh4728 wants to merge 6 commits from 97-grading-boundaries-wrong-in-suervisor-view into develop
pull from: 97-grading-boundaries-wrong-in-suervisor-view
merge into: DMC:develop
Conversation 1 Commits 6 Files Changed 3 +33 -38
1 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0355c829a1 - Show all commits

71
view/src/main/java/se/su/dsv/scipro/grading/TemplatePanel.html
View File

@ -3,70 +3,65 @@
<body> <body>
<wicket:panel> <wicket:panel>
<wicket:container wicket:id="from202411"> <wicket:container wicket:id="from202411">
<div wicket:id="bachelorContainer"><!-- todo ! --> <div wicket:id="bachelorContainer">
<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 class="card mb-3 bg-light"> <div class="card mb-3 bg-light">
<div class="card-body p-2"> <div class="card-body p-2">
<p> <p>
<strong>Conversion from points to grades is done according to the following schema:</strong> <strong>Conversion from points to grades is done according to the following schema:</strong>
</p> </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>
</div> </div>
<div wicket:id="master30Container"><!-- todo ! --> <div wicket:id="master15Container">
<div class="card mb-3 bg-light"> <div class="card mb-3 bg-light">
<div class="card-body p-2"> <div class="card-body p-2">
<p> <p>
<strong>Conversion from points to grades is done according to the following schema:</strong> <strong>Conversion from points to grades is done according to the following schema:</strong>
</p> </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> </div>
</div> </div>