DMC/scipro
7
0
Fork 0
Code Issues 27 Pull Requests 4 Actions Projects 1 Wiki Activity

Assign supervisor to student ideas no matter if target (goal) is reached #96

Merged
ansv7779 merged 12 commits from 67-supervisor-target-non-blocking into develop 2025-02-18 09:59:24 +01:00
Conversation 5 Commits 12 Files Changed 4 +92 -18
tozh4728 commented 2025-01-27 14:55:51 +01:00
Owner
Copy Link

Fixes #67

How to test

  1. log in with principal 'dev@localhost' (default)
  2. Click "Match", there is one student idea available: 'Fundamental Math Concepts of AI', which is unmatched.
  3. Click "Application periods", and then "Edit targets", Supervisor "Eric Employee" has target set to 10, and "Eve Employee", has targets set to 0.
  4. Click "Ideas" again, select supervisor "Eve Employee", this assignment will go through, but feedback text will be shown as warning, since there is not target assigned to "Eve Employee".
  5. Change supervisor "Eric Employee", the assignment will go through, and the feedback text will be shown as green. "Eric Employee" has target set to 10.
Fixes #67 ## How to test 1. log in with principal 'dev@localhost' (default) 2. Click "Match", there is one student idea available: 'Fundamental Math Concepts of AI', which is unmatched. 3. Click "Application periods", and then "Edit targets", Supervisor "Eric Employee" has target set to 10, and "Eve Employee", has targets set to 0. 4. Click "Ideas" again, select supervisor "Eve Employee", this assignment will go through, but feedback text will be shown as warning, since there is not target assigned to "Eve Employee". 5. Change supervisor "Eric Employee", the assignment will go through, and the feedback text will be shown as green. "Eric Employee" has target set to 10.
tozh4728 added 1 commit 2025-01-27 14:55:52 +01:00
67: Assign supervisor to student ideas no matter if target (goal) is reached
Some checks failed
Build and test / build-and-test (push) Failing after 44s
Details
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m9s
Details
b8afa202ba
gitea-actions commented 2025-01-27 14:58:00 +01:00
First-time contributor
Copy Link

Deployed to https://scipro-67-supervisor-target-non-blocking.branch.dsv.su.se

Deployed to https://scipro-67-supervisor-target-non-blocking.branch.dsv.su.se
tozh4728 added 1 commit 2025-01-27 15:06:33 +01:00
67: Reformat code
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m8s
Details
Build and test / build-and-test (push) Successful in 15m42s
Details
ce6b5aabdb
tozh4728 added 1 commit 2025-01-27 15:22:47 +01:00
67: Create target for test purpose
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m8s
Details
Build and test / build-and-test (push) Successful in 15m42s
Details
8a44bc8eb3
tozh4728 added 1 commit 2025-01-30 09:21:28 +01:00
67: Increase target in test data to 10 for supervisor 'Eric Employee'
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m7s
Details
Build and test / build-and-test (push) Successful in 19m33s
Details
6e31fca410
tozh4728 added 1 commit 2025-01-30 15:19:27 +01:00
67: Add project type in message
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 2m12s
Details
Build and test / build-and-test (push) Successful in 15m31s
Details
3c8252d010
tozh4728 added 1 commit 2025-02-10 12:30:13 +01:00
67: Employee needs to set up as active supervisor.
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m33s
Details
Build and test / build-and-test (push) Successful in 17m40s
Details
6f82d5fdc4
tozh4728 added 1 commit 2025-02-10 13:34:51 +01:00
67: Enable JPA save for employee.
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m31s
Details
Build and test / build-and-test (push) Successful in 22m31s
Details
f5c88c7b8e
tozh4728 added 1 commit 2025-02-10 14:50:44 +01:00
67: Add languages to supervisors and add new student for submitting student idea.
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m37s
Details
Build and test / build-and-test (push) Successful in 18m45s
Details
37b4e76ad2
tozh4728 added 1 commit 2025-02-12 10:06:53 +01:00
67: Create student idea to test setting supervisor target
Some checks failed
Build and test / build-and-test (push) Successful in 16m29s
Details
Deploy to branch.dsv.su.se / deploy (pull_request) Failing after 1m20s
Details
32c066a1c5
tozh4728 added 1 commit 2025-02-12 13:35:29 +01:00
67: merge from develop
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m21s
Details
Build and test / build-and-test (push) Successful in 21m5s
Details
1b692f87fb
tozh4728 changed title from WIP: Assign supervisor to student ideas no matter if target (goal) is reached to Assign supervisor to student ideas no matter if target (goal) is reached 2025-02-12 14:05:58 +01:00
tozh4728 added the
po
needed
 label 2025-02-12 14:08:44 +01:00
