+
@@ -162,7 +162,7 @@
},
});
},
- minLength: 6,
+ minLength: 4,
appendTo: "#confirmCreate"
});
});
diff --git a/mondumas/templates/dossier/dossier_lookup.pt b/mondumas/templates/dossier/dossier_lookup.pt
index 4310fe6..cf6e812 100644
--- a/mondumas/templates/dossier/dossier_lookup.pt
+++ b/mondumas/templates/dossier/dossier_lookup.pt
@@ -12,29 +12,30 @@
data-fv-icon-validating="glyphicon glyphicon-refresh">
@@ -99,9 +100,31 @@
});
});
- $('#site-search-form').formValidation();
+ $('#site-search-form').formValidation({
+ framework: 'bootstrap',
+ message: 'This value is not valid',
+ icon: {
+ valid: 'glyphicon glyphicon-ok',
+ invalid: 'glyphicon glyphicon-remove',
+ validating: 'glyphicon glyphicon-refresh'
+ },
+ fields: {
+ name: {
+ validators: {
+ notEmpty: {
+ message: 'Le nom ou le numéro doit avoir de 2 à 30 caractères de long'
+ },
+ }
+ },
+ }
+ });
$('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();
+ }
});
diff --git a/mondumas/templates/parametres/users_list.pt b/mondumas/templates/parametres/users_list.pt
index 389ec7e..3cc8b7a 100644
--- a/mondumas/templates/parametres/users_list.pt
+++ b/mondumas/templates/parametres/users_list.pt
@@ -16,6 +16,7 @@
Email |
Agenda |
Fonction |
+
Société |
Etat |
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index f2f7db8..e08204c 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -59,7 +59,6 @@ def dossier_lookup(request):
logged_in = request.authenticated_userid.upper()
message = ''
- societes = ['PE','ME','PL','PO','CD']
member = get_member_by_id(request, logged_in)
societe_defaut = member.societe
societe = societe_defaut
@@ -71,10 +70,6 @@ def dossier_lookup(request):
if 'form.submitted' in request.params:
name = request.params['name']
societe = request.params['societe']
- if access_defaut > 0:
- societe = request.params['societe']
- else:
- societe = societe_defaut
# lire les chantiers
chantiers = get_chantiers_byName(request, societe, name)
@@ -97,7 +92,6 @@ def dossier_lookup(request):
'goto_url': goto_url,
'message': message,
'dt_data': json.dumps(liste),
- 'societes': societes,
'societe': societe,
'name': name,
'order_option': order_option,
diff --git a/mondumas/views/parametres.py b/mondumas/views/parametres.py
index a09b2f7..b4ab0a9 100644
--- a/mondumas/views/parametres.py
+++ b/mondumas/views/parametres.py
@@ -65,7 +65,7 @@ def users_list(request):
else:
role = 'Gestion'
- d = (item.CD_UTI, item.NOM, item.email, item.agenda, role, etat)
+ d = (item.CD_UTI, item.NOM, item.email, item.agenda, role, item.societe, etat)
liste.append(d)
return {