18299 Commits

Author SHA1 Message Date
d292ecc34d Remove useless PhD project type
All checks were successful
Build and test / build-and-test (push) Successful in 16m6s
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m9s
It interfered with grading report templates due to having the grading module activated but no template defined. Could have removed the module but it serves no purpose since all PhD-related functionality was removed a long time ago.
2025-02-18 15:13:51 +01:00
1b36ad7987 Disable ability to grade opponents after requesting improvements 2025-02-18 15:12:21 +01:00
ad91a9b961 Remove unused dependencies 2025-02-18 14:54:47 +01:00
cbd426be07 Show the time that opponents submitted their report 2025-02-18 14:53:28 +01:00
093dd11c29 Send notifications to opponents when they're approved 2025-02-18 14:37:10 +01:00
cfef02b98c Enable *all* notifications during development and on test servers 2025-02-18 14:17:45 +01:00
970f6ee61b Merge branch 'develop' into opponent-completion
All checks were successful
Build and test / build-and-test (push) Successful in 20m50s
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 6m3s
# Conflicts:
#	core/src/main/java/se/su/dsv/scipro/DataInitializer.java
2025-02-18 10:04:28 +01:00
399d8f5275 Assign supervisor to student ideas no matter if target (goal) is reached (#96)
All checks were successful
Build and test / build-and-test (push) Successful in 21m4s
Fixes #67

Reviewed-on: #96
Reviewed-by: Andreas Svanberg <andreass@dsv.su.se>
Co-authored-by: Tom Zhao <tom.zhao@dsv.su.se>
Co-committed-by: Tom Zhao <tom.zhao@dsv.su.se>
2025-02-18 09:59:23 +01:00
b9f7dd5a49 Update supervisor's idea table immediately upon scheduling a first meeting (#105)
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m24s
Build and test / build-and-test (push) Successful in 16m29s
Before, after scheduling a first meeting, they had to refresh the entire page to show the information in the table.

Fixes #82

Reviewed-on: #105
Reviewed-by: Nico Athanassiadis <nico@dsv.su.se>
2025-02-13 09:59:33 +01:00
8892bf4780 Merge branch 'develop' into opponent-completion
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m37s
Build and test / build-and-test (push) Successful in 18m9s
2025-02-12 13:45:51 +01:00
08e1b785ca Fix Docker build due to missing json-smart version (#107)
All checks were successful
Build and test / build-and-test (push) Successful in 19m6s
Co-authored-by: Andreas Svanberg <andreass@dsv.su.se>
Co-committed-by: Andreas Svanberg <andreass@dsv.su.se>
2025-02-12 13:28:14 +01:00
6410710679 Merge branch 'develop' into opponent-completion
Some checks failed
Deploy to branch.dsv.su.se / deploy (pull_request) Failing after 8m30s
Build and test / build-and-test (push) Successful in 16m29s
# Conflicts:
#	core/src/main/java/se/su/dsv/scipro/DataInitializer.java
2025-02-12 11:18:06 +01:00
304d0431c1 Deadline visible in "Rough draft approval" page (#106)
All checks were successful
Build and test / build-and-test (push) Successful in 16m56s
Previously deadline was only visible at the Reviewer start page, tab 'Rough draft approvals'.

Now the deadline is also shown when you go to the detail page of a rough draft.

Fixes issue #99

Reviewed-on: #106
Reviewed-by: Andreas Svanberg <andreass@dsv.su.se>
Co-authored-by: Nico Athanassiadis <nico@dsv.su.se>
Co-committed-by: Nico Athanassiadis <nico@dsv.su.se>
2025-02-12 11:07:53 +01:00
87e60578c0 Styling improvements
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m44s
Build and test / build-and-test (push) Successful in 19m2s
2025-02-11 15:47:19 +01:00
3be41635b1 Alert the opponent that they need to an improved report on the final seminar page
Some checks failed
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m55s
Build and test / build-and-test (push) Has been cancelled
2025-02-11 15:37:46 +01:00
236f6a0ad3 Better UX for notification about opposition report needing improvements
Now takes the opponent directly to the form where they can fill in the report and view the feedback from the seminar supervisor.
2025-02-11 15:37:46 +01:00
a20455df97 Merge branch 'develop' into opponent-completion
All checks were successful
Build and test / build-and-test (push) Successful in 19m42s
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m24s
2025-02-10 14:35:40 +01:00
06c1e81978 Send out notification when an opponent submits a report
Some checks failed
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m37s
Build and test / build-and-test (push) Has been cancelled
2025-02-10 10:48:20 +01:00
1299af5b00 Remove the AttachmentReport abstraction on the panel to fill out opposition report
The reviewer report has long since been removed and the supervisors report differs too much and had been decoupled already.
2025-02-10 10:27:29 +01:00
791ec65633 Show information to the supervisor that they've requested improvements
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m33s
Build and test / build-and-test (push) Successful in 15m42s
2025-02-07 14:48:03 +01:00
305142a862 Do not remind supervisors to grade opponents if they've requested improvements
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m35s
Build and test / build-and-test (push) Successful in 15m44s
2025-02-07 12:40:23 +01:00
5e0d285272 Extract common functionality for both branches 2025-02-07 12:34:54 +01:00
9823dc193c Move worker @Beans to the correct @Configuration class 2025-02-07 12:14:38 +01:00
219c312441 Fix localizer warning on the finishing up tab for each author (#101)
All checks were successful
Build and test / build-and-test (push) Successful in 16m4s
Fixes #48

The `getReflectionText` method was calling `getString` when no reflection has been submitted. This is not a relevant case for the editing form since it can not be accessed when there is no reflection. Inlined the method call and removed the non-submitted case, the default will be an empty string.

## How to test
1. Log in as a supervisor
2. Open a project that has a Daisy connection (`identifier`is non-null on the `Project`)
3. Go to the "Finishing up" tab
4. Go to the tab for the author with no reflection submitted
5. See that no warning is logged

Co-authored-by: Nico Athanassiadis <nico@dsv.su.se>
Reviewed-on: #101
Reviewed-by: Nico Athanassiadis <nico@dsv.su.se>
Co-authored-by: Andreas Svanberg <andreass@dsv.su.se>
Co-committed-by: Andreas Svanberg <andreass@dsv.su.se>
2025-02-07 07:50:02 +01:00
34e986a6c9 Switch back to the grading form after requesting improvements
Some checks failed
Build and test / build-and-test (push) Failing after 13m36s
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m45s
2025-02-06 16:38:13 +01:00
08302f9719 Fail authors who do not improve their opposition report in time. 2025-02-06 16:38:13 +01:00
cbbd98b597 Upgrade Wicket version (#102)
All checks were successful
Build and test / build-and-test (push) Successful in 15m50s
Is a drop in replacement according to https://wicket.apache.org/news/2025/01/24/wicket-10.4.0-released.html#upgrading-from-earlier-versions

Fixes #100

Reviewed-on: #102
Reviewed-by: Nico Athanassiadis <nico@dsv.su.se>
Co-authored-by: Andreas Svanberg <andreass@dsv.su.se>
Co-committed-by: Andreas Svanberg <andreass@dsv.su.se>
2025-02-06 14:10:30 +01:00
88ced02a2d Notify opponent when improvements are requested
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m7s
Build and test / build-and-test (push) Successful in 15m50s
2025-01-24 15:47:10 +01:00
9db30b3d28 Translated some swedish text into english.
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m6s
Build and test / build-and-test (push) Successful in 15m40s
The entire system is in english so have two paragraphs in swedish made no sense.
2025-01-24 15:16:02 +01:00
54d5ef8752 Show requests for improvement when filling in the opposition report
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m42s
Build and test / build-and-test (push) Successful in 16m11s
2025-01-23 21:17:36 +01:00
13efe4bada Updated Spring Boot and Springdoc versions (#91)
All checks were successful
Build and test / build-and-test (push) Successful in 16m44s
The updated versions should fix CVE-2024-45801.
Was forced to update spring-boot 3.4.1 to be able to use the latest version of springdoc as per the
springdoc compability matrix.

The compability matrix can be found [here](https://springdoc.org/#what-is-the-compatibility-matrix-of-springdoc-openapi-with-spring-boot)

fixes issue #80

Reviewed-on: #91
Reviewed-by: Andreas Svanberg <andreass@dsv.su.se>
Co-authored-by: Nico Athanassiadis <nico@dsv.su.se>
Co-committed-by: Nico Athanassiadis <nico@dsv.su.se>
2025-01-23 20:50:18 +01:00
fec631f2d0 Replace @Entity with DTO
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m11s
Build and test / build-and-test (push) Successful in 15m41s
2025-01-23 16:06:30 +01:00
da91d4074d Replace direct repository access with a service
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m13s
Build and test / build-and-test (push) Successful in 15m51s
2025-01-21 11:18:00 +01:00
ecdd68efbe Fix test
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 23s
Build and test / build-and-test (push) Successful in 15m50s
2025-01-20 14:24:24 +01:00
7bb37407d6 Calculate correct deadline for improvement submission
Some checks failed
Build and test / build-and-test (push) Has been cancelled
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m13s
2025-01-20 14:21:51 +01:00
45c21e3fe4 Store the request for improvements 2025-01-20 13:30:20 +01:00
d01dee1ec7 Add a thesis document to the final seminar to help testing 2025-01-20 13:19:03 +01:00
6b24e84694 Request improvements 2025-01-20 11:49:11 +01:00
21d7c034bf The info box is now based on the criteria rather than hard-coded text 2025-01-20 11:45:51 +01:00
1233842511 Implement gradeOpponent 2025-01-20 10:34:11 +01:00
cebd005f88 Verify that opposition criteria are based on the grading report template 2025-01-20 10:34:11 +01:00
35b60df1cb Use the same project type for opponent and seminar 2025-01-20 10:34:11 +01:00
2261096f0a Refactored away business logic from the Wicket panel
Changed how data is moved from the opposition to the grading report

Fixed a completely broken integration test
2025-01-20 10:34:11 +01:00
5e3f6c1383 Opposition grading is now based on the opponents grading report criteria 2025-01-20 10:34:11 +01:00
5439d77d73 Require authors to fill in background, literature, problem, method, and interests when submitting ideas (#72)
All checks were successful
Build and test / build-and-test (push) Successful in 18m5s
Require authors to fill in background, literature, method, problem, and interests when submitting an idea.

Fixes #37

## How to test
1. Navigate to https://scipro-student-idea-form-required-fields.branch.dsv.su.se/
2. Log in as `stig@example.com`
3. Go to "Ideas" / "My ideas"
4. Attempt to submit an idea without either of background, literature, method, problem, or interests

Co-authored-by: Nico Athanassiadis <nico@dsv.su.se>
Reviewed-on: #72
Reviewed-by: Nico Athanassiadis <nico@dsv.su.se>
Co-authored-by: Andreas Svanberg <andreass@dsv.su.se>
Co-committed-by: Andreas Svanberg <andreass@dsv.su.se>
2025-01-17 09:45:27 +01:00
2784bca8f6 Improve XJC-binding (Issue 73) (#74)
All checks were successful
Build and test / build-and-test (push) Successful in 18m2s
Fixes #73

In daisy.xsd there are two datatypes, one is called STATUS and another one is called Status. Since Windows file system is case insensitive, file STATUS.java and Status.java are considered as same name. This makes build on Windows impossible.

Solution: in XJC binding file, rename Status.java to Status2.java (the Status2.java belongs to Examination is endpoint/resource which is not used by Scipro).

Other small improvments:

- package name 'se.su.dsv.scipro.daisyExternal' is renamed to 'se.su.dsv.scipro.daisyexternal'.
- single import statements are applied.

Reviewed-on: #74
Reviewed-by: Andreas Svanberg <andreass@dsv.su.se>
Co-authored-by: Tom Zhao <tom.zhao@dsv.su.se>
Co-committed-by: Tom Zhao <tom.zhao@dsv.su.se>
2025-01-16 13:55:38 +01:00
e0e84df720 Reset the failure flag in workers on successful runs. (#76)
All checks were successful
Build and test / build-and-test (push) Successful in 18m10s
Reviewed-on: #76
Reviewed-by: Tom Zhao <tom.zhao@dsv.su.se>
Co-authored-by: Andreas Svanberg <andreass@dsv.su.se>
Co-committed-by: Andreas Svanberg <andreass@dsv.su.se>
2025-01-14 14:50:31 +01:00
8ce045b33c Create test data
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m46s
Build and test / build-and-test (push) Successful in 15m53s
2025-01-13 16:25:11 +01:00
9d88c373f2 GUI to request improvements 2025-01-13 16:24:47 +01:00
b99c458160 Allow a single author to start multiple ideas of different types (#70)
All checks were successful
Build and test / build-and-test (push) Successful in 16m32s
Reviewed-on: #70
Reviewed-by: Tom Zhao <tom.zhao@dsv.su.se>
Co-authored-by: Andreas Svanberg <andreass@dsv.su.se>
Co-committed-by: Andreas Svanberg <andreass@dsv.su.se>
2025-01-13 12:17:53 +01:00