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

Frontend: A few design fixes #215

Closed
wants to merge 51 commits into from
Closed

Frontend: A few design fixes #215

wants to merge 51 commits into from

Conversation

Lionqueen94
Copy link
Contributor

@Lionqueen94 Lionqueen94 commented Aug 5, 2024 •
edited
Loading

Done:

Fixed from #101 :

  • when a list has exactly n*25 candidates, the spacer/separator for the next 25 candidates is shown. The separator should only be added if there is a (n*25)+1'nd candidate. Scherm­afbeelding 2024-08-01 om 11 13 17
  • The zebra-striping of the rows does not match the striping used in the paper forms. On paper, the first row of each 25 rows is white. In our digital form, row 26 and row 76 have a dark background. Each block of 25 rows should start with a white background.
    Scherm­afbeelding 2024-08-05 om 09 49 33

Lionqueen94 and others added 30 commits July 18, 2024 17:59
@Lionqueen94
WIP
1d30a92
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
a460dcf 
…-to-api-including-validation
@Lionqueen94
WIP2
221709a
@Lionqueen94
Added openapi updates
c883713
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
b025eb2 
…-to-api-including-validation
@Lionqueen94
Please review my TODO in PollingStationFormController
749b82c
@Lionqueen94
Removed console.log statements and added recounted backend validation…
2da2da6 
… to show in frontend
@Lionqueen94
Fixed test and added IncorrectTotal check for voters_recounts to mock…
93ab121 
… api
@Lionqueen94
Added IncorrectTotal error for voters_recounts to mock api
7ff58b8
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
91d0b0f 
…-to-api-including-validation
@Lionqueen94
Added validation check identifiers to backend and removed message and…
fa9e46c 
… saved fields from frontend tests
@Lionqueen94
Backend validation is added, need to add a few more tests
439b47f
@Lionqueen94
Finished adding backend validation tests
52e9cbe
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
2121b4b 
…-to-api-including-validation
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
5c9dfca 
…-to-api-including-validation
@Lionqueen94
Added testing for fields to all tests and made sure voters_counts are…
7cfd32c 
… not validated when voters_recounts is filled in
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
a8a1e3d 
…-to-api-including-validation
@Lionqueen94
Fixes after merge main
b5d31a8
@Lionqueen94
Added more distinction between validation rules for recounted true or…
cf4c75c 
… false based on rules change PR
@Lionqueen94
Renamed differences errorcodes to more understandable codes
ed1c100
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
c969060 
…-to-api-including-validation
@Lionqueen94
Fixed success variable in code and made sure recounted doesn't submit…
2bf7123 
… before a radio is clicked
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
8510f9c 
…-to-api-including-validation
@Lionqueen94
Added all possible validation errors to frontend api mock and added t…
06b235d 
…ests for validation of DifferencesForm
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
391b71d 
…-to-api-including-validation
@Lionqueen94
Updated page based on Joris' design changes
990e274
@Lionqueen94
Fixed wrong error and warning field paths
648bbbf
@Lionqueen94
Fixed recounted title text
c3cab01
@Lionqueen94
Changed incorrect 'votes_recounts' to 'voters_recounts'
e6bda22
@jschuurk-kr
updates error code mentioned in test name to match use cases doc again
55494c4
Lionqueen94 and others added 18 commits July 30, 2024 18:43
@Lionqueen94
Merge remote-tracking branch 'origin/110-backend-add-recounted-differ…
0856417 
…ences-fields-to-api-including-validation' into 110-backend-add-recounted-differences-fields-to-api-including-validation

# Conflicts:
#	frontend/app/component/form/voters_and_votes/VotersAndVotesForm.test.tsx
@praseodym
Fix tests for F.13 and W.30
f9e20ba 
Improve testability of `PollingStationFormController` children by
allowing default values to be passed to the controller. This can then
be used to set `recounted: true` to test validation logic of the
recounted fields.
@praseodym
Merge remote-tracking branch 'origin/main' into 110-backend-add-recou…
2d1d272 
…nted-differences-fields-to-api-including-validation
@praseodym
Only process warnings when there are no errors
e025c3f
@praseodym
Remove repeated suffix
aa75f95
@praseodym
Do not submit voters_recounts unless recounted
d33f6eb
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
c9b3800 
…-to-api-including-validation
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
057ea3a 
…-to-api-including-validation
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
93015c1 
…-to-api-including-validation
@Lionqueen94
Renamed all errors and warnings and adjusted where the check/rule was…
ca8bea7 
… changed
@Lionqueen94
Corrected last comments and added check for W.306 in backend
045de9c
@Lionqueen94
Added tests for W.304 and W.306 in the backend
2305533
@Lionqueen94
Added W.304, W.305 and W.306 to mock api and frontend tests
0febb3d
@Lionqueen94
Fixed styling of Feedback element based on Joris notes
5101f92
@Lionqueen94
Merge branch 'main' into 110-backend-add-recounted-differences-fields…
042afb8 
…-to-api-including-validation
@Lionqueen94
Clear voters_recounts when recounted is set to no
6769ed1
@Lionqueen94
Corrected Alert colors based on Figma design changes
e90ecbc
@Lionqueen94
Fixed case when separator needs to be added and how the zebra should …
d92e468 
…look in the InputGrid
@Lionqueen94 Lionqueen94 self-assigned this Aug 5, 2024
@praseodym
Copy link
Contributor

It looks like this PR includes some unintended changes (e.g. to the backend) that might be the result of incorrectly resolved merge conflicts?

@Lionqueen94
Copy link
Contributor Author

It looks like this PR includes some unintended changes (e.g. to the backend) that might be the result of incorrectly resolved merge conflicts?

Ah shit I created this from my other branch, will correct it

@Lionqueen94 Lionqueen94 closed this Aug 5, 2024
@Lionqueen94 Lionqueen94 deleted the design_fixes branch August 5, 2024 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@praseodym praseodym Awaiting requested review from praseodym

@jorisleker jorisleker Awaiting requested review from jorisleker

Assignees

@Lionqueen94 Lionqueen94

Labels
None yet
Projects
Abacus
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Lionqueen94 @praseodym @jschuurk-kr