issue 4423: clean pollster page

2 files changed, 29 insertions, 97 deletions

diff --git a/webapp/pollster/templates/pollster-assigned-polls.html b/webapp/pollster/templates/pollster-assigned-polls.html
index da4ae17..e201dd7 100644
--- a/webapp/pollster/templates/pollster-assigned-polls.html
+++ b/webapp/pollster/templates/pollster-assigned-polls.html
@@ -1,102 +1,36 @@
 {% extends "base-poll.html" %}
 
 {% block main_container %}
-    <script src="{{ STATIC_URL }}js/angular.min.js"></script>
-
-    <div ng-app="pollster-assigned-polls">
-
-        <div  ng-controller="CollapseCtrl">
-
-            <h2 class="well well-small open" ng-click="sort_by('open')" style="cursor: pointer;"><i class="icon-chevron-down">&nbsp;</i>Abiertas, asignadas a usted</h2>
-
-            <div collapse="isCollapsed">
-                {% if open_polls|length %}
-                <table class="table table-hover table-bordered">
-                    <thead>
-                        <tr>
-                            <th class="span5">Nombre</th>
-                            <th class="span5"><center>Descripción</center></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for poll in open_polls %}
-                            <tr>
-                                <td>{{ poll.name|capfirst }}</td>
-                                <td>Esta encuesta est&aacute; en proceso de elavoraci&oacute;n.</td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-                {% else %}
-                    <div class="alert">
-                      No existen encuestas abiertas y asociadas a usted, por el momento.
-                    </div>
-                {% endif %}
+    <div>
+        {% if closed_polls|length %}
+        <table class="table table-hover table-bordered">
+            <thead>
+                <tr>
+                    <th class="span5">Nombre</th>
+                    <th><center>Resultados</center></th>
+                    <th class="span5"><center>Acciones</center></th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for poll in closed_polls %}
+                    <tr>
+                        <td>{{ poll.name|capfirst }}</td>
+                        <td>{% if poll.has_result %}Existen resultados para esta encuesta y pueden ser visualizados por los investigadores.{% else %}No tiene resultados.{% endif %}</td>
+                        <td>
+                            <a class="btn" href="{% url pollsters:poll_download poll_id=poll.id %}">
+                                <i class="icon-download-alt"></i>&nbsp;Descargar encuesta
+                            </a>
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+        {% else %}
+            <div class="alert">
+              No existen encuestas asignadas a usted que pueda realizar, por el momento.
             </div>
-
-        </div>
-
-        <div ng-controller="CollapseCtrl">
-
-            <h2 class="well well-small closed" ng-init="sort_by('closed')" ng-click="sort_by('closed')" style="cursor: pointer;"><i class="icon-chevron-down"></i>&nbsp;Cerradas o terminadas</h2>
-
-            <div collapse="isCollapsed">
-                {% if closed_polls|length %}
-                <table class="table table-hover table-bordered">
-                    <thead>
-                        <tr>
-                            <th class="span5">Nombre</th>
-                            <th><center>Resultados</center></th>
-                            <th class="span5"><center>Acciones</center></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for poll in closed_polls %}
-                            <tr>
-                                <td>{{ poll.name|capfirst }}</td>
-                                <td>{% if poll.has_result %}Existen resultados para esta encuesta y pueden ser visualizados por los investigadores.{% else %}No tiene resultados.{% endif %}</td>
-                                <td>
-                                    <a class="btn" href="{% url pollsters:poll_download poll_id=poll.id %}">
-                                        <i class="icon-download-alt"></i>&nbsp;Descargar encuesta
-                                    </a>
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-                {% else %}
-                    <div class="alert">
-                      No existen encuestas asignadas a usted que pueda realizar, por el momento.
-                    </div>
-                {% endif %}
-            </div>
-
-        </div>
-
+        {% endif %}
     </div>
-
     <script src="{{ STATIC_URL }}js/ui-bootstrap-0.2.0.min.js"></script>
     <script src="{{ STATIC_URL }}js/ui-bootstrap-tpls-0.2.0.min.js"></script>
-
-    <script type="text/javascript">
-
-        angular.module('pollster-assigned-polls', ['ui.bootstrap']);
-
-        function CollapseCtrl($scope) {
-            $scope.isCollapsed = true;
-
-            $scope.sort_by = function(class_) {
-
-                $scope.isCollapsed = !$scope.isCollapsed;
-
-                if ($scope.isCollapsed)
-                    $('h2.' + class_ + " i").removeClass().addClass('icon-chevron-down');
-                else
-                    $('h2.' + class_ + " i").removeClass().addClass('icon-chevron-up');
-            }
-
-        }
-
-    </script>
-
 {% endblock %}
\ No newline at end of file
diff --git a/webapp/pollster/views.py b/webapp/pollster/views.py
index fbf4329..082a989 100644
--- a/webapp/pollster/views.py
+++ b/webapp/pollster/views.py
@@ -35,16 +35,14 @@ class PollsterAssignedPollsListView(ListView):
             **kwargs)
 
         closed_polls = []
-        open_polls = []
 
         for poll in Poll.assigned_to_pollster(self.pollster):
             if poll.is_open():
-                open_polls.append(poll)
+                pass
             else:
                 closed_polls.append(poll)
 
         context.update({
-            'open_polls': open_polls,
             'closed_polls': closed_polls
         })