Emil Siverhall
|
621d163b37
|
started to work on new component for keyword filtering used in supervisor settings tab. using dropdown to save space and render list of choices underneath
|
2012-03-26 15:12:43 +02:00 |
|
Emil Siverhall
|
ee1f668baf
|
started with some refactoring work on admin - supervisor settings
|
2012-03-26 15:12:42 +02:00 |
|
Emil Siverhall
|
c7f681cda7
|
removed some hardcoded project class values
|
2012-03-26 15:12:39 +02:00 |
|
Tom Vahlman
|
75ecb358e2
|
Changed size of window for adding supervisor interest + refactored a complicated method.
|
2012-03-26 13:51:21 +02:00 |
|
Fredrik Friis
|
7914adc5a7
|
some gui improvements
|
2012-03-26 18:50:38 +09:00 |
|
Tom Vahlman
|
93b2db6a59
|
The new data tables are now created automatically so we dont need this property any more.
|
2012-03-26 11:44:57 +02:00 |
|
Fredrik Friis
|
8b420811fa
|
changed name of page
|
2012-03-26 18:41:45 +09:00 |
|
Tom Vahlman
|
158c53ef7a
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminStatisticsPage.java
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaPage.java
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorUnmatchedProjectIdeaPage.java
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanel.java
|
2012-03-26 11:37:04 +02:00 |
|
Tom Vahlman
|
64b6b2a4ef
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
Conflicts:
src/test/java/se/su/dsv/scipro/configuration/TestDeployConfiguration.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestActivityPlanDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestBoardMessageDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestCategoryDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestCheckListTemplateDao.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestCheckPlagiarismEventDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestCommentThreadDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestFinalSeminarDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestMessageBoardDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestPeerReviewDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestPrivateMessageDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestProjectDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestProjectPartnerDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestRatableDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestRecipientDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestResourceDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestRoleDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestScheduleTemplateDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestStringResourceDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestTagDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestUserDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestWebNotificationDaoJPA.java
src/test/java/se/su/dsv/scipro/data/dao/jpa/TestQuery.java
src/test/java/se/su/dsv/scipro/data/dao/jpa/TestQuerySet.java
src/test/java/se/su/dsv/scipro/dataproviders/TestSortableDataProvider.java
src/test/java/se/su/dsv/scipro/match/TestGreedyMatchingAlgorithm.java
src/test/java/se/su/dsv/scipro/match/TestMatcher.java
src/test/java/se/su/dsv/scipro/match/dao/TestApplicationPeriodDao.java
src/test/java/se/su/dsv/scipro/match/dao/TestAuthorDao.java
src/test/java/se/su/dsv/scipro/match/dao/TestExemptionDao.java
src/test/java/se/su/dsv/scipro/match/dao/TestKeywordDao.java
src/test/java/se/su/dsv/scipro/match/dao/TestMatchDao.java
src/test/java/se/su/dsv/scipro/match/dao/TestProjectIdeaDao.java
src/test/java/se/su/dsv/scipro/match/dao/TestSupervisorDao.java
src/test/java/se/su/dsv/scipro/match/dataobject/TestProjectIdea.java
|
2012-03-26 11:36:34 +02:00 |
|
Tom Vahlman
|
08e5a59e4e
|
Added a feedback panel to give users information when a supervisor has reported interest to supervise a project idea + removed text area which we not should use.
|
2012-03-26 11:36:19 +02:00 |
|
Fredrik Friis
|
625e3fd1e3
|
new improvements
|
2012-03-26 18:25:54 +09:00 |
|
Tom Vahlman
|
1065fd4131
|
Embeddable class Watson should be in a stand alone class file.
|
2012-03-26 11:12:10 +02:00 |
|
Tom Vahlman
|
7bedf545e0
|
Embeddable class Watson should be in a stand alone class file.
|
2012-03-26 10:54:08 +02:00 |
|
Emil Siverhall
|
8971e299df
|
changed api url to make supervisor and reviewer imports work correctly
|
2012-03-26 09:34:12 +02:00 |
|
Fredrik Friis
|
fbf4023c09
|
some markup improvements
|
2012-03-26 15:34:51 +09:00 |
|
Fredrik Friis
|
25f9417c5e
|
project idea status matrix pretty complete
|
2012-03-26 15:30:03 +09:00 |
|
Fredrik Friis
|
d26cc80920
|
implementing new service method
|
2012-03-26 15:25:08 +09:00 |
|
Fredrik Friis
|
a4c1279b8c
|
service class seems to work
|
2012-03-26 14:19:15 +09:00 |
|
Fredrik Friis
|
affdf0d2f7
|
adding a service to a panel now works
|
2012-03-26 14:11:02 +09:00 |
|
Fredrik Friis
|
f83fb79543
|
some refactoring
|
2012-03-26 13:36:11 +09:00 |
|
Fredrik Friis
|
64c8be3954
|
spring error when adding bean to a panel
|
2012-03-26 13:27:15 +09:00 |
|
Fredrik Friis
|
7518bc62cd
|
trying implementing a method
|
2012-03-26 13:22:16 +09:00 |
|
Fredrik Friis
|
8f8b70e7cf
|
new separation
|
2012-03-26 13:18:37 +09:00 |
|
Fredrik Friis
|
d6349d1497
|
redoing
|
2012-03-26 13:16:28 +09:00 |
|
Fredrik Friis
|
8654731f43
|
beginning to implement new panel, starting with service
|
2012-03-26 12:51:15 +09:00 |
|
Fredrik Friis
|
92f638839e
|
added new page and panel to statistics
|
2012-03-26 12:10:25 +09:00 |
|
Fredrik Friis
|
c81fdef366
|
added new panel and its markup
|
2012-03-26 12:02:42 +09:00 |
|
Fredrik Friis
|
de51ce9d7c
|
added html for new page
|
2012-03-26 12:00:59 +09:00 |
|
Fredrik Friis
|
94d76ba37f
|
added new page
|
2012-03-26 12:00:06 +09:00 |
|
Fredrik Friis
|
f74bf27a9b
|
renamed page
|
2012-03-26 11:58:49 +09:00 |
|
Fredrik Friis
|
15403a57c8
|
changed name of a panel
|
2012-03-26 11:56:07 +09:00 |
|
Fredrik Friis
|
d91198cd6a
|
added separate repo and service packages to springdata package
|
2012-03-26 10:58:31 +09:00 |
|
Fredrik Friis
|
fbecde2f44
|
added querydsl to projectidearepo
|
2012-03-26 10:53:40 +09:00 |
|
Tom Vahlman
|
dc445b8450
|
Refactoring and removing unused variables.
|
2012-03-24 21:33:35 +01:00 |
|
Tom Vahlman
|
4b20838392
|
Added an information text that interest already is added + disabled the "add"-link when this is the case.
|
2012-03-24 20:49:58 +01:00 |
|
Tom Vahlman
|
ec76c00210
|
Added a check that interest not is already added before saving supervisor interest to the database table.
|
2012-03-24 20:48:17 +01:00 |
|
Tom Vahlman
|
79d856ebea
|
Just added line breaks
|
2012-03-24 20:46:49 +01:00 |
|
Tom Vahlman
|
0604f4084b
|
Removed unused statement.
|
2012-03-24 15:19:27 +01:00 |
|
Tom Vahlman
|
397e90d7bc
|
Auto complete component should have weaker accessibility.
|
2012-03-24 15:12:45 +01:00 |
|
Tom Vahlman
|
2bb15b94ee
|
Changed button text.
|
2012-03-24 15:06:24 +01:00 |
|
Tom Vahlman
|
abed050e41
|
Added the new property supervisorInterest to the methods equals, hashcode and toString.
|
2012-03-24 15:03:24 +01:00 |
|
Tom Vahlman
|
e6490d31a3
|
Added suppress statements to avoid IDEA complaints.
|
2012-03-24 15:02:14 +01:00 |
|
Tom Vahlman
|
1a363128ac
|
There should not be any confirmation message when the input data in the auto complete component is invalid.
|
2012-03-24 12:13:35 +01:00 |
|
Tom Vahlman
|
38183ae1d3
|
Removed "unused" if-statement.
|
2012-03-24 11:04:38 +01:00 |
|
Tom Vahlman
|
e9a064bf0c
|
Refactored "heavy" method implementation.
|
2012-03-24 11:02:30 +01:00 |
|
Tom Vahlman
|
61d6c0a8bf
|
Refactored incorrect method implementation.
|
2012-03-24 10:54:00 +01:00 |
|
Tom Vahlman
|
84e86658db
|
Added a supress statement to avoid IDEA complaints.
|
2012-03-24 10:48:40 +01:00 |
|
Tom Vahlman
|
6933a03d83
|
Supervisors should be able to report there interest for supervising a certain project idea.
|
2012-03-23 22:46:17 +01:00 |
|
Tom Vahlman
|
f0a43fdf04
|
Removed unnecessary columns.
|
2012-03-23 20:29:35 +01:00 |
|
Tom Vahlman
|
6751ea7f63
|
Added serialverionID which were missing.
|
2012-03-23 20:28:58 +01:00 |
|