Fixes expats not displayed for temporary results

HISTORY.rst

@@ -1,5 +1,9 @@
 Changelog
 ---------
+
+- Fixes expats not displayed for temporary results.
+  [msom]
+
 3.13.4 (2019-04-30)
 ~~~~~~~~~~~~~~~~~~~
 

onegov/election_day/formats/election/internal_majorz.py

@@ -199,9 +199,12 @@ def import_election_internal_majorz(election, principal, file, mimetype):
         return errors
 
     # Add the missing entities
-    remaining = entities.keys() - results.keys()
+    remaining = set(entities.keys())
+    if election.expats:
+        remaining.add(0)
+    remaining -= set(results.keys())
     for entity_id in remaining:
-        entity = entities[entity_id]
+        entity = entities.get(entity_id, {})
         district = entity.get('district', '')
         if election.domain == 'region':
             if not election.distinct:

onegov/election_day/formats/election/internal_proporz.py

@@ -317,9 +317,12 @@ def import_election_internal_proporz(election, principal, file, mimetype):
         return errors
 
     # Add the missing entities
-    remaining = entities.keys() - results.keys()
+    remaining = set(entities.keys())
+    if election.expats:
+        remaining.add(0)
+    remaining -= set(results.keys())
     for entity_id in remaining:
-        entity = entities[entity_id]
+        entity = entities.get(entity_id, {})
         district = entity.get('district', '')
         if election.domain == 'region':
             if not election.distinct:

onegov/election_day/formats/election/wabsti_majorz.py

@@ -273,9 +273,12 @@ def import_election_wabsti_majorz(
         return errors
 
     # Add the missing entities
-    remaining = entities.keys() - results.keys()
+    remaining = set(entities.keys())
+    if election.expats:
+        remaining.add(0)
+    remaining -= set(results.keys())
     for entity_id in remaining:
-        entity = entities[entity_id]
+        entity = entities.get(entity_id, {})
         district = entity.get('district', '')
         if election.domain == 'region':
             if not election.distinct:

onegov/election_day/formats/election/wabsti_proporz.py

@@ -427,9 +427,12 @@ def import_election_wabsti_proporz(
         return errors
 
     # Add the missing entities
-    remaining = entities.keys() - results.keys()
+    remaining = set(entities.keys())
+    if election.expats:
+        remaining.add(0)
+    remaining -= set(results.keys())
     for entity_id in remaining:
-        entity = entities[entity_id]
+        entity = entities.get(entity_id, {})
         district = entity.get('district', '')
         if election.domain == 'region':
             if not election.distinct:

onegov/election_day/formats/election/wabstic_majorz.py

@@ -404,9 +404,12 @@ def import_election_wabstic_majorz(
 
     # Add the missing entities
     result_inserts = []
-    remaining = entities.keys() - added_results.keys()
+    remaining = set(entities.keys())
+    if election.expats:
+        remaining.add(0)
+    remaining -= set(added_results.keys())
     for entity_id in remaining:
-        entity = entities[entity_id]
+        entity = entities.get(entity_id, {})
         district = entity.get('district', '')
         if election.domain == 'region':
             if not election.distinct:

onegov/election_day/formats/election/wabstic_proporz.py

@@ -632,9 +632,12 @@ def import_election_wabstic_proporz(
 
     # Add the missing entities
     result_inserts = []
-    remaining = entities.keys() - added_results.keys()
+    remaining = set(entities.keys())
+    if election.expats:
+        remaining.add(0)
+    remaining -= set(added_results.keys())
     for entity_id in remaining:
-        entity = entities[entity_id]
+        entity = entities.get(entity_id, {})
         district = entity.get('district', '')
         if election.domain == 'region':
             if not election.distinct:

onegov/election_day/formats/vote/default.py

@@ -176,8 +176,12 @@ def skip_line(line):
 
     if not errors:
         # Add the missing entities as uncounted results
-        for entity_id in (entities.keys() - added_entity_ids):
-            entity = entities[entity_id]
+        remaining = set(entities.keys())
+        if vote.expats:
+            remaining.add(0)
+        remaining -= added_entity_ids
+        for entity_id in remaining:
+            entity = entities.get(entity_id, {})
             ballot_results.append(
                 BallotResult(
                     name=entity.get('name', ''),

onegov/election_day/formats/vote/internal.py

@@ -164,9 +164,12 @@ def import_vote_internal(vote, principal, file, mimetype):
 
     # Add the missing entities
     for ballot_type in ballot_types:
-        remaining = (entities.keys() - added_entity_ids[ballot_type])
+        remaining = set(entities.keys())
+        if vote.expats:
+            remaining.add(0)
+        remaining -= added_entity_ids[ballot_type]
         for entity_id in remaining:
-            entity = entities[entity_id]
+            entity = entities.get(entity_id, {})
             ballot_results[ballot_type].append(
                 dict(
                     name=entity.get('name', ''),

onegov/election_day/formats/vote/wabsti.py

@@ -185,11 +185,12 @@ def import_vote_wabsti(vote, principal, vote_number, file, mimetype):
     vote.clear_results()
 
     for ballot_type in used_ballot_types:
-        remaining = (
-            entities.keys() - added_entity_ids
-        )
+        remaining = set(entities.keys())
+        if vote.expats:
+            remaining.add(0)
+        remaining -= added_entity_ids
         for entity_id in remaining:
-            entity = entities[entity_id]
+            entity = entities.get(entity_id, {})
             ballot_results[ballot_type].append(
                 BallotResult(
                     name=entity.get('name', ''),

onegov/election_day/formats/vote/wabstic.py

@@ -230,13 +230,12 @@ def import_vote_wabstic(vote, principal, number, district,
 
     # Add the missing entities
     for ballot_type in used_ballot_types:
-        remaining = (
-            entities.keys() - set(
-                result['entity_id'] for result in ballot_results[ballot_type]
-            )
-        )
+        remaining = set(entities.keys())
+        if vote.expats:
+            remaining.add(0)
+        remaining -= set(r['entity_id'] for r in ballot_results[ballot_type])
         for entity_id in remaining:
-            entity = entities[entity_id]
+            entity = entities.get(entity_id, {})
             ballot_results[ballot_type].append(
                 dict(
                     entity_id=entity_id,

onegov/election_day/formats/vote/wabstim.py

@@ -170,11 +170,12 @@ def import_vote_wabstim(vote, principal, file, mimetype):
     vote.clear_results()
 
     for ballot_type in used_ballot_types:
-        remaining = (
-            entities.keys() - added_entity_ids
-        )
+        remaining = set(entities.keys())
+        if vote.expats:
+            remaining.add(0)
+        remaining -= added_entity_ids
         for id in remaining:
-            entity = entities[id]
+            entity = entities.get(entity_id, {})
             ballot_results[ballot_type].append(
                 BallotResult(
                     name=entity.get('name', ''),