|
|
f4020516f0
|
Added dependency to jersey-media-jaxb to get back XML support.
|
2015-05-29 17:42:46 +02:00 |
|
|
|
1ab9ee8b09
|
Upgraded versions.
Could not update Hibernate due to problems with enums.
Could not update Commons CSV due to stupid reliance on CSVRecord#toString.
|
2015-05-28 13:05:25 +02:00 |
|
golrokh
|
a9427d04a0
|
Sonar undo - weird errors happened so I reverted! The changes are in the branch makeUserUncomparable
|
2015-05-27 14:07:22 +02:00 |
|
golrokh
|
ae7d2f4c8f
|
Sonar.
|
2015-05-27 13:31:49 +02:00 |
|
golrokh
|
c0a706e602
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-05-19 10:09:21 +02:00 |
|
|
|
fd0295b1dc
|
[SCIPRO-34309] Reduced log level when the Daisy API is down while trying to fetch authors grades for milestone completion.
|
2015-05-19 12:02:31 +02:00 |
|
|
|
be3ab38e3e
|
[SCIPRO-34287] Handle the case when Daisy API is not available when searching for users in the auto-complete.
|
2015-05-19 11:56:03 +02:00 |
|
golrokh
|
61bd55df46
|
Sonar
|
2015-05-19 10:09:16 +02:00 |
|
|
|
d15e5d4a09
|
Minor change.
|
2015-05-07 14:15:58 +02:00 |
|
|
|
aecaeeba3b
|
[SCIPRO-34139] If the Daisy project is missing when trying to mark the grading completed milestone completed by checking the students grade we sever the connection to the no longer existing project.
|
2015-05-07 14:15:12 +02:00 |
|
|
|
363e792a2c
|
Added missing @Transactional annotation.
|
2015-04-29 10:45:45 +02:00 |
|
|
|
4f0c7428c0
|
Fixed test.
|
2015-04-24 10:49:40 +02:00 |
|
|
|
d06964ece3
|
Only try to fetch Daisy grades for Daisy exported projects for automatic milestone completion.
|
2015-04-24 10:31:53 +02:00 |
|
nikos
|
4181a00c59
|
[2830] Only search in Daisy for personnummer if the search term is at least 6 characters long.
|
2015-04-01 08:52:55 +02:00 |
|
|
|
5461a064b0
|
Added a user search service that looks up users in Daisy using personnummer.
|
2015-03-25 17:29:46 +01:00 |
|
golrokh
|
89fdc61bb7
|
Fixed wrong usage of the constant param
|
2015-02-26 09:41:19 +01:00 |
|
golrokh
|
5c9b2ef1fa
|
Made 'grading completeg' milestone as completed when supervisor set kursbetyg in daisy
|
2015-02-25 14:39:43 +01:00 |
|
|
|
a7900373ec
|
Fixed looking up users by username from Daisy.
|
2015-02-20 10:41:05 +01:00 |
|
|
|
162e56442a
|
Fixed tests.
|
2015-02-18 13:28:41 +01:00 |
|
|
|
80879bb114
|
Added business method for completing a project. Notifications are now sent when projects are completed.
|
2015-02-18 13:16:37 +01:00 |
|
|
|
dba91ecba7
|
Fixed test.
|
2015-02-18 12:49:57 +01:00 |
|
|
|
5818e102be
|
Mark projects completed when "Klar" in Daisy
|
2015-02-18 11:42:30 +01:00 |
|
|
|
0f021029e4
|
Fixed test.
|
2015-02-18 11:25:44 +01:00 |
|
|
|
db6f4ee996
|
Do not set finished flag for projects when exporting to Daisy.
|
2015-02-18 10:37:23 +01:00 |
|
|
|
a33f997871
|
Sigh
|
2015-02-16 10:05:20 +01:00 |
|
golrokh
|
b9fca68b2b
|
Completed finalizing project
|
2015-02-13 16:55:41 +01:00 |
|
golrokh
|
35ec0b4086
|
Completed the first version of finalizing project
|
2015-02-13 16:02:12 +01:00 |
|
golrokh
|
6282520c04
|
Adding stuff for reading grade from the API, to be continued
|
2015-02-12 17:31:43 +01:00 |
|
|
|
746cb6913d
|
[SCIPRO-26535] Skip importing users from Daisy without a defined e-mail.
|
2015-02-11 12:57:34 +01:00 |
|
golrokh
|
6e2e651466
|
Added a Logger to give us more info about the problem in user import
|
2014-12-11 12:45:17 +01:00 |
|
|
|
0b326c3396
|
Deleted unused methods.
|
2014-12-08 12:41:08 +01:00 |
|
|
|
f33cf1eb08
|
Improved some types to signal that they may not return a value rather than throwing an exception.
|
2014-12-08 12:40:11 +01:00 |
|
|
|
45b4067e55
|
Merge remote-tracking branch 'origin/develop' into import
|
2014-12-08 12:24:36 +01:00 |
|
|
|
1139bd1f4f
|
Why was this converted to use an iterator?
|
2014-12-08 12:23:40 +01:00 |
|
|
|
d8a65e9b48
|
Removed unused class.
|
2014-12-03 13:12:36 +01:00 |
|
fred-fri
|
e0862f8ca9
|
import
|
2014-12-03 10:51:19 +09:00 |
|
|
|
d34302615c
|
Revert "why not just do this to avoid the daisy merge problem"
This reverts commit b580159504.
|
2014-12-01 15:16:11 +01:00 |
|
|
|
d531f3f2f8
|
Now sets title and start date when updating the project correctly.
|
2014-12-01 15:15:14 +01:00 |
|
fred-fri
|
b580159504
|
why not just do this to avoid the daisy merge problem
|
2014-12-01 13:06:01 +09:00 |
|
fred-fri
|
ec181d3e6a
|
we dont need this error
|
2014-11-28 17:59:55 +09:00 |
|
fred-fri
|
5a304d6fa5
|
we dont need this error
|
2014-11-28 13:41:50 +09:00 |
|
fred-fri
|
48d9ae92bf
|
removing logging
|
2014-11-10 14:44:20 +09:00 |
|
fred-fri
|
8c7e4248de
|
removing unused stuff
|
2014-11-03 19:29:54 +09:00 |
|
fred-fri
|
21cc320bde
|
removing unused stuff
|
2014-11-03 19:27:50 +09:00 |
|
fred-fri
|
2dd8bd0f08
|
test fix
|
2014-10-30 14:06:17 +09:00 |
|
fred-fri
|
38bb710db9
|
adding languages
|
2014-10-30 10:27:57 +09:00 |
|
fred-fri
|
644e09cc5e
|
refactor
|
2014-10-29 19:35:21 +09:00 |
|
fred-fri
|
d44f2680a9
|
moving daisy stuff
|
2014-10-29 18:14:31 +09:00 |
|
fred-fri
|
bc69303f4e
|
this took a while to find lol
|
2014-10-24 16:07:13 +09:00 |
|
fred-fri
|
633b9ceffb
|
sonar
|
2014-09-30 10:40:42 +09:00 |
|
|
|
bed1c9f2b7
|
Removed unused grading report exporter.
|
2014-09-29 10:01:39 +02:00 |
|
torgny
|
e7e004fa0e
|
Tagit bort hakparenteserna runt författarnamnen.
|
2014-09-26 11:21:40 +02:00 |
|
fred-fri
|
9b081e4ea5
|
code inspection issues
|
2014-09-12 16:09:48 +09:00 |
|
fred-fri
|
d34f4a27bc
|
gradingreport pdf no longer says null at grade if grade is null, it says that grade will be calculated when all critera have been assessed
|
2014-08-13 10:03:17 +09:00 |
|
|
|
f78be5b83a
|
Removed unused field.
|
2014-07-11 16:02:36 +02:00 |
|
fred-fri
|
aa27870a3f
|
removing remote export setting
|
2014-07-02 10:35:17 +09:00 |
|
|
|
4217315680
|
Lowered log level.
|
2014-06-04 14:28:52 +02:00 |
|
|
|
c0284bcfc1
|
Fixed test.
|
2014-05-22 14:26:09 +02:00 |
|
|
|
1ed32eb238
|
Realm removed from username (merged it into the username column as username@realm).
|
2014-05-21 17:16:59 +02:00 |
|
|
|
166042a8a0
|
Fixed some sonar issues.
|
2014-05-21 15:22:14 +02:00 |
|
|
|
1040f6505c
|
Approved opponents and active participants are now sent to Daisy.
|
2014-05-15 13:02:57 +02:00 |
|
Emil Siverhall
|
dcde75f12c
|
changed log level on re-import failures so we don't have to delete tickets every morning
|
2014-04-16 09:45:00 +02:00 |
|
|
|
96559097b9
|
Fixed UserImportWorker so that it updates existing users personal details.
|
2014-04-09 16:45:52 +02:00 |
|
|
|
9aa831219e
|
Fixed UserImportWorker so that it updates existing users personal details.
|
2014-04-09 16:43:24 +02:00 |
|
|
|
4f9247d2c9
|
Changed Worker interface to fit our actual worker needs. Used the Worker interface instead of AbstractWorker everywhere.
|
2014-04-09 13:20:54 +02:00 |
|
|
|
3b9fba07d6
|
Moved Daisy-related exception to Daisy module.
|
2014-04-08 15:56:41 +02:00 |
|
|
|
e664412d6d
|
Moved the project exporter and user bulk import to the daisy-integration module.
|
2014-04-08 15:49:45 +02:00 |
|
|
|
7310ff6b59
|
Moved the project exporter and user bulk import to the daisy-integration module.
|
2014-04-08 15:38:43 +02:00 |
|
|
|
5e5d68a371
|
Rewrote IdeaExportWorker so that it no longer is dependent on Daisy to function.
|
2014-04-01 16:37:24 +02:00 |
|
|
|
0a18853268
|
SSO authenticated users are now imported from Daisy if necessary.
|
2014-03-31 14:03:20 +02:00 |
|
|
|
b389365379
|
SSO login is now provided with the daisy-integration module.
|
2014-03-31 13:55:04 +02:00 |
|
|
|
60fb46db5b
|
Spring gone for good. No backsies.
|
2014-03-17 16:40:10 +01:00 |
|
leosu
|
9d56de1392
|
pleasing sonar
|
2014-03-12 15:40:11 +01:00 |
|
fred-fri
|
0960e04102
|
switches
|
2014-03-11 14:24:29 +09:00 |
|
leosu
|
bf0f36bc9a
|
credits added to grading report template
|
2014-03-10 13:21:30 +01:00 |
|
|
|
45127ec63e
|
View updated to use role enums.
|
2014-03-06 14:42:58 +01:00 |
|
|
|
fca8ac7937
|
Moved GradingReportExportRepo to the daisy integration package.
|
2014-02-28 22:47:33 +01:00 |
|
|
|
8c4874f31b
|
Moved ProjectFollower to the project package.
|
2014-02-28 11:24:15 +01:00 |
|
|
|
474b542d6c
|
Moved Role hierarchy to system package
|
2014-02-28 10:42:24 +01:00 |
|
fred-fri
|
4f362ba238
|
moving projecttype
|
2014-02-28 18:20:35 +09:00 |
|
fred-fri
|
a146e341fb
|
moving gradingreportstuff
|
2014-02-28 16:13:46 +09:00 |
|
fred-fri
|
8786f71809
|
moving report stuff
|
2014-02-28 15:49:10 +09:00 |
|
fred-fri
|
50579f648a
|
moved user
|
2014-02-28 13:52:04 +09:00 |
|
|
|
3f160abdcc
|
Updated all dependency versions.
Still stuck with Spring 3.2.8 due to Spring-data-jpa.
Hibernate introduced a bug in 4.3.* so until that is resolved we use 4.2.8.
|
2014-02-26 16:47:14 +01:00 |
|
fred-fri
|
1bfa14c83d
|
moving project stuff
|
2014-02-26 18:15:17 +09:00 |
|
fred-fri
|
f8c61154be
|
moving project stuff
|
2014-02-26 18:03:56 +09:00 |
|
leosu
|
b5a3b4ba5e
|
pleasing sonar
|
2014-02-12 16:51:25 +01:00 |
|
|
|
b7b1ff1d54
|
Added some more margin to the PDF templates.
|
2014-02-07 14:43:55 +01:00 |
|
|
|
5b85bf9fed
|
Made description text stretch to fit all content.
|
2014-02-06 14:40:52 +01:00 |
|
|
|
ef1cb8bf64
|
Sonar issues.
|
2014-01-29 13:58:40 +01:00 |
|
|
|
8f23a763af
|
Ignored test since its not used anyway.
|
2014-01-28 12:31:07 +01:00 |
|
|
|
67962dbc51
|
Merge branch 'develop' into refactoringgradingreports
|
2014-01-24 15:35:28 +01:00 |
|
|
|
ccc27ec660
|
Fixed templates field declaration.
|
2014-01-24 15:05:45 +01:00 |
|
fred-fri
|
bd526d3652
|
refactoring
|
2014-01-24 20:04:14 +09:00 |
|
|
|
ccc0a355c3
|
Fixed templates to use criteria instead of answers.
|
2014-01-24 11:46:27 +01:00 |
|
Leo
|
7e595822ec
|
*DataInitializer now creates individual criteria
*new service logic for reviewer grading reports
*database migration scripts
|
2013-12-18 16:28:49 +01:00 |
|
|
|
d3a66f9272
|
Removed code from ProjectType.
|
2013-12-10 16:43:11 +01:00 |
|
Per Lundholm
|
451607cd5c
|
Renamed DegreeLevel to ProjectType
|
2013-12-09 17:10:46 +01:00 |
|
Per Lundholm
|
e2ac1fe48f
|
Renamed DegreeLevel to ProjectType
|
2013-12-09 15:52:43 +01:00 |
|
Per Lundholm
|
46ea4f3b25
|
Renamed ProjectClass to DegreeLevel
|
2013-12-09 10:07:42 +01:00 |
|
|
|
c6cc29d3a3
|
Split grading criterion templates into two types (individual and project).
|
2013-12-04 13:46:18 +01:00 |
|
|
|
99c2b306ff
|
Grade is automatically calculated for A-F (but not Fx)
|
2013-12-04 13:38:54 +01:00 |
|
|
|
283301349e
|
Refactor of domain model related to grading reports complete.
|
2013-12-04 11:58:14 +01:00 |
|
|
|
97c1f9858e
|
Refactored out a base class from GradingCriterionTemplate.
|
2013-12-04 10:14:15 +01:00 |
|
|
|
ae99c46b04
|
Renamed GradingAnswer to GradingCriterion.
|
2013-12-04 09:30:52 +01:00 |
|
|
|
23caf5df5d
|
Renamed GradingCriterion to GradingCriterionTemplate.
|
2013-12-04 09:22:24 +01:00 |
|
|
|
a3214e3559
|
Creating GradingReports is done from a template.
|
2013-12-03 17:00:25 +01:00 |
|
|
|
29a06665ea
|
Removed description from GradingReportTemplate.
|
2013-12-03 16:23:25 +01:00 |
|
Leo
|
da6d050afd
|
grading report is one per author and project
|
2013-12-02 16:52:32 +01:00 |
|
Emil Siverhall
|
7f31832378
|
pdf download of finished grading reports
|
2013-11-28 16:27:57 +01:00 |
|
fred-fri
|
889bf111f5
|
cleanup
|
2013-11-28 16:44:58 +09:00 |
|
fred-fri
|
4f21be7075
|
fixes
|
2013-11-28 15:28:40 +09:00 |
|
Leo
|
dbc88eea54
|
fixed a null pointer in a test
|
2013-11-26 14:18:40 +01:00 |
|
|
|
ac08bc8f95
|
Updated date format in the jasper generated pdf.
|
2013-11-14 16:39:34 +01:00 |
|
Emil Siverhall
|
996919f1fe
|
added grading report export object to check if a grading report has been exported to daisy
|
2013-11-14 11:15:41 +01:00 |
|
|
|
0bbfb0244a
|
Went back in jasperreports version since the latest has a faulty dependency on javax.servlet.
|
2013-11-13 19:11:25 +01:00 |
|
|
|
3882cf62b5
|
Bad niklas causing compilation errors.
|
2013-11-13 19:10:40 +01:00 |
|
|
|
85cb365956
|
Added worker to send grading reports as PDFs to daisy.
|
2013-11-13 16:52:29 +01:00 |
|
