Changeset 25ec4a7 in firmaeventos

Timestamp:

Nov 22, 2017, 11:02:15 AM (6 years ago)

Author:

rudmanmrrod <rudman22@…>

Branches:

master

Children:

9add819

Parents:

d2472e8 (diff), bc1e568 (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.

Message:

Merge branch 'master' of ​https://github.com/cenditel-desarrollo/FirmaEventos

Files:

• base/templates/base.vars.javascript.html (modified) (1 diff)
• eventos/forms.py (modified) (1 diff)
• eventos/models.py (modified) (1 diff)
• eventos/templates/evento.detail.html (modified) (1 diff)
• eventos/templates/evento.firma.html (modified) (1 diff)

base/templates/base.vars.javascript.html

@@ -4 +4 @@
     var URL_USUARIO_EVENTO = "{% url 'participantes:search_participante_nid' %}";
     
-    // URUL para actualizar la firma de un participante
+    // URL para actualizar la firma de un participante
     var URL_ACTUALIZAR_PARTICIPACION = "{% url 'participantes:update_participante_evento' %}";
-        
+            
 </script>

eventos/forms.py

@@ -44 +44 @@
              'placeholder': 'Subir Archivo',
              'accept': '.pdf'})
+        self.fields['pos_x'].widget = forms.HiddenInput()
+        self.fields['pos_y'].widget = forms.HiddenInput()
 
 class FirmaEventoForm(forms.Form):

eventos/models.py

@@ -14 +14 @@
     fecha = models.DateField(null=False)
     serial = models.CharField(max_length=128)
+    pos_x = models.CharField(max_length=32)
+    pos_y = models.CharField(max_length=32)
     activo = models.BooleanField(default=True)
 

eventos/templates/evento.detail.html

@@ -55 +55 @@
         </iframe>
     </div>
+    <div class="row">
+        <a class="btn waves-effect blue darken-1" href="{% url 'events:list_events' %}" >Regresar</a>
+    </div>
 {% endblock %}

eventos/templates/evento.firma.html

@@ -18 +18 @@
             <div id="datos_paricipante"></div>
         </form>
+        <div class="row" style="padding-top: 25px;">
+            <a class="btn left waves-effect blue darken-1" href="{% url 'events:list_events' %}" >Regresar</a>
+        </div>
     </div>
 {% endblock %}