ansv7779 requested changes 2025-02-12 15:22:50 +01:00
Dismissed
ansv7779 left a comment
Owner
Copy Link

Code looks good to me. Minor nitpick on the null check on the return value from a count method.

Code looks good to me. Minor nitpick on the null check on the return value from a count method.
view/src/main/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanel.java
@ -217,0 +219,4 @@
);
int targetCounter = (currentTarget == null) ? 0 : currentTarget.getTarget();
long matchedCounter = (countMatched == null) ? 0L : countMatched;
ansv7779 commented 2025-02-12 15:20:37 +01:00
Owner
Copy Link

This seems weird, a count method should return 0 not null.

This seems weird, a count method should return 0 not `null`.
tozh4728 commented 2025-02-13 09:30:58 +01:00
Author
Owner
Copy Link

Fine point, the unnecessary null check has been removed.

The rationale for null check is that ideaService.countMatched returning Long. It would be better that a @NotNull annotation is applied to such method which is guaranteed to return non null object.

Fine point, the unnecessary null check has been removed. The rationale for null check is that ideaService.countMatched returning Long. It would be better that a @NotNull annotation is applied to such method which is guaranteed to return non null object.
ansv7779 marked this conversation as resolved
tozh4728 added 1 commit 2025-02-13 09:26:26 +01:00
67: Remove unnessary null check
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m36s
Details
Build and test / build-and-test (push) Successful in 15m57s
Details
aa801d0ae5
ansv7779 approved these changes 2025-02-13 10:01:07 +01:00
ansv7779 left a comment
Owner
Copy Link

Looks good

Looks good
tozh4728 added 1 commit 2025-02-13 15:28:21 +01:00
67: Merge from develop
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m25s
Details
Build and test / build-and-test (push) Successful in 16m7s
Details
Remove branch deployment from branch.dsv.su.se / cleanup (pull_request) Successful in 4s
Details
46173d5da3
andan commented 2025-02-14 08:39:23 +01:00
Owner
Copy Link

Jag tycker att det ser bra ut. Jag har skickat länken till Gruorna för test, så vi avvaktar deras feedback.
Avvaktar deras feedback innan vi ändrar status från "PO needed".

Jag tycker att det ser bra ut. Jag har skickat länken till Gruorna för test, så vi avvaktar deras feedback. Avvaktar deras feedback innan vi ändrar status från "PO needed".
andan added
po
approved
 and removed
po
needed
 labels 2025-02-18 08:54:31 +01:00
andan commented 2025-02-18 08:54:58 +01:00
Owner
Copy Link

Ok för Gruorna att sätta denna feature i drift redan den här veckan

Ok för Gruorna att sätta denna feature i drift redan den här veckan
ansv7779 merged commit 399d8f5275 into develop 2025-02-18 09:59:24 +01:00
ansv7779 deleted branch 67-supervisor-target-non-blocking 2025-02-18 09:59:24 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
ansv7779
Labels
Clear labels
bug
Something is not working
discussion
duplicate
This issue or pull request already exists
enhancement
New feature
frozen
The issue is not solved, but it will be investigated in the future it the issue arises again
help wanted
Need some help
invalid
Something is wrong
new
To be discussed at the next meeting
po
approved
po
changes
PO has requested changes
po
needed
question
More information is needed
size
1
size
2
size
3
wontfix
This won't be fixed
No Label
po
approved
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
4 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: DMC/scipro#96
No description provided.
Delete Branch "67-supervisor-target-non-blocking"

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?