Commit Graph

79 Commits

Author SHA1 Message Date
a14d2a6f33 temp 2021-01-09 20:34:55 +01:00
577015fa3f BUGFIX 2021-01-09 20:23:16 +01:00
b5d18c63ce Fixed out of bounds exception 2021-01-09 18:32:31 +01:00
4c56f2c0ab Back up of first Database 2021-01-09 03:50:07 +01:00
436142f546 Added second voting 2021-01-09 02:35:55 +01:00
e9e9cfca97 Made final changes 2021-01-04 02:22:00 +01:00
dfaf2c55e2 Expanded the number of candidates from 5 to 10-15 2021-01-04 00:42:43 +01:00
f63847a092 Updated Requierments 2020-12-29 19:23:45 +01:00
907db5fb36 QOL 2020-12-27 23:33:56 +01:00
2a8ba84bec Added a datelock to end votes automatically 2020-12-27 23:23:41 +01:00
0597edf116 Changed to Voting Mode 2020-12-27 22:37:20 +01:00
4005fd4edb Google account go taken down switched it 2020-12-25 22:20:26 +01:00
d56514a712 Added names to the voter list 2020-12-18 21:04:02 +01:00
63f4e7c907 Fix error message 2020-12-18 20:11:28 +01:00
47beddf9c8 Final 2020-12-18 20:01:54 +01:00
d7b6283ffe End 2020-12-18 19:25:40 +01:00
fb7b0271b3 Removed code pass through 2020-12-18 19:04:12 +01:00
f65ff26e48 Finishing touches 2020-12-18 18:57:29 +01:00
d0f62b4ca6 Must function now Email is down 2020-12-17 03:11:28 +01:00
221ebf1c2b fixed bug 2020-12-16 23:49:50 +01:00
5cfade336e test 2020-12-16 23:49:27 +01:00
80b20f2098 Test 2020-12-16 20:03:14 +01:00
a37a1e1a91 Changed categories 2020-12-13 21:29:33 +01:00
6d83a513f1 Make input field static 2020-12-13 17:25:27 +01:00
3b0d0ec982 Fixed email input bug 2020-12-13 17:20:42 +01:00
8946853604 Css changes to start site 2020-12-13 17:18:56 +01:00
03e5e1b455 Removed the dashboard because of the existence of phpmyadmin 2020-12-12 00:02:58 +01:00
b32cc63e76 Regex ignores whitespaces now and added all fallback pages 2020-12-11 23:53:42 +01:00
3cd8670cef Merge remote-tracking branch 'origin/main' into main 2020-12-11 21:21:35 +01:00
efc2bd7501 added support of controling the behavoir of the program from the cli
Start application with:
-Dmotto for mottoVoting
-Dadding for addingPhase
-Dvoting for votingPhase
2020-12-11 10:57:58 +01:00
5202042894 added 2020-12-11 00:20:17 +01:00
512331d3ab added 2020-12-11 00:03:40 +01:00
4dd3468bef Have to go to bed now need to write 2020-12-10 23:50:44 +01:00
7a64b195ed QOL changes
- Authentication code only gets send now if you don't have one or your code expired
- Added custom error page
- Trying out scalable Interface
2020-12-09 21:38:43 +01:00
5204322f40 votingPhase can now be toggled from jar
Use -DvotingPhase={boolean} to set value (Defaults to false)
2020-12-08 23:32:20 +01:00
9bf9f8acdc Added dynamic resource parsing and fixed breaking bug 2020-12-08 23:03:14 +01:00
525ba69689 Merge remote-tracking branch 'origin/main' into main 2020-12-07 23:42:40 +01:00
1ee5174207 Made the transition of data between possibleCandidates and Candidates easier
CHANGED VotingController:
    - changed: candidateRepositorys get now only created if empty and 'candidatesAdded == true'

CHANGED PossibleCandidate:
    - added: new getter getCategoryID

CHANGED PossibleCandidateRepository
    - removed: unnecessary public declaration of methods

CHANGED TableAction:
    - changed: 'setupCandiates' adds the top 5 (votes) of every category in possibleCandidates (Manual preselection necessary)
    - added: helper method 'getLimit
    - removed: 'addCandidate' and 'addPossibleCandidate' due to no usage

