DMC/scipro
12
0
Fork 0
Code Issues 3 Pull Requests 3 Actions Wiki Activity

Allow changes to the reflection to be made after it's been submitted #13

Open
ansv7779 wants to merge 19 commits from 3412-supervisor-edit-reflection into develop
pull from: 3412-supervisor-edit-reflection
merge into: DMC:develop
Conversation 1 Commits 19 Files Changed 26 +626 -25
ansv7779 commented 2024-10-03 14:00:36 +02:00
Owner
Copy Link

Replaces #12

Fixes card 3213 and 3412

There are minimum requirements for the reflection document submitted by authors at the end of the thesis process. Before now there was no way to handle the case when the reflection did not meet these minimum requirements.

This change makes it possible in two ways;

  1. The supervisor can request improvements to be made requiring the author to re-submit a new reflection inside SciPro
  2. The supervisor can directly edit the reflection themselves if it has been submitted out-of-band or for any other reason

How to test

  1. Set up/find a project that has had a final seminar.
  2. Switch to an author
  3. Submit a reflection (and final thesis if required)
  4. Switch to the supervisor
  5. Go to the "Finishing up" page and switch to the author's tab
  6. Scroll down to the reflection criteria (Ö6) and view the reflection
  7. Request a new one
  8. Go back to step 2
Replaces #12 Fixes card 3213 and 3412 There are minimum requirements for the reflection document submitted by authors at the end of the thesis process. Before now there was no way to handle the case when the reflection did not meet these minimum requirements. This change makes it possible in two ways; 1. The supervisor can request improvements to be made requiring the author to re-submit a new reflection inside SciPro 2. The supervisor can directly edit the reflection themselves if it has been submitted out-of-band or for any other reason ## How to test 1. Set up/find a project that has had a final seminar. 2. Switch to an author 3. Submit a reflection (and final thesis if required) 4. Switch to the supervisor 5. Go to the "Finishing up" page and switch to the author's tab 6. Scroll down to the reflection criteria (Ö6) and view the reflection 7. Request a new one 8. Go back to step 2
ansv7779 added 9 commits 2024-10-03 14:00:37 +02:00 
Use the same language as the GUI to make it easier when talking about the states.
Can not send the notification from the Notifications class since that class is registered in the test-context and for some reason HSQLDB fails with some unknown check constraint violation with absolutely no information about why.

For some reason it is not possible to debug HSQLDB with breakpoints to step through and see exactly why it fails, so registering a new single purpose class in the cross-cutting module (that's not available in test) is used as a work-around.
Useful if they students submit a revised version via e-mail or similar, or maybe to fix some glaring typos.
ansv7779 added 5 commits 2024-10-16 10:29:42 +02:00
ansv7779 added 1 commit 2024-11-04 10:16:32 +01:00
Merge branch 'develop' into 3412-supervisor-edit-reflection
All checks were successful
Build and test / build-and-test (push) Successful in 6m33s
Details
6a765a73d7
ansv7779 added 1 commit 2024-11-07 15:20:12 +01:00
Merge branch 'develop' into 3412-supervisor-edit-reflection
All checks were successful
Build and test / build-and-test (push) Successful in 6m42s
Details
2001a3619d 
# Conflicts:
#	core/src/main/java/se/su/dsv/scipro/reflection/ReflectionServiceImpl.java
#	view/src/main/java/se/su/dsv/scipro/crosscutting/CrosscuttingModule.java
ansv7779 added 1 commit 2024-11-19 13:17:19 +01:00
Merge remote-tracking branch 'refs/remotes/gitea/develop' into 3412-supervisor-edit-reflection
All checks were successful
Build and test / build-and-test (push) Successful in 6m56s
Details
c4f5bc72e5 
# Conflicts:
#	core/src/main/java/se/su/dsv/scipro/notifications/dataobject/ProjectEvent.java
#	core/src/main/java/se/su/dsv/scipro/project/Author.java
niat8586 reviewed 2024-11-20 13:14:09 +01:00
core/src/main/java/se/su/dsv/scipro/notifications/dataobject/ProjectEvent.java
@ -25,2 +25,3 @@
EXPORTED_SUCCESS, REVIEWER_GRADING_INITIAL_ASSESSMENT_DONE, FIRST_MEETING, OPPOSITION_FAILED,
PARTICIPATION_APPROVED, COMPLETED, PARTICIPATION_FAILED
PARTICIPATION_APPROVED, COMPLETED, PARTICIPATION_FAILED, REFLECTION_IMPROVEMENTS_REQUESTED,
REFLECTION_IMPROVEMENTS_SUBMITTED
niat8586 commented 2024-11-20 13:14:09 +01:00
Owner
Copy Link

Move the Event enum to its own file, it has grown to be very big.
That way we can separate the enums and also add comments as explanation for the different events.

Suggesting this to be done in a separate issue marked as technical debt.

Move the Event enum to its own file, it has grown to be very big. That way we can separate the enums and also add comments as explanation for the different events. Suggesting this to be done in a separate issue marked as technical debt.
niat8586 added 1 commit 2024-11-20 14:14:26 +01:00
TR fix minor code styling improvements
Some checks failed
Build and test / build-and-test (push) Has been cancelled
Details
7f613a17ad
ansv7779 added 1 commit 2024-11-20 14:18:41 +01:00
Merge branch 'develop' into 3412-supervisor-edit-reflection
All checks were successful
Build and test / build-and-test (push) Successful in 6m50s
Details
cdb91d9093
niat8586 approved these changes 2024-11-20 14:19:57 +01:00
niat8586 commented 2024-11-20 14:20:10 +01:00
Owner
Copy Link

👍

👍
All checks were successful
Build and test / build-and-test (push) Successful in 6m50s
Details
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 3412-supervisor-edit-reflection:3412-supervisor-edit-reflection
git checkout 3412-supervisor-edit-reflection
Sign in to join this conversation.
Reviewers
No reviewers
niat8586
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: DMC/scipro#13
No description provided.
Delete Branch "3412-supervisor-edit-reflection"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?