Allow supervisors to request improvements from final seminar opponents #78

Open
ansv7779 wants to merge 40 commits from opponent-completion into develop
Owner

Fixes #36

How to test

  1. (Optional) Log in as sid@example.com and submit an opposition report
    1. Go to the tab "Opposition & Active participation"
    2. Open the opposition "Putting the it in supervising" on the right
    3. Submit the report
  2. Log in as eric@example.com
  3. Go to the final seminar in the "Putting the it in supervising" project (or follow the notification if you did step 1)
  4. Request improvements
  5. Log in as sid@example.com
  6. Follow the notification to submit the new opposition report

Click the "Re-run all jobs" button (top right) on https://gitea.dsv.su.se/DMC/scipro/actions/runs/367/jobs/0 to reset the database. It takes a few minutes.

Fixes #36 ## How to test 1. (Optional) Log in as `sid@example.com` and submit an opposition report 1. Go to the tab "Opposition & Active participation" 2. Open the opposition "Putting the it in supervising" on the right 3. Submit the report 2. Log in as `eric@example.com` 3. Go to the final seminar in the "Putting the it in supervising" project (or follow the notification if you did step 1) 4. Request improvements 5. Log in as `sid@example.com` 6. Follow the notification to submit the new opposition report Click the "Re-run all jobs" button (top right) on https://gitea.dsv.su.se/DMC/scipro/actions/runs/367/jobs/0 to reset the database. It takes a few minutes.
ansv7779 added 2 commits 2025-01-13 16:28:57 +01:00
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
8ce045b33c
First-time contributor
Deployed to https://scipro-opponent-completion.branch.dsv.su.se
ansv7779 added 3 commits 2025-01-14 15:33:23 +01:00
Refactored away business logic from the Wicket panel
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m49s
Build and test / build-and-test (push) Successful in 17m57s
5c0238485e
Changed how data is moved from the opposition to the grading report

Fixed a completely broken integration test
ansv7779 added 3 commits 2025-01-17 12:36:22 +01:00
Implement gradeOpponent
Some checks failed
Deploy to branch.dsv.su.se / deploy (pull_request) Failing after 2m48s
Build and test / build-and-test (push) Failing after 16m26s
49f14a00f0
ansv7779 added 2 commits 2025-01-17 13:19:43 +01:00
Fix compilation problem
Some checks failed
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m6s
Build and test / build-and-test (push) Failing after 15m55s
54e6e5d787
ansv7779 added 1 commit 2025-01-17 15:18:41 +01:00
Save assessment
Some checks failed
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m10s
Build and test / build-and-test (push) Has been cancelled
fd01796121
ansv7779 added 1 commit 2025-01-17 15:21:21 +01:00
Fix test
Some checks failed
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m8s
Build and test / build-and-test (push) Failing after 15m35s
7a3b8d4a98
ansv7779 force-pushed opponent-completion from 7a3b8d4a98 to 50a082adb5 2025-01-20 10:50:34 +01:00 Compare
ansv7779 force-pushed opponent-completion from 50a082adb5 to 7bb37407d6 2025-01-20 14:22:09 +01:00 Compare
ansv7779 added 1 commit 2025-01-20 14:24:30 +01:00
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
ecdd68efbe
ansv7779 added 1 commit 2025-01-21 14:55:06 +01:00
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
da91d4074d
ansv7779 added 1 commit 2025-01-23 17:47:00 +01:00
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
fec631f2d0
ansv7779 added 1 commit 2025-01-23 21:17:44 +01:00
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
54d5ef8752
ansv7779 added 1 commit 2025-01-24 15:16:08 +01:00
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
9db30b3d28
The entire system is in english so have two paragraphs in swedish made no sense.
ansv7779 added 1 commit 2025-01-24 15:47:15 +01:00
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
88ced02a2d
ansv7779 added 2 commits 2025-02-06 16:38:24 +01:00
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
34e986a6c9
ansv7779 added 3 commits 2025-02-07 12:40:34 +01:00
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
305142a862
ansv7779 added 1 commit 2025-02-07 15:28:16 +01:00
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
791ec65633
ansv7779 added 2 commits 2025-02-10 10:48:59 +01:00
The reviewer report has long since been removed and the supervisors report differs too much and had been decoupled already.
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
06c1e81978
ansv7779 changed title from WIP: Allow supervisors to request improvements from final seminar opponents to Allow supervisors to request improvements from final seminar opponents 2025-02-10 10:52:53 +01:00
ansv7779 added the
po
needed
label 2025-02-10 10:53:27 +01:00
ansv7779 added 1 commit 2025-02-10 14:35:42 +01:00
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
a20455df97
niat8586 requested review from niat8586 2025-02-11 08:53:35 +01:00
Owner

