Merge branch '5.9' into feat/api_v2

theus77 · Sep 11, 2023 · a36bf69 · a36bf69
2 parents 53f6700 + 97a1e5f
commit a36bf69
Show file tree

Hide file tree

Showing 37 changed files with 61,204 additions and 60,980 deletions.
diff --git a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/datatable/dom.html.twig b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/datatable/dom.html.twig
@@ -1,10 +1,8 @@
 {%- use '@EMSAdminUI/bootstrap5/form/forms.html.twig' -%}
 {% trans_default_domain 'EMSCoreBundle' %}
 
-
-<div class="table-responsive">
-    <table class="table table-condensed table-striped" data-datatable="{{ datatable.frontendOptions|json_encode|e('html_attr') }}">
-        <thead>
+<table class="table table-condensed table-striped" data-datatable="{{ datatable.frontendOptions|json_encode|e('html_attr') }}" style="width: 100%;">
+    <thead>
         <tr role="row">
             {% if datatable.supportsTableActions %}
                 <th class="fit" data-orderable="false" data-name="_checkbox">
@@ -25,8 +23,8 @@
                 <th class="nowrap" data-orderable="false">{{ 'table.index.column.actions'|trans }}</th>
             {% endif %}
         </tr>
-        </thead>
-        <tbody>
+    </thead>
+    <tbody>
         {% for line in datatable %}
             <tr>
                 {% if datatable.supportsTableActions %}
@@ -44,13 +42,12 @@
                 {% endif %}
             </tr>
         {%  endfor %}
-        </tbody>
-    </table>
-</div>
+    </tbody>
+</table>
 {% if datatable.supportsTableActions %}
     <div class="btn-group">
         {% for action in datatable.tableActions %}
             {{ form_widget(attribute(form, action.name)) }}
         {% endfor %}
     </div>
-{% endif %}
+{% endif %}
diff --git a/EMS/common-bundle/src/Common/File/FileReader.php b/EMS/common-bundle/src/Common/File/FileReader.php
@@ -6,15 +6,21 @@
 
 use EMS\CommonBundle\Contracts\File\FileReaderInterface;
 use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Reader\Csv;
+use PhpOffice\PhpSpreadsheet\Reader\Html;
+use PhpOffice\PhpSpreadsheet\Reader\Slk;
 
 final class FileReader implements FileReaderInterface
 {
     /**
      * {@inheritDoc}
      */
-    public function getData(string $filename, bool $skipFirstRow = false): array
+    public function getData(string $filename, bool $skipFirstRow = false, string $encoding = null): array
     {
         $reader = IOFactory::createReaderForFile($filename);
+        if (($reader instanceof Csv || $reader instanceof Html || $reader instanceof Slk) && null !== $encoding) {
+            $reader->setInputEncoding($encoding);
+        }
 
         $data = $reader->load($filename)->getActiveSheet()->toArray();
 

diff --git a/EMS/common-bundle/src/Contracts/File/FileReaderInterface.php b/EMS/common-bundle/src/Contracts/File/FileReaderInterface.php
@@ -9,5 +9,5 @@ interface FileReaderInterface
     /**
      * @return array<mixed>
      */
-    public function getData(string $filename, bool $skipFirstRow = false): array;
+    public function getData(string $filename, bool $skipFirstRow = false, string $encoding = null): array;
 }
diff --git a/EMS/core-bundle/assets/css/_ems.scss b/EMS/core-bundle/assets/css/_ems.scss
@@ -166,4 +166,8 @@ div.core-js-progress {
   text-align: left;
 
   & i { padding-right: 10px;}
+}
+
+div.dataTables_scroll {
+  margin-bottom: 10px;
 }
diff --git a/EMS/core-bundle/src/Form/Data/TableAbstract.php b/EMS/core-bundle/src/Form/Data/TableAbstract.php
@@ -233,7 +233,9 @@ public function getFrontendOptions(): array
                 ++$counter;
             }
         }
-        $options = [];
+        $options = [
+            'scrollX' => true,
+        ];
 
         if (null !== $columnIndex) {
             $options['order'] = [[$columnIndex, $this->orderDirection]];

diff --git a/...s/public/css/app.cef1c7a4846dc5fa76ef.css → ...s/public/css/app.d0d16200429aaff8e7d7.css b/...s/public/css/app.cef1c7a4846dc5fa76ef.css → ...s/public/css/app.d0d16200429aaff8e7d7.css
diff --git a/...lic/css/calendar.428711ce4389ebccc0d3.css → ...lic/css/calendar.81cfd21ea8c974352bbc.css b/...lic/css/calendar.428711ce4389ebccc0d3.css → ...lic/css/calendar.81cfd21ea8c974352bbc.css
diff --git a/...s/criteria-table.428711ce4389ebccc0d3.css → ...s/criteria-table.81cfd21ea8c974352bbc.css b/...s/criteria-table.428711ce4389ebccc0d3.css → ...s/criteria-table.81cfd21ea8c974352bbc.css
diff --git a/...ss/criteria-view.428711ce4389ebccc0d3.css → ...ss/criteria-view.81cfd21ea8c974352bbc.css b/...ss/criteria-view.428711ce4389ebccc0d3.css → ...ss/criteria-view.81cfd21ea8c974352bbc.css
diff --git a/...ss/edit-revision.cef1c7a4846dc5fa76ef.css → ...ss/edit-revision.d0d16200429aaff8e7d7.css b/...ss/edit-revision.cef1c7a4846dc5fa76ef.css → ...ss/edit-revision.d0d16200429aaff8e7d7.css