scipro

DMC/scipro

Fork 0

Commit Graph

Select branches

Hide Pull Requests

87-split-project

calendar-meeting-overview

develop

master

project-level-credits-participants-view

remove-forum-post

specialisation

supervisor-submit-to-examiner-date

test-coverage

#10

#101

#102

#105

#106

#107

#111

#112

#113

#114

#115

#116

#117

#118

#12

#121

#122

#123

#124

#125

#126

#128

#13

#132

#133

#134

#137

#138

#14

#140

#141

#143

#146

#148

#15

#151

#153

#159

#16

#167

#17

#18

#19

#20

#21

#23

#24

#25

#26

#27

#3

#44

#47

#5

#52

#54

#55

#57

#58

#59

#6

#61

#65

#70

#71

#72

#74

#76

#78

#8

#9

#91

#96

#98

201

2011-07-18

2011-07-21

2011-08-22

2011-08-24

2011-09-09

2011-09-21

2011-10-25

2011-10-27

2011-11-07

2011-11-10

2011-11-14

2011-12-07

2011-12-08

2011-12-21

2012-05-07

2012-09-15

2012-09-19

2012-10-15

20120102

20120109

20120113

20120123

20120126

20120129b

20120130

20120203

20120208

20120213

20120215

20120224

20120224b

20120227

20120229

20120306

20120308

20120320

20120323

20120326

20120401

20120420

20120430

20120501

20120511

20120515

20120520

20120521

20120525

20120601

20120605

20120607

20120614

20120625

20120720

20120731

20120810

20120813

20120814

20120815

20120817

20120819

20120819b

20120819c

20120819d

20120821

20120821b

20120827

20120827b

20120827c

20120911

20120917

20120928

20121003

20121005

20121009

20121010

20121010b

20121010c

20121010d

20121019

20121024

20121026

20121102

20121102b

20121102c

20121102d

20121112

20121119

20121123

20121204

20121221

20130114

20130114b

20130116

20130117

20130118

20130118b

20130121

20130125

20130201

20130204

20130204-2

20130215

20130220

20130301

20130308

20130315

20130319

20130322

20130405

20130412

20130412b

20130419

20130426

20130503

20130510

20130517

20130520b

20130524

20130524b

20130531

20130607

20130809

20130816

20130823

20130906

20130913

20131010

20131015

20131015b

20131023

20131024

20131024b

20131024c

20131025

20131025b

20131029

20131029b

20131029c

20131031

20131104

20131106

fix20130520

release-100

release-101

release-102

release-103

release-104

release-105

release-106

release-107

release-108

release-109

release-110

release-111

release-112

release-113

release-114

release-115

release-116

release-117

release-118

release-119

release-120

release-124

release-125

release-126

release-127

release-128

release-129

release-130

release-131

release-132

release-133

release-134

release-135

release-136

release-137

release-138

release-139

release-140

release-141

release-142

release-143

release-144

release-145

release-146

release-147

release-148

release-149

release-150

release-151

release-152

release-154

release-155

release-156

release-157

release-158

release-159

release-160

release-161

release-162

release-163

release-164

release-165

release-166

release-167

release-168

release-169

release-170

release-171

release-172

release-173

release-174

release-175

release-177

release-178

release-179

release-180

release-181

release-182

release-183

release-184

release-185

release-186

release-187

release-188

release-189

release-190

release-191

release-192

release-193

release-194

release-195

release-196

release-197

release-198

release-199

release-200

release-201

release-2014-02-11_09-10-21

release-2014-02-18_12-56-20

release-2014-02-18_14-07-18

release-2014-02-18_17-39-07

release-2014-02-18_18-52-52

release-2014-02-20_10-05-22

release-2014-03-05_15-17-07

release-2014-03-05_16-11-47

release-2014-03-06_14-40-27

release-2014-03-06_17-04-04

release-2014-03-13_13-44-31

release-2014-03-13_16-21-44

release-2014-03-14_16-51-04

release-2014-03-26_16-03-09

release-2014-03-27_13-53-50

release-2014-03-27_17-09-01

release-2014-04-01_15-20-30

release-2014-04-04_12-51-51

release-2014-04-08_09-18-21

release-2014-04-08_17-09-06

release-2014-04-10_10-24-17

release-2014-04-11_07-44-26

release-2014-04-11_09-43-06

release-2014-04-25_06-47-30

release-2014-05-09_06-12-15

release-2014-05-16_17-09-30

release-2014-05-19_20-32-59

release-2014-05-27_02-23-47

release-2014-05-27_05-28-36

release-2014-06-03_05-58-50

release-2014-06-27_02-59-33

release-2014-07-17_15-40-18

release-2014-07-30_10-58-12

