Commit Graph

6912 Commits

Author SHA1 Message Date
d6d51d7e34 3204 Show current reviewer in the project management page 2024-01-12 14:09:16 +01:00
4b727167e5 3204 Assign targets by specific periods 2024-01-12 14:09:16 +01:00
a123fd1932 3204 Start of managing reviewer capacity 2024-01-12 14:09:16 +01:00
7f999022c8 Store information about assigned reviews 2024-01-12 14:09:15 +01:00
1a9a1a13d2 Basic GUI for assigning reviewers 2024-01-12 14:09:15 +01:00
33e0e033b5 Basic GUI for assigning reviewers 2024-01-12 14:09:15 +01:00
a615f12238 Support medium-sized profile pictures 2024-01-12 14:09:15 +01:00
7495931891 3035 TR 2024-01-12 13:38:38 +01:00
1cb10be6a1 3283 TR Change signature 2024-01-10 16:18:30 +01:00
59a215422f 3283 TR 2024-01-09 14:42:13 +01:00
5905308085 3122 Stöd för manuell hantering av slutsem för handledare 2023-12-01 17:21:13 +01:00
nikos dimitrakas
9100e593a8 3122 TR Bättre variabelnamn, metodnamn, klassnamn. Fixade texter. Tog bort oanvända properties. 2023-11-30 12:56:22 +01:00
d389b40b9e Upgrade to Wicket 9.16.0 2023-11-29 14:52:17 +01:00
97dec05f34 3231 Prevent approving phase two if grades can't be reported 2023-11-29 13:43:16 +01:00
172ddbe27f 3231 Show warning if there's a probable problem reporting the grades 2023-11-29 13:38:13 +01:00
d63ed58330 3231 Handle grading service being down when approving phase two 2023-11-27 15:02:58 +01:00
a69784091f 3283: I Supervisor-vyn av ett projekt visar att en författare har genomfört flera oppositioner 2023-11-27 14:25:28 +01:00
da53f15bb1 Merge remote-tracking branch 'origin/develop' into develop 2023-11-23 15:44:48 +01:00
9628c6a28f 3122 Stöd för manuell hantering av slutsem för handledare 2023-11-23 12:55:10 +01:00
cb2d389881 3249 Allow saving general criteria before filling in overall motivation 2023-11-22 13:19:31 +01:00
9ede3a270d 3245 Create project in Daisy at course start (from idea) instead of waiting on the daily sync 2023-11-21 15:04:07 +01:00
6b6c535e97 Fixed in Wicket
32005878a7
2023-11-06 13:00:08 +01:00
e8bd998b93 3110 Improve text instructions for final thesis and reflection based on project state 2023-11-06 10:53:56 +01:00
13fef97d0f 3113 Keep the link to view authors reflection visible even after sending to the examiner 2023-11-02 15:55:12 +01:00
64fe65ce80 3157 Catch weird failure at marking threads as read 2023-11-02 15:28:40 +01:00
7a67aac779 3240 Show anonymous reviewer rather than current one (which may be wrong) in the reviewer timeline
Use an anonymous reviewer instead of actual reviewers name to try and steer the communication to be inside the system rather than out-of-band like e-mail. In case the reviewer is actually changed all relevant communication is then available to the new reviewer.
2023-11-02 15:14:40 +01:00
09318002a8 3245 Remove the "Finishing up" tab if the project has no connection to Daisy
Temporary fix until a better one is in place
2023-11-02 10:15:58 +01:00
0e6f80d111 3092 Switch to MariaDB JDBC driver 2023-11-02 09:54:08 +01:00
909936b290 3243 Fix bug with introduced examination date 2023-10-31 16:12:40 +01:00
58d95df913 3214 Fix crash when students unselects a supervisor idea and presses the back button in the browser 2023-10-30 15:12:51 +01:00
30984192bb 3147 Send the correct examination date if an author performs their required final seminar participations after uploading the final thesis. 2023-10-30 14:14:30 +01:00
0d95489908 3144 Suggest a better date when supervisors have to set the grade for problem and method 2023-10-30 13:48:57 +01:00
9223f53f42 Filter survey statistics by supervisor 2023-10-30 12:32:46 +01:00
c0902a8cad 3133 Move URKUND specific logic behind the plagiarism control abstraction 2023-10-26 18:58:10 +02:00
ba848835c9 2984 PO 3) Fix stale state when completing steps 2023-10-26 14:51:01 +02:00
7047618682 2984 PO 3) Fix stale state when completing steps 2023-10-25 12:31:06 +02:00
841dfbc8a8 2984 PO 3) Mark which steps are completed 2023-10-25 12:06:49 +02:00
7d9bde2892 2984 PO 9) Update text when sent to the survey page after authors upload the final thesis 2023-10-25 10:35:18 +02:00
nikos dimitrakas
c0f14bd941 Merge remote-tracking branch 'origin/1584-abstract-keywords' into 1584-abstract-keywords 2023-10-24 17:07:27 +02:00
nikos dimitrakas
b96643da3e 3229 Rättade terminologi. Nycklar och variabler kan behöva anpassas. Jag har bara ändrat de synliga texterna. 2023-10-24 17:07:21 +02:00
2b14fd0ede 2984 PO 8) Save final thesis rejection comment 2023-10-24 10:44:34 +02:00
nikos dimitrakas
8fba4d4451 3229 Fixade rubrik 2023-10-23 15:01:00 +02:00
nikos dimitrakas
9debdc437c 3228 Fixade text och visning av examinationsdatum för rapporterbara prov. 2023-10-23 11:12:08 +02:00
a147c05ed4 Merge branch 'develop' into 1584-abstract-keywords
# Conflicts:
#	view/src/main/java/se/su/dsv/scipro/plagiarism/UrkundSubmissionPanel.java
2023-10-19 16:57:14 +02:00
b5a3e59a53 2984 PO 5) Utilise client side validation to maintain the selected file when trying to submit the plagiarism analysis without writing a comment.
Browsers, as a security measure, will clear out the file input and prevent it from being set using JavaScript.
2023-10-19 14:51:41 +02:00
nikos dimitrakas
cbbb69b1e7 Fixade visningen av projekttiteln ihop med typ och poäng (hec istället för hp och inget blanktecken före parentesen) 2023-10-19 14:48:54 +02:00
88bbf06514 2984 PO 3) Remove button for final thesis removes the approval rather than flat out rejecting (without reason) the document. 2023-10-19 12:50:53 +02:00
e5e012060a 3133 Improve feedback message from URKUND when the file is too large 2023-10-18 12:44:04 +02:00
ef301dec4c 3064 PO 5) Add confirmation message if not all active participations have been completed. 2023-10-18 11:09:12 +02:00
c261b4739b 3221 Remove excessive logging during tests 2023-10-17 10:58:24 +02:00
3ee6b3372b 3221 Self-host Bootstrap CSS 2023-10-17 10:43:30 +02:00
3ca4e99e99 3221 Self-host Bootstrap JS
Using Webjars to make it easier to keep track of versioning.
2023-10-17 10:39:51 +02:00
5f676b2eda 2934 PO remove toggle for the approval step 2023-10-13 11:24:05 +02:00
fd73aec166 3064 PO 7) Include points when supervisors have to report pass/fail 2023-10-13 10:44:04 +02:00
97de2b159f 3064 PO text improvements 2023-10-13 10:35:23 +02:00
261fcd4629 2984 Remove undefined from URL 2023-10-13 10:13:07 +02:00
72ac370af4 2984 PO Fix scrolling issues 2023-10-13 10:11:50 +02:00
772db37f8b 2984 PO 5) Better text 2023-10-12 20:20:13 +02:00
e28ab15005 2934 PO Inform reviewers if there is nothing to report because the authors have already passed 2023-10-11 13:49:25 +02:00
4a27718711 2934 PO Report all pass/fail examinations when approving phase two 2023-10-11 13:47:49 +02:00
1dd5997870 2934 Set correct examination date 2023-10-11 13:47:49 +02:00
8821c94d49 2934 Add cancel link to the "approve" state 2023-10-11 13:47:49 +02:00
bbba2c3dc2 2934 PO Remove reviewer access from supervisor parts of projects 2023-10-11 13:47:49 +02:00
0105f6a490 Merge branch 'develop' into 1584-abstract-keywords 2023-10-09 12:43:54 +02:00
b45cdb57d9 3134 Allow authors to see their own opposition points and feedback 2023-10-09 12:39:23 +02:00
d128048c13 3134 show approved/failed in the attending list for authors under the "Opposition and Active participation" tab 2023-10-09 12:29:14 +02:00
nikos dimitrakas
bfe9025dd2 3122 TR Kortare (och tydligare) variabel-/metodnamn. 2023-10-06 09:54:46 +02:00
3a45f356eb 3122 Stöd för manuell hantering av slutsem för handledare 2023-10-05 21:55:56 +02:00
2fc1b53394 3148 SupervisorStatisticsPage: IllegalArgumentException 2023-10-05 21:55:23 +02:00
19840f5641 3216 NPE med användare utan identifier 2023-10-05 21:50:20 +02:00
9f10421b76 3104 PO 3,4) Add client side validation to the publishing constent choice 2023-10-04 23:34:46 +02:00
f67eca8e87 2984 PO 1) Don't show rejection form again after rejecting a final thesis and then immediately uploading a new version 2023-10-04 16:44:41 +02:00
c2c7551c39 2984 PO 11) Can only change publication metadata if no students have been submitted for examination 2023-10-04 16:35:00 +02:00
239c648549 2984 PO 11) Can only remove final thesis if no students have been submitted for examination 2023-10-04 14:19:38 +02:00
b2af1906d5 2984 PO 11) Add ability to remove plagiarism analysis if no student has been submitted for examination. 2023-10-04 10:06:29 +02:00
206dd24d4c 2984 PO Include credits when supervisor is forced to report pass/fail grades. 2023-10-03 13:39:41 +02:00
565216dc7b 3064 PO 2) Text fixes 2023-10-03 13:10:26 +02:00
999b6cc8ae Better display of authors submitted reflections. 2023-10-03 11:32:52 +02:00
84f9d82ff2 2984 PO 10) Add green checkmark to the "Has been sent to examiner" text 2023-10-02 14:19:04 +02:00
5e8ebc0d34 2984 PO 6) Text improvements for criterion that did not meet minimum requirements 2023-10-02 12:44:50 +02:00
bf8e31dc28 2984 PO 5) Show criteria that did not meet minimum requirements when filling in the grading basis 2023-10-02 12:17:44 +02:00
c615ffea56 3200 Change heading for supervisors overall motivation in the generated PDF 2023-09-28 11:59:49 +02:00
8c1940d6d2 3064 PO review 7) remove the ability to report graded examinations on the grading page for the supervisor
It is only used in case the reviewer did not report phase 2
2023-09-27 13:57:33 +02:00
5fb540a2a9 3064 PO review 6) always fetch new data instead of showing stale 2023-09-27 13:43:28 +02:00
41c5ffe69f 3064 PO review 3) better highlight of the tabs in "Finishing up" page 2023-09-27 13:38:57 +02:00
3a66ffdf0f 3064 PO review 2) give more detailed information about active participations performed by authors to the supervisor 2023-09-27 13:14:07 +02:00
0492746493 3064 PO review 1) more detailed information about missing active participations 2023-09-27 10:27:21 +02:00
68373ff250 3104 PO review better feedback text 2023-09-27 10:19:46 +02:00
c7c5162e0b 3104 PO review 2) 2023-09-27 10:11:10 +02:00
nikos dimitrakas
b6df7ec299 Merge remote-tracking branch 'origin/develop' into develop 2023-09-22 22:13:42 +02:00
nikos dimitrakas
568f3e850a stavfel 2023-09-22 22:13:36 +02:00
d3d0d689c8 2934 Better handling of failed grade reporting 2023-09-16 13:58:33 +02:00
59ab4e428b 2934 Fix wrong decisions show up for reviewers 2023-09-16 12:57:15 +02:00
cf810ba724 Fix badge visibility 2023-09-16 12:19:38 +02:00
496c46ee52 Code cleanup 2023-09-16 12:19:23 +02:00
5b3a64ea6e Merge remote-tracking branch 'origin/2934-reviewer-grading' into 1584-abstract-keywords
# Conflicts:
#	core/src/main/java/se/su/dsv/scipro/notifications/Notifications.java
#	core/src/main/java/se/su/dsv/scipro/report/GradingReportService.java
#	core/src/main/java/se/su/dsv/scipro/report/GradingReportServiceImpl.java
#	core/src/test/java/se/su/dsv/scipro/milestones/service/MilestoneActivatorTest.java
#	view/src/main/java/se/su/dsv/scipro/grading/FillOutGradingReportPanel.utf8.properties
#	view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPage.java
#	view/src/main/resources/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPage.html
#	view/src/test/java/se/su/dsv/scipro/SciProTest.java
#	view/src/test/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanelTest.java
#	view/src/test/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPageTest.java
2023-09-16 12:18:51 +02:00
e8f0f9a131 2984 PO 9) Fix NPE when trying to submit a plagiarism check without upload the text matching report 2023-09-13 10:45:14 +02:00
8a0529e98a 2984 PO 7) Add mininum point requirement to grading basis 2023-09-13 10:02:42 +02:00
0730798f53 2984 PO 3) Better textual instructions for the supervisor 2023-09-13 09:32:16 +02:00
23f497e88d 3181 Kan inte ta bort systemmeddelande 2023-09-12 17:09:54 +02:00
903ade76db 2984 PO 4) Save every approval by the examiners 2023-09-12 14:04:57 +02:00
2fbd644221 3181 Kan inte ta bort systemmeddelande 2023-09-12 12:16:38 +02:00
434837f0e1 3122 Stöd för manuell hantering av slutsem för handledare 2023-09-12 12:14:41 +02:00
3e408d143c 2984 PO 4) Save every rejection by an examiner 2023-09-12 11:55:15 +02:00
ab7f382163 3122 Stöd för manuell hantering av slutsem för handledare 2023-09-12 10:23:49 +02:00
db27ce8361 3181 Kan inte ta bort systemmeddelande 2023-09-11 15:09:41 +02:00
2eafad2b29 2984 PO 4) Timeline of examiner interactions (wip) 2023-09-11 15:06:58 +02:00
7a192d1b92 2984 PO 2) Text fixes 2023-09-11 09:45:30 +02:00
aa383d980c Merge branch 'develop' into 1584-abstract-keywords
# Conflicts:
#	view/src/main/java/se/su/dsv/scipro/grading/CriteriaPanel.java
#	view/src/main/java/se/su/dsv/scipro/project/panels/FinalStepsPanel.html
#	view/src/main/java/se/su/dsv/scipro/project/panels/FinalStepsPanel.java
#	view/src/test/java/se/su/dsv/scipro/SciProTest.java
#	view/src/test/java/se/su/dsv/scipro/grading/CriteriaPanelTest.java
#	view/src/test/java/se/su/dsv/scipro/grading/FillOutGradingReportPanelTest.java
2023-09-06 16:31:14 +02:00
1f70bd56e1 3104 Add required indicator and some textual improvements 2023-09-06 14:56:55 +02:00
nikos dimitrakas
92ad0ca334 3035 Fixade ytterligare en NPE. 2023-08-25 12:35:54 +02:00
nikos dimitrakas
53152e28bc 3035 Fixade NPE och test som misslyckades. Oklart om mina ändringar är korrekta. 2023-08-25 12:19:51 +02:00
Filip Kantar
9014a310ce 3035: SciPro DB changes:
Grading criteria template changes: added new columns for english titles and descriptions (grading_criterion_template and grading_criterion_point_template),
updated the criteria with new ones, in both languages, in their respective columns.
Specific changes for Master templates, 15hp version: Added 3p option (for U5, U6 and U7) and updated pointsRequiredToPass from 1 to 2 (for U5, U6, U7 and U13).
Specific changes for Magister templates, 0hp and 30hp versions: Removed 3p option (for U5, U6, U7) and 4p (for U13) and updated pointsRequiredToPass from 2 to 1 (for U5, U6, U7 and U13).

