Commit Graph

5105 Commits

Author SHA1 Message Date
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
Fredrik Friis
18d5644282 if files have the isThesisFile attribute, the filedescription gets it too 2012-04-17 13:08:14 +09:00
Fredrik Friis
f226d5a487 added isthesisfile attribute to filedescription class 2012-04-17 13:04:41 +09:00
Fredrik Friis
321e9fa493 can now store files with the new node type definition 2012-04-17 12:50:25 +09:00
Fredrik Friis
47e5210013 added isthesisfile boolean attribute to node type definition 2012-04-17 12:34:05 +09:00
Emil Siverhall
810bf7cd84 Merge branch 'removeMySettings' into develop 2012-04-16 12:38:38 +02:00
Emil Siverhall
1c5d4401bc removed My settings tab from service menu panel. Did not remove the class file yet if we need settings page in the future. 2012-04-16 12:36:12 +02:00
Emil Siverhall
ef8094ff3c Merge branch 'opponentBugFix' into develop 2012-04-16 11:35:27 +02:00
Emil Siverhall
e3cc5b63a9 fixed rendering bug on project opposition page 2012-04-16 11:35:07 +02:00
Emil Siverhall
c00c7e7b22 Merge branch 'studentMyProjects' into develop 2012-04-16 11:22:55 +02:00
Emil Siverhall
b8b426a9b9 removed unused imports and unused class file 2012-04-16 11:21:01 +02:00
Emil Siverhall
65aa8195a4 automatically redirect authors with 1 or 0 projects to appropriate project details page or project idea page 2012-04-16 11:20:59 +02:00
Emil Siverhall
8695d5ef38 code cleanup and restructuing of the options in tab menu panels 2012-04-16 11:20:57 +02:00
Emil Siverhall
3c7be4a34d more removal of scipro sesssion get active project code 2012-04-16 11:20:55 +02:00
Emil Siverhall
91515f7d15 changes to project opposition page to avoid using the sessions active project 2012-04-16 11:20:53 +02:00
Emil Siverhall
e4e4cdb30d mounted url for new project details sub page 2012-04-16 11:20:49 +02:00
Emil Siverhall
070be3c864 added opposition page to sub menu 2012-04-16 11:20:47 +02:00
Emil Siverhall
5aab5c27f4 added correct menu highlighting to peer pages as well 2012-04-16 11:20:45 +02:00
Emil Siverhall
19a2fa072b added correct menu highlighting for sub tabs in author - my projects 2012-04-16 11:20:43 +02:00
Emil Siverhall
44e672c1c2 changes to project checklist page to make them render with new hierarchy 2012-04-16 11:20:41 +02:00
Emil Siverhall
4206503b00 more major refactoring work of the author part of scipro. still a lot to be done, but my projects exist with sub tabs for each project 2012-04-16 11:20:39 +02:00
Emil Siverhall
04fdd8e5f4 added spring data repos for projects and student roles. also some service implementations in the project service class 2012-04-16 11:20:37 +02:00