release-2014-08-19_14-03-31

release-2014-08-19_16-58-15

release-2014-08-20_13-28-07

release-2014-08-28_05-21-30

release-2014-08-28_16-01-59

release-2014-09-12_04-32-23

release-2014-10-13_08-42-56

release-2014-10-13_23-32-12

release-2014-10-18_01-41-15

release-2014-10-20_05-31-21

release-2014-10-29_03-09-05

release-2014-11-07_00-19-08

release-2014-11-25_02-38-44

release-2014-12-01_03-52-02

release-2014-12-01_22-46-42

release-2014-12-09_12-38-01

release-2014-12-14_20-43-16

release-2015-01-05_14-42-00

release-2015-01-12_19-19-12

release-2015-01-14_23-29-05

release-2015-01-16_13-58-21

release-2015-01-21_01-43-10

release-202

release-203

release-204

release-205

release-206

release-207

release-208

release-209

release-210

release-211

release-212

release-213

release-214

release-215

release-216

release-217

release-218

release-219

release-220

release-221

release-222

release-223

release-224

release-225

release-226

release-227

release-228

release-229

release-230

release-231

release-232

release-233

release-234

release-235

release-236

release-237

release-238

release-239

release-240

release-241

release-242

release-243

release-244

release-245

release-246

release-247

release-248

release-249

release-250

release-251

release-252

release-253

release-254

release-255

release-256

release-257

release-258

release-259

release-260

release-261

release-262

release-263

release-264

release-265

release-266

release-267

release-268

release-269

release-270

release-271

release-273

release-274

release-275

release-276

release-277

release-278

release-279

release-280

release-281

release-282

release-283

release-284

release-287

release-288

release-289

release-290

release-291

release-292

release-293

release-294

release-295

release-296

release-297

release-298

release-299

release-300

release-73

release-74

release-75

release-77

release-78

release-79

release-80

release-81

release-82

release-83

release-84

release-85

release-86

release-87

release-88

release-89

release-90

release-91

release-92

release-93

release-94

release-95

release-96

release-97

release-98

release-99

release20140411

