phuoc/dumas_gestion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

saisie suivi chantier

Browse Source
This commit is contained in:
Phuoc
2020-03-13 14:09:34 +01:00
parent ae4484374f
commit cdff87d001
7 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mondumas/templates/dossier/dossier_view.pt
View File

@@ -152,7 +152,8 @@
</tr> </tr>
<tr tal:repeat="detail details"> <tr tal:repeat="detail details">
<td> <td>
${detail.DATE.strftime('%d-%m-%Y')} <a href="${request.route_url('suivi_edit', nodossier=nodossier, nolig=detail.NOLIG)}">
${detail.DATE.strftime('%d-%m-%Y')}</a>
</td> </td>
<td> <td>
<span tal:condition="detail.rdv_debut==None"></span> <span tal:condition="detail.rdv_debut==None"></span>
@@ -168,8 +169,7 @@
<b>${detail.COMMENT}</b> <b>${detail.COMMENT}</b>
</td> </td>
<td tal:condition="not detail.COMMENT.startswith('!!')"> <td tal:condition="not detail.COMMENT.startswith('!!')">
<a href="${request.route_url('suivi_edit', nodossier=nodossier, nolig=detail.NOLIG)}"> ${detail.COMMENT}
${detail.COMMENT}</a>
</td> </td>
<td class="text-right">${layout.to_euroz(detail.montant)}</td> <td class="text-right">${layout.to_euroz(detail.montant)}</td>
<td class="text-center">${detail.REF_LET}</td> <td class="text-center">${detail.REF_LET}</td>

2
mondumas/templates/dossier/rdf_bill.pt
View File

@@ -42,7 +42,7 @@
</tr> </tr>
</table> </table>
<br /> <br />
<form id="rdv_edit-form" class="form-horizontal" action="${url}" method="post" <form id="rdf_bill-form" class="form-horizontal" action="${url}" method="post"
data-fv-framework="bootstrap" data-fv-framework="bootstrap"
data-fv-icon-valid="glyphicon glyphicon-ok" data-fv-icon-valid="glyphicon glyphicon-ok"
data-fv-icon-invalid="glyphicon glyphicon-remove" data-fv-icon-invalid="glyphicon glyphicon-remove"

2
mondumas/templates/dossier/rdf_edit.pt
View File

@@ -28,7 +28,7 @@
</div> <!-- row --> </div> <!-- row -->
<div class="row"> <div class="row">
<form id="rdv_edit-form" action="${url}" method="post" <form id="rdf_edit-form" action="${url}" method="post"
data-fv-framework="bootstrap" data-fv-framework="bootstrap"
data-fv-icon-valid="glyphicon glyphicon-ok" data-fv-icon-valid="glyphicon glyphicon-ok"
data-fv-icon-invalid="glyphicon glyphicon-remove" data-fv-icon-invalid="glyphicon glyphicon-remove"

2
mondumas/templates/dossier/rdf_view.pt
View File

@@ -54,7 +54,7 @@
</tr> </tr>
</table> </table>
<form id="rdv_edit-form" action="${url}" method="post" <form id="rdf_view-form" action="${url}" method="post"
data-fv-framework="bootstrap" data-fv-framework="bootstrap"
data-fv-icon-valid="glyphicon glyphicon-ok" data-fv-icon-valid="glyphicon glyphicon-ok"
data-fv-icon-invalid="glyphicon glyphicon-remove" data-fv-icon-invalid="glyphicon glyphicon-remove"

4
mondumas/templates/dossier/suivi_edit.pt
View File

@@ -4,7 +4,7 @@
<div tal:condition="message" tal:content="message" class="alert alert-danger" /> <div tal:condition="message" tal:content="message" class="alert alert-danger" />
<br /> <br />
<div class="row"> <div class="row">
<form id="rdv_edit-form" class="form-horizontal" action="${url}" method="post" <form id="suiv_edit-form" class="form-horizontal" action="${url}" method="post"
data-fv-framework="bootstrap" data-fv-framework="bootstrap"
data-fv-icon-valid="glyphicon glyphicon-ok" data-fv-icon-valid="glyphicon glyphicon-ok"
data-fv-icon-invalid="glyphicon glyphicon-remove" data-fv-icon-invalid="glyphicon glyphicon-remove"
@@ -56,7 +56,7 @@
<div metal:fill-slot="additional_scripts"> <div metal:fill-slot="additional_scripts">
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('#rdv_edit-form').formValidation(); $('#suiv_edit-form').formValidation();
$('form input').on('keypress', function(e) { $('form input').on('keypress', function(e) {
return e.which !== 13; return e.which !== 13;
}); });

4
mondumas/templates/parametres/rdf_cause_edit.pt
View File

@@ -4,7 +4,7 @@
<div tal:condition="message" tal:content="message" class="alert alert-danger" /> <div tal:condition="message" tal:content="message" class="alert alert-danger" />
<br /> <br />
<div class="row"> <div class="row">
<form id="rdv_edit-form" class="form-horizontal" action="${url}" method="post" <form id="rdf_cause-form" class="form-horizontal" action="${url}" method="post"
data-fv-framework="bootstrap" data-fv-framework="bootstrap"
data-fv-icon-valid="glyphicon glyphicon-ok" data-fv-icon-valid="glyphicon glyphicon-ok"
data-fv-icon-invalid="glyphicon glyphicon-remove" data-fv-icon-invalid="glyphicon glyphicon-remove"
@@ -61,7 +61,7 @@
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('#rdv_edit-form').formValidation(); $('#rdf_cause-form').formValidation();
$('form input').on('keypress', function(e) { $('form input').on('keypress', function(e) {
return e.which !== 13; return e.which !== 13;
}); });

6
mondumas/views/dossier.py
View File

@@ -82,12 +82,8 @@ def dossier_lookup(request):
message = "Chantier non trouvé : %s" % name message = "Chantier non trouvé : %s" % name
# construire la liste # construire la liste
for item in chantiers: for item in chantiers:
if item.humidite != 0:
status = 'Humidité'
else:
status = item.status
d = ('%s-%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant), d = ('%s-%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant),
item.nosin, status, item.usermaj) item.nosin, item.status, item.usermaj)
liste.append(d) liste.append(d)
if len(name) == 0 : if len(name) == 0 :