Changes for already copied criteria: added new columns for english titles and descriptions (GradingCriterion, GradingCriterionPoint and criterion).
For grading reports, older already copied criteria have been updated to the same format as the new ones, but with the old texts, in both languages.
For opposition reports, the old ones are left as they were, but with the same content copied to the new english columns. New ones will be available in both languages.

SciPro changes:
The criteria in the "Grading report" tab and the grading report PDF will be shown in the project's set language, if no language is set, swedish will be selected for bachelor and english for the rest.
The same applies to the opposition reports, but only for new ones, the old ones will still use the same language that was used when the criteria were copied.

Additions to the Grading report PDF: Added total points. Showing the full history of the reviewer's comments.
2023-07-02 21:50:43 +02:00
779c6922c9 3069 Send keywords and abstract to Daisy 2023-06-26 13:01:53 +02:00
08962b6f76 3134 Send out notification to authors when their active participation gets a failed grade. 2023-06-26 12:54:29 +02:00
5f328b4c29 3134 Send out notification to authors when their active participation is approved, but they have not yet done all the required ones. 2023-06-26 12:48:05 +02:00
c1fcf8ce4b 3134 Send out notification to authors when their opposition gets a failed grade. 2023-06-26 12:33:18 +02:00
7b6c1406d8 Remove max length of titles on supervisor start page 2023-06-20 14:07:09 +02:00
9876a896a6 Visual improvements when viewing authors submitted reflection as supervisor 2023-06-15 18:22:40 +02:00
5b294c8df4 3110 Inform authors how the final thesis and reflection will be submitted 2023-06-15 17:58:35 +02:00
a85dad2aa6 3074 Simple prototype of survey followup as a base for discussion 2023-06-09 16:37:49 +02:00
7c42ba67dc 3116 Handle projects without Daisy connection when performing the final steps as an author 2023-06-09 09:56:06 +02:00
2c921bf97f 3104 Enable students to add publication metadata
Abstract and keywords in both English and Swedish
2023-06-08 16:27:29 +02:00
aa99b600e5 Merge branch 'develop' into 1584-abstract-keywords 2023-06-08 09:42:49 +02:00
e6b5c47b8f 2984 Add points to each criterion on the grading basis 2023-06-02 09:57:40 +02:00
30b5b5e0db 2984 Fixed saving grading basis 2023-06-02 09:47:42 +02:00
567812f1ce 3068 Better text and fix scrolling issues 2023-05-26 08:29:43 +02:00
1bfdccd093 3083 Upgrade Flyway 2023-05-25 16:38:59 +02:00
4b1865f4d5 2984 Removed unused code 2023-05-24 17:29:22 +02:00
52f58ca27f 2984 Add examiner rejection feedback to the grading basis 2023-05-24 14:55:55 +02:00
cdf493c05e 2984 Handle the case when there is plagiarism in the submitted final thesis. 2023-05-24 14:23:49 +02:00
fa17169e77 3064 Show active participation requirements when sending an author for examination to enable supervisors to make sure it's been done. 2023-05-24 13:11:32 +02:00
cf8735438f 2984 Easier access to the thesis document and text matching report when doing the plagiarism analysis 2023-05-24 11:12:51 +02:00
0d21197235 2984 HTML improvements 2023-05-24 11:11:23 +02:00
113d35e216 2984 Abstracted away URKUND behind the text matching interface 2023-05-23 23:03:27 +02:00
704c87e993 2984 Refactoring 2023-05-22 14:01:14 +02:00
4b419ef643 2984 Tests for submitting plagiarism analysis 2023-05-22 14:01:05 +02:00
e6b6187490 Merge branch 'develop' into 1584-abstract-keywords
# Conflicts:
#	pom.xml
2023-05-22 12:47:16 +02:00
cbae067cc1 2984 Send to examiner button is individual 2023-05-11 16:33:03 +02:00
d18b45f7b4 2984 Add button to send to examiner once all pre-requisites steps are completed. 2023-05-11 16:10:27 +02:00
d2020302ee 2984 Instructions for the final sending to examiner step 2023-05-11 15:57:01 +02:00
6eca580297 2984 Correctly show final thesis and plagiarism status 2023-05-04 16:07:25 +02:00
ef0ce207b5 2984 Text clarifications 2023-05-04 16:07:03 +02:00
82cacd9b58 2984 Maintain scroll position when updating grading basis 2023-05-04 15:47:09 +02:00
d98e4e9608 2984 Tab for individual assessment 2023-05-04 15:44:14 +02:00
ab36939105 2984 Criteria panel is only for individual criteria since the separate grading basis covers the rest 2023-05-04 14:39:19 +02:00
b4d5bd41e9 2984 Extract the red/green label as a stand-alone component 2023-05-04 14:31:29 +02:00
3a7d4bfb23 2984 Remove unnecessary parameter 2023-05-04 12:16:46 +02:00
4a55c18460 2984 Simplified generics 2023-05-04 12:11:14 +02:00
a3c8cc9d4b 2984 HTML formatting 2023-05-04 11:59:37 +02:00