14332 Commits

Author SHA1 Message Date
a3214e3559 Creating GradingReports is done from a template. 2013-12-03 17:00:25 +01:00
Richard
bb9a89c5dc CSS changes to the feedbackPanel on the gradingReportPanel. 2013-12-03 16:26:31 +01:00
796429c163 Removed @Data to remove temptation to modify the object from the outside. 2013-12-03 16:26:17 +01:00
67f14a60ce Removed stray constant. 2013-12-03 16:24:29 +01:00
29a06665ea Removed description from GradingReportTemplate. 2013-12-03 16:23:25 +01:00
Richard
47bd177ba3 Merge remote-tracking branch 'origin/develop' into develop 2013-12-03 16:04:59 +01:00
Richard
8b100925bf Continued styling of the gradereportpanel. 2013-12-03 16:04:52 +01:00
Leo
6269b22474 timestamp in feedback 2013-12-03 15:44:19 +01:00
Leo
627aad567c Merge remote-tracking branch 'origin/develop' into develop 2013-12-03 15:29:35 +01:00
Leo
32f0662336 fixed the null pointer when saving twice 2013-12-03 15:28:46 +01:00
Richard
901755dde4 Continued styling of the gradereportpanel. 2013-12-03 15:18:49 +01:00
Leo
553be33292 fixed Download pdf button bug 2013-12-03 14:58:11 +01:00
Leo
2d20172c0c moved feedback panel inside form 2013-12-03 14:51:44 +01:00
Leo
cab2ae9028 Merge remote-tracking branch 'origin/develop' into develop 2013-12-03 14:42:53 +01:00
Leo
d4dfcb224e only content of first tab is shown when going to the grading page 2013-12-03 10:41:37 +01:00
Leo
2a3c1f737f tabs now link to each authors GradingForm 2013-12-03 10:21:25 +01:00
fred-fri
131abda8a5 when filedesc userid is null, get userid from jackrabbit node 2013-12-03 17:59:37 +09:00
fred-fri
837e1d7093 finished moving 2013-12-03 16:32:03 +09:00
fred-fri
23d00673a5 moved activity plan templates into new submenu 2013-12-03 16:20:16 +09:00
fred-fri
54d91bdfaf added new highlighting interface 2013-12-03 16:08:59 +09:00
fred-fri
07f6924536 added new abstractsupervisorallprojectspage 2013-12-03 16:08:14 +09:00
fred-fri
a591cfa1dd more detailed removed string 2013-12-03 15:53:50 +09:00
fred-fri
ea30e41644 fixed latestuploadpanel crash when no userid on file 2013-12-03 14:12:53 +09:00
Leo
72bb87b106 dynamic tabs in FillOutGradingReportPanel 2013-12-02 17:19:40 +01:00
Leo
da6d050afd grading report is one per author and project 2013-12-02 16:52:32 +01:00
Emil Siverhall
ae26ef6c22 Grading page now only have save and download buttons. download is allowed if all criteria have points assigned 2013-12-02 15:04:24 +01:00
Emil Siverhall
66a3baaf18 hasFinishedGradingReport now checks if all questions are answered instead of finished flag 2013-12-02 14:04:30 +01:00
fred-fri
47d2fbb599 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-12-02 19:49:01 +09:00
fred-fri
0c41617b7e cleanup 2013-12-02 19:46:56 +09:00
Richard
2e710ffce9 Merge remote-tracking branch 'origin/develop' into develop 2013-12-02 11:44:17 +01:00
Richard
39e29df016 Moved create grade report button. 2013-12-02 11:44:08 +01:00
Emil Siverhall
6dca7354af Merge remote-tracking branch 'origin/develop' into develop 2013-12-02 11:30:32 +01:00
Emil Siverhall
8f2d8ccc1b detach model after getting answers 2013-12-02 11:28:01 +01:00
Richard
58cef9128c 2nd version of gradingReport tabs. 2013-12-02 11:23:59 +01:00
Richard
bb15ae9402 Merge remote-tracking branch 'origin/develop' into develop 2013-12-02 11:02:27 +01:00
Richard
bdc6a247c1 First version of gradingReport tabs. 2013-12-02 11:02:19 +01:00
fred-fri
c6cabfdd04 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-12-02 18:47:20 +09:00
fred-fri
c2cf5fecd1 tests 2013-12-02 18:46:45 +09:00
Emil Siverhall
06657e8c64 Merge remote-tracking branch 'origin/develop' into develop 2013-12-02 10:45:03 +01:00
Emil Siverhall
042a4012e6 sort answers by criterion sort order 2013-12-02 10:44:38 +01:00
fred-fri
48cb2d158a Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-12-02 18:39:26 +09:00
fred-fri
9ec680b4d5 returned onsubmit and fixed test 2013-12-02 18:38:37 +09:00
fred-fri
2ab2104b4c refactored to two submitlinks, still doesnt give latest grade 2013-12-02 18:24:10 +09:00
fred-fri
157f768b7c adding components, hooking up 2013-12-02 18:13:53 +09:00
Emil Siverhall
a543214561 Merge remote-tracking branch 'origin/develop' into develop 2013-12-02 10:13:44 +01:00
Emil Siverhall
6571ad3c5a login with internal credentials 2013-12-02 10:13:34 +01:00
9983c9915b Moved RequestCycleExtra suppression to where it should be. 2013-12-02 10:04:12 +01:00
fred-fri
98462a4d06 fixed methods 2013-12-02 17:57:28 +09:00
fred-fri
c7b9dfb61e conflict 2013-12-02 17:37:15 +09:00
fred-fri
919eac604a fixed underlying issue, restored some code 2013-12-02 17:35:42 +09:00