From 8f2e76cbfafb95147da47ddb63a46b01c59f5b4a Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Mon, 26 Aug 2019 11:58:11 +0200
Subject: [PATCH] enter key simulated submit form

---
 mondumas/models/dossier.py                   |  2 +-
 mondumas/templates/default/login.pt          | 51 ++++++++++++++------
 mondumas/templates/dossier/dossier_lookup.pt | 13 +----
 mondumas/views/dossier.py                    | 34 +++++++------
 4 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py
index b7989dc..65bf578 100644
--- a/mondumas/models/dossier.py
+++ b/mondumas/models/dossier.py
@@ -19,7 +19,7 @@ def execute_query(request, query, params):
     mark_changed(request.dbsession)
     transaction.commit()
 
-def get_chantiers_byName(request, societe, name, tous):
+def get_chantiers_byName(request, societe, name):
     
     query = "CALL spGET_CHANTIERS_byName('%s','%s');" % (societe, name)
     results = request.dbsession.execute(query).fetchall()
diff --git a/mondumas/templates/default/login.pt b/mondumas/templates/default/login.pt
index ec7f05d..6e2b7ea 100644
--- a/mondumas/templates/default/login.pt
+++ b/mondumas/templates/default/login.pt
@@ -8,31 +8,21 @@
 	<br />
 	<div class="col-md-offset-4 col-md-4 well">
 
-		<form id="login-form" role="form" action="${url}" method="post" 
-				data-fv-framework="bootstrap"
-				data-fv-icon-valid="glyphicon glyphicon-ok"
-				data-fv-icon-invalid="glyphicon glyphicon-remove"
-				data-fv-icon-validating="glyphicon glyphicon-refresh">
+		<form id="login-form" role="form" action="${url}" method="post" >
 				
 			<h3>Se connecter</h3>
             <input type="hidden" name="came_from" value="${came_from}"/>
 
 			<div class="form-group">
-				<input class="form-control" type="text" name="login" value="${login}" 
-					placeholder="Identifiant" 
-					data-fv-notempty="true"
-					data-fv-notempty-message="L'identifiant est obligatoire"  />
+				<input class="form-control" type="text" name="login" value="${login}" />
 			</div>
 
 			<div class="form-group">
-					<input class="form-control" type="password" name="password" value="" 
-						placeholder="Mot de passe"
-						data-fv-notempty="true"
-						data-fv-notempty-message="Le mot de passe est obligatoire">
+					<input class="form-control" type="password" name="password" value="" />
 			</div>
 
 			<div class="form-group">
-				<button  class="btn btn-primary" type="submit" name="form.submitted">Se connecter</button>
+				<button id="submitButton" class="btn btn-primary" type="submit" name="form.submitted">Se connecter</button>
 				&nbsp;&nbsp;
 			</div>
             <p class="help-block">
@@ -49,9 +39,38 @@
 
 <script>
 $(document).ready(function() {
-	$('#login-form').formValidation();
+	$('#login-form').formValidation({
+		framework: 'bootstrap',
+		message: 'This value is not valid',
+		icon: {
+			valid: 'glyphicon glyphicon-ok',
+			invalid: 'glyphicon glyphicon-remove',
+			validating: 'glyphicon glyphicon-refresh'
+		},
+		fields: {
+			login: {
+				validators: {
+					notEmpty: {
+						message: 'Le code utilisateur est obligatoire'
+					},
+				}
+			},
+			password: {
+				validators: {
+					notEmpty: {
+						message: 'Le mot de passe est obligatoire'
+					}
+				}
+			}
+		}
+	});
 	$('form input').on('keypress', function(e) {
-		return e.which !== 13;
+	var code = e.keyCode || e.which; 
+	if (code === 13) {               
+		e.preventDefault();
+		// simuler clic bouton submit
+		document.getElementById("submitButton").click();
+		}	
 	});
 });
 </script>