CHANGED voting.css:
    - added: font-size to 'h1', 'h2.categoryHeader' and 'button' to enhance readability

CHANGED addingCandidates.html:
    - changed: language used in html tag from 'en' to 'de'

ADDED alreadysubmittedcandidates.html:
    - added: error page if voter already submitted possibleCandidates
2020-12-07 23:42:35 +01:00
cato
3effc5364e Update README.md 2020-12-07 23:25:27 +01:00
32894e5469 Fixed copying mechanism 2020-12-06 23:31:44 +01:00
75ccf7d28e You know the drill 2020-12-06 01:19:39 +01:00
a642ea9890 Massive changes but I have to go to sleep now 2020-12-05 06:05:56 +01:00
525074af15 PossibleCandidates get saved to their own database now
CHANGED VotingController:
    - changed 'candidateSaving' possibleCandidates get Located by name and category and get saved now

CHANGED PossibleCandidateRepository:
    - removed 'findByNameAndCategoryID'
    - added 'findByNameAndCategory'

ADDED addingCandidates.css:
    - added basic styling

CHANGED voting.css:
    - bug that div gets cut off resolved

CHANGED addingCandidates.html:
    - changed display method from table to div

CHANGED: voting.html:
    - added div to style the site (bugfix)
2020-12-02 14:08:28 +01:00
361433bf22 Devided Candidates in PossibleCandidates and Candidates
CHANGED: VotingController:
    - added implementation of PossibleCandidateRepository 'possibleCandidateRepository'
    - 'VerifyName' added checking for candidatesubmit_status
    - 'VerifyName' changed Candidate to PossibleCandidate
    - 'VerifyName' changed CandidateWrapper to PossibleCandidateWrapper
    - added method 'candidateSaving'

ADDED: PossibleCandidate:
    - added entity PossibleCandidate

CHANGED: Voter
    - removed 'vote_status' from parameterized constructor
    - added candidatesubmit_status
    - added getter for candidatesubmit_status

CHANGED: Candidate
    - added 'Category category' to parameterized constructor

ADDED: PossibleCandidateWrapper
    - added method 'addPossibleCandidate'
    - added getters/setters

REMOVED: CandidateWrapper
ADDED: PossibleCandidateRepository:
    - added method 'findByNameAndCategoryID' (!!! Not working)
    - added method 'findById'

CHANGED: TableAction:
    - added needed elements to parameter lists because of changes in the entitys voter, candidate and possibleCandidate
    - added method 'logPossibleCandidates'

CHANGED: addingCandidates.html:
    - changed the pointer to list according to the changes in 'VotingController.VerifyName'
2020-12-02 14:07:58 +01:00
6a6ef2b96d Added candidate suggestion
- CHANGES: VotingControler:
    -- added: switch to toogle between candidate suggestion and voting
    -- added: suport for adding candidate names
    -- added: method to save given candidate names
- ADDED: addingCandidates:
    -- added: site to enter candidate suggestions
- ADDED: CandidateWrapper:
    -- added: complete class to help with data transferation through th:object
- CHANGES: Category:
    -- added: constructor with name parameter for logging purposes
- CHANGES: Candidate:
    -- added: setters for class variables
- CHANGES: TableAction:
    -- refactoring: moved method to vote and update vote status from VotingController to TableActions class
- CHANGES: Resources:
    -- added: Files with data to feed to the tables
- ADDED: voteSuccessful:
    -- added fallback html page
- REFACTORING: candidateAddingSuccessful:
    -- renamed file
2020-11-29 17:13:17 +01:00
81befda3a9 Change vote status of voter if voter voted
Through that voters can only vote once
2020-11-28 00:17:16 +01:00
7b4f460445 Created a success.html page 2020-11-28 00:03:56 +01:00
75ad93bde0 Added the voting system 2020-11-28 00:03:36 +01:00
23e4a27d38 Dashboard gets displayed horizontally 2020-11-28 00:02:09 +01:00
ae1ba8b9c5 Candidates get sorted descending by their votes within their categories 2020-11-27 23:59:14 +01:00