- Timestamp:
- Nov 20, 2017, 3:54:37 PM (7 years ago)
- Branches:
- master
- Children:
- 8ec6ee3
- Parents:
- 94b3e3f (diff), def10d2 (diff)
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. - Location:
- eventos
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
eventos/admin.py
rbf47591 r8ef5d2c 1 1 from django.contrib import admin 2 from .models import Evento 2 3 3 # Register your models here. 4 admin.site.register(Evento) -
eventos/forms.py
r94b3e3f r16cf088 13 13 14 14 @author Ing. Leonel P. Hernandez M. (lhernandez at cenditel.gob.ve) 15 @copyright <a href='http ://www.gnu.org/licenses/gpl-2.0.html'>GNU Public License versión 2 (GPLv2)</a>15 @copyright <a href='https://www.gnu.org/licenses/gpl-3.0.en.html'>GNU Public License versión 3 (GPLv3)</a> 16 16 @date 19-11-2017 17 17 @version 1.0.0 … … 42 42 self.fields['archivo'].required=True 43 43 self.fields['archivo'].widget.attrs.update( 44 <<<<<<< HEAD 44 45 { 45 46 'class': 'file-path validate', 46 47 'placeholder': 'Subur un archivo'}) 48 ======= 49 {'class': 'file-path', 50 'placeholder': 'Subir Archivo'}) 51 52 class FirmaEventoForm(forms.Form): 53 """! 54 Clase que permite crear el formulario para la firma de un documento 55 56 @author Rodrigo Boet (rboet at cenditel.gob.ve) 57 @copyright <a href='https://www.gnu.org/licenses/gpl-3.0.en.html'>GNU Public License versión 3 (GPLv3)</a> 58 @date 20-11-2017 59 @version 1.0.0 60 """ 61 62 pasaporte = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control','placeholder':'Ingrese su pasaporte'})) 63 >>>>>>> def10d28a56c05436aa09889ff50481aaec4bc4a -
eventos/models.py
r3397a08 r5dea5ff 7 7 8 8 @author Ing. Leonel P. Hernandez M. (lhernandez at cenditel.gob.ve) 9 @copyright <a href='http ://www.gnu.org/licenses/gpl-2.0.html'>GNU Public License versión 2 (GPLv2)</a>9 @copyright <a href='https://www.gnu.org/licenses/gpl-3.0.en.html'>GNU Public License versión 3 (GPLv3)</a> 10 10 @date 19-11-2017 11 11 @version 1.0.0 -
eventos/templates/register.event.html
r8fa24c3 r94b3e3f 2 2 {% load staticfiles %} 3 3 {% block title %}Registrar Evento{% endblock title %} 4 {% block extraJs %} 5 <script src="{% static "js/formset.js" %}"></script> 6 <script type="text/javascript"> 7 $(function() { 8 $('#id_orders_table tbody tr').formset({ 9 // For inline formsets, be sure to set the prefix, as the default prefix 10 // ('form') isn't correct. 11 // Django appears to generate the prefix from the lowercase plural 12 // name of the related model, with camel-case converted to underscores. 13 prefix: 'form' 14 }) 15 $('.datepicker').pickadate({ 16 selectMonths: true, // Creates a dropdown to control month 17 selectYears: 15, // Creates a dropdown of 15 years to control year, 18 today: 'Today', 19 clear: 'Clear', 20 close: 'Ok', 21 closeOnSelect: false, // Close upon selecting a date, 22 format: "dd/mm/yyyy", 23 }); 24 }) 25 </script> 26 {%endblock%} 27 4 28 {% block content %} 5 29 <div class="content center"> 30 <h5>Datos del Evento</h5><hr/><br> 6 31 <form id="form" method="post"> 7 32 {% csrf_token %} 8 <div class="input-field {% if form s.event.nombre.errors %}invalid{% endif %}">9 {{ form s.event.nombre}}10 <label for="icon_prefix {{ form s.event.nombre.auto_id }}">Nombre</label>11 {% include 'base.forms.errors.html' with form_errors=form s.event.nombre.errors col_title_error='col s2' col_msg_error='col s10' %}33 <div class="input-field {% if form.nombre_evento.errors %}invalid{% endif %}"> 34 {{ form.nombre_evento }} 35 <label for="icon_prefix {{ form.nombre_evento.auto_id }}">Nombre</label> 36 {% include 'base.forms.errors.html' with form_errors=form.nombre_evento.errors col_title_error='col s2' col_msg_error='col s10' %} 12 37 </div> 13 38 14 <div class="input-field {% if form s.event.fecha.errors %}invalid{% endif %}">15 <i class=" material-icons">perm_contact_calendar</i>16 {{ form s.event.fecha }}17 <label for="icon_prefix {{ form s.event.fecha.auto_id }}">Fecha</label>18 {% include 'base.forms.errors.html' with form_errors=form s.event.fecha.errors col_title_error='col s2' col_msg_error='col s10' %}39 <div class="input-field {% if form.fecha.errors %}invalid{% endif %}"> 40 <i class="tiny material-icons prefix">perm_contact_calendar</i> 41 {{ form.fecha }} 42 <label for="icon_prefix {{ form.fecha.auto_id }}">Fecha</label> 43 {% include 'base.forms.errors.html' with form_errors=form.fecha.errors col_title_error='col s2' col_msg_error='col s10' %} 19 44 </div> 20 45 21 <div class="file-field input-field {% if forms.event.archivo.errors %}invalid{% endif %}"> 22 <i class="material-icons">attachment</i> 46 <div class="file-field input-field {% if form.archivo.errors %}invalid{% endif %}"> 47 48 <div class="btn"> 49 <span for="icon_prefix {{ form.archivo.auto_id }}">Archivo</span> 50 <input type="file"> 51 </div> 23 52 <div class="file-path-wrapper"> 24 {{ form s.event.archivo }}53 {{ form.archivo }} 25 54 </div> 26 <label for="icon_prefix {{ forms.event.archivo.auto_id }}">Archivo</label> 27 {% include 'base.forms.errors.html' with form_errors=forms.event.archivo.errors col_title_error='col s2' col_msg_error='col s10' %} 55 {% include 'base.forms.errors.html' with form_errors=form.archivo.errors col_title_error='col s2' col_msg_error='col s10' %} 28 56 </div> 29 57 <h5>Datos de los Participantes</h5><hr/><br> 58 <table class="striped" id="id_orders_table"> 59 <thead> 60 <tr> 61 <th scope="col">Nombres</th> 62 <th scope="col">Apellidos</th> 63 <th scope="col">Pasaporte</th> 64 <th scope="col">Correo</th> 65 <th scope="col">Opcion</th> 66 </tr> 67 </thead> 68 <tbody> 69 {{ form2.management_form }} 70 {% for form in form2 %} 71 <tr id="{{ form.prefix }}-row"> 72 <td> 73 {{form.nombres}} 74 </td> 75 <td> 76 {{form.apellidos}} 77 </td> 78 <td> 79 {{form.pasaporte}} 80 </td> 81 <td> 82 {{form.correo}} 83 </td> 84 <td></td> 85 </tr> 86 {% endfor %} 87 </tbody> 88 </table> 30 89 <div> 31 90 <button type="submit" class="btn waves-effect red darken-1">Registrar</button> -
eventos/urls.py
r8fa24c3 r248b1b4 8 8 # Crear y asignar participantes a eventos 9 9 url(r'^crear-eventos/$', RegisterEvent.as_view(), name='create_events'), 10 url(r'^lista-eventos/$', ListEvent.as_view(), name='list_events'), 11 url(r'^firmar-evento/(?P<pk>\d+)$', SignEvent.as_view(), name='firma_events'), 10 12 ] -
eventos/views.py
r94b3e3f r16cf088 1 <<<<<<< HEAD 1 2 from django.contrib import messages 2 3 from django.core.urlresolvers import reverse_lazy … … 4 5 render, redirect, get_object_or_404 5 6 ) 7 ======= 8 from django.shortcuts import render 9 from django.views.generic import ListView, FormView 10 >>>>>>> def10d28a56c05436aa09889ff50481aaec4bc4a 6 11 from multi_form_view import MultiModelFormView 7 12 from django.views.generic import FormView … … 11 16 FormsetParticipanteEvento 12 17 ) 18 from .models import Evento 13 19 14 20 class RegisterEvent(FormView): … … 17 23 18 24 @author Ing. Leonel P. Hernandez M. (lhernandez at cenditel.gob.ve) 19 @copyright <a href='http ://www.gnu.org/licenses/gpl-2.0.html'>GNU Public License versión 2 (GPLv2)</a>25 @copyright <a href='https://www.gnu.org/licenses/gpl-3.0.en.html'>GNU Public License versión 3 (GPLv3)</a> 20 26 @date 20-11-2017 21 27 @version 1.0.0 … … 23 29 24 30 template_name = "register.event.html" 31 <<<<<<< HEAD 25 32 form_class = EventoForm 26 33 form_participante = FormsetParticipanteEvento … … 51 58 (str(self.form_class.errors, self.form_participante.errors))) 52 59 return redirect(self.success_url) 60 ======= 61 form_classes = { 62 'event': EventoForm, 63 'participante': FormsetParticipanteEvento, 64 } 65 #success_url = reverse_lazy('users:home') 66 record_id=None 67 68 69 class ListEvent(ListView): 70 """! 71 Muestra el listado de eventos 72 73 @author Rodrigo Boet (rboet at cenditel.gob.ve) 74 @copyright <a href='https://www.gnu.org/licenses/gpl-3.0.en.html'>GNU Public License versión 3 (GPLv3)</a> 75 @date 20-11-2017 76 @version 1.0.0 77 """ 78 model = Evento 79 template_name = "evento.list.html" 80 paginate_by = 5 81 82 class SignEvent(FormView): 83 """! 84 Muestra el formulario para buscar y luego firmar documento 85 86 @author Rodrigo Boet (rboet at cenditel.gob.ve) 87 @copyright <a href='https://www.gnu.org/licenses/gpl-3.0.en.html'>GNU Public License versión 3 (GPLv3)</a> 88 @date 20-11-2017 89 @version 1.0.0 90 """ 91 form_class = FirmaEventoForm 92 template_name = "evento.firma.html" 93 94 def get_context_data(self, **kwargs): 95 """! 96 Metodo que permite cargar de nuevo valores en los datos de contexto de la vista 97 98 @author Rodrigo Boet (rboet at cenditel.gob.ve) 99 @copyright GNU/GPLv3 100 @date 20-11-2017 101 @param self <b>{object}</b> Objeto que instancia la clase 102 @param kwargs <b>{object}</b> Objeto que contiene los datos de contexto 103 @return Retorna los datos de contexto 104 """ 105 kwargs['nombre_evento'] = Evento.objects.get(pk=int(self.kwargs['pk'])) 106 return super(SignEvent, self).get_context_data(**kwargs) 107 >>>>>>> def10d28a56c05436aa09889ff50481aaec4bc4a
Note: See TracChangeset
for help on using the changeset viewer.