After a request for improvements

Logged in as sid@example.com after the request for improvements has been done.

Shouldn't the view in the Opponents reflect that a request for improvements has been made? Look at the below screen shot.
image.png

Now it just says that no opposition report has been submitted yet. Could this be confusing to the opponent?

After a request for improvements Logged in as sid@example.com after the request for improvements has been done. Shouldn't the view in the Opponents reflect that a request for improvements has been made? Look at the below screen shot. ![image.png](/attachments/dc737f5c-c7aa-44f4-84b7-ae602fb3bef4) Now it just says that no opposition report has been submitted yet. Could this be confusing to the opponent?
ansv7779 added 2 commits 2025-02-11 15:37:48 +01:00
Now takes the opponent directly to the form where they can fill in the report and view the feedback from the seminar supervisor.
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
3be41635b1
ansv7779 added 1 commit 2025-02-11 15:47:26 +01:00
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
87e60578c0
Author
Owner

Shouldn't the view in the Opponents reflect that a request for improvements has been made? Look at the below screen shot.
image.png

Now it just says that no opposition report has been submitted yet. Could this be confusing to the opponent?

I've added an alert to notify the opponent that improvements have been requested. I also made the notification take you directly to the form to make the UX for the opponent even better.

> Shouldn't the view in the Opponents reflect that a request for improvements has been made? Look at the below screen shot. > ![image.png](/attachments/dc737f5c-c7aa-44f4-84b7-ae602fb3bef4) > > Now it just says that no opposition report has been submitted yet. Could this be confusing to the opponent? > I've added an alert to notify the opponent that improvements have been requested. I also made the notification take you directly to the form to make the UX for the opponent even better.
ansv7779 added 1 commit 2025-02-12 11:24:32 +01:00
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
6410710679
# Conflicts:
#	core/src/main/java/se/su/dsv/scipro/DataInitializer.java
ansv7779 added 1 commit 2025-02-12 13:45:54 +01:00
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
8892bf4780
niat8586 approved these changes 2025-02-12 15:10:23 +01:00
niat8586 left a comment
Owner

👍

Really like the changes to the ui.
Notification takes you directly to the request to improve the opposition.
Also when going to the opposition the added information that the supervisor has requested improvements makes it more clear now that you need to do.

Good work

👍 Really like the changes to the ui. Notification takes you directly to the request to improve the opposition. Also when going to the opposition the added information that the supervisor has requested improvements makes it more clear now that you need to do. Good work
Owner

