diff options
author | Code Raguet <ignacio.code@gmail.com> | 2013-09-06 16:12:23 (GMT) |
---|---|---|
committer | Code Raguet <ignacio.code@gmail.com> | 2013-09-06 16:13:01 (GMT) |
commit | 430ad68dc8df2746c35ff788afc7491ee6c1ef9b (patch) | |
tree | 151a1bae17d063a89ac2a922452011362e2e5659 | |
parent | 774c03c638a54fd88ebbcb612315b781397ffa62 (diff) |
change get_numero_escuela so that it can return all "numero_escuela" from a .poll_result
-rw-r--r-- | webapp/polls/models.py | 8 | ||||
-rw-r--r-- | webapp/polls/tests/poll_result_file_tests.py | 23 | ||||
-rw-r--r-- | webapp/sociologist/templates/poll-result-list.html | 2 |
3 files changed, 31 insertions, 2 deletions
diff --git a/webapp/polls/models.py b/webapp/polls/models.py index 50f3ca9..b50557d 100644 --- a/webapp/polls/models.py +++ b/webapp/polls/models.py @@ -1519,7 +1519,13 @@ class PollResultFile(object): self.data = json.loads(self.json_str, 'utf-8') def get_numero_escuela(self): - return set([self.data['result']['0']['polled']['NUM_ESC']]) + results = self.data['result'] + + all_numero_escuela = [] + for i in results: + numero_escuela = results[i]['polled']['NUM_ESC'] + all_numero_escuela.append(numero_escuela) + return set(all_numero_escuela) def get_pollster_username(self): return self.data['pollster_username'] diff --git a/webapp/polls/tests/poll_result_file_tests.py b/webapp/polls/tests/poll_result_file_tests.py index b57e475..f5b4178 100644 --- a/webapp/polls/tests/poll_result_file_tests.py +++ b/webapp/polls/tests/poll_result_file_tests.py @@ -164,3 +164,26 @@ class NumeroEscuelaTest(MongoTestCase): result = PollResultFile(file_path) self.assertEqual(set([numero_escuela]), result.get_numero_escuela()) + + def test_it_should_get_all_numero_escuela_as_unique_items(self): + data = self.data + numero_escuela1 = '1' + data['result']['0']['polled']['NUM_ESC'] = numero_escuela1 + numero_escuela2 = '2' + data['result']['1'] = {} + data['result']['1']['polled'] = {} + data['result']['1']['polled']['NUM_ESC'] = numero_escuela2 + data['result']['2'] = {} + data['result']['2']['polled'] = {} + data['result']['2']['polled']['NUM_ESC'] = numero_escuela2 + + json_str = json_construc(data) + file_ = tempfile.NamedTemporaryFile(suffix='.poll_result', + delete=False) + file_.write(json_str) + file_.close() + file_path = file_.name + + result = PollResultFile(file_path) + expected = set([numero_escuela1, numero_escuela2]) + self.assertEqual(expected, result.get_numero_escuela()) diff --git a/webapp/sociologist/templates/poll-result-list.html b/webapp/sociologist/templates/poll-result-list.html index 9e1f969..3f81e02 100644 --- a/webapp/sociologist/templates/poll-result-list.html +++ b/webapp/sociologist/templates/poll-result-list.html @@ -30,7 +30,7 @@ <tbody> {% for poll_result in poll_results %} <tr> - <td>{{ poll_result.numero_escuela }}</td> + <td>{{ poll_result.numero_escuela|join:", " }}</td> <td>{{ poll_result.pollster }}</td> <td>{{ poll_result.cantidad_encuestados }}</td> <td> |