diff --git a/View/ReportServicioAT.html.twig b/View/ReportServicioAT.html.twig index 9483e13..ec48e15 100644 --- a/View/ReportServicioAT.html.twig +++ b/View/ReportServicioAT.html.twig @@ -120,40 +120,6 @@ {% include includeView['path'] %} {% endfor %} - {# Gráficos por mes y por año #} -
-
-
-
-
- - {{ trans('services-by-month') }} -
-
-
-
- -
-
-
-
-
-
-
-
- - {{ trans('services-by-year') }} -
-
-
-
- -
-
-
-
-
- {# Importes por mes y por año #}
@@ -198,54 +164,60 @@ {# Tabla por estado #}
-
-
-
-
- - {{ trans('services-by-status') }} -
-
-
-
- - - - - - - - - - {% for row in fsc.servicesByStatus %} - - - - - - {% else %} - - - - {% endfor %} - -
{{ trans('status') }}{{ trans('quantity') }}{{ trans('net') }}
- - {% if row.color %} - - {% else %} - - {% endif %} - {{ row.nombre }} - - {{ row.total }}{{ money(row.neto) }}
- {{ trans('no-data') }} -
-
-
-
-
-
+
+
+
+
+ + {{ trans('services-by-status') }} +
+
+
+
+ + + + + + + + + + + {% for row in fsc.servicesByStatus %} + + + + + + + {% else %} + + + + {% endfor %} + +
{{ trans('status') }}{{ trans('quantity') }}{{ trans('percentage') }} %{{ trans('net') }}
+ + {% if row.color %} + + {% else %} + + {% endif %} + {{ row.nombre }} + + {{ row.total }} + {{ fsc.totalServices > 0 ? ((row.total / fsc.totalServices) * 100)|number_format(1) ~ ' %' : '0 %' }} + {{ money(row.neto) }}
+ {{ trans('no-data') }} +
+
+
+
+
+
{% for includeView in getIncludeViews('ReportServicioAT', 'afterStatus') %} {% include includeView['path'] %}