Commit Graph

1826 Commits

Author SHA1 Message Date
Skia
78e00c3bd4 Merge branch 'Elections' into 'master'
Election app

See merge request !27
2016-12-26 00:45:40 +01:00
3609952db5 Some translation fixs 2016-12-26 00:37:32 +01:00
Skia
bf4d0693c6 Reformat templates to fit with the rest of the Sith 2016-12-26 00:10:41 +01:00
61e67898e1 Coherent create/edit/delete templates for elections 2016-12-25 23:49:02 +01:00
cd97901db1 Some date fix 2016-12-25 23:37:42 +01:00
772a3b5827 Squashmigrations for elections 2016-12-25 22:09:59 +01:00
5449a4fca2 Little permission fix 2016-12-25 22:04:31 +01:00
e17fd22a37 Fix populate after rebase 2016-12-25 20:24:18 +01:00
4d067165aa Election's trad 2016-12-25 20:09:18 +01:00
c07f49305b Full CRUD for elections 2016-12-25 19:54:10 +01:00
4f62863599 Pimp role and list forms and add edit for election 2016-12-25 19:54:10 +01:00
d7387005c0 Better role creation 2016-12-25 19:54:10 +01:00
02913d91e6 Refactors Candidate form 2016-12-25 19:54:10 +01:00
9d9c86ea0f Refactored has_voted 2016-12-25 19:54:10 +01:00
37decde04d Adds an S in electionS 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet
da77c18871 Really display results when election is finished. 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet
64f5fef89f Display results only when the polls close 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet
1c761f9db2 Added results when the user is not voting 2016-12-25 19:54:10 +01:00
e8d54764bd Add election results 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet
baf39d8f3b Hide input if user can not vote 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet
9bb5951dac Removed request.user as user bc it already exists 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet
1a34dcdafe Changed plain form action to reversed URL. 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet
fa9e4e5dc6 Tweaked Election view and added request.user as user 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet
a9d154506f Added js validation for max_choice 2016-12-25 19:54:10 +01:00
33d8c14da5 can_vote in Election 2016-12-25 19:54:10 +01:00
2c76784007 Fixed Election.has_voted 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet
89362bae79 Hide inputs when user already voted. 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet
dfcddbd1fa Hide election detail parts when user cannot candidate or edit. 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet
a3a5a0446d Finished main view. Some tuning are to be done. 2016-12-25 19:54:10 +01:00
9ac1cab983 Add vote in database 2016-12-25 19:54:10 +01:00
97f835eb4e Convert indent with space, fix populate and add an s 2016-12-25 19:54:10 +01:00
a27fd267d7 Remove useless methods on elections 2016-12-25 19:54:10 +01:00
1f60fbd484 Uses election_detail for vote form 2016-12-25 19:54:10 +01:00
938e2ce0a9 Fix rights in election 2016-12-25 19:54:10 +01:00
Skia
177e39bd6e Fix RuntimeWarning in populate 2016-12-25 19:54:10 +01:00
67630fc9f8 Vote template 2016-12-25 19:53:04 +01:00
Jean-Baptiste Lenglet
9dbff0cd50 Finished election details. 2016-12-25 19:53:04 +01:00
Jean-Baptiste Lenglet
94d15684b7 Added profile pictures for users 2016-12-25 19:53:04 +01:00
Jean-Baptiste Lenglet
6784d66403 Building the new vote/display for a election. 2016-12-25 19:52:14 +01:00
Jean-Baptiste Lenglet
2095dd621e Reworked election list view with datetime ranges and a description. 2016-12-25 19:52:14 +01:00
Jean-Baptiste Lenglet
e6b37ef332 Added date ranges in the elections list view. 2016-12-25 19:52:14 +01:00
521b61517b Functionnal vote form 2016-12-25 19:52:14 +01:00
e8ead338d0 Removed useless widget added previously + began voteform 2016-12-25 19:52:14 +01:00
03754aba8a Can now add candidature 2016-12-25 19:52:14 +01:00
51bb6c8472 Can add ElectionList and start of candidature form 2016-12-25 19:52:14 +01:00
d72d8366cf Add new widget (not tested) and new bdd scheme for elections 2016-12-25 19:52:14 +01:00
7956067686 Election right update 2016-12-25 19:52:14 +01:00
2764f6d2d2 Refactor List Model 2016-12-25 19:52:14 +01:00
c604282b77 Nice display for elections 2016-12-25 19:52:14 +01:00
52e69b0ac1 Refactor elections 2016-12-25 19:52:14 +01:00