Conjunto beac5e8 en consulta_publica
- Fecha y hora:
- 22/03/2017 15:53:09 (hace 7 años)
- 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. - Ficheros:
-
- 15 editados
Leyenda
- No modificado
- Añadido
- Eliminado
-
base/functions.py
rb2927f0 rbae8490 82 82 tuplaNameEntity = ('', 'Seleccione...'), 83 83 uniqueEntities = [] 84 index = 084 nidEntities = [] 85 85 86 86 for dicc in data: 87 87 tmpEntity = dicc['name_ente'] 88 if tmpEntity not in uniqueEntities: 89 uniqueEntities.append(dicc['name_ente']) 88 tmpNidEntity = dicc['nid'] 89 if tmpEntity.startswith('Ministerio') and tmpEntity not in uniqueEntities: 90 uniqueEntities.append(tmpEntity) 91 nidEntities.append(tmpNidEntity) 90 92 else: 91 93 continue 92 for item in uniqueEntities: 93 if ( item.startswith('Ministerio') ):94 tuplaNameEntity += (index+1, item),94 95 for i in range(0, len(uniqueEntities)) : 96 tuplaNameEntity += (nidEntities[i], uniqueEntities[i]), 95 97 96 98 return tuplaNameEntity … … 120 122 tuplaSector = ('', 'Seleccione...'), 121 123 uniqueSectors = [] 122 index = 0124 nidEntities = [] 123 125 124 126 for dicc in data: 125 127 tmpSector = dicc['sector'] 126 if tmpSector not in uniqueSectors: 127 uniqueSectors.append(dicc['sector']) 128 tmpNidEntity = dicc['nid'] 129 if tmpSector.startswith('Vicepresidencia') and tmpSector not in uniqueSectors: 130 uniqueSectors.append(tmpSector) 131 nidEntities.append(tmpNidEntity) 128 132 else: 129 133 continue 130 for item in uniqueSectors: 131 if ( item.startswith('Vicepresidencia') ):132 tuplaSector += (index+1, item),134 135 for i in range(0, len(uniqueSectors)) : 136 tuplaSector += (nidEntities[i], uniqueSectors[i]), 133 137 134 138 return tuplaSector … … 141 145 @author Antonio Araujo (aaraujo at cenditel.gob.ve) 142 146 @copyright <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU Public License versión 2 (GPLv2)</a> 143 @date 15-03-2017147 @date 22-03-2017 144 148 @return Devuelve una tupla con los ambitos 145 149 """ … … 147 151 # TODO: especificar la URL del servicio a traves de una configuracion y gestion 148 152 # de error en solicitud http 149 url = 'http://192.168.12.152:8080/services_sipes/entes_planificadores/views/servicios_webs?display_id=page_1'153 url = 'http://192.168.12.152:8080/services_sipes/entes_planificadores/views/lista_ambitos_y_sectores?display_id=ambitos' 150 154 r = requests.get(url) 151 155 if not r.status_code == 200: … … 155 159 data = r.json() 156 160 157 # tupla de ambitos158 161 tuplaScope = ('', 'Seleccione...'), 159 uniqueScope = []160 index = 0161 162 162 163 for dicc in data: 163 tmpScope = dicc['ambito'] 164 if tmpScope not in uniqueScope: 165 uniqueScope.append(dicc['ambito']) 166 else: 167 continue 168 for item in uniqueScope: 169 #if ( item.startswith('') ): 170 tuplaScope += (index+1, item), 164 if dicc['parent_id'] == '0' : 165 tuplaScope += (dicc['id'], dicc['nombre']), 171 166 172 167 return tuplaScope 168 169 def cargar_sectores(): 170 """! 171 Función que permite cargar los sectores 172 173 @author Antonio Araujo (aaraujo at cenditel.gob.ve) 174 @copyright <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU Public License versión 2 (GPLv2)</a> 175 @date 22-03-2017 176 @return Devuelve una tupla con los ambitos 177 """ 178 179 # TODO: especificar la URL del servicio a traves de una configuracion y gestion 180 # de error en solicitud http 181 url = 'http://192.168.12.152:8080/services_sipes/entes_planificadores/views/lista_ambitos_y_sectores?display_id=ambitos' 182 r = requests.get(url) 183 if not r.status_code == 200: 184 print "ERROR:" 185 return ('', 'ocurrio error...'), 186 187 data = r.json() 188 tuplaSector = ('', 'Seleccione...'), 189 190 for dicc in data: 191 if dicc['parent_id'] != '0' : 192 tuplaSector += (dicc['parent_id'], dicc['nombre']), 193 194 return tuplaSector -
base/templates/base.footer.html
r99ac420 r95b08c1 1 <footer class="navbar-default ">1 <footer class="navbar-default navbar-fixed-bottom"> 2 2 <div class="container-fluid"> 3 3 <div class="row"> -
base/templates/base.template.html
r99ac420 r95b08c1 17 17 </head> 18 18 <body> 19 <div class="wrapper"> 20 {% include 'base.nav.bar.html' %} 21 <div class="container content-wrapper"> 22 {% block content %}{% endblock %} 23 </div> 24 {% block modals %}{% endblock %} 19 {% include 'base.nav.bar.html' %} 20 <div class="container"> 21 {% block content %}{% endblock %} 25 22 </div> 23 {% block modals %}{% endblock %} 26 24 {% include 'base.footer.html' %} 27 25 </body> -
consulta/templates/consulta.base.html
r2d85efb r95b08c1 1 1 {% extends 'base.template.html' %} 2 {% block content %} 3 <div id="content"> 4 {% block contenido %}{% endblock %} 5 </div> 6 {% endblock %} 2 7 {% block modals %} 3 8 {% include 'consulta.form.modals.html' %} -
consulta/templates/consulta.create.html
r99ac420 r95b08c1 2 2 {% load staticfiles %} 3 3 {% block title %}Crear Consulta{% endblock %} 4 {% block conten t%}4 {% block contenido %} 5 5 <form action="{% url 'consulta_create' %}" role="form" class="form form-horizontal validate-form" method="post" autocomplete="off"> 6 6 {% csrf_token %} … … 24 24 <h4 class="pull-left text-primary"> 25 25 Agregar Más Preguntas 26 <a href="#" onclick="agregar_preguntas('#preguntas')"><span class="glyphicon glyphicon-plus " style="color:white;text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;"></span></a>26 <a href="#" onclick="agregar_preguntas('#preguntas')"><span class="glyphicon glyphicon-plus text-primary"></span></a> 27 27 </h4> 28 28 </div> -
consulta/templates/consulta.delete.html
r2d85efb r95b08c1 2 2 {% load staticfiles %} 3 3 {% block title %}Eliminar Consulta{% endblock %} 4 {% block conten t%}4 {% block contenido %} 5 5 <h1>Borrar consulta <b>{{object.nombre_consulta}}</b></h1><hr> 6 6 <form method="post"> -
consulta/templates/consulta.detail.html
rcdd72e5 r95b08c1 2 2 {% load staticfiles %} 3 3 {% block title %}Ver Consulta{% endblock %} 4 {% block conten t%}4 {% block contenido %} 5 5 <h1>Consulta "{{object.nombre_consulta}}"</h1><hr> 6 6 <div class="panel panel-default"> -
consulta/templates/consulta.index.html
r2d85efb r95b08c1 2 2 {% load staticfiles %} 3 3 {% block title %}Consulta{% endblock %} 4 {% block conten t%}4 {% block contenido %} 5 5 <div class="row text-center"> 6 6 <h1>Consulta</h1><hr> -
consulta/templates/consulta.list.html
r2d85efb r95b08c1 1 {% extends ' consulta.base.html' %}1 {% extends 'base.template.html' %} 2 2 {% load staticfiles %} 3 3 {% block title %}Consultas{% endblock %} … … 20 20 <h3>No existen consultas.</h3> 21 21 {% endfor %} 22 <a type="button" class="btn btn-info" href="{% url 'consulta_index' %}">Regresar</a> 22 <div class="container" style="padding-bottom: 50px;"> 23 <a type="button" class="btn btn-info" href="{% url 'consulta_index' %}">Regresar</a> 24 </div> 23 25 {% endblock %} -
consulta/templates/consulta.update.html
r2d85efb r95b08c1 2 2 {% load staticfiles %} 3 3 {% block title %}Actualizar Consulta{% endblock %} 4 {% block conten t%}4 {% block contenido %} 5 5 <form action="" role="form" class="form form-horizontal validate-form" method="post" autocomplete="off"> 6 6 {% csrf_token %} … … 32 32 {% endif %} 33 33 <div class="col-md-4 col-sm-4 col-xs-4"> 34 <h4 class="text- primary">34 <h4 class="text-success"> 35 35 <a href="#" onclick="add_preguntas({{object.id}})"> 36 36 <span class="glyphicon glyphicon-plus"></span> -
participacion/forms.py
ra1ac8b8 rbae8490 14 14 # @version 1.0 15 15 from django import forms 16 from base.functions import cargar_consulta, cargar_ministerios, cargar_vicepresidencias, cargar_ambitos 16 from base.functions import cargar_consulta, cargar_ministerios, cargar_vicepresidencias, cargar_ambitos, cargar_sectores 17 17 18 18 … … 63 63 self.fields['vicepresidencias'].choices = cargar_vicepresidencias() 64 64 self.fields['ambito'].choices = cargar_ambitos() 65 self.fields['sector'].choices = cargar_sectores() 65 66 66 67 ## Vicepresidencias … … 87 88 ambito = forms.ChoiceField(widget=forms.Select(attrs={'class':'form-control'}), 88 89 label="Selecione un ambito") 89 90 90 91 ## Sector 91 92 sector = forms.ChoiceField(widget=forms.Select(attrs={'class':'form-control'}), -
participacion/templates/participacion.create.html
r1731833 r95b08c1 7 7 <div class="row text-center"> 8 8 <h1>Consulta</h1><hr> 9 <div class="row ">9 <div class="row center-block" style="width: 90%"> 10 10 <div class="progress non-null" role="progressbar" id="status" > 11 11 <div class="progress-bar progress-bar active" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"> -
participacion/templates/participacion.index.html
r2d85efb r95b08c1 3 3 {% block title %}Ver Consultas{% endblock %} 4 4 {% block content %} 5 <form action="{% url 'participacion_index' %}" role="form" class="form form-horizontal validate-form" method="post" autocomplete="off"> 6 {% csrf_token %} 7 <div class="row text-center"> 8 <h1>Ver Consultas</h1><hr> 9 <div class="col-md-12 col-sm-12 col-xs-12"> 10 <div class="form-group {% if form.consultas.errors %}has-error{% endif %}"> 11 <label class="col-md-3 col-xs-3 col-sm-3 control-label" for="{{ form.consultas.auto_id }}"> 12 {{ form.consultas.label }} 13 </label> 14 <div class="col-md-4 col-xs-4 col-sm-4"> 15 {{ form.consultas }} 16 {% include 'base.forms.errors.html' with form_errors=form.consultas.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 5 <div id="content"> 6 <form action="{% url 'participacion_index' %}" role="form" class="form form-horizontal validate-form" method="post" autocomplete="off"> 7 {% csrf_token %} 8 <div class="row text-center"> 9 <h1>Ver Consultas</h1><hr> 10 <div class="col-md-12 col-sm-12 col-xs-12"> 11 <div class="form-group {% if form.consultas.errors %}has-error{% endif %}"> 12 <label class="col-md-3 col-xs-3 col-sm-3 control-label" for="{{ form.consultas.auto_id }}"> 13 {{ form.consultas.label }} 14 </label> 15 <div class="col-md-4 col-xs-4 col-sm-4"> 16 {{ form.consultas }} 17 {% include 'base.forms.errors.html' with form_errors=form.consultas.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 18 </div> 19 <div class="col-sm-1"><i class="ion ion-ios-medical item-requerido"></i></div> 17 20 </div> 18 <div class="col-sm-1"><i class="ion ion-ios-medical item-requerido"></i></div>19 21 </div> 22 <div class="col-md-12 col-sm-12 col-xs-12"> 23 <button type="submit" class="btn btn-success">Participar</button> 24 </div> 20 25 </div> 21 <div class="col-md-12 col-sm-12 col-xs-12"> 22 <button type="submit" class="btn btn-success">Participar</button> 23 </div> 24 </div> 25 </form> 26 </form> 27 </div> 26 28 {% endblock %} -
participacion/templates/participacion.search.html
ra1ac8b8 r95b08c1 3 3 {% block title %}Buscar{% endblock %} 4 4 {% block content %} 5 <form action="" role="form" class="form form-horizontal validate-form" method="post" autocomplete="off"> 6 {% csrf_token %} 7 <div class="row text-center"> 8 <h1>Buscar</h1><hr> 9 <div class="row"> 10 <div class="col-md-6 col-sm-6 col-xs-6"> 11 <div class="form-group {% if form.vicepresidencias.errors %}has-error{% endif %}"> 12 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.vicepresidencias.auto_id }}"> 13 {{ form.vicepresidencias.label }} 14 </label> 15 <div class="col-md-6 col-xs-6 col-sm-6"> 16 {{ form.vicepresidencias }} 17 {% include 'base.forms.errors.html' with form_errors=form.vicepresidencias.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 5 <div id="content"> 6 <form action="" role="form" class="form form-horizontal validate-form" method="post" autocomplete="off"> 7 {% csrf_token %} 8 <div class="row text-center"> 9 <h1>Buscar</h1><hr> 10 <div class="row"> 11 <div class="col-md-6 col-sm-6 col-xs-6"> 12 <div class="form-group {% if form.vicepresidencias.errors %}has-error{% endif %}"> 13 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.vicepresidencias.auto_id }}"> 14 {{ form.vicepresidencias.label }} 15 </label> 16 <div class="col-md-6 col-xs-6 col-sm-6"> 17 {{ form.vicepresidencias }} 18 {% include 'base.forms.errors.html' with form_errors=form.vicepresidencias.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 19 </div> 20 </div> 21 </div> 22 <div class="col-md-6 col-sm-6 col-xs-6"> 23 <div class="form-group {% if form.ministerios.errors %}has-error{% endif %}"> 24 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.ministerios.auto_id }}"> 25 {{ form.ministerios.label }} 26 </label> 27 <div class="col-md-6 col-xs-6 col-sm-6"> 28 {{ form.ministerios }} 29 {% include 'base.forms.errors.html' with form_errors=form.ministerios.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 30 </div> 18 31 </div> 19 32 </div> 20 33 </div> 21 <div class="col-md-6 col-sm-6 col-xs-6"> 22 <div class="form-group {% if form.ministerios.errors %}has-error{% endif %}"> 23 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.ministerios.auto_id }}"> 24 {{ form.ministerios.label }} 25 </label> 26 <div class="col-md-6 col-xs-6 col-sm-6"> 27 {{ form.ministerios }} 28 {% include 'base.forms.errors.html' with form_errors=form.ministerios.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 34 35 <div class="row"> 36 <div class="col-md-4 col-sm-4 col-xs-4"> 37 <div class="form-group {% if form.estado.errors %}has-error{% endif %}"> 38 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.estado.auto_id }}"> 39 {{ form.estado.label }} 40 </label> 41 <div class="col-md-6 col-xs-6 col-sm-6"> 42 {{ form.estado }} 43 {% include 'base.forms.errors.html' with form_errors=form.estado.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 44 </div> 45 </div> 46 </div> 47 <div class="col-md-4 col-sm-4 col-xs-4"> 48 <div class="form-group {% if form.municipio.errors %}has-error{% endif %}"> 49 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.municipio.auto_id }}"> 50 {{ form.municipio.label }} 51 </label> 52 <div class="col-md-6 col-xs-6 col-sm-6"> 53 {{ form.municipio }} 54 {% include 'base.forms.errors.html' with form_errors=form.municipio.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 55 </div> 56 </div> 57 </div> 58 <div class="col-md-4 col-sm-4 col-xs-4"> 59 <div class="form-group {% if form.parroquia.errors %}has-error{% endif %}"> 60 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.parroquia.auto_id }}"> 61 {{ form.parroquia.label }} 62 </label> 63 <div class="col-md-6 col-xs-6 col-sm-6"> 64 {{ form.parroquia }} 65 {% include 'base.forms.errors.html' with form_errors=form.parroquia.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 66 </div> 29 67 </div> 30 68 </div> 31 69 </div> 32 </div> 33 34 <div class="row"> 35 <div class="col-md-4 col-sm-4 col-xs-4"> 36 <div class="form-group {% if form.estado.errors %}has-error{% endif %}"> 37 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.estado.auto_id }}"> 38 {{ form.estado.label }} 39 </label> 40 <div class="col-md-6 col-xs-6 col-sm-6"> 41 {{ form.estado }} 42 {% include 'base.forms.errors.html' with form_errors=form.estado.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 70 <div class="row"> 71 <div class="col-md-6 col-sm-6 col-xs-6"> 72 <div class="form-group {% if form.ambito.errors %}has-error{% endif %}"> 73 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.ambito.auto_id }}"> 74 {{ form.ambito.label }} 75 </label> 76 <div class="col-md-6 col-xs-6 col-sm-6"> 77 {{ form.ambito }} 78 {% include 'base.forms.errors.html' with form_errors=form.ambito.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 79 </div> 80 </div> 81 </div> 82 <div class="col-md-6 col-sm-6 col-xs-6"> 83 <div class="form-group {% if form.sector.errors %}has-error{% endif %}"> 84 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.sector.auto_id }}"> 85 {{ form.sector.label }} 86 </label> 87 <div class="col-md-6 col-xs-6 col-sm-6"> 88 {{ form.sector }} 89 {% include 'base.forms.errors.html' with form_errors=form.sector.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 90 </div> 43 91 </div> 44 92 </div> 45 93 </div> 46 <div class="col-md-4 col-sm-4 col-xs-4"> 47 <div class="form-group {% if form.municipio.errors %}has-error{% endif %}"> 48 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.municipio.auto_id }}"> 49 {{ form.municipio.label }} 50 </label> 51 <div class="col-md-6 col-xs-6 col-sm-6"> 52 {{ form.municipio }} 53 {% include 'base.forms.errors.html' with form_errors=form.municipio.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 54 </div> 55 </div> 56 </div> 57 <div class="col-md-4 col-sm-4 col-xs-4"> 58 <div class="form-group {% if form.parroquia.errors %}has-error{% endif %}"> 59 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.parroquia.auto_id }}"> 60 {{ form.parroquia.label }} 61 </label> 62 <div class="col-md-6 col-xs-6 col-sm-6"> 63 {{ form.parroquia }} 64 {% include 'base.forms.errors.html' with form_errors=form.parroquia.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 65 </div> 66 </div> 67 </div> 94 <div class="col-md-12 col-sm-12 col-xs-12"> 95 <a type="button" class="btn btn-info pull-left" href="{% url 'participacion_index' %}">Regresar</a> 96 <button type="submit" class="btn btn-success">Buscar</button> 97 </div> 68 98 </div> 69 <div class="row"> 70 <div class="col-md-6 col-sm-6 col-xs-6"> 71 <div class="form-group {% if form.ambito.errors %}has-error{% endif %}"> 72 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.ambito.auto_id }}"> 73 {{ form.ambito.label }} 74 </label> 75 <div class="col-md-6 col-xs-6 col-sm-6"> 76 {{ form.ambito }} 77 {% include 'base.forms.errors.html' with form_errors=form.ambito.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 78 </div> 79 </div> 80 </div> 81 <div class="col-md-6 col-sm-6 col-xs-6"> 82 <div class="form-group {% if form.sector.errors %}has-error{% endif %}"> 83 <label class="col-md-5 col-xs-5 col-sm-5 control-label" for="{{ form.sector.auto_id }}"> 84 {{ form.sector.label }} 85 </label> 86 <div class="col-md-6 col-xs-6 col-sm-6"> 87 {{ form.sector }} 88 {% include 'base.forms.errors.html' with form_errors=form.sector.errors col_title_error='col-sm-2' col_msg_error='col-sm-10' %} 89 </div> 90 </div> 91 </div> 92 </div> 93 <div class="col-md-12 col-sm-12 col-xs-12"> 94 <a type="button" class="btn btn-info pull-left" href="{% url 'participacion_index' %}">Regresar</a> 95 <button type="submit" class="btn btn-success">Buscar</button> 96 </div> 97 </div> 98 </form> 99 </form> 100 </div> 99 101 {% endblock %} -
static/css/style.css
r1731833 r95b08c1 151 151 } 152 152 153 .wrapper {154 min-height:100%;155 position:relative;156 }157 158 153 body, html { 159 154 margin:; … … 161 156 height:100%; 162 157 } 163 footer{ 164 height:50px; 165 width:100%; 166 position:absolute; 167 bottom:0; 168 left:0; 158 159 .container{ 160 padding-bottom: 50px; 169 161 } 170 162 … … 176 168 border: solid 5px #deddde; 177 169 } 170 171 #content{ 172 background-color: white; 173 color: gray; 174 padding: 10px 10px 10px 10px; 175 border: solid 5px #deddde; 176 } 177 178 #content .text-primary a,#content .text-primary span{ 179 color: #337ab7; 180 } 181 182 #content .text-success a,#content .text-success span{ 183 color: #3c763d; 184 } 185 186 hr{ 187 width: 90%; 188 }
Nota: Vea TracChangeset
para ayuda en el uso del visor de conjuntos de cambios.