18124 Commits

Author SHA1 Message Date
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 release-270 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 release-269 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 release-268 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
Jenkins
c592917c69 Merge commit 'cd4cb23b931bf3b53b75aedb5d866e995612e79a' into HEAD release-267 2023-06-02 06:25:21 +02:00
nikos dimitrakas
cd4cb23b93 Ny xsd för API:et efter 3013 (stöd för nyckelord för examensarbetespublikationer) 2023-06-02 06:16:13 +02:00
2b1ffd8d60 3056 Check active participation minimum requirement before activating the milestone. 2023-05-26 09:02:29 +02:00
09873f48c2 3056 Remove dependency on deprecated ObjectMother 2023-05-26 08:35:50 +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
64d4813059 Code clean up 2023-05-24 10:59:58 +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
dbf3b1b9ab Merge branch 'develop' into 1584-abstract-keywords 2023-05-22 12:52:55 +02:00
7eae863a10 Upgrade maven-surefire-plugin 2023-05-22 12:52:37 +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