PO Review

  1. Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport. Texten om krav för resp. poäng (Requirement for 1 point: that the opposition report provides a short summary of the evaluated thesis, that it deliberates about the scientific basis, etc) verkar inte vara samma text som i de nya betygskriterier. Den behöver uppdateras. Troligen en gammal hårdkodad text?
    https://nextilearn.dsv.su.se/pluginfile.php/25609/mod_resource/content/3/Thesis_Instructions_2025.pdf

  2. Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport. Om man ger noll poäng och trycker på ”submit”: detta innebär att rapporten blir underkänd och studenten behöver anmäla sig till ett nytt slutsem, samt skriva en helt ny oppositionsrapport etc (om jag inte minns fel). Med tanke på effekten, borde vi kanske varna med ett meddelande. När man väljer noll poäng och klickar på submit: ”0 points implies failing the student’s opposition report. The student will have to sign up for a new seminar and write a new opposition report. Are you sure you want to continue?” Eller något liknande 😊

  3. Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport. När man tryckt ”Request Improvements” och skickat feedback till studenten. Som handledare/seminarieordförande kan man fortfarande välja att ge poäng. Vad händer då? Man borde frysa den möjligheten tills en ny uppdaterad version skickas av studenten.

  4. När handledaren begärt komplettering och studenten skickat in kompletteringen. När handledaren ger sen godkända poäng (1-2), skickas ingen (ny) notifikation till studenten? Inloggad som student kunde jag bara se notifikationen för avslag.

  5. Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport. Om studenten skickar en bilaga som oppositionsrapport, syns enbart datumet för uppladdningen. Kan vi lägga till även tidpunkten för uppladdningen? Som vi gjort med final thesis-uppladdningar.

**PO Review** 1) **Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport**. Texten om krav för resp. poäng (_Requirement for 1 point: that the opposition report provides a short summary of the evaluated thesis, that it deliberates about the scientific basis, etc_) verkar inte vara samma text som i de nya betygskriterier. Den behöver uppdateras. Troligen en gammal hårdkodad text? https://nextilearn.dsv.su.se/pluginfile.php/25609/mod_resource/content/3/Thesis_Instructions_2025.pdf 2) **Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport**. Om man ger noll poäng och trycker på ”submit”: detta innebär att rapporten blir underkänd och studenten behöver anmäla sig till ett nytt slutsem, samt skriva en helt ny oppositionsrapport etc (om jag inte minns fel). Med tanke på effekten, borde vi kanske varna med ett meddelande. När man väljer noll poäng och klickar på submit: ”_0 points implies failing the student’s opposition report. The student will have to sign up for a new seminar and write a new opposition report. Are you sure you want to continue?_” Eller något liknande 😊 3) **Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport.** När man tryckt ”Request Improvements” och skickat feedback till studenten. Som handledare/seminarieordförande kan man fortfarande välja att ge poäng. **Vad händer då?** Man borde frysa den möjligheten tills en ny uppdaterad version skickas av studenten. 4) **När handledaren begärt komplettering och studenten skickat in kompletteringen.** När handledaren ger sen godkända poäng (1-2), skickas ingen (ny) notifikation till studenten? Inloggad som student kunde jag bara se notifikationen för avslag. 5) **Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport**. Om studenten skickar en bilaga som oppositionsrapport, syns enbart datumet för uppladdningen. Kan vi lägga till även tidpunkten för uppladdningen? Som vi gjort med final thesis-uppladdningar.
ansv7779 added
po
changes
and removed
po
needed
labels 2025-02-18 10:00:18 +01:00
ansv7779 added 1 commit 2025-02-18 10:04:41 +01:00
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
970f6ee61b
# Conflicts:
#	core/src/main/java/se/su/dsv/scipro/DataInitializer.java
ansv7779 added 6 commits 2025-02-18 15:19:29 +01:00
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
d292ecc34d
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.
Author
Owner
  1. Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport. Texten om krav för resp. poäng (Requirement for 1 point: that the opposition report provides a short summary of the evaluated thesis, that it deliberates about the scientific basis, etc) verkar inte vara samma text som i de nya betygskriterier. Den behöver uppdateras. Troligen en gammal hårdkodad text?
    https://nextilearn.dsv.su.se/pluginfile.php/25609/mod_resource/content/3/Thesis_Instructions_2025.pdf

Texten tas från den mall som finns på våra test-servrar, se https://scipro-opponent-completion.branch.dsv.su.se/admin/project/grading/template/view?id=1. Ingen text är hårdkodad.

  1. Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport. Om man ger noll poäng och trycker på ”submit”: detta innebär att rapporten blir underkänd och studenten behöver anmäla sig till ett nytt slutsem, samt skriva en helt ny oppositionsrapport etc (om jag inte minns fel). Med tanke på effekten, borde vi kanske varna med ett meddelande. När man väljer noll poäng och klickar på submit: ”0 points implies failing the student’s opposition report. The student will have to sign up for a new seminar and write a new opposition report. Are you sure you want to continue?” Eller något liknande 😊