diff --git a/mondumas/templates/dossier/dossier_lookup.pt b/mondumas/templates/dossier/dossier_lookup.pt
index c9690e0..98ae0f4 100644
--- a/mondumas/templates/dossier/dossier_lookup.pt
+++ b/mondumas/templates/dossier/dossier_lookup.pt
@@ -25,23 +25,12 @@
 				<label class="col-sm-4 control-label">Nom ou numéro du chantier</label>
 				<div class="col-sm-8">
 					<input type="text" class="form-control" name="name" value="${name}"
-						data-fv-notempty="true"
-						data-fv-notempty-message="Le nom ou le numéro est obligatoire"
-
 						data-fv-stringlength="true"
 						data-fv-stringlength-min="2"
 						data-fv-stringlength-max="30"
 						data-fv-stringlength-message="Le nom ou le numéro doit avoir de 2 à 30 caractères de long" />
 				</div>
 			</div>
-			<!-- case a cocher "Afficher fiches cloturées" -->
-			<div class="form-group">
-				<div class="col-sm-offset-4 col-sm-8">
-					<input type="checkbox" name="cb_tous" value="cb_tous"  
-						tal:attributes="checked cb_tous == 'oui' and 'checked' or None">
-						Afficher les chantiers cloturées</input>
-				</div>
-			</div>
 
 			<div class="form-group"> 
 				<div class="col-sm-offset-4 col-sm-8">
@@ -74,6 +63,7 @@
 <script type="text/javascript">
 	var dataSet = ${dt_data};
 	var goto_url = '${goto_url}';
+	var order_option = '${order_option}'
 	
 	$(document).ready(function() {
 		$.fn.dataTable.moment('DD-MM-YYYY');
@@ -84,6 +74,7 @@
 			language: {
 				url: 'https://cdn.datatables.net/plug-ins/1.10.16/i18n/French.json'
 			},
+			order: [[0, order_option]],
 			columnDefs: [
 				{ "targets": 0,
 					"render": function (data, type, full, meta) {
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index 8a2d351..6aeafa7 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -75,21 +75,21 @@ def dossier_lookup(request):
         else:
             societe = societe_defaut
             
-        # si afficher tous les fiches ?
-        if 'cb_tous' in request.params: 
-            cb_tous = "oui" 
-            chantiers = get_chantiers_byName(request, societe, name, True)
-        else:
-            cb_tous = "non" 
-            chantiers = get_chantiers_byName(request, societe, name, False)
-        if len(chantiers) == 0:
-            message = "Chantier non trouvé : %s" % name
-        # construire la liste 
-        for item in chantiers:               
-            d = ('%s-%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant), 
-                 item.nosin, item.status)
-            liste.append(d)
+    # lire les chantiers
+    chantiers = get_chantiers_byName(request, societe, name)
+    if len(chantiers) == 0:
+        message = "Chantier non trouvé : %s" % name
+    # construire la liste 
+    for item in chantiers:               
+        d = ('%s-%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant), 
+             item.nosin, item.status)
+        liste.append(d)
 
+    if len(name) == 0 :
+        order_option = 'desc'
+    else:
+        order_option = 'asc'
+        
     return {
         'page_title': "Rechercher un chantier",
         'url': url,
@@ -99,7 +99,7 @@ def dossier_lookup(request):
         'societes': societes,
         'societe': societe,
         'name': name,
-        'cb_tous': cb_tous,
+        'order_option': order_option,
     }
 
 @view_config(route_name='dossier_view', renderer='../templates/dossier/dossier_view.pt', permission='view')
@@ -450,6 +450,10 @@ def rdf_edit(request):
     tierce_personnes = get_rdf_causes(request, 'C08')
     
     if 'form.submitted' in request.params:
+        if len(request.params['signature_svg']) > 7000:
+            request.session.flash(u"La signature est trop grande !", 'danger')
+            return HTTPFound(location=url)
+            
         new_values = {}
         for param, db_value in rapport.items():
             if param in request.params and request.params[param] != db_value: