Changeset fd66636 in firmaeventos

Timestamp:

Nov 22, 2017, 1:35:39 PM (6 years ago)

Author:

lhernandez <lhernandez@…>

Branches:

master

Children:

adb2e3a

Parents:

406146f (diff), 2ce257a (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/templates/register.event.html (modified) (6 diffs)
• participantes/urls.py (modified) (1 diff)
• participantes/views.py (modified) (1 diff)
• static/css/style.css (modified) (1 diff)
• static/img/QRCode.png (modified) (previous)
• static/js/DraggableSortable.js (modified) (1 diff)
• static/js/docsDraggable.js (modified) (2 diffs)
• static/js/funciones.js (modified) (1 diff)

base/templates/base.vars.javascript.html

@@ -6 +6 @@
     // URL para actualizar la firma de un participante
     var URL_ACTUALIZAR_PARTICIPACION = "{% url 'participantes:update_participante_evento' %}";
+    
+    // URL para comprobar si el firmante es el último
+    var URL_ULTIMO_FIRMANTE = "{% url 'participantes:participante_restante_evento_nid' %}";
             
 </script>

eventos/templates/register.event.html

@@ -58 +58 @@
 
 {% block content %}
-    <div class="content center">
+    <div class="content">
+      <div class="center">
         <h5>Datos del Evento</h5><hr/><br>
         <form id="form" method="post" enctype="multipart/form-data">
@@ -79 +80 @@
                 <div class="btn">
                 <span for="icon_prefix {{ form.archivo.auto_id }}">Archivo</span>
-                    <input type="file" name="file" id="file" accept=".pdf">
+                    <input type="file" name="file" id="file" accept="application/pdf">
                 </div>
                 <div class="file-path-wrapper">
@@ -87 +88 @@
                 
             </div>
+          </div>
+            <div class="col s8 m2 offset-s2">
             <div id="pdf-main-container" style="display:none;"><center><h5>Configurar Posicion de la Firma</h5></center> 
                   <div id="pdf-loader2">Cargando documento ...</div>
@@ -92 +95 @@
                     <div id="pdf-meta2">
                       <div id="pdf-buttons2">
-                        <button type="button" id="pdf-prev2" class="btn btn-default btn-sm">
-                          <span class="glyphicon glyphicon-step-backward"></span> 
-                        </button>
-                        <button type="button" id="pdf-next2" class="btn btn-default btn-sm">
-                          <span class="glyphicon glyphicon-step-forward"></span> 
-                        </button>                                
+                        <a class="waves-effect waves-light btn" id="pdf-prev2"><i class="material-icons">keyboard_arrow_left</i></a>
+                        <a class="waves-effect waves-light btn" id="pdf-next2"><i class="material-icons">keyboard_arrow_right</i></a>
                       </div>
                       <div id="page-count-container">Página <div id="pdf-current-page2"></div> de <div id="pdf-total-pages2"></div></div>
                     </div>
+                    <img class="text" src="{% static 'img/QRCode.png' %}" id="texto"/>
                     <div class="overflow" >
                       <div id="container1" class=".cropper-hidden">
@@ -112 +112 @@
                     <div id="page-loader2">Cargando página ...</div>
               </div>
+            </div>
+            <div class="center">
             <h5>Datos de los Participantes</h5><hr/><br>
             <table class="striped" id="id_orders_table">
@@ -144 +146 @@
                 </tbody>
             </table>
-            <div>
+            </div>
+            <div class="center">
+                {{ form.pos_x }}
+                {{ form.pos_y }}
+                {{ form.pag }}
                 <button type="submit" class="btn waves-effect blue darken-1">Registrar</button>
             </div>

participantes/urls.py

@@ -8 +8 @@
     url(r'^search-participante/$', ParticipanteEventoSearch.as_view(), name='search_participante_nid'),
     url(r'^update-participante-evento/$', AjaxParticipanteFirmaEvento.as_view(), name='update_participante_evento'),
+    url(r'^participante-restante/(?P<evento>\d+)/$', ParticipantesRestantes.as_view(), name='participante_restante_evento'),
+    url(r'^participante-restante/$', ParticipantesRestantes.as_view(), name='participante_restante_evento_nid'),
 ]

participantes/views.py

@@ -113 +113 @@
 
         return JsonResponse(data, safe=False)
+
+class ParticipantesRestantes(View):
+    """!
+    Muestra si el participante restante es el último
+
+    @author Rodrigo Boet  (rboet at cenditel.gob.ve)
+    @copyright <a href='https://www.gnu.org/licenses/gpl-3.0.en.html'>GNU Public License versión 3 (GPLv3)</a>
+    @date 22-11-2017
+    @version 1.0.0
+    """
+
+    def get(self,request,evento):
+        """!
+        Metodo para antender la vista por GET
+
+        @author Rodrigo Boet (rboet at cenditel.gob.ve)
+        @copyright GNU/GPLv3
+        @date 22-11-2017
+        @param self <b>{object}</b> Objeto que instancia la clase
+        @param request <b>{object}</b> Objeto que contiene la petición
+        @param evento <b>{int}</b> Recibe el id del evento
+        @return Retorna un Json con la respuesta
+        """
+        participante_evento = ParticipanteEvento.objects.select_related().filter(fk_evento=evento)
+        falta_porfirma = participante_evento.filter(firma=False).count()
+        data = {}
+        if(falta_porfirma==1):
+            evento = Evento.objects.get(pk=evento)
+            data = {'valid':True,'data':{'posX':evento.pos_x,'posY':evento.pos_y,'page':evento.pag}}
+        else:
+            data = {'valid':False}
+
+        return JsonResponse(data, safe=False)

