Rename Panachage to Panachage (lists)

onegov/election_day/layouts/election.py

@@ -20,7 +20,7 @@ def all_tabs(self):
             'connections',
             'party-strengths',
             'statistics',
-            'panachage',
+            'lists-panachage',
             'data'
         )
 
@@ -37,8 +37,8 @@ def title(self, tab=None):
             return _("Party strengths")
         if tab == 'statistics':
             return _("Election statistics")
-        if tab == 'panachage':
-            return _("Panachage")
+        if tab == 'lists-panachage':
+            return _("Panachage (lists)")
         if tab == 'data':
             return _("Downloads")
 
@@ -69,7 +69,7 @@ def visible(self, tab=None):
             )
         if tab == 'statistics':
             return not self.tacit
-        if tab == 'panachage':
+        if tab == 'lists-panachage':
             return (
                 self.proporz and
                 not self.tacit and

onegov/election_day/locale/de_CH/LC_MESSAGES/onegov.election_day.po

@@ -14,6 +14,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.5\n"
 
+msgid "Last change"
+msgstr "Aktualisiert"
+
 msgid "Not a valid phone number."
 msgstr "Ungültige Telefonnummer."
 
@@ -283,8 +286,8 @@ msgstr "Kandidierende"
 msgid "Party strengths"
 msgstr "Parteistärken"
 
-msgid "Panachage"
-msgstr "Panaschierstatistik"
+msgid "Panachage (lists)"
+msgstr "Panaschierstatistik (Listen)"
 
 msgid "Downloads"
 msgstr "Downloads"
@@ -476,7 +479,6 @@ msgstr "Passwort vergessen?"
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#, python-format
 msgid "${counted} of ${total}"
 msgstr "${counted} von ${total}"
 
@@ -501,9 +503,6 @@ msgstr "Noch keine Resultate"
 msgid "Intermediate results"
 msgstr "Zwischenergebnisse"
 
-msgid "Last change"
-msgstr "Aktualisiert"
-
 msgid "Alerts"
 msgstr "Benachrichtigungen"
 
@@ -850,6 +849,9 @@ msgstr "Leer"
 msgid "Invalid"
 msgstr "Ungültig"
 
+msgid "Panachage"
+msgstr "Panaschierstatistik"
+
 msgid "Wrong username or password"
 msgstr "Unbekannter Benutzername oder falsches Passwort"
 

onegov/election_day/locale/fr_CH/LC_MESSAGES/onegov.election_day.po

@@ -14,6 +14,9 @@ msgstr ""
 "Generated-By: xls-to-po 1.0\n"
 "X-Generator: Poedit 2.0.5\n"
 
+msgid "Last change"
+msgstr "Actualisé"
+
 msgid "Not a valid phone number."
 msgstr "N'est pas un numéro de téléphone valide."
 
@@ -283,8 +286,8 @@ msgstr "Candidats"
 msgid "Party strengths"
 msgstr "Force des partis"
 
-msgid "Panachage"
-msgstr "Panachage"
+msgid "Panachage (lists)"
+msgstr "Panachage (listes)"
 
 msgid "Downloads"
 msgstr "Téléchargements"
@@ -477,7 +480,6 @@ msgstr "Mot de passe oublié?"
 msgid "Reset password"
 msgstr "Réinitialiser mot de passe"
 
-#, python-format
 msgid "${counted} of ${total}"
 msgstr "${counted} de ${total}"
 
@@ -502,9 +504,6 @@ msgstr "Pas de résultats à l'heure actuelle"
 msgid "Intermediate results"
 msgstr "Résultats intermédiaires"
 
-msgid "Last change"
-msgstr "Actualisé"
-
 msgid "Alerts"
 msgstr "Alertes"
 
@@ -851,6 +850,9 @@ msgstr "Vide"
 msgid "Invalid"
 msgstr "Invalide"
 
+msgid "Panachage"
+msgstr "Panachage"
+
 msgid "Wrong username or password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 

onegov/election_day/locale/it_CH/LC_MESSAGES/onegov.election_day.po

@@ -14,6 +14,9 @@ msgstr ""
 "Generated-By: xls-to-po 1.0\n"
 "X-Generator: Poedit 2.0.5\n"
 
+msgid "Last change"
+msgstr "Aggiornato"
+
 msgid "Not a valid phone number."
 msgstr "Non è un numero di telefono valido."
 
@@ -283,8 +286,8 @@ msgstr "Candidati"
 msgid "Party strengths"
 msgstr "Forza delle parti"
 
-msgid "Panachage"
-msgstr "Panachage"
+msgid "Panachage (lists)"
+msgstr "Panachage (liste)"
 
 msgid "Downloads"
 msgstr "Download"
@@ -476,7 +479,6 @@ msgstr "Hai dimenticato la password?"
 msgid "Reset password"
 msgstr "Ripristina password"
 
-#, python-format
 msgid "${counted} of ${total}"
 msgstr "${counted} di ${total}"
 
@@ -501,9 +503,6 @@ msgstr "Ancora nessun risultato"
 msgid "Intermediate results"
 msgstr "Risultati provvisori"
 
-msgid "Last change"
-msgstr "Aggiornato"
-
 msgid "Alerts"
 msgstr "Avvisi"
 
@@ -847,6 +846,9 @@ msgstr "Bianche"
 msgid "Invalid"
 msgstr "Nulle"
 
+msgid "Panachage"
+msgstr "Panachage"
+
 msgid "Wrong username or password"
 msgstr "Nome utente sconosciuto o password errata"
 

onegov/election_day/locale/rm_CH/LC_MESSAGES/onegov.election_day.po

@@ -13,6 +13,9 @@ msgstr ""
 "Generated-By: xls-to-po 1.0\n"
 "X-Generator: Poedit 2.0.5\n"
 
+msgid "Last change"
+msgstr "Actualisà"
+
 msgid "Not a valid phone number."
 msgstr "Numer da telefon nunvalaivel."
 
@@ -283,8 +286,8 @@ msgstr "Candidatas e candidats"
 msgid "Party strengths"
 msgstr "Forza da las partidas"
 
-msgid "Panachage"
-msgstr "Statistica da panaschar"
+msgid "Panachage (lists)"
+msgstr "Statistica da panaschar (glistas)"
 
 msgid "Downloads"
 msgstr "Downloads"
@@ -477,7 +480,6 @@ msgstr "Emblidà il pled-clav?"
 msgid "Reset password"
 msgstr "Redefinir il pled-clav"
 
-#, python-format
 msgid "${counted} of ${total}"
 msgstr "${counted} da ${total}"
 
@@ -502,9 +504,6 @@ msgstr "Anc nagins resultats avant maun"
 msgid "Intermediate results"
 msgstr "Resultats intermediars"
 
-msgid "Last change"
-msgstr "Actualisà"
-
 msgid "Alerts"
 msgstr "Communicaziuns"
 
@@ -853,6 +852,9 @@ msgstr "Vid"
 msgid "Invalid"
 msgstr "Nunvalaivel"
 
+msgid "Panachage"
+msgstr "Statistica da panaschar"
+
 msgid "Wrong username or password"
 msgstr ""
 "Il num da l'utilisadra u da l'utilisader n'è betg enconuschent u il pled-"

onegov/election_day/templates/election/panachage.pt → onegov/election_day/templates/election/lists_panachage.pt

@@ -22,10 +22,10 @@
                     <figure>
                         <div class="sankey-chart"
                             i18n:attributes="data-embed-link"
-                            data-dataurl="${request.link(election, name='panachage-data')}"
+                            data-dataurl="${request.link(election, name='lists-panachage-data')}"
                             data-inverse="false"
                             data-embed-link="Embed"
-                            data-embed-source="${request.link(election, name='panachage-chart')}">
+                            data-embed-source="${request.link(election, name='lists-panachage-chart')}">
                         </div>
                         <a class="svg-download" tal:condition="layout.svg_path" href="${layout.svg_link}">
                             <i class="fa fa-download"></i><tal:block i18n:translate="">Download</tal:block>

onegov/election_day/tests/layouts/test_election_layout.py

@@ -11,7 +11,7 @@ def test_election_layout(session):
 
     assert layout.all_tabs == (
         'lists', 'candidates', 'connections', 'party-strengths', 'statistics',
-        'panachage', 'data'
+        'lists-panachage', 'data'
     )
 
     assert layout.title() == ''
@@ -22,7 +22,7 @@ def test_election_layout(session):
     assert layout.title('party-strengths') == 'Party strengths'
     assert layout.title('statistics') == 'Election statistics'
     assert layout.title('data') == 'Downloads'
-    assert layout.title('panachage') == 'Panachage'
+    assert layout.title('lists-panachage') == 'Panachage (lists)'
 
     layout = ElectionLayout(Election(type='majorz'), DummyRequest())
     assert layout.majorz
@@ -84,11 +84,11 @@ def test_election_layout(session):
         assert layout.svg_link == 'Election/connections-svg'
         assert layout.svg_name == 'election-list-connections.svg'
 
-        layout = ElectionLayout(election, request, 'panachage')
+        layout = ElectionLayout(election, request, 'lists-panachage')
         assert layout.pdf_path == f'pdf/election-{ts}.de.pdf'
-        assert layout.svg_path == f'svg/election-{ts}.panachage.any.svg'
-        assert layout.svg_link == 'Election/panachage-svg'
-        assert layout.svg_name == 'election-panachage.svg'
+        assert layout.svg_path == f'svg/election-{ts}.lists-panachage.any.svg'
+        assert layout.svg_link == 'Election/lists-panachage-svg'
+        assert layout.svg_name == 'election-panachage-lists.svg'
 
         layout = ElectionLayout(election, request, 'party-strengths')
         assert layout.pdf_path == f'pdf/election-{ts}.de.pdf'

onegov/election_day/tests/utils/test_svg_generator.py

@@ -32,23 +32,23 @@ def test_generate_svg(election_day_app, session):
             generator.generate_svg(item, 'candidates')
             generator.generate_svg(item, 'connections', 'de_CH')
             generator.generate_svg(item, 'party-strengths', 'de_CH')
-            generator.generate_svg(item, 'panachage', 'de_CH')
+            generator.generate_svg(item, 'lists-panachage', 'de_CH')
             generator.generate_svg(item, 'map', 'de_CH')
 
             item = add_proporz_election(session)
             generator.generate_svg(item, 'lists', 'de_CH')
             generator.generate_svg(item, 'candidates', 'de_CH')
             generator.generate_svg(item, 'connections', 'de_CH')
             generator.generate_svg(item, 'party-strengths', 'de_CH')
-            generator.generate_svg(item, 'panachage', 'de_CH')
+            generator.generate_svg(item, 'lists-panachage', 'de_CH')
             generator.generate_svg(item, 'map', 'de_CH')
 
             item = add_vote(session, 'complex').proposal
             generator.generate_svg(item, 'lists', 'de_CH')
             generator.generate_svg(item, 'candidates', 'de_CH')
             generator.generate_svg(item, 'connections', 'de_CH')
             generator.generate_svg(item, 'party-strengths', 'de_CH')
-            generator.generate_svg(item, 'panachage', 'de_CH')
+            generator.generate_svg(item, 'lists-panachage', 'de_CH')
             generator.generate_svg(item, 'map', 'de_CH')
             generator.generate_svg(item, 'map', 'it_CH')
 
@@ -68,7 +68,7 @@ def test_generate_svg(election_day_app, session):
             'election-{}.{}.candidates.de_CH.svg'.format(h2, ts),
             'election-{}.{}.connections.de_CH.svg'.format(h2, ts),
             'election-{}.{}.party-strengths.de_CH.svg'.format(h2, ts),
-            'election-{}.{}.panachage.de_CH.svg'.format(h2, ts),
+            'election-{}.{}.lists-panachage.de_CH.svg'.format(h2, ts),
             'ballot-{}.{}.map.de_CH.svg'.format(h3, ts),
             'ballot-{}.{}.map.it_CH.svg'.format(h3, ts)
         ])

