3979 Commits

Author SHA1 Message Date
d996f28d84 "Fixed" test. 2014-10-23 16:03:33 +02:00
a9675369b7 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-10-23 11:18:40 +02:00
858d963add Preliminary grading removed requirement to be filled in before submit. 2014-10-23 11:18:08 +02:00
golrokh
ec5bad9640 Stable in test & ui 2014-10-22 13:54:27 +02:00
fred-fri
08828cdb17 db fix for error that arose when rwanda_grading was renamed to final_grading 2014-10-22 10:22:46 +09:00
000d644271 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-10-21 17:20:12 +02:00
28535e7a94 Added feedback to save & add more users #2300 2 2014-10-21 17:20:01 +02:00
golrokh
5b73bdceee keep required to pass 2014-10-21 16:25:09 +02:00
1973721b8e Changed "initial assessment" to "first version". 2014-10-21 15:24:44 +02:00
fred-fri
d24672d034 fixes and adding panel 2014-10-21 09:25:10 +09:00
fred-fri
28c9506639 Merge remote-tracking branch 'origin/develop' into develop 2014-10-20 17:15:52 +09:00
fred-fri
fe43e2fb6a adding rwandagrade 2014-10-20 17:15:38 +09:00
6f46eac90c Changed to chained calls of StringBuffer#append 2014-10-20 09:56:40 +02:00
c3575bee66 Removed commented out lines of code (check git history). 2014-10-20 09:56:23 +02:00
2023abe8c2 [SCIPRO-20284] Fixed bug when downloading opposition reports and preliminary grading reports. Yay reflection. 2014-10-17 16:48:32 +02:00
210bb297ee Removed problematic preliminary grading reports in the new process. 2014-10-17 16:38:03 +02:00
741816f1f3 Test fixes. 2014-10-17 16:32:27 +02:00
da79fcf2dd Added condition for submitting preliminary grading report that the final seminar has a document attached. 2014-10-17 12:31:04 +02:00
97add3a354 Added unique constraint to prevent multiple preliminary grading reports from being created for the same final seminar/author combination. 2014-10-17 12:16:09 +02:00
ac00e6aa4b Merge remote-tracking branch 'origin/develop' into develop 2014-10-17 11:59:21 +02:00
fred-fri
860eb284b6 Merge remote-tracking branch 'origin/develop' into develop 2014-10-17 18:08:17 +09:00
cc13917fdf Lombok for getters/setters. Maybe use a proper language that does not need boilerplate or libraries to spit out boilerplate. 2014-10-17 11:02:42 +02:00
3b4e75dd50 Seriously 2014-10-17 10:58:02 +02:00
8d9e8c7cb1 Added more logic and test to make sure successful submissions are marked as submitted and saved to the database. 2014-10-17 10:57:36 +02:00
644e9db6b9 Merge remote-tracking branch 'origin/develop' into develop 2014-10-17 10:03:38 +02:00
fred-fri
0d9db71deb rewritten opposition and participation gui 2014-10-17 16:27:29 +09:00
fred-fri
214620c2ad refactoring multiple attachments 2014-10-17 13:46:50 +09:00
fred-fri
f853793e56 Merge branch 'develop' into attachments 2014-10-17 12:41:38 +09:00
fred-fri
a74cbdc901 Revert "final grading report > grading report"
This reverts commit 4dee431b3ccf14f844b5be27b8a6bf5ad5ad6af0.
2014-10-17 11:13:10 +09:00
golrokh
21f9de4a4f DB and classes changed 2014-10-16 17:49:45 +02:00
181a4d70d1 Business logic for submitting a grading report as a preliminary report. 2014-10-16 16:17:11 +02:00
d423d70274 Made comment for application period exemptions handle strings up to 65536 characters (TEXT MySQL type) instead of only 255 (VARCHAR(255)). 2014-10-16 12:47:06 +02:00
golrokh
80e5e16bd8 Add point template to the DB 2014-10-16 10:17:56 +02:00
2431214ef7 Refactored so the boolean parameter is actually used. 2014-10-16 10:03:56 +02:00
fred-fri
c7b66cba20 Merge branch 'develop' into attachments 2014-10-16 16:47:04 +09:00
fred-fri
48094772d7 clarification on user notification 2014-10-16 16:20:25 +09:00
fred-fri
c1f0dd00cd refactoring to multiple attachments 2014-10-15 18:37:23 +09:00
1f7a77ff80 Major refactoring of AddActivitiesFromTemplatePanel. 2014-10-15 11:11:12 +02:00
96ebe21fc5 Sonar. 2014-10-15 09:49:37 +02:00
fred-fri
28cc7ba26a Merge branch 'develop' into attachments 2014-10-15 16:47:20 +09:00
fred-fri
4dee431b3c final grading report > grading report 2014-10-15 16:06:26 +09:00
fred-fri
7d6002d5a8 improved opposition and participation gui 2014-10-15 14:46:58 +09:00
fred-fri
5247359421 stupid dates 2014-10-15 13:36:15 +09:00
fred-fri
7d43b92534 removed unused declarations 2014-10-15 10:25:20 +09:00
fred-fri
4966c869ab these should be there 2014-10-14 15:31:51 +09:00
fred-fri
4e123e433a infinite loops are infinite 2014-10-14 14:02:04 +09:00
fred-fri
2766ada043 ordnung 2014-10-14 12:56:20 +09:00
fred-fri
feb96fd706 moving methods 2014-10-14 12:52:23 +09:00
fred-fri
cb9c12232a moving methods 2014-10-14 12:11:09 +09:00
fred-fri
bca8a6883f cleanout 2014-10-14 11:48:05 +09:00