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

Merge branch 'master' of https://bitbucket.org/caotek/dumas_gestion

Browse Source
This commit is contained in:
cthienan
2021-08-13 10:16:14 +02:00
parent c74f60de09 dfbc1ea083
commit cbcdd3e19f
19 changed files with 2706 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mondumas/templates/devis/devis_ligne.pt
View File

@@ -14,12 +14,9 @@
<div class="form-group">
<label class="control-label col-sm-2">Type de texte</label>
<div class="col-sm-10">
<label class="radio-inline"><input type="radio" name="ref" value="T1"
tal:attributes="checked ligne.ref=='T1'">Titre</label>
<label class="radio-inline"><input type="radio" name="ref" value="T2"
tal:attributes="checked ligne.ref=='T2'">Sous-titre</label>
<label class="radio-inline"><input type="radio" name="ref" value="TX"
tal:attributes="checked ligne.ref=='TX'">Texte libre</label>
<label class="radio-inline"><input type="radio" name="ref" value="T1" checked>Titre</label>
<label class="radio-inline"><input type="radio" name="ref" value="T2">Sous-titre</label>
<label class="radio-inline"><input type="radio" name="ref" value="TX">Texte libre</label>
</div>
</div>
<div class="form-group">
@@ -47,8 +44,11 @@
<div class="form-group">
<label class="control-label col-sm-2">Quantité</label>
<div class="col-sm-10">
<input class="form-control" type="text" id="qte" name="qte" value="${ligne.qte}">
</div>
<div class="input-group">
<span class="input-group-addon" id="unite">.00</span>
<input class="form-control" type="text" id="qte" name="qte" value="${ligne.qte}">
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">Prix HT</label>
@@ -196,11 +196,13 @@ $(document).ready(function() {
var ref = response[0]['ref'];
var libelle = response[0]['libelle'];
var prixht = response[0]['prixht'];
var unite = response[0]['unite'];
// Set value to textboxes
document.getElementById('ref').value = ref;
document.getElementById('libelle').value = libelle;
document.getElementById('prixht').value = prixht;
document.getElementById("unite").innerHTML= unite;
}
}
});

28
mondumas/templates/dossier/croquis_edit.pt Normal file
View File

@@ -0,0 +1,28 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<div style="row">
<div id="dessin"></div>
</div> <!-- row -->
<!-- Drawingboard -->
<link href="${request.static_url('mondumas:static/dist/drawingboard/drawingboard.min.css')}" rel="stylesheet" media="all">
<script src="${request.static_url('mondumas:static/dist/drawingboard/drawingboard.min.js')}"></script>
<script>
var simpleBoard = new DrawingBoard.Board('dessin', {
background: 'none',
size: 10,
controls: [
'Color',
{ Size: { type: 'dropdown' } },
{ Navigation: { } },
],
size: 1,
webStorage: 'session',
enlargeYourContainer: true
});
</script>
</div><!-- content -->
</metal:block>

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