onegov/election_day/tests/views/test_views.py

@@ -177,7 +177,7 @@ def test_view_last_modified(election_day_app):
             '/election/election/lists',
             '/election/election/candidates',
             '/election/election/statistics',
-            '/election/election/panachage',
+            '/election/election/',
             '/election/election/party-strengths',
             '/election/election/data',
             '/elections/elections',
@@ -298,7 +298,7 @@ def test_view_svg(election_day_app):
         '/election/majorz-election/candidates-svg',
         '/election/proporz-election/lists-svg',
         '/election/proporz-election/candidates-svg',
-        '/election/proporz-election/panachage-svg',
+        '/election/proporz-election/lists-panachage-svg',
         '/election/proporz-election/connections-svg',
         '/election/proporz-election/party-strengths-svg',
     )
@@ -349,7 +349,7 @@ def test_view_svg(election_day_app):
         'proporz-election-candidates.svg',
         'proporz-election-list-connections.svg',
         'proporz-election-lists.svg',
-        'proporz-election-panachage.svg',
+        'proporz-election-panachage-lists.svg',
         'proporz-election-party-strengths.svg',
         'vote-proposal.svg'
     ]

onegov/election_day/tests/views/test_views_election.py

@@ -258,28 +258,30 @@ def test_view_election_connections(election_day_app_gr):
     assert '/election/proporz-election/connections-data' in chart
 
 
