This website requires JavaScript.
c4f5bc72e5
Merge remote-tracking branch 'refs/remotes/gitea/develop' into 3412-supervisor-edit-reflection
Andreas Svanberg
2024-11-19 12:52:15 +01:00
1f0f15fc18
3471: Reduced size of textarea as requested, also made small reformatting of Java code (#19 )
Tom Zhao
2024-11-19 12:17:15 +01:00
d4a8f411ba
Added missing @Transactional
Andreas Svanberg
2024-11-13 14:51:16 +01:00
f6f017703b
Added missing @Bean definition
Andreas Svanberg
2024-11-13 14:47:19 +01:00
680ef5b221
3471: Reduced size of textarea as requested, also made small reformatting of Java code
Tom Zhao
2024-11-18 12:52:13 +01:00
d89417ceea
Fix intermittent sorting of criterion to actual order (#18 )
Nico Athanassiadis
2024-11-14 12:39:41 +01:00
9c185e46d8
Merge branch 'develop' into 3495-grading-report-template-random-order
Tom Zhao
2024-11-14 12:39:25 +01:00
0af4e538a1
Fix intermittent sorting of criterion to actual order
Nico Athanassiadis
2024-11-13 12:00:03 +01:00
a9b8542576
Fix users getting stuck at a blank white page after logging in. (#16 )
Andreas Svanberg
2024-11-13 08:01:17 +01:00
724c4a8027
Merge remote-tracking branch 'gitea/develop' into session-tracking-firewall
Andreas Svanberg
2024-11-12 13:41:11 +01:00
cfe61a9ed8
task/3382: Harmonize database names as snake_case (#6 )
Tom Zhao
2024-11-12 13:33:43 +01:00
2f1e927ab7
task/3382: rename migration script version to V391 from V390
Tom Zhao
2024-11-12 11:53:22 +01:00
27aca141e0
Merge branch 'develop' into task/3382
Tom Zhao
2024-11-12 11:50:44 +01:00
e36018f927
task/3382: Rename 'file_reference_id' to 'document_file_reference_id' for final_seminar
Tom Zhao
2024-11-12 11:47:48 +01:00
28e617ef9b
task/3382: Rename 'file_reference_id' to 'upload_file_reference_id' for activity
Tom Zhao
2024-11-12 11:27:33 +01:00
0fb9e6dbc3
task/3382: Rename 'user_id' to 'creator_user_id' for checklist_template
Tom Zhao
2024-11-12 11:14:41 +01:00
9a8604d76a
task/3382: Rename 'user_id' to 'creator_user_id' for activity_plan_template
Tom Zhao
2024-11-12 11:00:51 +01:00
c833426a69
task/3382: Rename 'user_id' to 'creator_user_id' for comment
Tom Zhao
2024-11-12 10:48:11 +01:00
ccdfe6d979
task/3382: Rename 'user_id' to 'reviewer_user_id' for reviewer_target
Tom Zhao
2024-11-12 10:14:19 +01:00
05e5725581
task/3382: Rename 'user_name' to 'username' for urkund_settings
Tom Zhao
2024-11-12 09:55:53 +01:00
df29afdacc
task/3382: Rename 'user_name' to 'username'
Tom Zhao
2024-11-12 09:47:00 +01:00
f11fdcfb98
Fix foreign key names
Andreas Svanberg
2024-11-11 15:44:11 +01:00
8e5c9f5687
Allow longer final thesis titles (#17 )
Andreas Svanberg
2024-11-11 11:17:15 +01:00
353ead7966
task/3382: Move back public nested types Event to top of the class definition to improved readability.
Tom Zhao
2024-11-11 11:11:58 +01:00
a5b2bb614b
task/3382: Add JPA-annotations to all children classes to NotificationEvent (missed these earlier)
Tom Zhao
2024-11-11 11:03:14 +01:00
004b68b98d
task/3382: Update table answer with enum value NOT_APPLICABLE as well
Tom Zhao
2024-11-11 10:20:16 +01:00
75cc952d48
task/3382: Add missing column name to dateCreated for IdeaParticipation
Tom Zhao
2024-11-11 10:08:51 +01:00
897f5a8329
Allow longer final thesis titles
Andreas Svanberg
2024-11-01 14:34:29 +01:00
55a7043837
Fix users getting stuck at a blank white page after logging in.
Andreas Svanberg
2024-11-08 10:55:57 +01:00
8b705706b5
task/3382: Add editor-folding support to ActivityPlanTemplate and ActivityTemplate
Tom Zhao
2024-11-07 15:53:52 +01:00
f478521502
task/3382: Correct typo, to grading_report_template
Tom Zhao
2024-11-07 15:52:55 +01:00
0b02eb537e
task/3382: Since one of ChecklistAnswerEnum values is changed to NOT_APPLICABLE, Wicket properties files need to change as well
Tom Zhao
2024-11-07 15:44:09 +01:00
2001a3619d
Merge branch 'develop' into 3412-supervisor-edit-reflection
Andreas Svanberg
2024-11-07 10:56:22 +01:00
f507fcf0ec
task/3382: Use editor-fold to surround different sections of entity classes
Tom Zhao
2024-11-07 12:42:05 +01:00
3649c14f70
Merge branch 'develop' into task/3382
Tom Zhao
2024-11-07 10:01:29 +01:00
cfd42bcaf5
task/3382: Fix a few SQL errors, and ajusted JPA-mappings
Tom Zhao
2024-11-07 09:48:19 +01:00
4fde7fdac9
task/3382: Update enum NOT_APPLICABLE due to typo
Tom Zhao
2024-11-06 12:16:50 +01:00
0c93ee2f6b
task/3382: Use _sv and _en consistently on publication_metadata and national_subject_category
Tom Zhao
2024-11-06 12:04:14 +01:00
081678fcac
task/3382: Add back unique key to table idea and fix 'on delete set null' to peer_request and activity_template
Tom Zhao
2024-11-06 11:52:59 +01:00
0403726460
task/3382: Improve comments to NotificationEvent
Tom Zhao
2024-11-06 11:45:31 +01:00
63c8da867c
task/3382: Fixed changes required by merging from develop branch
Tom Zhao
2024-11-06 11:40:08 +01:00
ccac2c1cf8
Enable creating an API using Spring Web (#5 )
Andreas Svanberg
2024-11-06 11:23:28 +01:00
2e6d7f24c0
task/3382: Update SQl-migration version to V390.
Tom Zhao
2024-11-06 10:14:56 +01:00
d6ff57fcf3
task/3382: Merge from develop
Tom Zhao
2024-11-06 10:08:56 +01:00
6a765a73d7
Merge branch 'develop' into 3412-supervisor-edit-reflection
Andreas Svanberg
2024-11-04 09:55:53 +01:00
a7530fa85c
Merge branch 'develop' into spring
Andreas Svanberg
2024-11-04 09:43:28 +01:00
2c775e9e70
task/3382: Fixed notification_data and related tables and JPA-mappings
Tom Zhao
2024-10-31 13:23:15 +01:00
fe10101bc5
Merge commit 'ad770853563a210d9360dba45f2f6a56c9602e64' into HEAD
2024-10-30 19:54:08 +01:00
9e30f1aa57
task/3382: Fixed forum_post_read, project_thread, reviewer_thread, group_thread and their related JPA-mappings
Tom Zhao
2024-10-30 11:32:39 +01:00
2d1e04799d
task/3382: Fixed thread, forum_post, forum_post_file_description and their related JPA-mappings
Tom Zhao
2024-10-30 10:20:59 +01:00
ad77085356
Build and test on each push (#9 )
Andreas Svanberg
2024-10-30 10:19:50 +01:00
d62baf9065
Merge branch 'develop' into build-and-test-on-gitea-push
niat8586
2024-10-30 10:11:22 +01:00
e18af72336
Allows admins to manage grading report templates (#14 )
Andreas Svanberg
2024-10-30 10:05:22 +01:00
edd66e148b
task/3382: Fixed project_group, project_group_project and their related JPA-mappings
Tom Zhao
2024-10-30 09:04:21 +01:00
9f13775096
task/3382: Fixed mail_event related tables and their related JPA-mappings
Tom Zhao
2024-10-30 08:35:23 +01:00
78c31eff50
Update core/src/main/java/se/su/dsv/scipro/report/AbstractGradingCriterion.java
niat8586
2024-10-29 09:29:52 +01:00
c14f9de7e2
task/3382: Fixed urkund_submission and plagiarism_request and their related JPA-mappings
Tom Zhao
2024-10-28 16:04:05 +01:00
886a3a8d3d
Move integration tests back into the core module
Andreas Svanberg
2024-10-28 15:35:52 +01:00
a375c711b2
Clean up unused imports
Andreas Svanberg
2024-10-28 14:55:26 +01:00
1f112b68d1
Extend Exception instead of Throwable
Andreas Svanberg
2024-10-28 14:36:48 +01:00
42eb4d36d9
Merge branch 'develop' into 3482-new-grading-criteria
Andreas Svanberg
2024-10-28 14:33:35 +01:00
de27d3d212
task/3382: Fixed decision and reviewer_approval and their related JPA-mappings
Tom Zhao
2024-10-28 14:30:50 +01:00
676e6258e3
Add missing @Bean definition
Andreas Svanberg
2024-10-28 14:18:41 +01:00
c7a213baca
Merge branch 'develop' into spring
Andreas Svanberg
2024-10-28 14:05:14 +01:00
d8e4f0dd22
Stop confusing Spring Boot with copied classes
Andreas Svanberg
2024-05-15 14:23:13 +02:00
a76eb0c03c
task/3382: Fixed file_reference & file_description, FinalThesis, project_file and their related JPA-mappings
Tom Zhao
2024-10-24 15:25:12 +02:00
4e47cd426f
Calculate grades using grade limits, if available.
Andreas Svanberg
2024-10-24 13:53:21 +02:00
10369ddf4f
Limit the width of the template overview
Andreas Svanberg
2024-10-24 12:27:21 +02:00
cf509d752b
Remove more GUI testing
Andreas Svanberg
2024-10-24 12:25:31 +02:00
6ce9e1efb3
Remove debug print
Andreas Svanberg
2024-10-24 12:23:49 +02:00
a3a68b02e8
Add button to remove a criterion from the grading template
Andreas Svanberg
2024-10-24 12:23:30 +02:00
f147d50688
Add auto-saving when setting the valid from
Andreas Svanberg
2024-10-24 12:06:09 +02:00
62120b1186
task/3382: Fixed Many-to-Many tables between table project and table user, and related JPA-mappings
Tom Zhao
2024-10-24 11:53:38 +02:00
31dc80fcf4
Group migrations under a single major version
Andreas Svanberg
2024-10-24 10:58:13 +02:00
1756c9829e
Fix warnings
Andreas Svanberg
2024-10-24 10:15:15 +02:00
6bcf7dce3f
Display grading template notes
Andreas Svanberg
2024-10-23 15:52:42 +02:00
b0f6a81a23
Page to create new grading report templates
Andreas Svanberg
2024-10-23 15:50:55 +02:00
e8fdfc7f76
Migrate reflection criteria (Ö6) to use the new reflection flag
Andreas Svanberg
2024-10-23 14:53:19 +02:00
24b88c1d12
Migrate opposition criteria (Ö1) to use the new opposition flag
Andreas Svanberg
2024-10-23 14:09:58 +02:00
9a839579fc
Save criteria flags
Andreas Svanberg
2024-10-23 13:20:06 +02:00
eb5f948aaa
task/3382: Fixed project and related JPA-mappings
Tom Zhao
2024-10-23 13:20:16 +02:00
c76361caa9
Save grade limits on grading templates
Andreas Svanberg
2024-10-23 12:59:50 +02:00
49443f09e4
Save note and failing grade on grading templates
Andreas Svanberg
2024-10-23 12:17:37 +02:00
26ab89a2e3
Textual improvements
Andreas Svanberg
2024-10-23 10:47:58 +02:00
23f9ea114d
Renamed "default grade" to "failing grade" to better communicate what it is
Andreas Svanberg
2024-10-23 10:43:50 +02:00
6bc04a0a58
Flag grade limits as required inputs
Andreas Svanberg
2024-10-23 10:35:41 +02:00
e96ce9b0ff
Persist the edited grading template
Andreas Svanberg
2024-10-23 10:33:02 +02:00
e5aa53f882
Specify the minimum point requirement of each criterion
Andreas Svanberg
2024-10-23 10:15:35 +02:00
56bac63e4f
Specify the type (thesis or individual) of each criterion
Andreas Svanberg
2024-10-21 15:46:52 +02:00
1d3daa5226
Add new criteria to grading templates
Andreas Svanberg
2024-10-21 15:31:40 +02:00
99e4613a1c
Code simplification
Andreas Svanberg
2024-10-21 15:07:06 +02:00
556abce723
Correctly mark everything as required
Andreas Svanberg
2024-10-21 15:04:09 +02:00
f9af18a49c
[wip] Persist grading template after editing
Andreas Svanberg
2024-10-21 14:53:42 +02:00
4c7ef23e5d
Fix edit link for upcoming templates
Andreas Svanberg
2024-10-21 14:40:42 +02:00
55b6552d6a
Populate initial data when editing grading templates
Andreas Svanberg
2024-10-21 14:35:00 +02:00
a02291897e
Configure valid from date in grading templates
Andreas Svanberg
2024-10-21 13:13:43 +02:00
2708003cee
Configure point to grade conversion in templates
Andreas Svanberg
2024-10-21 12:57:22 +02:00
ac3da27733
Flag criteria if they're connected to some other part of the system
Andreas Svanberg
2024-10-21 10:27:37 +02:00
05a205d7cc
Number requirements correctly
Andreas Svanberg
2024-10-21 10:16:32 +02:00
95d9e2658d
Save text while editing the template
Andreas Svanberg
2024-10-21 10:09:52 +02:00
Andreas Svanberg
Tom Zhao
Nico Athanassiadis
Jenkins