Commit Graph

51 Commits

Author SHA1 Message Date
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
780448537b Merge branch 'MailSystem' into main 2020-11-27 23:56:55 +01:00
7690d05fd2 Added basics for the mail system 2020-11-25 18:36:28 +01:00
b52d4b47b9 Reset voting site to the basic 2020-11-25 18:35:05 +01:00
6dfe2a3329 updated start site
start site has now user and admin login panels
added custom css for start page
dashboard is now splitted in cateogies
implemendet LiveReload
added fallback 'falseInput.html' page
2020-11-24 17:11:16 +01:00
27f80636f0 Merge branch 'frontend' into main 2020-11-14 17:12:33 +01:00
264bfa8bf0 Fixed damage done by false git usage 2020-11-14 17:08:10 +01:00
ad91dbd5e9 Updated the .gitignore file
Hopefully this will fix the including of all log files in the repo
2020-11-14 15:15:14 +01:00
c608a9d207 Merge branch 'backend' into main 2020-11-14 15:07:52 +01:00
e1d8d81095 .gitignore expanded, Votingsite expanded
.gitignore:
    - All logs are now going to be ignored by git

VotingController.java:
    - added the categoryRepository to the model

voting.html:
     - showing data out of categoryRepository now
2020-11-14 13:03:43 +01:00
7713b1d3ec Skin changes
start.css:
    - added temporarily design

voting.css:
    - created the file
2020-11-14 01:18:21 +01:00
cd1e8787eb Basic sytling für die Startseite erstellt
- Startseite arbeitet nun mit einem Flow-Design
- Weiterleitende Links angepasst
2020-11-14 01:18:21 +01:00
d7185572fc All fallbacks added to the login site. Edited voting.html
.gitignore:
    - added the /logs folder to the gitignore

VotingController.java:
    - added log message logging false entry format

Candidate.java:
    - return type changed from 'String' to 'Candidate'

wrongEmail.html:
    - added html file to avoid error

voting.html:
    - changed the way of output
2020-11-14 01:11:17 +01:00
ad944b9616 [FATAL ] SQL-Injektions werden verhindert
-Es werden  nur Eingaben des Typs '[a-z]+\\.[a- z]+@adolfinum+\\.de$' an die mySQL Tabelle weiter gebeben.
2020-11-12 22:54:10 +01:00
cato
37b45d998d Update README.md 2020-11-11 23:42:49 +01:00
cato
55e2db138a Update README.md 2020-11-11 23:42:25 +01:00
cato
64c7ed198f Update README.md 2020-11-11 23:42:02 +01:00
65cebb835a Got a server set up to host the VotingSystem.
---------------------------------------------------
Internet address: http://abizeitung-voting.ddns.net
Server IP address: 217.83.93.128
Port: 8000
--------------------------------------------------
Try to port the database to be hosted on the server rather
than on be hosted on localhost
2020-11-11 23:36:53 +01:00
496ec030cb encrypted the emails 2020-11-10 23:50:45 +01:00
2a8d083e34 encrypted the database 2020-11-10 23:49:16 +01:00
dbbdf9e24c changes in the database 2020-11-10 23:44:06 +01:00
de5634b10c q 2020-11-10 23:38:09 +01:00
2a2390feac changed category_id 2020-11-10 23:34:37 +01:00
f108d12beb changed username of sql database 2020-11-10 23:30:43 +01:00
3ecfb34e97 transfer database 2020-11-10 23:27:21 +01:00
281f8811ca testing2 2020-11-10 23:13:16 +01:00
64d6228bdd testing 2020-11-10 22:57:36 +01:00
05877782a9 encrypting the database backup 2020-11-10 22:50:39 +01:00
1f810dbde6 initial commit 2020-11-09 23:51:28 +01:00