Merge branch 'feature/display-excluded' into 'develop'

Feature/display excluded

fix Issue #16

might have conflicts due to merge request !13  that fixes issue #19  !

See merge request !14

account_administration/locale/el/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-13 14:54+0300\n"
+"POT-Creation-Date: 2015-06-16 13:00+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

helios/locale/el/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-13 14:54+0300\n"
+"POT-Creation-Date: 2015-06-16 13:00+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -541,6 +541,10 @@ msgstr "Αποθήκευση κρυπτογραφικών δεδομένων"
 msgid "Total voters count"
 msgstr "Σύνολο ψηφοφόρων"
 
+#, fuzzy
+msgid "Excluded Voters"
+msgstr "Εξαίρεση ψηφοφόρου"
+
 msgid "Votes cast"
 msgstr "Έχουν ψηφίσει"
 

helios/templates/election_poll_voters_list.html

@@ -13,6 +13,9 @@
     <div class="columns seven">
     <div class="columns six" style="padding-left:0;">
         <h6>{% trans "Total voters count" %}: <span>{{ voters_count }}</span></h6>
+        {% if nr_voters_excluded > 0 %}
+          <h6>{% trans "Excluded Voters" %}: <span>{{nr_voters_excluded}}<span></h6>
+        {% endif %}
     </div>
     <div class="columns six" style="padding-left:0; width: 42%;" >
     <h6>{% trans "Votes cast" %}: {{ voted_count }}</h6>
@@ -96,7 +99,6 @@ <h6>{% trans "Votes cast" %}: {{ voted_count }}</h6>
         </div>
     </div>
 </div>
-
 <table id="voters-table" class="voters" width="100%">
   <thead>
     <tr>

heliosauth/locale/el/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-13 14:54+0300\n"
+"POT-Creation-Date: 2015-06-16 13:00+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

server_ui/locale/el/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-13 14:54+0300\n"
+"POT-Creation-Date: 2015-06-16 13:00+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -77,29 +77,20 @@ msgstr "Είσοδος Ψηφοφόρου"
 msgid "Your new password was set."
 msgstr "Ο νέος σας κωδικός έχει οριστεί."
 
-msgid "Name"
-msgstr "Όνομα"
-
-msgid "Institution"
-msgstr "Ίδρυμα"
-
-msgid "Administrator"
-msgstr "Διαχειριστής"
-
-msgid "Creation"
-msgstr "Δημιουργία"
-
-msgid "Start"
-msgstr "Έναρξη"
-
-msgid "End"
-msgstr "Λήξη"
-
-msgid "Election status"
-msgstr "Κατάσταση ψηφοφορίας"
+msgid "Filter"
+msgstr ""
 
-msgid "Trial"
-msgstr "Δοκιμαστική"
+#, python-format
+msgid ""
+"\n"
+"                %(elections_count)s result found\n"
+"                "
+msgid_plural ""
+"\n"
+"                %(elections_count)s results found\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
 msgid "YES"
 msgstr "ΝΑΙ"
@@ -109,3 +100,27 @@ msgstr "ΟΧΙ"
 
 msgid "Change language"
 msgstr "Change language"
+
+#~ msgid "Name"
+#~ msgstr "Όνομα"
+
+#~ msgid "Institution"
+#~ msgstr "Ίδρυμα"
+
+#~ msgid "Administrator"
+#~ msgstr "Διαχειριστής"
+
+#~ msgid "Creation"
+#~ msgstr "Δημιουργία"
+
+#~ msgid "Start"
+#~ msgstr "Έναρξη"
+
+#~ msgid "End"
+#~ msgstr "Λήξη"
+
+#~ msgid "Election status"
+#~ msgstr "Κατάσταση ψηφοφορίας"
+
+#~ msgid "Trial"
+#~ msgstr "Δοκιμαστική"

zeus/election_modules/__init__.py

@@ -198,10 +198,11 @@ def generate_result_docs(self, lang):
                       self.election.institution.name,
                       self.election.voting_starts_at, self.election.voting_ends_at,
                       self.election.voting_extended_until,
-                      [(poll.name, 
+                      [(poll.name,
                         poll.zeus.get_results(),
                         poll.questions_data,
-                        poll.questions[0]['answers'])],
+                        poll.questions[0]['answers'],
+                        poll.voters.all())],
                       lang,
                       self.get_poll_result_file_path('pdf', 'pdf', lang[0]),
                       score=score, parties=parties)