-def test_view_election_panachage(election_day_app_gr):
+def test_view_election_lists_panachage(election_day_app_gr):
     client = Client(election_day_app_gr)
     client.get('/locale/de_CH').follow()
 
     login(client)
     upload_majorz_election(client)
 
-    main = client.get('/election/majorz-election/panachage')
-    assert '<h3>Panaschierstatistik</h3>' not in main
+    main = client.get('/election/majorz-election/lists-panachage')
+    assert '<h3>Panaschierstatistik (Listen)</h3>' not in main
 
-    assert client.get('/election/majorz-election/panachage-data').json == {}
+    assert client.get(
+        '/election/majorz-election/lists-panachage-data'
+    ).json == {}
 
-    chart = client.get('/election/majorz-election/panachage-chart')
+    chart = client.get('/election/majorz-election/lists-panachage-chart')
     assert chart.status_code == 200
-    assert '/election/majorz-election/panachage-data' in chart
+    assert '/election/majorz-election/lists-panachage-data' in chart
 
     upload_proporz_election(client)
 
-    main = client.get('/election/proporz-election/panachage')
-    assert '<h3>Panaschierstatistik</h3>' in main
+    main = client.get('/election/proporz-election/lists-panachage')
+    assert '<h3>Panaschierstatistik (Listen)</h3>' in main
 
-    data = client.get('/election/proporz-election/panachage-data').json
+    data = client.get('/election/proporz-election/lists-panachage-data').json
 
     nodes = [node['name'] for node in data['nodes']]
     assert 'Blankoliste' in nodes
@@ -289,10 +291,6 @@ def test_view_election_panachage(election_day_app_gr):
     links = [link['value'] for link in data['links']]
     assert all((i in links for i in (1, 2, 4, 7)))
 
-    chart = client.get('/election/proporz-election/connections-chart')
-    assert chart.status_code == 200
-    assert '/election/proporz-election/connections-data' in chart
-
 
 def test_view_election_json(election_day_app_gr):
     client = Client(election_day_app_gr)

onegov/election_day/tests/views/test_views_manage.py

@@ -193,7 +193,7 @@ def test_view_clear_results(election_day_app):
         '/election/proporz-election/candidates',
         '/election/proporz-election/connections',
         '/election/proporz-election/party-strengths',
-        '/election/proporz-election/panachage',
+        '/election/proporz-election/lists-panachage',
         '/election/proporz-election/statistics',
         '/vote/vote'
     )