Känns lite out-of-scope. Lägg ett nytt ärende tycker jag.

  1. Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport. När man tryckt ”Request Improvements” och skickat feedback till studenten. Som handledare/seminarieordförande kan man fortfarande välja att ge poäng. Vad händer då? Man borde frysa den möjligheten tills en ny uppdaterad version skickas av studenten.

Fixat.

  1. När handledaren begärt komplettering och studenten skickat in kompletteringen. När handledaren ger sen godkända poäng (1-2), skickas ingen (ny) notifikation till studenten? Inloggad som student kunde jag bara se notifikationen för avslag.

Fixat.

  1. Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport. Om studenten skickar en bilaga som oppositionsrapport, syns enbart datumet för uppladdningen. Kan vi lägga till även tidpunkten för uppladdningen? Som vi gjort med final thesis-uppladdningar.

Fixat.

> 1) **Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport**. Texten om krav för resp. poäng (_Requirement for 1 point: that the opposition report provides a short summary of the evaluated thesis, that it deliberates about the scientific basis, etc_) verkar inte vara samma text som i de nya betygskriterier. Den behöver uppdateras. Troligen en gammal hårdkodad text? > https://nextilearn.dsv.su.se/pluginfile.php/25609/mod_resource/content/3/Thesis_Instructions_2025.pdf Texten tas från den mall som finns på våra test-servrar, se https://scipro-opponent-completion.branch.dsv.su.se/admin/project/grading/template/view?id=1. Ingen text är hårdkodad. > 2) **Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport**. Om man ger noll poäng och trycker på ”submit”: detta innebär att rapporten blir underkänd och studenten behöver anmäla sig till ett nytt slutsem, samt skriva en helt ny oppositionsrapport etc (om jag inte minns fel). Med tanke på effekten, borde vi kanske varna med ett meddelande. När man väljer noll poäng och klickar på submit: ”_0 points implies failing the student’s opposition report. The student will have to sign up for a new seminar and write a new opposition report. Are you sure you want to continue?_” Eller något liknande 😊 Känns lite out-of-scope. Lägg ett nytt ärende tycker jag. > 3) **Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport.** När man tryckt ”Request Improvements” och skickat feedback till studenten. Som handledare/seminarieordförande kan man fortfarande välja att ge poäng. **Vad händer då?** Man borde frysa den möjligheten tills en ny uppdaterad version skickas av studenten. Fixat. > 4) **När handledaren begärt komplettering och studenten skickat in kompletteringen.** När handledaren ger sen godkända poäng (1-2), skickas ingen (ny) notifikation till studenten? Inloggad som student kunde jag bara se notifikationen för avslag. Fixat. > 5) **Inloggad som seminarieordförande, när man skall ge poäng för oppositionsrapport**. Om studenten skickar en bilaga som oppositionsrapport, syns enbart datumet för uppladdningen. Kan vi lägga till även tidpunkten för uppladdningen? Som vi gjort med final thesis-uppladdningar. Fixat.
ansv7779 added
po
needed
and removed
po
changes
labels 2025-02-18 15:45:24 +01:00
ansv7779 added 1 commit 2025-02-21 14:17:39 +01:00
Merge branch 'develop' into opponent-completion
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m30s
Build and test / build-and-test (push) Successful in 19m58s
d0fb2e721c
# Conflicts:
#	core/src/main/java/se/su/dsv/scipro/DataInitializer.java
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m30s
Build and test / build-and-test (push) Successful in 19m58s
This pull request can be merged automatically.
You are not authorized to merge this pull request.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin opponent-completion:opponent-completion
git checkout opponent-completion
Sign in to join this conversation.
No description provided.