@@ -217,7 +218,8 @@ def generate_election_result_docs(self, lang):
             polls_data.append((poll.name, 
                                poll.zeus.get_results(),
                                poll.questions_data,
-                               poll.questions[0]['answers']))
+                               poll.questions[0]['answers'],
+                               poll.voters.all()))
 
         build_doc(_(u'Results'), self.election.name, self.election.institution.name,
                 self.election.voting_starts_at, self.election.voting_ends_at,

zeus/election_modules/stv/__init__.py

@@ -142,7 +142,8 @@ def update_answers(self):
 
     def generate_result_docs(self, lang):
         poll_data = [
-            (self.poll.name, self.poll.zeus.get_results(), self.poll.questions)
+            (self.poll.name, self.poll.zeus.get_results(), self.poll.questions,
+             self.poll.voters.all())
             ]
         from zeus.results_report import build_stv_doc
         results_json = self.poll.zeus.get_results()
@@ -160,7 +161,7 @@ def generate_election_result_docs(self, lang):
         polls_data = []
 
         for poll in self.election.polls.filter():
-            polls_data.append((poll.name, poll.zeus.get_results(), poll.questions))
+            polls_data.append((poll.name, poll.zeus.get_results(), poll.questions, poll.voters.all()))
 
         build_stv_doc(_(u'Results'), self.election.name,
             self.election.institution.name,

zeus/locale/el/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-13 14:54+0300\n"
+"POT-Creation-Date: 2015-06-16 13:00+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -57,6 +57,10 @@ msgstr "Επιλογή"
 msgid "Question"
 msgstr "Ερώτηση"
 
+#, python-format
+msgid "% is not a valid character."
+msgstr ""
+
 msgid "Min answers"
 msgstr "Ελάχιστος αριθμός επιλογών"
 
@@ -68,6 +72,10 @@ msgstr ""
 "Ο μέγιστος αριθμός απαντήσεων πρέπει να είναι ίσος ή μεγαλύτερος του "
 "ελάχιστου αριθμού απαντήσεων"
 
+#, python-format
+msgid "% is not a valid character"
+msgstr ""
+
 msgid "No duplicate choices allowed"
 msgstr "Δεν επιτρέπονται διπλότυπες επιλογές στο ψηφοδέλτιο"
 
@@ -77,6 +85,15 @@ msgstr "Όνομα συνδυασμού"
 msgid "Scores"
 msgstr "Βαθμοί"
 
+#, fuzzy
+msgid "Max answers should be greater or equal than min answers"
+msgstr ""
+"Ο μέγιστος αριθμός απαντήσεων πρέπει να είναι ίσος ή μεγαλύτερος του "
+"ελάχιστου αριθμού απαντήσεων"
+
+msgid "Number of answers must be equal or bigger than max answers"
+msgstr ""
+
 msgid "set the eligibles count of the election"
 msgstr "το πλήθος των εκλεγόμενων"
 
@@ -219,17 +236,26 @@ msgstr "Επιβεβαιώστε την οριστικοποίηση της ψη
 msgid "Are you sure you want to delete the selected poll ?"
 msgstr "Επιβεβαιώστε τη διαγραφή της επιλεγμένης κάλπης"
 
-#, python-format
-msgid "Start: %s"
-msgstr "Έναρξη: %s"
+msgid "Institution name"
+msgstr "Ίδρυμα"
 
-#, python-format
-msgid "End: %s"
-msgstr "Λήξη: %s"
+msgid "Start"
+msgstr "Έναρξη"
 
-#, python-format
-msgid "Extension: %s"
-msgstr "Παράταση: %s"
+msgid "End"
+msgstr "Λήξη"
+
+msgid "Extension"
+msgstr "Παράταση"
+
+msgid "Voters"
+msgstr "Ψηφοφόροι"
+
+msgid "Excluded voters"
+msgstr "Εξαιρεθέντες ψηφοφόροι"
+
+msgid "Poll name"
+msgstr "Όνομα κάλπης"
 
 msgid "RESULTS"
 msgstr "ΑΠΟΤΕΛΕΣΜΑΤΑ ΓΕΝΙΚΑ"
@@ -276,6 +302,18 @@ msgstr "ΑΚΥΡΟ"
 msgid "BLANK"
 msgstr "ΛΕΥΚΟ"
 
+#, python-format
+msgid "Start: %s"
+msgstr "Έναρξη: %s"
+
+#, python-format
+msgid "End: %s"
+msgstr "Λήξη: %s"
+
+#, python-format
+msgid "Extension: %s"
+msgstr "Παράταση: %s"
+
 msgid "Elect"
 msgstr "Εκλογή"
 
@@ -410,6 +448,26 @@ msgstr "Τελευταία είσοδος"
 msgid "Actions"
 msgstr "Επιλογές"
 
+msgid "Name"
+msgstr ""
+
+msgid "Institution"
+msgstr ""
+
+msgid "Administrator"
+msgstr ""
+
+#, fuzzy
+msgid "Creation"
+msgstr "Ερώτηση"
+
+#, fuzzy
+msgid "Election status"
+msgstr "Τίτλος ψηφοφορίας"
+
+msgid "Trial"
+msgstr ""
+
 msgid "Simple election with one or more questions"
 msgstr "Απλή ψηφοφορία με μία ή περισσότερες ερωτήσεις"
 
@@ -425,7 +483,6 @@ msgstr "Προσθήκη ερωτήσεων στην ψηφοφορία"
 msgid "Too many choices"
 msgstr "Περισσότερες επιλογές από το επιτρεπτό"
 
-#, python-brace-format
 msgid "Question '{0}' requires at least {1} choices."
 msgstr "Η ερώτηση '{0}' απαιτεί τουλάχιστον {1} επιλογές."
 
@@ -511,6 +568,9 @@ msgstr ""
 msgid "The requested page was not found."
 msgstr ""
 
+#~ msgid "Voters %d"
+#~ msgstr "Ψηφοφόροι %d"
+
 #~ msgid "Email body"
 #~ msgstr "Κείμενο μηνύματος email"