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
19efe7b343
2984 Correct language of the criteria title/descriptions
2023-09-13 09:39: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
7a19b2fc0f
Fix migration script version conflict
2023-09-07 16:24:55 +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
8b94ca296a
3134 Include reason the opposition failed in the mailed out notification
2023-09-06 14:34:48 +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
nikos dimitrakas
c5ee204a3c
Uppgraderade några maven-plugins och exkluderade p12 från valideringen.
2023-08-25 12:08:43 +02:00
Jenkins
134a7e6fdf
Merge commit 'b932899ef1be61aabdd8deb46c63011566ff39a0' into HEAD
2023-07-06 23:57:25 +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
nikos dimitrakas
b932899ef1
Merge remote-tracking branch 'origin/develop' into develop
2023-06-29 16:17:18 +02:00
nikos dimitrakas
e861c0dce4
3137 Anpassade SciPro till den nya xsd:n för Daisys API.
2023-06-29 16:16:53 +02:00
fa655a50f9
Suppress false security warning.
2023-06-29 09:52:05 +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
Jenkins
e561acf78f
Merge commit '9876a896a6bf6b2d8bbf3497442435b394710c6f' into HEAD
2023-06-15 22:52:16 +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
3fa1e9cd73
3110 Apply new reflection process to all projects
2023-06-15 17:53:34 +02:00
nikos dimitrakas
5136880c60
Uppgraderade guava
2023-06-13 12:04:37 +02:00
nikos dimitrakas
e713f055d1
Uppgraderade wicket
2023-06-13 11:54:23 +02:00
a85dad2aa6
3074 Simple prototype of survey followup as a base for discussion
2023-06-09 16:37:49 +02:00
Jenkins
190553e38c
Merge commit '7c42ba67dc7cc1b6b238e0a2ead058459f6d0bfb' into HEAD
2023-06-09 11:55:15 +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
