Fredrik Norberg
5687ba7b2a
added filter functionality for projectIdea dataview
2011-12-05 09:35:39 +01:00
Fredrik Norberg
4071fc3670
half done with the projectIdea dataprovider and the 3 dataViews on the projectManagementpage
2011-12-05 09:35:39 +01:00
Fredrik Norberg
169f90d7d9
started with admin dataviews
2011-12-05 09:35:39 +01:00
Fredrik Norberg
eaed2f368f
added dataproviders for match and project idea
2011-12-05 09:35:39 +01:00
Fredrik Norberg
c0f21df315
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
added improvements to add all algorithm
changed sentence, request from janne
2011-12-05 09:35:08 +01:00
Fredrik Friis
a602981be2
some gui changes
2011-12-05 17:03:33 +09:00
Fredrik Friis
9f2c822ee4
some refactoring... multiple filtering seems to work
2011-12-05 16:55:27 +09:00
Emil Siverhall
7bf1500152
added creation of default languages to DataInitialiser
2011-12-05 08:48:27 +01:00
Fredrik Friis
976db8b5c0
fixed a filtering bug
2011-12-05 16:27:00 +09:00
Fredrik Friis
ec81959e0a
sql exception when filtering and then removing filtering on a category
2011-12-05 16:08:46 +09:00
Fredrik Friis
d99d2c3059
peer filtering implemented
2011-12-05 15:49:43 +09:00
Fredrik Friis
ec94d9cf7e
added improvements to add all algorithm
2011-12-05 09:32:30 +09:00
Fredrik Friis
62214d4d44
changed sentence, request from janne
2011-12-05 08:45:22 +09:00
Emil Siverhall
3e4fe99069
working on some submission logic
2011-12-04 23:34:18 +01:00
Emil Siverhall
c32b77997e
Merge branch 'develop' into projectIdeaSubmission
...
* develop:
Fixed preferred supervisor database storage
added functionality to order checklistTemplates and they are now added in the correct order
Added so that only available supervisors are forwarded to matching strategy
Changed so that availabily uses real object
Added matcher and matching strategy
2011-12-04 19:47:52 +01:00
Fredrik Norberg
992d67f6dd
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Fixed preferred supervisor database storage
2011-12-02 09:14:37 +01:00
Robin Eklund
78b7513f49
Minor fixes.
2011-12-01 16:34:12 +01:00
Robin Eklund
786e6b0ea0
Added a lot of stuff to support basic-auth and temporary bypassing of certificate handling (this part will need to be removed)
2011-12-01 15:58:14 +01:00
Robin Eklund
75802d47f7
Minor formatting changes
2011-12-01 13:47:37 +01:00
Robin Eklund
39a4bc936f
Duplication issues resolved, started deprecating old value-objects.
2011-12-01 13:00:45 +01:00
Daniel Hasselrot
3c12262ea5
Merge branch 'preferedsupervisor' into develop
2011-12-01 09:47:22 +01:00
Daniel Hasselrot
2cf42d1742
Fixed preferred supervisor database storage
2011-12-01 09:46:48 +01:00
Emil Siverhall
faf222e48f
some changes in output data from auto completion of supervisors and small improvements on facade
2011-11-30 21:33:12 +01:00
Robin Eklund
46c275a98c
Numerous bug fixes concerning dates of imported data, also final seminars are automatically created to
...
support oppponent/participant roles.
2011-11-30 18:04:56 +01:00
Robin Eklund
b3d7a21fb7
Fixed duplicate reviewers/co-supervisors during import-procedure
2011-11-30 17:09:00 +01:00
Robin Eklund
440329e49b
Some bugfixes, also coerced the "import all supervisors" to actually work.
2011-11-30 14:49:46 +01:00
Fredrik Norberg
6f1d713c3f
added functionality to order checklistTemplates and they are now added in the correct order
2011-11-29 19:40:47 +01:00
Robin Eklund
eefecee068
Numerous bug-fixes
2011-11-29 17:29:51 +01:00
Robin Eklund
a90f970be6
Importers can now import named users and all supervisors (via bulk).
...
The API seems to be holding up pretty well, but we'll need support in the remote for ID, dated and project imports before we can move on with this.
2011-11-29 16:53:44 +01:00
Emil Siverhall
78d71c6ebe
minor code cleanup
2011-11-29 16:38:07 +01:00
Emil Siverhall
742605be6f
fixed merge conflicts
2011-11-29 16:22:29 +01:00
Emil Siverhall
57362c1691
refactoring when choosing project partner. it now uses its own panel
2011-11-29 15:59:04 +01:00
Fredrik Norberg
09a747dddf
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (36 commits)
Added so that only available supervisors are forwarded to matching strategy
Changed so that availabily uses real object
Added matcher and matching strategy
Fixed distinct queries and parameterized auto complete query
Fixed queries to use safe methods to set parameters
Match history is now accessible from project idea
Split up availability query in two requests.
Added capabilites to availability object
Added so that availability object counts number of matched project ideas
Added so that number of matches are counted
Started implemeting DAO for retrieving availability
Refactored tests
Removed duplicate code in getOrCreate method
Refactored supervisor dao to use queryset
Yet another sql fix
Changed SQL for altering worker_data table
Now uses StudentPeerInfoRequestsPanel instead of the supervisor version which is now removed
Fixed failing tests
Added keyword type dao
Restored many to one relation ship with keyword type
...
2011-11-29 15:39:08 +01:00
Daniel Hasselrot
b6878b3d1a
Added so that only available supervisors are forwarded to matching strategy
2011-11-29 15:17:59 +01:00
Emil Siverhall
bf414be76e
started working on facade class that is used to save project ideas
2011-11-29 14:23:00 +01:00
Emil Siverhall
d57bea3957
added properties file for customized feedback messages on project idea submission. also some changes when populating lists for keywords.
2011-11-29 14:22:58 +01:00
Emil Siverhall
829b011de4
Keyword selection now works properly. All keyword selection now has its own panel inside the form.
2011-11-29 14:22:56 +01:00
Emil Siverhall
3e66a9ea84
started to add keyword selection for project idea submission
2011-11-29 14:22:54 +01:00
Emil Siverhall
6c703df4a4
code refactoring
2011-11-29 14:22:52 +01:00
Emil Siverhall
f904de46a2
more changes to property models to work better with project ideas
2011-11-29 14:22:49 +01:00
Emil Siverhall
186540c2a8
some model changes to form components
2011-11-29 14:22:47 +01:00
Emil Siverhall
4060d8d23b
changes in auto completion of supervisor so it now works with project class and language capabilities.
2011-11-29 14:22:45 +01:00
Daniel Hasselrot
177f20dec7
Changed so that availabily uses real object
2011-11-29 14:15:34 +01:00
Daniel Hasselrot
0cf138d7db
Added matcher and matching strategy
2011-11-29 13:52:10 +01:00
Daniel Hasselrot
318c571b1f
Fixed distinct queries and parameterized auto complete query
2011-11-29 13:51:06 +01:00
Marcus Höjvall
b5e3ecc217
Fixed queries to use safe methods to set parameters
2011-11-29 11:57:28 +01:00
Daniel Hasselrot
810ae9b751
Match history is now accessible from project idea
2011-11-29 09:48:18 +01:00
Daniel Hasselrot
d36a284666
Split up availability query in two requests.
2011-11-29 09:48:18 +01:00
Daniel Hasselrot
baa885adbe
Added capabilites to availability object
2011-11-29 09:48:17 +01:00
Daniel Hasselrot
d7e40d5ce9
Added so that availability object counts number of matched project ideas
2011-11-29 09:48:17 +01:00
