DMC/scipro
7
0
Fork 0
Code Issues 29 Pull Requests 1 Actions Projects 1 Wiki Activity
4,290 Commits 5 Branches 412 Tags
Commit Graph

4290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Vahlman
b60f3d61c8 The sorting SQL:s now returns the same number of employees when sorting on keyword as returned when sorting on last name. 2012-04-14 11:20:59 +02:00
Tom Vahlman
cdc50fae90 The sorting SQL:s now returns the same number of employees when sorting on keyword as returned when sorting on last name. 2012-04-14 11:18:02 +02:00
Fredrik Friis
3ad8621ae9 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2012-04-13 22:03:20 +09:00
Fredrik Friis
081cfac35a Merge branch 'feature' into develop 2012-04-13 22:02:13 +09:00
Fredrik Friis
7849c8ff54 actually it works, you just need to add some waiting in between updating dates 2012-04-13 22:01:00 +09:00
Fredrik Friis
68f76ae00b testing, one method doesnt seem to work 2012-04-13 21:38:02 +09:00
Tom Vahlman
b7c092aaaa The sorting should always be in descending order for numbers when first clicking on a new search term, i. e. another Keyword type (area or regular). SQl (and not HQL) must be used in the database tier because of the implementation of Employee#keywords. 2012-04-13 14:36:48 +02:00
Tom Vahlman
1ed21f3b75 The sorting should always be in descending order for numbers when first clicking on a new search term, i. e. another Keyword type (area or regular). 2012-04-13 14:35:13 +02:00
Fredrik Friis
335125dc32 added sql to current sql 2012-04-13 19:16:00 +09:00
Fredrik Friis
29d25873a8 using capital letters for indications to make them more visible 2012-04-13 19:06:21 +09:00
Fredrik Friis
66889d017e changed indication text to new answer instead of change 2012-04-13 18:57:48 +09:00
Fredrik Friis
9d0314c77d works for supervisor too. made supervisor project checklist page a bit wider. 2012-04-13 18:55:01 +09:00
Fredrik Friis
ce82fe1bb9 indication is removed if the user is the one who makes a change in the checklist 2012-04-13 18:45:05 +09:00
Fredrik Friis
d50681c2b7 indication is now removed when user opens the checklist 2012-04-13 18:33:25 +09:00
Fredrik Friis
6aaa4dd4f2 mail got nice url 2012-04-13 11:40:51 +09:00
Emil Siverhall
f2e572876e Merge branch 'logFix' into develop 
* logFix:
  added logger for successful mail events
 2012-04-12 08:30:59 +02:00
Emil Siverhall
ae33f381fd added logger for successful mail events 2012-04-12 08:30:29 +02:00
Fredrik Friis
906a39096c the list of checklists now shows if there has been a change since users last open 2012-04-12 14:01:40 +09:00
Fredrik Friis
17752d6827 edited service method 2012-04-12 13:48:40 +09:00
Fredrik Friis
5d1c34515a added service methods 2012-04-12 13:46:28 +09:00
Fredrik Friis
cfe7e42f65 added user date hashmap to checklist 2012-04-12 13:39:07 +09:00
Fredrik Friis
dbe3384788 checklist repo and service layer added 2012-04-12 13:36:50 +09:00
Tom Vahlman
411b52029c Added changed repository method. 2012-04-11 13:48:38 +02:00
Niklas Herder
7c945cca3f Trying to fix HQL. 2012-04-11 13:31:57 +02:00
Tom Vahlman
5040f9d194 Removed a test which does not work because ORDER BY does not work in hsqldb when the order-by field is not a String. 2012-04-11 09:43:22 +02:00
Tom Vahlman
66bc17f159 Removed a test which does not work because ORDER BY does not work in hsqldb when the order-by field is not a String. 2012-04-11 00:05:57 +02:00
Tom Vahlman
4dbab3917f Removed a test which does not work because ORDER BY does not work in hsqldb when the order-by field is not a String. 2012-04-11 00:04:39 +02:00
Tom Vahlman
6716b52c66 Removed a test which does not work because ORDER BY does not work in hsqldb when the order-by field is not a String. 2012-04-10 23:56:11 +02:00
Tom Vahlman
eb9d2a52ce Using a native SQL query to sort the Employees based on keywords in the statistics page. 2012-04-10 22:37:26 +02:00
Tom Vahlman
2066e433e9 Merge remote-tracking branch 'origin/develop' into develop 2012-04-10 16:47:29 +02:00
Tom Vahlman
0225f1dd59 Using a native SQL query to sort the Employees based on keywords in the statistics page. 2012-04-10 16:47:08 +02:00
Emil Siverhall
80cace99c1 Merge branch 'importJobs' into develop 2012-04-10 16:12:55 +02:00
Emil Siverhall
186706136c removal of local participants that is not available at remote system now works for opponents and active participations as well. 2012-04-10 16:10:59 +02:00
Emil Siverhall
9bdd50215a changes to import workers to make sure authors, supervisors, co-supervisors and reviewers that exist in scipro but not in daisy is being removed. 2012-04-10 14:57:39 +02:00
Tom Vahlman
5348f25e54 Removed old code. 2012-04-10 12:59:17 +02:00
Fredrik Friis
2ba3fadd95 fixed bug that stopped paged from rendering 2012-04-10 16:28:16 +09:00
Fredrik Friis
15e69273e4 fixed some css bugs 2012-04-10 16:18:50 +09:00
Fredrik Friis
64e6151a30 fixed the go back to my projects lines 2012-04-10 16:06:48 +09:00
Fredrik Friis
b50e7f46f9 fixed bug that made radiobuttons appear in the wrong place 2012-04-10 15:46:48 +09:00
Fredrik Friis
42ebcff6fe fixed a panel that wouldnt render 2012-04-10 15:28:02 +09:00
Fredrik Friis
d4f5a3d5a6 fixed css bug that stopped a panel from rendering 2012-04-10 13:58:57 +09:00
Fredrik Friis
7efd111cef added soft border around whole window 2012-04-10 13:11:14 +09:00
Fredrik Friis
191dad55db fixed css bug in a ul class 2012-04-10 13:04:53 +09:00
Fredrik Friis
4ae44b2b7d fixed second level menu css bug 2012-04-10 13:03:47 +09:00
Fredrik Friis
985e5e0f10 removed side borders, made content wider 2012-04-10 12:52:16 +09:00
Fredrik Friis
0749edf885 removed all roundness 2012-04-10 12:44:20 +09:00
Tom Vahlman
d0bbf6df64 The sorting should preferably be done by the API instead of the application, though this version is not correct yet. 2012-04-09 17:39:30 +02:00
Tom Vahlman
d0e1e03bcd Added a new test for queryDslPredicateExecutor.findAll. 2012-04-08 23:57:50 +02:00
Tom Vahlman
b2e2705f4f Added a new test for queryDslPredicateExecutor.findAll. 2012-04-08 23:57:15 +02:00
Tom Vahlman
ac625ed62c Added a new test for queryDslPredicateExecutor.findAll. 2012-04-08 23:55:37 +02:00