Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge develop -> master #412

Merged
merged 101 commits into from
Feb 9, 2021
Merged

Merge develop -> master #412

merged 101 commits into from
Feb 9, 2021

Conversation

SmithPeder
Copy link
Member

SmithPeder and others added 30 commits February 7, 2021 17:50
@SmithPeder
Add initial implementation for the STV algorithm
1a38123
@SmithPeder
Use Object.create() to avoid mutations
0843db0
@SmithPeder
Object.create() was stupid, use Stringify->Parse
0b198ea
@SmithPeder
Clean input and out better
f149112
@SmithPeder
Implement backward checking for eliminations ties
949f6d0
@SmithPeder
Eliminate a random candidate if they have 0 or 1 in score
a2fdb97
@SmithPeder
minScore of 1 was not the best idea, as backtracking might break the tie
6f47eb7 
here
@SmithPeder
Remove minScore logic, and always eliminate ties
af7a6fe
@SmithPeder
Don't decrement iterations before current is checked
cdcbbf3
@SmithPeder
Add sests and voteCount to output. Use iterationMin in log
fd5d3fd
@SmithPeder
Use inputVote length when returning result
5660ed3
@SmithPeder
Implement useStrict for STV elections, forces 67%
0b7df38
@SmithPeder @LudvigHz
Apply suggestions from code review
de67f45 
Co-authored-by: Ludvig <ludvig123@gmail.com>
@SmithPeder
Add original .ts file for stv
a372697
@SmithPeder
Update model schemas, and move addVote method to election
8491ff8
@SmithPeder
Rename sumVotes to elect for election api
3c2785f
@SmithPeder
Rewrite create and retrive methods for votes
f375460
@SmithPeder
New error types
ec536d0
@SmithPeder
Emit websocket on election deactivation
d8cb492
@SmithPeder
Add and rewrite election and vote tests
b973f45
@SmithPeder
Move lock to API call to fix race condition
f2f0355
@SmithPeder
Remove chai subset from sum test
de19319
@SmithPeder
Allow timeout to be 5 sec for CLI tests
50d5f8f
@SmithPeder
Remove extra hasVoted schema, and use User directly
8a7af15
@SmithPeder
Implement useStrict in Election models/controller, and add tests
0fed94d
@SmithPeder
Small test improvements
3ac3e78
@LudvigHz @SmithPeder
Admin UI for setting amount of seats
0737133
@LudvigHz @SmithPeder
Add checkbox to enable election.useStrict for create view
d599f02
@SmithPeder
Add the chai-subset to resolve deep trees
ce166e0
@SmithPeder
Add dataset converter, datasets and tests for the STV algorithm
7aa132f
LudvigHz and others added 24 commits February 7, 2021 17:50
@LudvigHz @SmithPeder
Add blank votes to election summary
54e6441
@LudvigHz @SmithPeder
Add datasets and tests with blank votes
e1dc206
@SmithPeder
AccessCode was random for the schema, not the objects
23913fb
@LudvigHz @SmithPeder
Fix edit election page to match new alternatives styles
35ef0dc
@LudvigHz @SmithPeder
Reuse ballot confirmatin on receipt page
b27b626
@SmithPeder
Only allow one active election
3ad2d32
@SmithPeder
Improve the mail template with more env usage
71aaf73
@SmithPeder
Auto-fill username and password from token
815e11f
@SmithPeder
Improve mail-handler and write tests user-gen
61cce08
@SmithPeder
Enable normal STMP mail aswell
2fc1e1d
@SmithPeder @LudvigHz
Update client/controllers/generateUserCtrl.js
17732b0 
Co-authored-by: Ludvig <ludvig123@gmail.com>
@SmithPeder
Spelling
ce0e157
@SmithPeder
Remove LOGO and don't print in tests
f6cf525
@SmithPeder
LINT
c20f10d
@SmithPeder
Add moderator feature to manage register
151656b
@SmithPeder
Add tests, fix permissions, better errors
4ae3e9f
@SmithPeder
Move view, add search
254502c
@SmithPeder @LudvigHz
Update test/api/register.test.js
f3ed248 
Co-authored-by: Ludvig <ludvig123@gmail.com>
@SmithPeder
Add test for no associated user
af62f91
@LudvigHz @SmithPeder
Fix and add E2E tests for new STV voting
31c1a5c
@LudvigHz
Fix E2E tests for admin view with STV
0892406
@SmithPeder
Merge pull request #411 from webkom/e2e-stv-admin
f1a7094 
Fix the rest of the E2E tests
@SmithPeder
Rename legoUser to identifier so it's not linked to LEGO
34e741c
@LudvigHz
Merge pull request #410 from webkom/renameLegoUser
2c4ebd4 
Rename legoUser to identifier so it's not linked to LEGO
@LudvigHz
Copy link
Member

LudvigHz commented Feb 8, 2021

I think we should fix #355 before we merge this.

@SmithPeder
Copy link
Member Author

We're gonna have to merge this now

@SmithPeder SmithPeder merged commit 1613398 into master Feb 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LudvigHz LudvigHz LudvigHz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@SmithPeder @LudvigHz