Emil Siverhall
|
ecdcd35c84
|
added new repos, services and implementations for peer reviews and peer requests. methods that is being used in supervisor peer my projects is added as well
|
2012-04-23 16:16:54 +02:00 |
|
Emil Siverhall
|
d84375ceb4
|
created new panel for supervisor peer project details since the two that were used before needed major refactoring
|
2012-04-23 16:16:52 +02:00 |
|
Emil Siverhall
|
9384cf8b31
|
some improvements to author auto complete when field is cleared after previous input
|
2012-04-23 16:16:48 +02:00 |
|
Emil Siverhall
|
6d9ef10700
|
added filtering on authors and free text search on project title to supervisor-peer-my projects
|
2012-04-23 16:16:46 +02:00 |
|
Emil Siverhall
|
809a2c0ee4
|
added new service methods and a few repos
|
2012-04-23 16:16:44 +02:00 |
|
Emil Siverhall
|
035c2fab84
|
started with refactoring of supervisor peer my projects. code restructuring, more filtering and use of new repos
|
2012-04-23 16:16:41 +02:00 |
|
Niklas Herder
|
fb16361754
|
Skeleton for rest testing
|
2012-04-23 14:29:14 +02:00 |
|
Niklas Herder
|
0c20a6961f
|
Add jersey-json dependency, eliminate duplicate deps for jackson.
|
2012-04-23 14:28:15 +02:00 |
|
Emil Siverhall
|
5f56def98c
|
Merge branch 'cleanup' into develop
* cleanup:
removed unnecessary sys out printlines that filled up the logs
|
2012-04-22 21:30:53 +02:00 |
|
Emil Siverhall
|
3eddc8693e
|
removed unnecessary sys out printlines that filled up the logs
|
2012-04-22 21:30:25 +02:00 |
|
Fredrik Friis
|
f9e32cd0ee
|
added supervisor interest to watsonpanel
|
2012-04-20 12:21:08 +09:00 |
|
Fredrik Friis
|
3894652cb6
|
changed wording of match status
|
2012-04-20 11:42:01 +09:00 |
|
Fredrik Friis
|
f15588f724
|
new update db file
20120420
|
2012-04-20 10:52:49 +09:00 |
|
Fredrik Friis
|
6692d65585
|
Merge branch 'css' into develop
|
2012-04-20 10:27:51 +09:00 |
|
Fredrik Friis
|
566c6672f4
|
use same background header as in footer
|
2012-04-19 15:37:00 +09:00 |
|
Fredrik Friis
|
521743a4ce
|
changed span-22s to span-24s except in css files
|
2012-04-19 15:34:54 +09:00 |
|
Emil Siverhall
|
1982879115
|
Merge branch 'importRoleFix' into develop
* importRoleFix:
small bug fix when translating between participant dto and project member
|
2012-04-18 19:33:44 +02:00 |
|
Emil Siverhall
|
0263ac39ad
|
small bug fix when translating between participant dto and project member
|
2012-04-18 19:33:18 +02:00 |
|
Fredrik Friis
|
b1d0e8fa9c
|
added space to admin pages to they dont flow into the menu
|
2012-04-18 15:24:56 +09:00 |
|
Fredrik Friis
|
ee349627b7
|
added some spaces to supervisor pages so they dont flow into menu
|
2012-04-18 15:21:33 +09:00 |
|
Fredrik Friis
|
5ea685e224
|
added space back under peer-title
|
2012-04-18 15:13:00 +09:00 |
|
Fredrik Friis
|
2e4569a2a5
|
added space to some pages
|
2012-04-18 15:10:47 +09:00 |
|
Fredrik Friis
|
bc89f96ad0
|
removed another ugly space
|
2012-04-18 15:03:27 +09:00 |
|
Fredrik Friis
|
c3a081c05f
|
removed ugly space between second menu and contents below
|
2012-04-18 15:02:17 +09:00 |
|
Fredrik Friis
|
ff04470e14
|
some cleanup
|
2012-04-18 14:52:40 +09:00 |
|
Fredrik Friis
|
015674d15a
|
added background to container, making the window stand out better against the white background
|
2012-04-18 14:48:53 +09:00 |
|
Fredrik Friis
|
62728d8121
|
major changes to top panel, making it smaller and removing png logo in favor of serif font logo
|
2012-04-18 14:46:11 +09:00 |
|
|
|
d9d743a00c
|
Merge branch 'newMatchFeatures' into develop
Conflicts:
src/main/java/se/su/dsv/scipro/match/GreedyMatchingAlgorithm.java
|
2012-04-18 02:49:24 +02:00 |
|
|
|
1dae8fb66e
|
Added null checkers in Pair.compareTo and made it slightly more efficient.
|
2012-04-18 02:39:44 +02:00 |
|
|
|
e03044ce8c
|
Matching algorithm now takes into consideration whether or not the supervisor in a match is interested in the same match object's project idea, and sorts matches accordingly.
|
2012-04-18 01:56:45 +02:00 |
|
|
|
8c806bc1b6
|
IntelliJ pushed to the wrong remote. Sorry! (changes reverted)
|
2012-04-18 01:40:43 +02:00 |
|
|
|
05ecc9c39a
|
Matching algorithm now takes into consideration whether or not the supervisor in a match is interested in the same match object's project idea, and sorts matches accordingly.
|
2012-04-18 01:29:29 +02:00 |
|
|
|
b7913bb892
|
String case mismatch of ProjectClass constants and actual database rows ignored by using equalsIgnoreCase. Failing test is now fixed.
|
2012-04-18 01:04:41 +02:00 |
|
|
|
111b77dc76
|
Fixed accidental inversion of boolean expression on project idea vs supervisor availability level comparison.
|
2012-04-18 01:02:04 +02:00 |
|
|
|
5ad3d886a6
|
Removed obsolete assertion from testAvailabilityLevelMatching.
|
2012-04-18 00:55:45 +02:00 |
|
|
|
b1cab20db3
|
Removed assignment of obsolete weight field value.
|
2012-04-18 00:50:23 +02:00 |
|
|
|
48f3bdfa2a
|
Modified method of field access for consistency on two more rows.
|
2012-04-18 00:45:55 +02:00 |
|
|
|
7de15c97bf
|
Corrected a few confusing comments and grammatical errors.
|
2012-04-18 00:38:47 +02:00 |
|
|
|
013483d804
|
Removed weight for common research area.
|
2012-04-18 00:36:52 +02:00 |
|
|
|
c7f182b345
|
Modified method of field access in Pair.compareTo for consistency.
|
2012-04-18 00:31:01 +02:00 |
|
|
|
f9f32d969c
|
Wrote a more specific testCommonResearchAreaScoring and renamed old test to reflect the difference (Match).
|
2012-04-17 23:58:01 +02:00 |
|
|
|
a1a311bc8e
|
Wrote a test for scoring of common research ares (Match).
|
2012-04-17 23:41:51 +02:00 |
|
|
|
0f3653a43d
|
Added availabilityLevelPoints to Weights.
|
2012-04-17 21:33:29 +02:00 |
|
|
|
059ea1fb30
|
Wrote test testAvailabilityLevelMatching.
|
2012-04-17 21:31:39 +02:00 |
|
Fredrik Friis
|
64b028cee4
|
added updates to db to current.sql file
|
2012-04-17 14:00:12 +09:00 |
|
Fredrik Friis
|
90c40ded02
|
some gui cleanup
|
2012-04-17 13:42:30 +09:00 |
|
Fredrik Friis
|
d1270f0f05
|
forgot to set the final boolean value when storing to the one recieved, was hard coded to true lol
|
2012-04-17 13:40:57 +09:00 |
|
Fredrik Friis
|
c8f158599b
|
added checkbox for choosing whether a file is thesis file or not, added false to most storefile method calls
|
2012-04-17 13:36:39 +09:00 |
|
Fredrik Friis
|
f646324722
|
changed repo methods to receive boolean isthesisfile. now we must send it from everywhere we access those methods
|
2012-04-17 13:29:11 +09:00 |
|
Fredrik Friis
|
21093fa61d
|
file table now indicates whether file is thesisfile or not
|
2012-04-17 13:18:49 +09:00 |
|
