Merge branch 'master' into testing

This commit is contained in:
2022-09-06 15:33:27 +02:00
351 changed files with 13755 additions and 10201 deletions

View File

@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
{% extends "@ChillMain/layout.html.twig" %}
{% block title "Download export"|trans ~ export.title|trans %}
@@ -33,11 +33,24 @@ window.addEventListener("DOMContentLoaded", function(e) {
</script>
{% endblock %}
{% block layout_wvm_content %}
{% block content %}
<div class="col-md-10">
<h1>{{ export.title|trans }}</h1>
<h2>{{ "Download export"|trans }}</h2>
<div id="download_container" data-alias="{{ alias|escape('html_attr') }}" {% if mime_type is defined %}data-mime-type="{{ mime_type|escape('html_attr') }}"{% endif %} data-download-text="{{ "Download your report"|trans|escape('html_attr') }}"><span id="waiting_text">{{ "Waiting for your report"|trans }}...</span></div>
{% endblock %}
<h6>
<i class="fa fa-folder-open-o fa-fw"></i>
{{ export_group|trans }}
</h6>
<h1>{{ export.title|trans }}</h1>
<h2>{{ "Download export"|trans }}</h2>
<div id="download_container"
data-alias="{{ alias|escape('html_attr') }}"
{%- if mime_type is defined %}
data-mime-type="{{- mime_type|escape('html_attr') -}}"
{% endif -%}
data-download-text="{{ "Download your report"|trans|escape('html_attr') }}"
><span id="waiting_text">{{ "Waiting for your report"|trans ~ '...' }}</span></div>
</div>
{% endblock content %}

View File

@@ -22,19 +22,18 @@
{% block content %}
<div class="container-export">
<h1>{{ 'Exports list'|trans }}</h1>
<div>
<div class="col-md-10">
<h1>{{ 'Exports list'|trans }}</h1>
<div class="container mt-4">
{% for group, exports in grouped_exports %}{% if group != '_' %}
<h2>{{ group }}</h2>
<div class="export-list">
<h2 class="display-6">{{ group|trans }}</h2>
<div class="row grouped">
{% for export_alias, export in exports %}
<div class="export-list__element">
<div class="col-6 col-md-4 mb-3">
<h2>{{ export.title|trans }}</h2>
<p>{{ export.description|trans }}</p>
<p>{{ export.description|trans }}</p>
<p>
<a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
{{ 'Create an export'|trans }}
@@ -45,24 +44,25 @@
</div>
{% endif %}{% endfor %}
{% if grouped_exports|keys|length > 1 %}
<h2>{{ 'Ungrouped exports'|trans }}</h2>
{% if grouped_exports|keys|length > 1 and grouped_exports['_']|length > 0 %}
<h2 class="display-6">{{ 'Ungrouped exports'|trans }}</h2>
{% endif %}
<div class="export-list">
{% for export_alias,export in grouped_exports['_'] %}
<div class="export-list__element">
<div class="row ungrouped">
{% for export_alias,export in grouped_exports['_'] %}
<div class="col-6 col-md-4 mb-3">
<h2>{{ export.title|trans }}</h2>
<p>{{ export.description|trans }}</p>
<p>{{ export.description|trans }}</p>
<p>
<a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
{{ 'Create an export'|trans }}
</a>
</p>
</div>
{% endfor %}
{% endfor %}
</div>
</div>
</div>
</div>
{% endblock %}

View File

@@ -16,95 +16,126 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
{% extends "@ChillMain/layout.html.twig" %}
{% block title %}{{ export.title|trans }}{% endblock %}
{% block js %}
<script type="text/javascript">
window.addEventListener("DOMContentLoaded", chill.listenerDisplayCheckbox);
</script>
{{ encore_entry_script_tags('page_export') }}
{% endblock js %}
{% block layout_wvm_content %}
{% block content %}
<div class="col-md-10">
<h1>{{ export.title|trans }}</h1>
<h6>
<i class="fa fa-folder-open-o fa-fw"></i>
{{ export_group|trans }}
</h6>
<p>{{ export.description|trans }}</p>
{{ form_start(form) }}
<h1>{{ export.title|trans }}</h1>
<p>{{ export.description|trans }}</p>
{% if form.children.export.children.filters is defined %}
{% if form.children.export.children.filters is not empty%}
<div style="clear:both; padding-top: 1.5em;">
<h2>{{ 'Filters'| trans }}</h2>
{% for filter_form in form.children.export.children.filters %}
<div>
<p>
{{ form_widget(filter_form.enabled, { 'attr' : { 'style' : 'vertical-align: middle;', 'data-display-target': filter_form.vars.id } }) }}
<span class="force-inline-label">{{ form_label(filter_form) }}</span>
</p>
<div data-display-show-hide="{{ filter_form.vars.id }}">
{{ form_widget(filter_form.form) }}
{{ form_errors(filter_form) }}
{{ form_start(form) }}
{% if form.children.export.children.filters is defined %}
{% if form.children.export.children.filters is not empty%}
<section class="filter mb-4">
<h2>{{ 'Filters'| trans }}</h2>
{{ form_errors(form.children.export.children.filters) }}
<div class="flex-table">
{% for filter_form in form.children.export.children.filters %}
<div class="item-bloc no-altern">
{{ form_widget(filter_form.enabled, {
'label': filter_form.vars.label,
'label_attr': { 'class': 'h6' },
'attr': { 'data-display-target': filter_form.vars.id }
}) }}
<div data-display-show-hide="{{ filter_form.vars.id }}">
{{ form_widget(filter_form.form) }}
{{ form_errors(filter_form) }}
</div>
</div>
{% endfor %}
</div>
</div>
{% endfor %}
{{ form_errors(form.children.export.children.filters) }}
</div>
{% else %}
{# render the children, to mark the widget as 'rendered' #}
{{ form_widget(form.children.export.children.filters) }}
</section>
{% else %}
{# render the children, to mark the widget as 'rendered' #}
{{ form_widget(form.children.export.children.filters) }}
{% endif %}
{% endif %}
{% endif %}
{% if form.children.export.children.aggregators is defined %}
{% if form.children.export.children.aggregators is not empty %}
<section class="aggregator mb-4">
<h2>{{ 'Aggregators'| trans }}</h2>
{% if form.children.export.children.aggregators is defined %}
{% if form.children.export.children.aggregators is not empty %}
<div style="clear:both; padding-top: 1.5em;">
<h2>{{ 'Aggregators'| trans }}</h2>
{% for aggregator_form in form.children.export.children.aggregators %}
<div>
<p>
{{ form_widget(aggregator_form.enabled, { 'attr' : { 'style' : 'vertical-align: middle;', 'data-display-target': aggregator_form.vars.id } }) }}
<span class="force-inline-label">{{ form_label(aggregator_form) }}</span>
</p>
<div data-display-show-hide="{{ aggregator_form.vars.id }}">
{{ form_widget(aggregator_form.form) }}
{{ form_errors(aggregator_form) }}
<div class="flex-table">
{% for aggregator_form in form.children.export.children.aggregators %}
<div class="item-bloc no-altern">
{{ form_widget(aggregator_form.enabled, {
'label': aggregator_form.vars.label,
'label_attr': { 'class': 'h6' },
'attr': { 'data-display-target': aggregator_form.vars.id }
}) }}
<div data-display-show-hide="{{ aggregator_form.vars.id }}">
{{ form_widget(aggregator_form.form) }}
{{ form_errors(aggregator_form) }}
</div>
</div>
{% endfor %}
</div>
</div>
{% endfor %}
</div>
</section>
{% else %}
{# render the children, to mark the widget as 'rendered' #}
{{ form_widget(form.children.export.children.aggregators) }}
{% endif %}
{% endif %}
{% if form.children.export.children.export.children|length > 0 %}
<style>
div#export_export_fields { column-count: 2; }
</style>
<section class="parameter mb-4">
<h2>
{{ 'Export parameters'|trans }}
</h2>
{{ form_widget(form.children.export.children.export) }}
</section>
{% else %}
{# render the children, to mark the widget as 'rendered' #}
{{ form_widget(form.children.export.children.aggregators) }}
{% endif %}
{% endif %}
{% if form.children.export.children.export.children|length > 0 %}
<div style="clear:both; padding-top: 1.5em;">
<h2>{{ 'Export parameters'|trans }}</h2>
{{ form_widget(form.children.export.children.export) }}
</div>
{% else %}
{# render the children, to mark the widget as 'rendered' #}
{{ form_widget(form.children.export.children.export) }}
{% endif %}
{% if form.children.export.children.pick_formatter is defined %}
<div style="clear: both; padding-top: 1.5em;">
<h2>{{ 'Formatter'| trans }}</h2>
<p> {{ 'Choose the formatter'|trans }}</p>
{% endif %}
{% if form.children.export.children.pick_formatter is defined %}
<section class="formatter mb-4">
<h2>
{{ 'Formatter'| trans }}
</h2>
<p>
{{ 'Choose the formatter'|trans }}
</p>
{{ form_row(form.children.export.children.pick_formatter.children.alias, { 'label' : 'Formatter' }) }}
</div>
{% endif %}
<p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' }, 'label' : 'Go to formatter options' } ) }}</p>
{{ form_end(form) }}
{% endblock layout_wvm_content %}
</section>
{% endif %}
<p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' }, 'label' : 'Go to formatter options' } ) }}</p>
{{ form_end(form) }}
</div>
{% endblock content %}

View File

@@ -16,35 +16,48 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
{% extends "@ChillMain/layout.html.twig" %}
{% block title %}{{ export.title|trans }}{% endblock %}
{% block layout_wvm_content %}
<h1>{{ export.title|trans }}</h1>
<p>{{ export.description|trans }}</p>
{{ form_start(form) }}
<h2>{{ 'Pick centers'|trans }}</h2>
<p>{{ 'The export will contains only data from the picked centers.'|trans }}
{{ 'This will eventually restrict your possibilities in filtering the data.'|trans }}</p>
{{ form_widget(form.centers.c) }}
{% if form.centers.children.g is defined %}
{% block content %}
<div class="col-md-10">
<h3>{{ 'Pick aggregated centers'|trans }}</h3>
<h6>
<i class="fa fa-folder-open-o fa-fw"></i>
{{ export_group|trans }}
</h6>
{% for f in form.centers.children.g.children %}
{{ form_row(f) }}
{% endfor %}
{% endif %}
<h1>{{ export.title|trans }}</h1>
<p>{{ export.description|trans }}</p>
<p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action btn-create' }, 'label' : 'Go to export options' } ) }}</p>
{{ form_end(form) }}
{{ form_start(form) }}
<section class="center mb-4">
<h2>{{ 'Pick centers'|trans }}</h2>
<p>{{ 'The export will contains only data from the picked centers.'|trans }}
{{ 'This will eventually restrict your possibilities in filtering the data.'|trans }}</p>
{{ form_widget(form.centers.c) }}
{% if form.centers.children.g is defined %}
<h3>{{ 'Pick aggregated centers'|trans }}</h3>
{% for f in form.centers.children.g.children %}
{{ form_row(f) }}
{% endfor %}
{% endif %}
</section>
<p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action btn-create' }, 'label' : 'Go to export options' } ) }}</p>
{{ form_end(form) }}
{% endblock layout_wvm_content %}
</div>
{% endblock content %}

View File

@@ -16,39 +16,45 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
{% extends "@ChillMain/layout.html.twig" %}
{% block title %}{{ export.title|trans }}{% endblock %}
{% block layout_wvm_content %}
{% block content %}
<div class="col-md-10">
<h1>{{ export.title|trans }}</h1>
<p>{{ export.description|trans }}</p>
{{ form_start(form) }}
<div style="">
<h2>{{ 'Formatter'| trans }}</h2>
<h6>
<i class="fa fa-folder-open-o fa-fw"></i>
{{ export_group|trans }}
</h6>
<div style="clear: both;">
{% if form.children.formatter.children|length == 0 %}
<p>
<span class="chill-no-data-statement">{{ "No options availables. Your report is fully configured."|trans }}</span>
</p>
{{ form_widget(form.children.formatter) }}
{% else %}
{# we always have to render children, to mark as rendered #}
{% for input in form.children.formatter.children %}
{{ form_row(input) }}
{% endfor %}
{% endif %}
<h1>{{ export.title|trans }}</h1>
<p>{{ export.description|trans }}</p>
{{ form_start(form) }}
<section class="formatter mb-4">
<h2>{{ 'Formatter'| trans }}</h2>
<div>
{% if form.children.formatter.children|length == 0 %}
<p>
<span class="chill-no-data-statement">{{ "No options availables. Your report is fully configured."|trans }}</span>
</p>
{{ form_widget(form.children.formatter) }}
{% else %}
{# we always have to render children, to mark as rendered #}
{% for input in form.children.formatter.children %}
{{ form_row(input) }}
{% endfor %}
{% endif %}
</div>
</section>
<div class="mb-4">
<p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action' }, 'label': 'Generate the report' } ) }}</p>
</div>
{{ form_end(form) }}
</div>
<div style=clear:both;">
<p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action' }, 'label': 'Generate the report' } ) }}</p>
</div>
{{ form_end(form) }}
{% endblock layout_wvm_content %}
{% endblock content %}

View File

@@ -60,7 +60,7 @@
{{- form_errors(form) -}}
</div>
{%- else -%}
{% if form.vars.hideLabel is not defined or form.vars.hideLabel == false %}
{% if form.vars.fullWidth is not defined or form.vars.fullWidth == false %}
{{- form_label(form) -}}
<div class="{{ block('form_group_class') }}">
{{- form_widget(form, widget_attr) -}}

View File

@@ -18,7 +18,7 @@
{% block form_row %}
{% apply spaceless %}
{% if form.vars.hideLabel is not defined or form.vars.hideLabel == false %}
{% if form.vars.fullWidth is not defined or form.vars.fullWidth == false %}
<div class="mb-2">
<div class="row">
<div class="{% apply spaceless %}