Conjunto de cambios beac5e8 en consulta_publica para base

Fecha y hora:

22/03/2017 15:53:09 (hace 7 años)

Autor:

Antonio Araujo <aaraujo@…>

Branches:

master, base, constituyente, estudiantes, general, plan_patria, sala

Children:

81b0915

Parents:

bae8490 (diferencia), 95b08c1 (diferencia)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Mensaje:

Merge branch 'master' of ​https://planificacion.cenditel.gob.ve/scm/git/consulta_publica

Ubicación:

base

Ficheros:

• functions.py (modificado) (5 diferencias)
• templates/base.footer.html (modificado) (1 diferencia)
• templates/base.template.html (modificado) (1 diferencia)

base/functions.py

@@ -82 +82 @@
     tuplaNameEntity = ('', 'Seleccione...'),
     uniqueEntities = []
-    index = 0
+    nidEntities = []
 
     for dicc in data:
         tmpEntity = dicc['name_ente']
-        if tmpEntity not in uniqueEntities:
-            uniqueEntities.append(dicc['name_ente'])
+        tmpNidEntity = dicc['nid']
+        if  tmpEntity.startswith('Ministerio') and  tmpEntity not in uniqueEntities:
+            uniqueEntities.append(tmpEntity)
+            nidEntities.append(tmpNidEntity)
         else:
             continue
-    for item in uniqueEntities:
-        if ( item.startswith('Ministerio') ):
-            tuplaNameEntity += (index+1, item),
+
+    for i in range(0, len(uniqueEntities)) :
+        tuplaNameEntity += (nidEntities[i], uniqueEntities[i]),
 
     return tuplaNameEntity
@@ -120 +122 @@
     tuplaSector = ('', 'Seleccione...'),
     uniqueSectors = []
-    index = 0
+    nidEntities = []
 
     for dicc in data:
         tmpSector = dicc['sector']
-        if tmpSector not in uniqueSectors:
-            uniqueSectors.append(dicc['sector'])
+        tmpNidEntity = dicc['nid']
+        if tmpSector.startswith('Vicepresidencia') and tmpSector not in uniqueSectors:
+            uniqueSectors.append(tmpSector)
+            nidEntities.append(tmpNidEntity)
         else:
             continue
-    for item in uniqueSectors:
-        if ( item.startswith('Vicepresidencia') ):
-            tuplaSector += (index+1, item),
+
+    for i in range(0, len(uniqueSectors)) :
+        tuplaSector += (nidEntities[i], uniqueSectors[i]),
 
     return tuplaSector
@@ -141 +145 @@
     @author Antonio Araujo (aaraujo at cenditel.gob.ve)
     @copyright <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU Public License versión 2 (GPLv2)</a>
-    @date 15-03-2017
+    @date 22-03-2017
     @return Devuelve una tupla con los ambitos
     """
@@ -147 +151 @@
     # TODO: especificar la URL del servicio a traves de una configuracion y gestion
     # de error en solicitud http
-    url =  'http://192.168.12.152:8080/services_sipes/entes_planificadores/views/servicios_webs?display_id=page_1'
+    url = 'http://192.168.12.152:8080/services_sipes/entes_planificadores/views/lista_ambitos_y_sectores?display_id=ambitos'
     r = requests.get(url)
     if not r.status_code == 200:
@@ -155 +159 @@
     data = r.json()
 
-    # tupla de ambitos
     tuplaScope = ('', 'Seleccione...'),
-    uniqueScope = []
-    index = 0
 
     for dicc in data:
-        tmpScope = dicc['ambito']
-        if tmpScope not in uniqueScope:
-            uniqueScope.append(dicc['ambito'])
-        else:
-            continue
-    for item in uniqueScope:
-        #if ( item.startswith('') ):
-        tuplaScope += (index+1, item),
+        if dicc['parent_id'] == '0' :
+            tuplaScope += (dicc['id'], dicc['nombre']),
 
     return tuplaScope
+
+def cargar_sectores():
+    """!
+    Función que permite cargar los sectores
+
+    @author Antonio Araujo (aaraujo at cenditel.gob.ve)
+    @copyright <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU Public License versión 2 (GPLv2)</a>
+    @date 22-03-2017
+    @return Devuelve una tupla con los ambitos
+    """
+
+    # TODO: especificar la URL del servicio a traves de una configuracion y gestion
+    # de error en solicitud http
+    url = 'http://192.168.12.152:8080/services_sipes/entes_planificadores/views/lista_ambitos_y_sectores?display_id=ambitos'
+    r = requests.get(url)
+    if not r.status_code == 200:
+        print "ERROR:"
+        return ('', 'ocurrio error...'),
+
+    data = r.json()
+    tuplaSector = ('', 'Seleccione...'),
+
+    for dicc in data:
+        if dicc['parent_id'] != '0' :
+            tuplaSector += (dicc['parent_id'], dicc['nombre']),
+
+    return tuplaSector

base/templates/base.footer.html

@@ -1 @@
-<footer class="navbar-default">
+<footer class="navbar-default navbar-fixed-bottom">
     <div class="container-fluid">
         <div class="row">

base/templates/base.template.html

@@ -17 +17 @@
     </head>
     <body>
-        <div class="wrapper">
-            {% include 'base.nav.bar.html' %}
-            <div class="container content-wrapper">
-                {% block content %}{% endblock %}
-            </div>
-            {% block modals %}{% endblock %}
+        {% include 'base.nav.bar.html' %}
+        <div class="container">
+            {% block content %}{% endblock %}
         </div>
+        {% block modals %}{% endblock %}
         {% include 'base.footer.html' %}
     </body>