6396 Commits

Author SHA1 Message Date
Emil Siverhall
76bcc0b1ec ProjectIdeas doesnt have a completed status so when adding match objects we need to check if the confirmed ideas are connected to projects. if so, add status completed. 2013-01-25 12:01:02 +01:00
Emil Siverhall
b6e065e2b5 ProjectIdea.Status.PUBLISHED translates to NewIdea.Status.SUGGESTED (which is not implemented in our process as of now) 2013-01-25 12:01:00 +01:00
Emil Siverhall
08742dc917 added sql changes to NewIdea in current.sql 2013-01-25 12:00:58 +01:00
Emil Siverhall
f223e38d6d added migration method to old ProjectIdeas as well 2013-01-25 11:59:55 +01:00
Emil Siverhall
1eac44df4c matched ideas on supervisor new idea start page needs to include completed ideas as well. 2013-01-25 11:59:53 +01:00
Emil Siverhall
5457b2b10a fixed some npe's that came with the migrated ideas since language isn't optional anymore 2013-01-25 11:59:50 +01:00
Emil Siverhall
7fece6a4d3 added link to migrate supervisor idea to our system maintenance page 2013-01-25 11:59:48 +01:00
Emil Siverhall
31f8c14be6 migration method for supervisor ideas is ready to be tested.. 2013-01-25 11:59:46 +01:00
Emil Siverhall
aa02e84562 added a new migrateMatch period that takes date created as well, since we need to create new match objects with the same dateCreated as the old idea match 2013-01-25 11:59:43 +01:00
Emil Siverhall
2d11b4d3d2 language and research area are now optional on the NewIdea entity. migration from old ideas would fail otherwise 2013-01-25 11:59:41 +01:00
Emil Siverhall
3f768318b1 added translation methods from SupervisorIdeas ideaStatus and ProjectIdeas status to NewMatch.Status enums. need this to migrate the old ideas 2013-01-25 11:59:38 +01:00
Emil Siverhall
89daeeaa78 new constructor for NewIdeaParticipation to make the code a bit cleaner 2013-01-25 11:59:36 +01:00
9caf226545 Test refactoring.
Support mail contains supervisor name.
2013-01-25 11:42:55 +01:00
05553cdf1a Support mail sender is now SciPro 2013-01-25 11:12:02 +01:00
52535a439a Support mail contains error message test 2013-01-25 11:09:02 +01:00
58767db775 ApiClient now parses the daisy error message from the response if something went wrong. 2013-01-25 10:47:38 +01:00
35c1d5432d More tests for IdeaExportWorker 2013-01-25 10:15:21 +01:00
fred-fri
9ea159fdde removed unused css 2013-01-25 17:57:11 +09:00
03beb9ca14 Notifications for failed exports 2013-01-25 09:56:19 +01:00
fred-fri
cf3a2ed68c removed unused css 2013-01-25 17:55:32 +09:00
fred-fri
273dc626c5 made shortening of titles in tables work as it should 2013-01-25 17:53:09 +09:00
0d1404304a Renamed NotificationSource#source to message to better communicate what it is. 2013-01-25 09:48:11 +01:00
71f643767f Notification URLs are now specified in a properties file and spring injected into NotificationSourceURL bean which can be injected where needed. 2013-01-25 09:39:22 +01:00
fred-fri
c8359f1c14 notify line was missing from a notify method 2013-01-25 15:48:01 +09:00
fred-fri
5214118ec3 Merge branch 'release20130125' 20130125 2013-01-25 12:51:47 +09:00
fred-fri
3a3fefb1ff added new sql file 2013-01-25 12:41:34 +09:00
ff82a57a45 Test and behaviour for notifications for successful idea exports 2013-01-24 16:01:07 +01:00
0a0fa5eecb Test to verify notifying behaviour in IdeaExportWorker 2013-01-24 15:45:14 +01:00
9f63458a6c Refactoring 2013-01-24 15:23:04 +01:00
Emil Siverhall
1bfbc66209 Merge branch 'smallFix' into develop 2013-01-24 15:11:23 +01:00
Emil Siverhall
77e537e82a changed to show first meeting room info instead of optional description field in admin new idea details dialog 2013-01-24 15:11:15 +01:00
1a59b9275b Transactions, successful runs, logging 2013-01-24 14:57:11 +01:00
6dfab3e744 Initial worker implementation. 2013-01-24 14:49:46 +01:00
77dde031a5 New entity holding the export status 2013-01-24 14:48:37 +01:00
4c0a8f8092 Builders to help setup tests faster 2013-01-24 14:46:51 +01:00
Emil Siverhall
72451d3496 Merge branch 'showSupervisor' into develop 2013-01-24 13:46:42 +01:00
Emil Siverhall
45558d9401 prepared supervisor settings panel to use newidea count numbers (if we gonna use this instead of targets/app period.. 2013-01-24 13:35:21 +01:00
Emil Siverhall
38fe922dcc removed ExpiredIdeaParticipationsWorker from scheduler since we gonna skip that one as well for now 2013-01-24 12:49:36 +01:00
Emil Siverhall
4d8df6f846 added new getAvailability method for NewIdea+Projects count. we need to use this one since we dont have anything ready for targets per app period yet 2013-01-23 21:08:54 +01:00
Emil Siverhall
ecfbbae8d6 some alignments to make all filter options fit on one row 2013-01-23 21:07:28 +01:00
Emil Siverhall
2090507898 some changes to the visibility of the match3.5 start page for supervisors. when entering the page as a sysadmin without employee role, the content was weird. now we wont show anything if the employee role is missing 2013-01-23 18:07:44 +01:00
Emil Siverhall
c88ef78602 we want to show the name of the supervisor when students select supervisor submitted ideas 2013-01-23 12:45:57 +01:00
Emil Siverhall
e0ed807a09 Merge branch 'inactivation' into develop 2013-01-23 11:09:07 +01:00
Emil Siverhall
892444511a removed the watson completion worker from our scheduler. match 3.5 does not have this worker at all. 2013-01-23 11:02:42 +01:00
Emil Siverhall
410ffd2a0d Merge branch 'connectProjectToNewIdea' into develop 2013-01-23 10:57:20 +01:00
Emil Siverhall
dc9a5aa965 import method to connect projects created in daisy with NewIdea-objects if a match is found (supervisor, projectclass and authors). 2013-01-23 10:57:02 +01:00
1a170177eb Fixed icon paths to relative instead of absolute 2013-01-23 09:51:00 +01:00
c60de5093b Added HTML pages for Shibboleth and ShibbolethInitialization 2013-01-23 09:44:45 +01:00
5a1da3019c Merge branch 'feature/notifications/request_deleted' into develop
Conflicts:
	src/main/java/se/su/dsv/scipro/notifications/MailFormatter.properties
2013-01-23 09:34:05 +01:00
fred-fri
dce46f95f4 removed html from notifications mail 2013-01-23 13:07:33 +09:00