Commit Graph
77 Commits
Author SHA1 Message Date
Casually9790 5bba424c34 Merge remote-tracking branch 'origin/testing' into testing 2021-01-27 18:26:40 +01:00
Casually9790 f5e714883d Cleaning up for publication 2021-01-27 18:26:35 +01:00
Casually9790 6cae7d78ae Updated Datelock 2021-01-17 16:19:26 +01:00
Casually9790 def3ed6309 Prepared everything for the votings 2021-01-17 15:54:32 +01:00
Casually9790 bbc83031b2 asdf3 2021-01-09 22:09:48 +01:00
Casually9790 57589e402c asdf2 2021-01-09 22:08:55 +01:00
Casually9790 fe5a91455c asdf 2021-01-09 22:07:45 +01:00
Casually9790 63aa795086 Final release 2021-01-09 21:56:17 +01:00
Casually9790 91874abe4e Added exeptions 2021-01-09 21:26:13 +01:00
Casually9790 0036b19721 reverse block 2021-01-09 21:09:46 +01:00
Casually9790 6ed12992c9 temp 2021-01-09 20:34:55 +01:00
Casually9790 865c3e778f BUGFIX 2021-01-09 20:23:16 +01:00
Casually9790 8da69f0170 Fixed out of bounds exception 2021-01-09 18:32:31 +01:00
Casually9790 7ee603d5df Added second voting 2021-01-09 02:35:55 +01:00
Casually9790 149a0dece3 Made final changes 2021-01-04 02:22:00 +01:00
Casually9790 937971da63 Expanded the number of candidates from 5 to 10-15 2021-01-04 00:42:43 +01:00
Casually9790 0b9d5cc90c Updated Requierments 2020-12-29 19:23:45 +01:00
Casually9790 880dd12a6f QOL 2020-12-27 23:33:56 +01:00
Casually9790 11e2906271 Added a datelock to end votes automatically 2020-12-27 23:23:41 +01:00
Casually9790 ffea848311 Changed to Voting Mode 2020-12-27 22:37:20 +01:00
Casually9790 d1c8f24d3d Fix error message 2020-12-18 20:11:28 +01:00
Casually9790 be8d49ff9e Final 2020-12-18 20:01:54 +01:00
Casually9790 506e2285fd End 2020-12-18 19:25:40 +01:00
Casually9790 14ab45227a Removed code pass through 2020-12-18 19:04:12 +01:00
Casually9790 8f65d9cc26 Finishing touches 2020-12-18 18:57:29 +01:00
Casually9790 cf138cd8cf Must function now Email is down 2020-12-17 03:11:28 +01:00
Casually9790 629d4076f8 fixed bug 2020-12-16 23:49:50 +01:00
Casually9790 b48453c300 test 2020-12-16 23:49:27 +01:00
Casually9790 7aff0c5b02 Test 2020-12-16 20:03:14 +01:00
Casually9790 e863d288ee Changed categories 2020-12-13 21:29:33 +01:00
Casually9790 3e69fcf97f Make input field static 2020-12-13 17:25:27 +01:00
Casually9790 97a1313524 Fixed email input bug 2020-12-13 17:20:42 +01:00
Casually9790 3be9c3b665 Css changes to start site 2020-12-13 17:18:56 +01:00
Casually9790 0cffad8ed0 Removed the dashboard because of the existence of phpmyadmin 2020-12-12 00:02:58 +01:00
Casually9790 5cb73a5a1a Regex ignores whitespaces now and added all fallback pages 2020-12-11 23:53:42 +01:00
Casually9790 9b9d754713 Merge remote-tracking branch 'origin/main' into main 2020-12-11 21:21:35 +01:00
Casually9790 7429462f91 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
Casually9790 d629cec557 added 2020-12-11 00:20:17 +01:00
Casually9790 ec60234d7c added 2020-12-11 00:03:40 +01:00
Casually9790 0a33b55a61 Have to go to bed now need to write 2020-12-10 23:50:44 +01:00
Casually9790 e503b0df61 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
Casually9790 aa036fb07b votingPhase can now be toggled from jar
Use -DvotingPhase={boolean} to set value (Defaults to false)
2020-12-08 23:32:20 +01:00
Casually9790 f0ada512ca Added dynamic resource parsing and fixed breaking bug 2020-12-08 23:03:14 +01:00
Casually9790 faa1cea8e2 Merge remote-tracking branch 'origin/main' into main 2020-12-07 23:42:40 +01:00
Casually9790 3186b63f35 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
catoandGitHub 11b704a7e2 Update README.md 2020-12-07 23:25:27 +01:00
Casually9790 301ffc60f0 Fixed copying mechanism 2020-12-06 23:31:44 +01:00
Casually9790 7e39d2dab9 You know the drill 2020-12-06 01:19:39 +01:00
Casually9790 9531dadd69 Massive changes but I have to go to sleep now 2020-12-05 06:05:56 +01:00
Casually9790 56d3f9875c 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