Liste des dernières commandes/propal récupérées depuis Dolibarr.
+ Les commandes doivent avoir un statut "Validée", et le Propal un statut "Signée" pour apparaître dans la liste.
+
@@ -84,6 +87,10 @@
{{offer.project.customer.name}} |
{{offer.project.name}} |
{{offer.name}} |
+ {%if offer.iddolibarr %}
+ {% if offer.typedolibarr == "commande" %}
{{offer.ref}} | {% endif %}
+ {% if offer.typedolibarr == "propal" %}
{{offer.ref}} | {% endif %}
+ {% endif %}
{{offer.ref}} |
{{offer.quantity|number_format(2, '.', ' ')}} |
{{offer.pu|number_format(2, '.', ' ')}} |
diff --git a/src/schedule-2.0/templates/Project/edit.html.twig b/src/schedule-2.0/templates/Project/edit.html.twig
index 6672d45..df6c2d3 100755
--- a/src/schedule-2.0/templates/Project/edit.html.twig
+++ b/src/schedule-2.0/templates/Project/edit.html.twig
@@ -61,6 +61,7 @@
{% endblock %}
{% block localjavascript %}
+ $("#project_customer").addClass("select2entity");
$(document).ready(function() {
$("#project_name").focus();
});
diff --git a/src/schedule-2.0/templates/Report/planning.html.twig b/src/schedule-2.0/templates/Report/planning.html.twig
index 50dfb35..607637b 100644
--- a/src/schedule-2.0/templates/Report/planning.html.twig
+++ b/src/schedule-2.0/templates/Report/planning.html.twig
@@ -142,6 +142,32 @@
{% endfor %}
+
+ {% if month.total > 0 %}
+
+
+ {% for task in month.tasks %}
+
+ | {{ task.displayname }} |
+ {{ task.duration|number_format(2, '.', ' ') }} |
+
+ {% endfor %}
+
+ {% if month.totala > 0 %}
+
+ | Astreinte |
+ {{ month.totala|number_format(2, '.', ' ') }} |
+
+ {% endif %}
+
+
+
+ | TOTAL |
+ {{ (month.total + month.totala)|number_format(2, '.', ' ') }} |
+
+
+
+ {% endif %}
{% if month.total > 0 %}
Total = {{ month.total }}
{% endif %}
diff --git a/src/schedule-2.0/templates/Stat/view.html.twig b/src/schedule-2.0/templates/Stat/view.html.twig
new file mode 100644
index 0000000..c3b9967
--- /dev/null
+++ b/src/schedule-2.0/templates/Stat/view.html.twig
@@ -0,0 +1,161 @@
+
+{% extends 'base.html.twig' %}
+
+{% block body %}
+
+
+
+
+{% endblock %}
+
+{% block localjavascript %}
+ $(document).ready(function() {
+
+ graphCadoles();
+ graphDEV();
+ graphCSS();
+ });
+
+ function graphCadoles() {
+
+ new Morris.Line({
+ element: 'chart-c',
+ xkey: 'month',
+ ymax: 350,
+ ykeys: [
+ 'Total',
+ {% for nature in tbnatures %}
+ '{{ nature.name }}',
+ {% endfor %}
+ ],
+ data: [
+ {% for month in tbmonths %}
+ { month: '{{ month.name }}',
+ {% for nature in month.natures %}
+ {% if loop.first %}
+ 'Total': {{ nature.totalmonth }},
+ {% endif %}
+
+ '{{ nature.name }}': {{ nature.totalnature }},
+ {% endfor %}
+ },
+ {% endfor %}
+ ],
+ labels: [
+ 'Total',
+ {% for nature in tbnatures %}
+ '{{ nature.name }}',
+ {% endfor %}
+ ]
+ });
+ }
+
+
+ function graphDEV() {
+
+ new Morris.Line({
+ element: 'chart-1',
+ xkey: 'month',
+ ymax: 160,
+ ykeys: [
+ 'Total',
+ {% for nature in tbnatures %}
+ '{{ nature.name }}',
+ {% endfor %}
+ ],
+ data: [
+ {% for month in tbmonths %}
+ { month: '{{ month.name }}',
+ {% for nature in month.services[1].natures %}
+ {% if loop.first %}
+ 'Total': {{ nature.totalservice }},
+ {% endif %}
+
+ '{{ nature.name }}': {{ nature.totalnature }},
+ {% endfor %}
+ },
+ {% endfor %}
+ ],
+ labels: [
+ 'Total',
+ {% for nature in tbnatures %}
+ '{{ nature.name }}',
+ {% endfor %}
+ ]
+ });
+ }
+
+ function graphCSS() {
+ new Morris.Line({
+ element: 'chart-3',
+ xkey: 'month',
+ ymax: 160,
+ ykeys: [
+ 'Total',
+ {% for nature in tbnatures %}
+ '{{ nature.name }}',
+ {% endfor %}
+ ],
+ data: [
+ {% for month in tbmonths %}
+ { month: '{{ month.name }}',
+ {% for nature in month.services[3].natures %}
+ {% if loop.first %}
+ 'Total': {{ nature.totalservice }},
+ {% endif %}
+ '{{ nature.name }}': {{ nature.totalnature }},
+ {% endfor %}
+ },
+ {% endfor %}
+ ],
+ labels: [
+ 'Total',
+ {% for nature in tbnatures %}
+ '{{ nature.name }}',
+ {% endfor %}
+ ]
+ });
+ }
+
+{% endblock %}
+
+{% block localexternalscript %}
+
+
+{% endblock %}
+
diff --git a/src/schedule-2.0/templates/Timer/list.html.twig b/src/schedule-2.0/templates/Timer/list.html.twig
index f829542..3be017e 100644
--- a/src/schedule-2.0/templates/Timer/list.html.twig
+++ b/src/schedule-2.0/templates/Timer/list.html.twig
@@ -7,6 +7,13 @@
#timer-desc {
width:300px;
}
+.select2-results__group {
+ font-size:12px !important;
+}
+.select2-results__option{
+ font-size: 14px;
+ padding-left:15px
+}
{% endblock %}
{% block body %}
@@ -21,10 +28,15 @@ SUIVI HORAIRE
{% if user %}
Lancer un Timer :
diff --git a/src/schedule-2.0/templates/base.html.twig b/src/schedule-2.0/templates/base.html.twig
index c6c61e5..4579789 100644
--- a/src/schedule-2.0/templates/base.html.twig
+++ b/src/schedule-2.0/templates/base.html.twig
@@ -284,7 +284,7 @@