Merge branch 'mt6-ocultar-universidades' into develop

RITSI · Feb 1, 2018 · 9a1a942 · 9a1a942
2 parents e5f6314 + 8217c98
commit 9a1a942
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 116 deletions.
diff --git a/tasas/api/views.py b/tasas/api/views.py
@@ -2,16 +2,14 @@
 from rest_framework.response import Response
 
 from django.shortcuts import get_object_or_404, get_list_or_404
-from django.db.models import Avg, Q
+from django.db.models import Avg
 
 from .serializers import UniversidadSerializer, TasaSerializer
 from ..models import Universidad, Tasa, Curso
 
-from tasasrest import settings
-
 
 class UniversidadViewSet(ModelViewSet):
-    queryset = Universidad.objects.all()
+    queryset = Universidad.objects.all().filter(activa=True)
     serializer_class = UniversidadSerializer
     base_name = "universidades"
     http_method_names = ['get', 'head', 'options']
@@ -33,7 +31,7 @@ def retrieve(self, request, pk=None, *args, **kwargs):
 
 
 class ProvinciaViewSet(ModelViewSet):
-    queryset = Universidad.objects.all().prefetch_related('tasas')
+    queryset = Universidad.objects.all().prefetch_related('tasas').filter(activa=True)
     serializer_class = UniversidadSerializer
     http_method_names = ['get', 'head', 'options']
 

diff --git a/tasas/migrations/0021_universidad_activa.py b/tasas/migrations/0021_universidad_activa.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2018-01-18 18:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tasas', '0020_auto_20161102_1103'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='universidad',
+            name='activa',
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/tasas/models.py b/tasas/models.py
@@ -65,6 +65,7 @@ def __init__(self, *args, **kwargs):
                               help_text=ugettext_lazy("Siglas de la universidad"))
     nombre = models.CharField(max_length=200, null=False, blank=False,
                               help_text=ugettext_lazy("Nombre de la universidad"))
+    activa = models.BooleanField(default=True, null=False)
     tipo = models.IntegerField(choices=TIPO_UNIVERSIDAD_CHOICES, null=False, blank=False,
                                help_text=ugettext_lazy("Tipo de centro (público/privado)"))
     centro = models.CharField(max_length=200, null=True, blank=True, help_text=ugettext_lazy("Nombre del centro"))

diff --git a/tasas/static/tasas/css/backend.css b/tasas/static/tasas/css/backend.css
@@ -3,7 +3,6 @@
 }
 
 @keyframes faint {
-
     0% {
         background-color: rgba(35, 210, 0, 0.86);
         opacity: 1;
@@ -38,14 +37,13 @@
     opacity: 1;
     animation: faint ease-in 5s forwards;
     -moz-animation: faint ease-in 5s forwards;
-
-    p {
-        position: relative;
-        top: 50%;
-        -webkit-transform: translateY(-50%);
-        -ms-transform: translateY(-50%);
-        transform: translateY(-50%);
-    }
+}
+.status p {
+    position: relative;
+    top: 50%;
+    -webkit-transform: translateY(-50%);
+    -ms-transform: translateY(-50%);
+    transform: translateY(-50%);
 }
 
 .success {
@@ -69,22 +67,25 @@
     margin-right: auto;
     margin-left: auto;
     padding-bottom: 30px;
-
-    form{
-        display: inline-block;
-        #submit {
-            margin-left: auto;
-            margin-right: auto;
-        }
-    }
-
+}
+.form-container form{
+    display: inline-block;
+}
+.form-container form #submit {
+    margin-left: auto;
+    margin-right: auto;
 }
 
 .errorlist{
     color: red;
     list-style: none;
 }
+
 /*Fix for bootstrap-select*/
 .overlay{
     z-index:3 !important;
 }
