PollingStation property alignment with EML/Figma (#774)

Co-authored-by: Mark Janssen <[email protected]> Co-authored-by: Ellen <[email protected]>
kiesraad · Dec 24, 2024 · 77e0190 · 77e0190
1 parent fce73be
commit 77e0190
Show file tree

Hide file tree

Showing 29 changed files with 246 additions and 408 deletions.
diff --git a/backend/.sqlx/query-111a62c9d93018a8e18d7668f5f8ffc50fe77a531b012535214c1d64df48a624.json b/backend/.sqlx/query-111a62c9d93018a8e18d7668f5f8ffc50fe77a531b012535214c1d64df48a624.json
diff --git a/backend/.sqlx/query-1686d44af659b8e5e59ba88b49bf75316c4ac561786a21d039a18828a620e519.json b/backend/.sqlx/query-1686d44af659b8e5e59ba88b49bf75316c4ac561786a21d039a18828a620e519.json
diff --git a/backend/.sqlx/query-61f2578d0396908b72242f3ddea30ba11b4e72d61c3633199aff681817f4d585.json b/backend/.sqlx/query-61f2578d0396908b72242f3ddea30ba11b4e72d61c3633199aff681817f4d585.json
diff --git a/...4f499a9c75a99e336742f1c33a0bcca78c46.json → ...8620298d7289bcd475d8775eca8f9a5d2c9b.json b/...4f499a9c75a99e336742f1c33a0bcca78c46.json → ...8620298d7289bcd475d8775eca8f9a5d2c9b.json
diff --git a/...9990460814755aaba03e367e32d32afe339e.json → ...8691912f04a04334578aefcab20b2586035a.json b/...9990460814755aaba03e367e32d32afe339e.json → ...8691912f04a04334578aefcab20b2586035a.json
diff --git a/backend/.sqlx/query-b836c60b7f2a207d778817e5642b0af2c29d984ec0e991539f5436aef0c6547e.json b/backend/.sqlx/query-b836c60b7f2a207d778817e5642b0af2c29d984ec0e991539f5436aef0c6547e.json
diff --git a/backend/.sqlx/query-b944439f84db91932045d96930281bc076b4e1ccd3bf211a89fad53892249395.json b/backend/.sqlx/query-b944439f84db91932045d96930281bc076b4e1ccd3bf211a89fad53892249395.json
diff --git a/backend/.sqlx/query-baf46c64e4594a6412f8429fc26d64c3cee9cefa359a510270a2ba7dbbe46edc.json b/backend/.sqlx/query-baf46c64e4594a6412f8429fc26d64c3cee9cefa359a510270a2ba7dbbe46edc.json
diff --git a/...377a1130a41f479e32e2039c671caaa4c804.json → ...0bde76604394f0d60adb4bb5f392dd88e1a6.json b/...377a1130a41f479e32e2039c671caaa4c804.json → ...0bde76604394f0d60adb4bb5f392dd88e1a6.json
diff --git a/backend/.sqlx/query-d44673acd6f4030907246abb1cb06bc7c74eb974e34046039ce0ff05892d253e.json b/backend/.sqlx/query-d44673acd6f4030907246abb1cb06bc7c74eb974e34046039ce0ff05892d253e.json
diff --git a/backend/.sqlx/query-ea78207f538b5f72cd2d42b0d071d0c89e38a7dc0befc2da28abf2cc35d4eac4.json b/backend/.sqlx/query-ea78207f538b5f72cd2d42b0d071d0c89e38a7dc0befc2da28abf2cc35d4eac4.json
diff --git a/backend/fixtures/polling_stations.sql b/backend/fixtures/polling_stations.sql
@@ -1,14 +1,14 @@
-INSERT INTO polling_stations (id, election_id, name, number, number_of_voters, polling_station_type, street,
-                              house_number, house_number_addition, postal_code, locality)
-VALUES (1, 1, 'Op Rolletjes', 33, NULL, 'Mobile', 'Rijksweg A12', '1', NULL, '1234 YQ', 'Den Haag'),
-       (2, 1, 'Testplek', 34, 1000, 'Special', 'Teststraat', '2', 'b', '1234 QY', 'Testdorp'),
-       (3, 2, 'Testgebouw', 35, NULL, 'FixedLocation', 'Testweg', '3', NULL, '1234 QA', 'Teststad'),
-       (4, 3, 'Studio The Rules', 1, NULL, 'FixedLocation', 'Gerontoplein', '1', NULL, '1337 YQ', 'Juinen'),
-       (5, 3, 'Buurtcentrum de Mattenklopper', 2, 1000, 'Special', 'Complexiteitslaan', '2', 'b', '1337 QY',
+INSERT INTO polling_stations (id, election_id, name, number, number_of_voters, polling_station_type, address,
+                               postal_code, locality)
+VALUES (1, 1, 'Op Rolletjes', 33, NULL, 'Mobile', 'Rijksweg A12 1', '1234 YQ', 'Den Haag'),
+       (2, 1, 'Testplek', 34, 1000, 'Special', 'Teststraat 2b', '1234 QY', 'Testdorp'),
+       (3, 2, 'Testgebouw', 35, NULL, 'FixedLocation', 'Testweg 3', '1234 QA', 'Teststad'),
+       (4, 3, 'Studio The Rules', 1, NULL, 'FixedLocation', 'Gerontoplein 1', '1337 YQ', 'Juinen'),
+       (5, 3, 'Buurtcentrum de Mattenklopper', 2, 1000, 'Special', 'Complexiteitslaan 2b', '1337 QY',
         'Juinen'),
-       (6, 3, 'Positivo Zaal', 3, NULL, 'FixedLocation', 'Kerkweg', '3', NULL, '1337 QA', 'Juinen'),
-       (7, 4, 'Studio The Rules', 1, NULL, 'FixedLocation', 'Gerontoplein', '1', NULL, '1337 YQ', 'Juinen'),
-       (8, 4, 'Buurtcentrum de Mattenklopper', 2, 1000, 'Special', 'Complexiteitslaan', '2', 'b', '1337 QY',
+       (6, 3, 'Positivo Zaal', 3, NULL, 'FixedLocation', 'Kerkweg 3', '1337 QA', 'Juinen'),
+       (7, 4, 'Studio The Rules', 1, NULL, 'FixedLocation', 'Gerontoplein 1', '1337 YQ', 'Juinen'),
+       (8, 4, 'Buurtcentrum de Mattenklopper', 2, 1000, 'Special', 'Complexiteitslaan 2b', '1337 QY',
         'Juinen'),
-       (9, 4, 'Positivo Zaal', 3, NULL, 'FixedLocation', 'Kerkweg', '3', NULL, '1337 QA', 'Juinen'),
-       (10, 5, 'Buurthuis de Snelste', 103, NULL, 'FixedLocation', 'Kiespolder', '1', 'a', '1884 IT', 'Kiespolder');
+       (9, 4, 'Positivo Zaal', 3, NULL, 'FixedLocation', 'Kerkweg 3', '1337 QA', 'Juinen'),
+       (10, 5, 'Buurthuis de Snelste', 103, NULL, 'FixedLocation', 'Kiespolder 1a', '1884 IT', 'Kiespolder');
diff --git a/backend/migrations/2_polling_stations.sql b/backend/migrations/2_polling_stations.sql
@@ -5,10 +5,8 @@ CREATE TABLE polling_stations
     name                  TEXT                              NOT NULL,
     number                INTEGER                           NOT NULL,
     number_of_voters      INTEGER,
-    polling_station_type  TEXT                              NOT NULL,
-    street                TEXT                              NOT NULL,
-    house_number          TEXT                              NOT NULL,
-    house_number_addition TEXT,
+    polling_station_type  TEXT,
+    address               TEXT                              NOT NULL,
     postal_code           TEXT                              NOT NULL,
     locality              TEXT                              NOT NULL,