@@ -282,6 +282,39 @@
<td class="text-center">${detail.usermaj}</td>
</tr>
</table>
<h3 class="text-center">NOTES et CROQUIS</h3>
<br />
<div class="row">
<!-- bouton AJOUT NOTE-->
<div class="text-center col-sm-3">
<a href="${request.application_url}/note_add/${nodossier}">
<span class="glyphicon glyphicon-plus logo-success"></span>
<h4>NOTE</h4></a>
</div>
<!-- Listes des Notes -->
<div class="text-center" tal:repeat="item dem_notes">
<div class="col-sm-3">
<a href="${request.application_url}/note_edit/${nodossier}/${item.noligne}" tal:condition="item.type_note=='NOTE'">
<span class="glyphicon glyphicon-text-size logo-primary"></span>
<h4>${item.libelle}</h4></a>
</div>
</div>
</div>
<div class="row">
<div class="text-center col-sm-3">
<a href="${request.application_url}/croquis_edit/">
<span class="glyphicon glyphicon-plus logo-success"></span>
<h4>CROQUIS</h4></a>
</div>
<div class="text-center" tal:repeat="item dem_croquis">
<div class="col-sm-3">
<a href="${request.application_url}/croquis_edit/" tal:condition="item.type_note=='CROQUIS'">
<span class="glyphicon glyphicon-picture logo-primary"></span>
<h4>${item.libelle}</h4></a>
</div>
</div>
</div>
</div>
<!-- PANEL RDF -->
<div id="tab_rdf" class="tab-pane fade">
@@ -345,8 +378,8 @@
<div class="col-xs-8">
<select class="form-control" id="motif" name="motif">
<option selected> </option>
<div tal:repeat="item motif">
<option>${item.code} | ${item.libelle}</option>
<div tal:repeat="item motifs">
<option>${item.libelle}</option>
</div>
</select>
</div>
@@ -361,6 +394,34 @@
</div>
</div>
</div>
<!-- Modal : add NOTES et CROQUIS -->
<div class="modal fade" id="addNote" role="dialog" aria-labelledby="addNoteLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Ajouter une note ou un croquis</h4>
</div>
<div class="modal-body">
<!-- The form is placed inside the body of modal -->
<form id="add_justif-form" class="form-horizontal" action="${url}" method="post">
<div class="form-group">
<label class="control-label col-sm-6">Voulez-vous ajouter</label>
<div class="col-sm-6">
<label class="radio-inline"><input type="radio" name="type_note" value="NOTE" checked>une note</label>
<label class="radio-inline"><input type="radio" name="type_note" value="CROQUIS">un croquis</label>
</div>
</div>
<br>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>
<button type="submit" class="btn btn-warning" name="form.addNote">Ajouter</button>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</metal:block>

38
mondumas/templates/dossier/note_edit.pt Normal file
View File

@@ -0,0 +1,38 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<div class="alert alert-danger" tal:condition="message" tal:content="message" />
<div class="row">
<form id="text_edit-form" action="${url}" method="post">
<div class="form-group">
<label class="control-label" for="text-text">Tapez ou dictez le texte :</label>
<textarea class="form-control monospace-font" rows="30" cols="40" id="notes" name="notes">${note.notes}</textarea>
</div>
<p>Modifié le : ${note.modif_le.strftime('%d-%m-%Y')} par ${note.usermaj}
</p>
<div class="form-group">
<a href="${request.application_url}/dossier_view/${nodossier}" class="btn btn-default" role="button">
<span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Annuler</a>
<button class="btn btn-primary" type="submit" name="form.submitted">
<span class="glyphicon glyphicon-ok"></span>&nbsp;Enregistrer</button>
<button class="btn btn-warning" type="submit" name="form.deleted">
<span class="glyphicon glyphicon-remove"></span>&nbsp;Supprimer</button>
</div>
</form>
<br />
<br />
</div> <!-- row -->
<script>
$(document).ready(function() {
$('#text_edit-form').formValidation();
$('form input').on('keypress', function(e) {
return e.which !== 13;
});
});
</script>
</div>
</metal:block>

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

@@ -34,10 +34,6 @@
<a href="${request.application_url}/text_list"><span class="glyphicon glyphicon-list logo-primary"></span></a>
<h4>TEXTES EMAIL</h4>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/new_home"><span class="glyphicon glyphicon-dashboard logo-primary"></span></a>
<h4>PROTOTYPE HOME</h4>
</div>
</div>
<br />
<div class="row text-center">

3
mondumas/templates/stats/ca_groupes.pt
View File

@@ -87,16 +87,19 @@
var options_ca_3y_1 = {
title: '${title1}',
colors: ['purple', 'ff9900', '#dc3912', '3366cc', 'green'],
pieHole: 0.3,
};
var options_ca_3y_2 = {
title: '${title2}',
colors: ['purple', 'ff9900', '#dc3912', '3366cc', 'green'],
pieHole: 0.3,
};
var options_ca_3y_3 = {
title: '${title3}',
colors: ['purple', 'ff9900', '#dc3912', '3366cc', 'green'],
pieHole: 0.3,
};
var options_ca_3y_1_x = {