+
+.panel-inactive{
+    background-color: rgb(174, 182, 180);
+}
diff --git a/tasas/static/tasas/css/backend.less b/tasas/static/tasas/css/backend.less
diff --git a/tasas/templates/tasas/edit.html b/tasas/templates/tasas/edit.html
@@ -36,6 +36,11 @@ <h5>{% trans "Información general" %}</h5>
                             <label class="has-error">{{ universidad_form.nombre.errors }}</label>
                                 {{ universidad_form.nombre|add_class:"form-control" }}
                         </div>
+                        <div>
+                            <label for="{{ universidad_form.activa.id_for_label }}">{{ universidad_form.activa.label }}</label>
+                            <label class="has-error">{{ universidad_form.activa.errors }}</label>
+                                {{ universidad_form.activa }}
+                        </div>
                         <div>
                             <label for="{{ universidad_form.tipo.id_for_label }}">{{ universidad_form.tipo.label }}</label>
                             <label class="has-error">{{ universidad_form.tipo.errors }}</label>

diff --git a/tasas/templates/tasas/index.html b/tasas/templates/tasas/index.html
@@ -5,19 +5,34 @@
 {{ content.super }}
 <div class="col-md-8">
     <div class="col-md-12">
-        {% for universidad in universidades %}
+        {% for universidad in universidades_activas %}
         <div class="row uni-row">
             <div class="panel panel-default">
                 <a href="universidad/{{universidad.siglas}}/">
                     <div class="panel-body">
                         <div class="col-xs-3 col-sm-2 col-md-2 col-lg-1">{% if universidad.logo %}<img src="{{universidad.logo.url}}" alt="{% trans "Foto de la" %} {{universidad.nombre}}" class="img-circle foto-uni">{% endif %}</div>
-                        <div class="col-xs-8 col-sm-9 col-md-9 col-lg-10"><strong>{{universidad.nombre}}</strong><br><span class="text-muted">{{universidad.campus}}</span></div>
+                        <div class="col-xs-8 col-sm-9 col-md-9 col-lg-10"><strong>{{universidad.nombre}}</strong><br><span class="text-muted">{{universidad.campus|default_if_none:''}}</span></div>
                         <div class="col-xs-1 col-sm-1 col-md-1 col-lg-1"><a href="universidad/{{universidad.siglas}}/editar/"><i class="fa fa-pencil-square"></i></a></div>
                     </div>
                 </a>
             </div>
         </div>
         {% endfor %}
+        <h3>Universidades inactivas</h3>
+        {% for universidad in universidades_inactivas %}
+        <div class="row uni-row">
+            <div class="panel panel-default panel-inactive">
+                <a href="universidad/{{universidad.siglas}}/">
+                    <div class="panel-body">
+                        <div class="col-xs-3 col-sm-2 col-md-2 col-lg-1">{% if universidad.logo %}<img src="{{universidad.logo.url}}" alt="{% trans "Foto de la" %} {{universidad.nombre}}" class="img-circle foto-uni">{% endif %}</div>
+                        <div class="col-xs-8 col-sm-9 col-md-9 col-lg-10">{{universidad.nombre}}<br><span class="text-muted">{{universidad.campus|default_if_none:''}}</span></div>
+                        <div class="col-xs-1 col-sm-1 col-md-1 col-lg-1"><a href="universidad/{{universidad.siglas}}/editar/"><i class="fa fa-pencil-square"></i></a></div>
+                    </div>
+                </a>
+            </div>
+        </div>
+        {% endfor %}
+
     </div>
 </div>
 <div class="col-md-4">

diff --git a/tasas/views.py b/tasas/views.py
@@ -13,7 +13,8 @@ class IndexView(TemplateView):
 
     def get_context_data(self, **kwargs):
         context = super(IndexView, self).get_context_data(**kwargs)
-        context['universidades'] = Universidad.objects.all()
+        context['universidades_activas'] = Universidad.objects.filter(activa=True)
+        context['universidades_inactivas'] = Universidad.objects.filter(activa=False)
 
         return context