static/css/style.css

@@ -52 +52 @@
     color: #1e88e5;
 }
+
+.overflow {
+  position: relative; 
+  overflow: auto; 
+  width: 100%;
+}

static/js/DraggableSortable.js

@@ -34 +34 @@
           VALOR_X = parseInt(ui.position['left']);
           VALOR_Y = parseInt(ui.position['top']);
+          console.log(VALOR_X, VALOR_Y)
         }
-        
+        $('#id_pos_x').val(VALOR_X)
+        $('#id_pos_y').val(VALOR_Y)
+        $('#id_pag').val(__CURRENT_PAGE)
       },
     

static/js/docsDraggable.js

@@ -110 +110 @@
 
   // Validate whether PDF
-  if(['application/pdf'].indexOf($("#file-sign-ft_Vble").get(0).files[0].type) == -1) {
+  if(['application/pdf'].indexOf($("#file").get(0).files[0].type) == -1) {
       alert('Error : Not a PDF');
       return;
@@ -128 +128 @@
 
   // Send the object url of the pdf
-  showPDF2(URL.createObjectURL($("#file-sign-ft_Vble").get(0).files[0]));
+  showPDF2(URL.createObjectURL($("#file").get(0).files[0]));
 
 

static/js/funciones.js

@@ -91 +91 @@
 */
 function ObtenerCertificadoFirmanteMultiples(fileId){
-
-        // identificador del archivo en el servidor
-        window.hwcrypto.getCertificate({lang: "en"}).then(
-                function(response) {
-                        var cert = response;
-                        var parameters = "";
-                        parameters = JSON.stringify({
-                                "fileId":fileId,
-                                "certificate":cert.hex,
-                                "reason":"Certificado",
-                                "location":"RedGealc",
-                                "contact":"RedGealc",
-                                "signatureVisible":"false",
-                                "signaturePage": "",
-                                "xPos": "",
-                                "yPos": ""
-                                });                             
-
-                        // ahora llamar al ajax de obtener la resena del pdf
-                        ObtenerHashPDFServerMultiples(parameters, cert);        
-
-                }, 
-                function(err) {
-            var error;
-            if(err == "Error: user_cancel") {
-                error = "El usuario cancelo la operación"; 
-             }      
-             else if(err == "Error: no_certificates") {
-                 error = "No hay certificado disponible";
-             }
-             else if(err == "Error: no_implementation") {
-                 error = "No hay soporte para el manejo del certificado";
-                        }
-            simple_modal(error);
+    var xPos = yPos= signaturePage = "";
+    var lastSignature = false;
+    var routes = $(location).attr('pathname').split('/');
+    var pk = routes[routes.length-1];
+    
+    $.ajax({
+                type: 'GET',
+        async: false,
+                url:URL_ULTIMO_FIRMANTE+pk,
+                success: function(datos){
+            if (datos.valid==true) {
+                xPos = datos.data.posX;
+                yPos = datos.data.posY;
+                signaturePage = datos.data.page;
+                lastSignature = true;
+            }
+            window.hwcrypto.getCertificate({lang: "en"}).then(
+                function(response) {
+                    var cert = response;
+                    var parameters = "";
+                    parameters = JSON.stringify({
+                        "fileId":fileId,
+                        "certificate":cert.hex,
+                        "reason":"Certificado",
+                        "location":"RedGealc",
+                        "contact":"RedGealc",
+                        "signatureVisible":"false",
+                        "signaturePage": signaturePage,
+                        "xPos": xPos,
+                        "yPos": yPos,
+                        "lastSignature":lastSignature
+                        });                             
+        
+                    // ahora llamar al ajax de obtener la resena del pdf
+                    ObtenerHashPDFServerMultiples(parameters, cert);    
+        
+                }, 
+                function(err) {
+                    var error;
+                    if(err == "Error: user_cancel") {
+                        error = "El usuario cancelo la operación"; 
+                     }      
+                     else if(err == "Error: no_certificates") {
+                         error = "No hay certificado disponible";
+                     }
+                     else if(err == "Error: no_implementation") {
+                         error = "No hay soporte para el manejo del certificado";
+                    }
+                    simple_modal(error);
+                }
+        
+            );
+                },
+                error: function(jqXHR, textStatus, errorThrown){
+                        console.log('error: ' + textStatus);
                 }
-
-        );
+        });
 }