DMC/scipro
7
0
Fork 0
Code Issues 23 Pull Requests 2 Actions Projects 1 Releases Wiki Activity

Allow supervisors to request improvements from final seminar opponents #78

Merged
niat8586 merged 41 commits from opponent-completion into develop 2025-03-05 10:05:38 +01:00
Conversation 8 Commits 41 Files Changed 53 +33 -41
4 changed files with 33 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 87e60578c0 - Show all commits

22
view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.html
View File

@ -6,14 +6,10 @@
<div class="col-lg-8"> <div class="col-lg-8">
<h4>Opposition report</h4> <h4>Opposition report</h4>
<div class="row mb-4"> <div class="help-box mb-3">
<div class="col-lg-8"> Use the assessment criteria in this report and write your views as an opponent in the text
<div class="help-box"> fields under each criterion. However, you do not make a point assessment but are free to
Use the assessment criteria in this report and write your views as an opponent in the text write as much as you wish on each criterion.
fields under each criterion. However, you do not make a point assessment but are free to
write as much as you wish on each criterion.
</div>
</div>
</div> </div>
<div class="mb-3"> <div class="mb-3">
@ -32,14 +28,14 @@
</wicket:enclosure> </wicket:enclosure>
<div wicket:id="fillOutReport"> <div wicket:id="fillOutReport">
<strong>Thesis summary</strong> <label wicket:for="thesisSummary">
Thesis summary
</label>
<p> <p>
Give a short summary of the evaluated work. Give a short summary of the evaluated work.
</p> </p>
<label> <textarea class="form-control mb-4" rows="8" wicket:id="thesisSummary"></textarea>
<textarea class="form-control mb-4" rows="8" wicket:id="thesisSummary"></textarea>
</label>
</div> </div>
</div> </div>
</div> </div>

2
view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.html
View File

@ -11,7 +11,7 @@
<div wicket:id="container"> <div wicket:id="container">
<div wicket:id="opponents"> <div wicket:id="opponents">
<div class="row"> <div class="row">
<div class="col-lg-7 mb-3"> <div class="col-lg-7">
<span wicket:id="user"></span><a href="#" wicket:id="remove"><span class="fa fa-times"></span></a><br> <span wicket:id="user"></span><a href="#" wicket:id="remove"><span class="fa fa-times"></span></a><br>
<div wicket:id="report"></div> <div wicket:id="report"></div>
</div> </div>

10
view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.html
View File

@ -7,13 +7,13 @@
<div wicket:id="wmc"> <div wicket:id="wmc">
<wicket:enclosure child="newReport"> <wicket:enclosure child="newReport">
<wicket:container wicket:id="newReport"/> <wicket:container wicket:id="newReport"/>
<div class="alert alert-info mt-1 mb-1" wicket:id="improvements_requested">
The supervisor has requested improvements to your opposition report.
Click the link below to see detailed comments from the supervisor and to make the requested changes.
</div>
<span wicket:id="oppositionReportLabel"></span> <span wicket:id="noOppositionReportYet"></span> <span wicket:id="oppositionReportLabel"></span> <span wicket:id="noOppositionReportYet"></span>
<a href="#" wicket:id="oppositionReportLink">Fill out opposition report</a> <a href="#" wicket:id="oppositionReportLink">Fill out opposition report</a>
<div class="alert alert-info mt-1" wicket:id="improvements_requested"> <div wicket:id="downloadPdfPanel"></div>
The supervisor has requested improvements to your opposition report.
Click the link above to see detailed comments from the supervisor and to make the requested changes.
</div>
<span wicket:id="downloadPdfPanel"></span><br />
<wicket:enclosure child="downloadAttachment"> <wicket:enclosure child="downloadAttachment">
Report attachment: <span wicket:id="downloadAttachment"></span> Report attachment: <span wicket:id="downloadAttachment"></span>
</wicket:enclosure> </wicket:enclosure>

40
view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.html
View File

@ -5,30 +5,26 @@
</head> </head>
<body> <body>
<wicket:border> <wicket:border>
<div class="row"> <div wicket:id="save"></div>
<div class="col-lg-8"> <form wicket:id="form">
<div wicket:id="save"></div> <div wicket:id="feedbackPanel"></div>
<form wicket:id="form"> <wicket:body/>
<div wicket:id="feedbackPanel"></div> <div wicket:id="criteria">
<wicket:body/> <strong><span wicket:id="title"></span></strong>
<div wicket:id="criteria">
<strong><span wicket:id="title"></span></strong>
<p><span wicket:id="description" class="gradingCriteria"></span></p> <p><span wicket:id="description" class="gradingCriteria"></span></p>
<textarea class="form-control mb-4" rows="8" cols="5" wicket:id="feedback"></textarea> <textarea class="form-control mb-4" rows="8" cols="5" wicket:id="feedback"></textarea>
</div>
<div>
<strong><wicket:message key="attachment" /></strong>
<span wicket:id="viewAttachment"></span>
<a wicket:id="deleteAttachment"><span class="fa fa-times"></span></a>
<input type="file" wicket:id="uploadAttachment" class="mb-3"/>
</div>
<button type="button" class="btn btn-success btn-sm mb-3" wicket:id="submit">
Submit
</button>
</form>
</div> </div>
</div> <div>
<strong><wicket:message key="attachment" /></strong>
<span wicket:id="viewAttachment"></span>
<a wicket:id="deleteAttachment"><span class="fa fa-times"></span></a>
<input type="file" wicket:id="uploadAttachment" class="mb-3"/>
</div>
<button type="button" class="btn btn-success btn-sm mb-3" wicket:id="submit">
Submit
</button>
</form>
</wicket:border> </wicket:border>
</body> </body>
</html> </html>