Merge branch 'shared-style'

kiesraad · Mar 26, 2024 · af43702 · af43702
2 parents 67c9f51 + bb0ac3e
commit af43702
Show file tree

Hide file tree

Showing 3 changed files with 392 additions and 2 deletions.
diff --git a/src/input.rs b/src/input.rs
@@ -29,6 +29,7 @@ pub struct Lijst {
     naam: String,
     lijstnummer: u64,
     kandidaten: Vec<Kandidaat>,
+    kieskringen: Vec<Kieskring>,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -47,6 +48,21 @@ pub struct ModelP22_1Input {
     datum: String,
     partijen: Vec<Party>,
     stemmen: Vec<Lijst>,
+    kieskringen: Vec<KieskringTotals>,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct KieskringTotals {
+    number: u64,
+    total_stemmen: u64,
+    blanco_stemmen: u64,
+    ongeldige_stemmen: u64,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct Kieskring {
+    number: u64,
+    votes: u64,
 }
 
 #[derive(Serialize, Deserialize)]