second20120215

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
ffcd880384 Edit upcoming templates Andreas Svanberg 2024-10-17 16:17:44 +02:00
065601aa03 task/3382: Fixed GradingCriterionPoint, GradingCriterion, SupervisorGradingReport, ReviewerGradingReport and GradingReport related tables and JPA-mappings Tom Zhao 2024-10-16 14:46:17 +02:00
7ec355718b 3412 TR Remember their selected publishing consent Andreas Svanberg 2024-10-16 10:20:26 +02:00
2ae764a0ad 3412 TR Send notification to supervisor when the author resubmits their reflection Andreas Svanberg 2024-10-16 10:19:37 +02:00
4c1a30a6e5 3412 TR Show red warning when grading if reflection improvements have been requested Andreas Svanberg 2024-10-16 10:05:07 +02:00
806860dc17 Fix warning Andreas Svanberg 2024-10-16 09:58:10 +02:00
df1410c612 3412 TR Hide buttons when the report is submitted instead of only dimming them Andreas Svanberg 2024-10-16 09:35:29 +02:00
862dd59513 Show upcoming templates on the overview page Andreas Svanberg 2024-10-16 09:31:21 +02:00
7a1b3d4744 View current/old template Andreas Svanberg 2024-10-15 15:05:57 +02:00
1672171f46 Grading templates overview page Andreas Svanberg 2024-10-15 13:42:53 +02:00
0c1c871fb4 Grading templates are based on valid date ranges instead of only a single global one Andreas Svanberg 2024-10-09 14:43:30 +02:00
4e9e35a99a Remove persistence related implementation details from GradingReportServiceImpl Andreas Svanberg 2024-10-02 13:53:22 +02:00
a6f38dbab8 3412 Allow supervisors to edit the submitted reflections Andreas Svanberg 2024-10-02 11:05:26 +02:00
543234558b task/3382: Merge branch 'develop' into task/3382 Tom Zhao 2024-09-26 13:34:45 +02:00
5a92cbbce9 task/3382: Fixed report, criterion and opposition_report related tables and JPA-mappings Tom Zhao 2024-09-26 13:21:36 +02:00
ffb571fd23 Notify the author when reflection improvements are needed Andreas Svanberg 2024-09-25 13:57:57 +02:00
32353c0d1f Save supervisors comment about what improvements are needed on the reflection Andreas Svanberg 2024-09-25 12:28:13 +02:00
fc3bc9e871 Supervisors can request improvements to the submitted reflection Andreas Svanberg 2024-09-23 15:47:43 +02:00
fed94d55b7 Allow students to resubmit their reflection after supervisors requested improvements Andreas Svanberg 2024-09-23 14:24:32 +02:00
e867dfcde9 task/3382: Fixed final seminar related tables and JPA-mappings Tom Zhao 2024-09-23 12:33:44 +02:00
019a6aa147 Simplified enum constant naming Andreas Svanberg 2024-09-23 12:05:31 +02:00
33071c5daa Merge branch 'develop' into 3213-reflection-resubmission Andreas Svanberg 2024-09-23 09:42:44 +02:00
da93ff0638 task/3382: Fixed milestone related tables and JPA-mappings Tom Zhao 2024-09-11 16:14:03 +02:00
612f5c33ac Merge remote-tracking branch 'gitea/develop' into spring Andreas Svanberg 2024-09-09 09:52:52 +02:00
93124dfade Request resubmission Andreas Svanberg 2024-07-29 15:11:23 +02:00
60732cd0c3 task/3382: Fixed peer request related tables and JPA-mappings Tom Zhao 2024-09-04 10:20:37 +02:00
74f0933fbb task/3382: Fixed activity related tables and JPA-mappings Tom Zhao 2024-09-02 12:06:49 +02:00
b052988839 task/3382: Fixed idea related tables and JPA-mappings Tom Zhao 2024-08-26 10:57:29 +02:00
cac874af88 task/3382: Fixed JPA-mapping annotation from User to ResearchArea Tom Zhao 2024-08-09 14:52:04 +02:00
52cb71d3d2 task/3382: Fixed keyword and research area related tables and JPA-mappings Tom Zhao 2024-08-09 14:37:20 +02:00
f5f85f1486 task/3382: Fixed Survey related tables and JPA-mappings Tom Zhao 2024-08-08 12:11:01 +02:00
28f2d65e23 Merge commit 'e3003231357843a9d1f0ec30d88ad98118454b93' into HEAD release-287 Jenkins 2024-07-26 00:08:55 +02:00
e300323135 Update pom.xml (#10) wwest 2024-07-25 14:20:24 +02:00
9427745fa1 Update pom.xml wwest 2024-07-25 14:18:49 +02:00
8650278efc task/3382: JPA-mapping shall use @MapKeyJoinColumn for mapping from talbe checklist to checklist_user_last_open_date. Tom Zhao 2024-07-11 16:30:14 +02:00
9b30164faf task/3382: Remove @Lob annotation to get rid of IntelliJ warnng. Tom Zhao 2024-07-11 15:58:09 +02:00
f2ae73d35c task/3382: improve helper SQL-script. Tom Zhao 2024-07-11 15:50:25 +02:00
d62ad0817a task/3382: fixed checklist template related tables and JPA-mappings Tom Zhao 2024-07-11 15:20:45 +02:00
bb1ded0977 task/3382: fixed checklist question/answer tables and JPA-mappings Tom Zhao 2024-07-11 14:38:54 +02:00
d21601044c task/3382: fixed a typo Tom Zhao 2024-07-11 14:17:06 +02:00
ed50cae208 task/3382: fixed a few checklist related tables and their entity class Tom Zhao 2024-07-11 14:10:19 +02:00
aa45adc5cb task/3382: use single import statement Tom Zhao 2024-07-11 12:47:00 +02:00
1bbb178822 task/3382: fix table project_user_note and JPA-mapping at entity class GradingReportTemplate Tom Zhao 2024-07-11 10:59:14 +02:00
ac3f8e16e3 task/3382: rename SQL script file to later version because of changes of database in develop branch. Tom Zhao 2024-07-11 10:15:37 +02:00
9583eaf439 task/3382: Merge branch 'develop' into task/3382 Tom Zhao 2024-07-11 10:08:51 +02:00
a855218d48 Failing test Andreas Svanberg 2024-07-10 15:41:52 +02:00
a9a2ee1631 task/3382: Correct JPA-mapping to defaultProjectTypeFilter in UserProfile. Tom Zhao 2024-07-10 15:37:50 +02:00
45a2a47068 Merge branch 'develop' into spring Andreas Svanberg 2024-07-10 15:00:42 +02:00
7b7e0364b2 Add Maven Wrapper to not require Maven to be installed Andreas Svanberg 2024-07-10 14:03:10 +02:00
9667c340c1 Re-trigger action Andreas Svanberg 2024-07-10 13:51:19 +02:00
9d9ee49b2c task/3382: Fix a few errors Tom Zhao 2024-07-10 13:51:00 +02:00
5ae9b47ce6 Build and test on push Andreas Svanberg 2024-07-10 13:43:39 +02:00
949de4a260 Allow supervisors to write a note associated with their projects (#8) ansv7779 2024-07-10 13:43:27 +02:00
e11b2cc22a Merge branch 'develop' into 3399-supervisor-project-note ansv7779 2024-07-10 13:42:30 +02:00
0ffe1bd79a Rename variable to match other model variable names Andreas Svanberg 2024-07-10 13:38:29 +02:00
9f583f9e7a Replace string concatenation with proper i18n Andreas Svanberg 2024-07-10 13:25:23 +02:00
0684919bb2 Make the full view of project notes respect formatting (line breaks) Andreas Svanberg 2024-07-10 13:09:44 +02:00
4dc0ba32d0 Enable supervisors to get an overview of forum activity (#3) Andreas Svanberg 2024-07-10 13:18:20 +02:00
2e55ae0df6 task/3382: Improve comments. Tom Zhao 2024-07-05 16:16:41 +02:00
5b09b0963e task/3382: ProjectType is finally fixed. Tom Zhao 2024-07-05 16:05:40 +02:00
fcd0a4c8b6 task/3382: Finally, application_period table is ready. Tom Zhao 2024-07-05 15:49:31 +02:00
1d3ea2e4ef task/3382: Fix table applicationperiodexemption and part of table idea Tom Zhao 2024-07-05 15:27:04 +02:00
83ae6491f8 task/3382: Fix table ActivityPlanTemplate Tom Zhao 2024-07-05 14:46:57 +02:00
1fc8daa0a3 task/3382: Fix table ActivityTemplate Tom Zhao 2024-07-05 14:24:16 +02:00
770d0aff31 task/3382: Fix table ApplicationPeriodProjectType Tom Zhao 2024-07-05 12:52:12 +02:00
340c72dd38 task/3382: Fix table project_partner Tom Zhao 2024-07-05 12:16:41 +02:00
ae86b54692 task/3382: fix table target Tom Zhao 2024-07-05 11:59:24 +02:00
fd248c55e3 task/3382: Partially fix table project Tom Zhao 2024-07-05 10:10:08 +02:00
237d15351e task/3382: Partially fix table idea Tom Zhao 2024-07-05 10:00:36 +02:00
f750dad22c task/3382: Fix table milestone_activity_template_projectType and JPA-mapping metadata in MilesoneActivityTemplate. Tom Zhao 2024-07-05 09:35:32 +02:00
3b1281f4c4 task/3382: Fix table checklist_template_projectType and related entity class. Tom Zhao 2024-07-04 12:37:08 +02:00
e3d843cce2 task/3382: Primarily fixed table grading_criterion_template and grading_criterion_point_template Tom Zhao 2024-07-04 10:37:09 +02:00
fe0bed901e task/3382: Fix table grading_report_template and entity class GradingReportTemplate. Tom Zhao 2024-07-03 16:05:22 +02:00
94cad840e8 task/3382: Fix table project_type_settings and entity class ProjectTypeSettings. Tom Zhao 2024-07-03 15:47:47 +02:00
eeedd0cd56 Fix test Andreas Svanberg 2024-07-03 15:11:32 +02:00
ec6eb86f91 Allow supervisors to toggle showing the entire note Andreas Svanberg 2024-07-03 15:00:55 +02:00
4de8a02e57 task/3382: Fix table project_type_project_module and JPA-mapping in ProjectType class. Tom Zhao 2024-07-03 14:55:28 +02:00
27ec885664 task/3382: Fix table external_resource and the entity class, except fk to project_type. Tom Zhao 2024-07-03 13:44:13 +02:00
4facacb398 Hide the text area label since the modal title is enough Andreas Svanberg 2024-07-03 13:34:25 +02:00
481d8cd76e Update the note in the table when the user is done editing. Andreas Svanberg 2024-07-03 13:33:21 +02:00
f5a7b592c0 Do not include milliseconds in feedback when saving the note Andreas Svanberg 2024-07-03 13:32:38 +02:00
cdaa57aefa task/3382: Fix table user_profile_project_type and it's containing entity class UserProfile (no fix on project_type yet) - missed db-script. Tom Zhao 2024-07-03 13:23:11 +02:00
7869f17ba3 task/3382: Fix table user_profile_project_type and it's containing entity class UserProfile (no fix on project_type yet). Tom Zhao 2024-07-03 13:22:41 +02:00
de3803d9d1 View/edit project notes as supervisor Andreas Svanberg 2024-07-03 13:21:07 +02:00
2b0b0d7b71 task/3382: Fix table user_profile_default_project_team_member_roles_filter and containing entity class UserProfile. Tom Zhao 2024-07-03 12:54:38 +02:00
b3b4e0dd10 task/3382: Fix table user_profile and it's entity class. Tom Zhao 2024-07-03 10:33:32 +02:00