Merge pull request #690 from OpenOlitor/fix/OO#165_csv_export_not_wor…

…king_for_rechnung Fix/oo#165 csv export not working for rechnung
OpenOlitor · Aug 6, 2024 · c49372b · c49372b
2 parents c9b1c36 + 3117524
commit c49372b
Show file tree

Hide file tree

Showing 18 changed files with 80 additions and 42 deletions.
diff --git a/app/scripts/abos/overview/zusatzabosoverview.html b/app/scripts/abos/overview/zusatzabosoverview.html
@@ -24,7 +24,7 @@ <h3 class="panel-title"><span class="navbar-brand" translate>Zusatzabos</span>
           <i class="fa fa-eye" aria-hidden="true" ng-hide="showAll" style="cursor: pointer;" ng-click="toggleShowAll()" tooltip-placement="left" uib-tooltip="{{'Alle Spalten einblenden' | translate}}"></i>
           <i class="fa fa-eye-slash" aria-hidden="true" ng-show="showAll" style="cursor: pointer;" ng-click="toggleShowAll()" tooltip-placement="left" uib-tooltip="{{'Standardansicht' | translate}}"></i>
         </script>
-        <div ng-show="entries" id="zusatzabosTable" display-export="true" export-file-name="Abos" class="horizontal-scroll">
+        <div ng-show="entries" id="zusatzabosTable" display-export="true" export-file-name="{{'Abos'| translate}}" class="horizontal-scroll">
           <table ng-table="tableParams" class="table table-striped" show-filter="{{showFilter && hasData()}}" template-pagination="scripts/common/ngtable/oo-ngtable-paginationTemplate.html">
             <tr ng-repeat="abo in $data | filter: search.query.$" id="selectedRow_{{abo.id}}">
               <td header="'headerCheckbox.html'">

diff --git a/app/scripts/arbeitsangebote/overview/arbeitsangeboteoverview.html b/app/scripts/arbeitsangebote/overview/arbeitsangeboteoverview.html
@@ -23,7 +23,7 @@ <h3  class="panel-title"><span class="navbar-brand" translate>Arbeitsangebote</s
         <div ng-hide="entries">
           <p ng-show="loading"><i class="fa fa-circle-o-notch fa-spin fa-2x"></i></p>
         </div>
-        <div ng-show="entries" id="arbeitsangebotTable" display-export="true" export-file-name="Arbeitseinsaetze">
+        <div ng-show="entries" id="arbeitsangebotTable" display-export="true" export-file-name="{{'Arbeitseinsaetze'| translate}}">
           <script type="text/ng-template" id="headerCheckbox.html">
             <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" ng-change="updateChecked()" />
           </script>

diff --git a/app/scripts/arbeitseinsaetze/overview/arbeitseinsaetzeoverview.html b/app/scripts/arbeitseinsaetze/overview/arbeitseinsaetzeoverview.html
@@ -17,7 +17,7 @@ <h3  class="panel-title"><span class="navbar-brand" translate>Arbeitseinsätze</
         <div ng-hide="entries">
           <p ng-show="loading"><i class="fa fa-circle-o-notch fa-spin fa-2x"></i></p>
         </div>
-        <div ng-show="entries" id="arbeitseinsatzTable" display-export="true" export-file-name="Arbeitseinsaetze">
+        <div ng-show="entries" id="arbeitseinsatzTable" display-export="true" export-file-name="{{'Arbeitseinsaetze'|translate}}">
           <script type="text/ng-template" id="headerCheckbox.html">
             <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" />
           </script>

diff --git a/app/scripts/arbeitseinsatzabrechnung/overview/arbeitseinsatzabrechnungoverview.html b/app/scripts/arbeitseinsatzabrechnung/overview/arbeitseinsatzabrechnungoverview.html
@@ -19,7 +19,7 @@ <h3  class="panel-title "><span class="navbar-brand">{{getPageTitle | translate}
         <div ng-hide="entries">
           <p ng-show="loading"><i class="fa fa-circle-o-notch fa-spin fa-2x"></i></p>
         </div>
-        <div ng-show="entries" id="arbeitseinsatzabrechnungTable" display-export="true" export-file-name="Arbeitseinsatzabrechnung">
+        <div ng-show="entries" id="arbeitseinsatzabrechnungTable" display-export="true" export-file-name="{{'Arbeitseinsatzabrechnung'| translate}}">
           <script type="text/ng-template" id="headerCheckbox.html">
             <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" />
           </script>

diff --git a/app/scripts/auslieferungen/overview/auslieferungenoverview.controller.js b/app/scripts/auslieferungen/overview/auslieferungenoverview.controller.js
@@ -201,7 +201,8 @@ angular.module('openolitor-admin')
           exportODSFilter: function() {
             return {
               f: $scope.search.filterQuery,
-              g: $scope.geschaeftsjahr
+              g: $scope.geschaeftsjahr,
+              'tf': JSON.stringify($scope.tableParams.filter())
             };
           },
           getData: function(params) {

diff --git a/app/scripts/auslieferungen/overview/depotauslieferungenoverview.html b/app/scripts/auslieferungen/overview/depotauslieferungenoverview.html
@@ -25,7 +25,7 @@ <h3 class="panel-title"><span class="navbar-brand" translate>Depotauslieferungen
           <script type="text/ng-template" id="headerCheckbox.html">
             <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" />
           </script>
-          <div ng-show="entries" id="auslieferungenTable" display-export="true" export-file-name="Depotauslieferungen" class="horizontal-scroll">
+          <div ng-show="entries" id="auslieferungenTable" display-export="true" export-file-name="{{'Depotauslieferungen'| translate}}" class="horizontal-scroll">
             <table ng-table="tableParams" class="table table-striped" show-filter="{{showFilter && hasData()}}" template-pagination="scripts/common/ngtable/oo-ngtable-paginationTemplate.html">
               <tr ng-repeat="depotauslieferung in $data | filter: search.query.$">
                 <td header="'headerCheckbox.html'">

diff --git a/app/scripts/auslieferungen/overview/postauslieferungenoverview.html b/app/scripts/auslieferungen/overview/postauslieferungenoverview.html
@@ -25,7 +25,7 @@ <h3 class="panel-title"><span class="navbar-brand" translate>Postauslieferungen<
           <script type="text/ng-template" id="headerCheckbox.html">
             <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" />
           </script>
-          <div ng-show="entries" id="auslieferungenTable" display-export="true" export-file-name="Depotauslieferungen" class="horizontal-scroll">
+          <div ng-show="entries" id="auslieferungenTable" display-export="true" export-file-name="{{'PostAuslieferungen' | translate}}" class="horizontal-scroll">
             <table ng-table="tableParams" class="table table-striped" show-filter="{{showFilter && hasData()}}" template-pagination="scripts/common/ngtable/oo-ngtable-paginationTemplate.html">
               <tr ng-repeat="postauslieferung in $data | filter: search.query.$">
                 <td header="'headerCheckbox.html'">

diff --git a/app/scripts/auslieferungen/overview/tourauslieferungenoverview.html b/app/scripts/auslieferungen/overview/tourauslieferungenoverview.html
@@ -25,7 +25,7 @@ <h3 class="panel-title"><span class="navbar-brand" translate>Tourauslieferungen<
           <script type="text/ng-template" id="headerCheckbox.html">
             <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" />
           </script>
-          <div ng-show="entries" id="auslieferungenTable" display-export="true" export-file-name="Depotauslieferungen" class="horizontal-scroll">
+          <div ng-show="entries" id="auslieferungenTable" display-export="true" export-file-name="{{'TourAuslieferungen'| translate}}" class="horizontal-scroll">
             <table ng-table="tableParams" class="table table-striped" show-filter="{{showFilter && hasData()}}" template-pagination="scripts/common/ngtable/oo-ngtable-paginationTemplate.html">
               <tr ng-repeat="tourauslieferung in $data | filter: search.query.$">
                 <td header="'headerCheckbox.html'">

diff --git a/app/scripts/einkaufsrechnungen/overview/einkaufsrechnungenoverview.html b/app/scripts/einkaufsrechnungen/overview/einkaufsrechnungenoverview.html
@@ -23,7 +23,7 @@ <h3 class="panel-title"><span class="navbar-brand" translate>Einkaufsrechnungen<
         <script type="text/ng-template" id="headerCheckbox.html">
           <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" />
         </script>
-        <div ng-show="entries" id="abrechnungenTable" display-export="true" export-file-name="Einkaufsrechnungen" class="horizontal-scroll">
+        <div ng-show="entries" id="abrechnungenTable" display-export="true" export-file-name="{{'Einkaufsrechnungen'| translate}}" class="horizontal-scroll">
           <table ng-table="tableParams" class="table table-striped" show-filter="{{showFilter && hasData()}}" template-pagination="scripts/common/ngtable/oo-ngtable-paginationTemplate.html">
             {{$data}}
             <tr ng-repeat="bestellung in $data | filter: search.query.$" id="selectedRow_{{bestellung.id}}">

diff --git a/app/scripts/kunden/overview/kundenoverview.html b/app/scripts/kunden/overview/kundenoverview.html
@@ -16,7 +16,7 @@ <h3  class="panel-title"><span class="navbar-brand" translate>Kunden</span>
           <div ng-hide="entries">
             <p ng-show="loading"><i class="fa fa-circle-o-notch fa-spin fa-2x"></i></p>
           </div>
-          <div ng-show="entries" id="kundeTable" display-export="true" export-file-name="Kunden" class="horizontal-scroll">
+          <div ng-show="entries" id="kundeTable" display-export="true" export-file-name="{{'Kunden'| translate}}" class="horizontal-scroll">
             <script type="text/ng-template" id="headerCheckbox.html">
               <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" ng-change="updateChecked()" />
             </script>

diff --git a/app/scripts/lieferplanungen/overview/lieferplanungoverview.html b/app/scripts/lieferplanungen/overview/lieferplanungoverview.html
@@ -24,7 +24,7 @@ <h3 class="panel-title"><span class="navbar-brand" translate>Lieferplanungen</sp
         <script type="text/ng-template" id="headerCheckbox.html">
           <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" />
         </script>
-        <div ng-show="entries" id="kundeTable" display-export="true" export-file-name="Lieferplanungen" class="horizontal-scroll">
+        <div ng-show="entries" id="kundeTable" display-export="true" export-file-name="{{'Lieferplanungen' | translate}}" class="horizontal-scroll">
           <table ng-table="tableParams" class="table table-striped" show-filter="{{showFilter && hasData()}}" template-pagination="scripts/common/ngtable/oo-ngtable-paginationTemplate.html">
             <tr ng-repeat="lieferplanung in $data">
               <td header="'headerCheckbox.html'">

diff --git a/app/scripts/personen/overview/personenoverview.html b/app/scripts/personen/overview/personenoverview.html
@@ -16,7 +16,7 @@ <h3 class="panel-title"><span class="navbar-brand" translate>Personen</span>
         <div ng-hide="entries">
           <p ng-show="loading"><i class="fa fa-circle-o-notch fa-spin fa-2x"></i></p>
         </div>
-        <div ng-show="entries" id="personTable" display-export="true" export-file-name="Personen" class="horizontal-scroll">
+        <div ng-show="entries" id="personTable" display-export="true" export-file-name="{{'Personen'}|translate}}" class="horizontal-scroll">
           <script type="text/ng-template" id="headerCheckbox.html">
             <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" ng-change="updateChecked()" />
           </script>

diff --git a/app/scripts/produkte/overview/produkteoverview.html b/app/scripts/produkte/overview/produkteoverview.html
@@ -16,7 +16,7 @@ <h3 class="panel-title"><span class="navbar-brand" translate>Produkte</span>
         <div ng-hide="entries">
           <p ng-show="loading"><i class="fa fa-circle-o-notch fa-spin fa-2x"></i></p>
         </div>
-        <div ng-show="entries" id="produktTable" display-export="true" export-file-name="Produkte">
+        <div ng-show="entries" id="produktTable" display-export="true" export-file-name="{{'Produkte'|translate}}">
           <table ng-table="tableParams" class="table table-striped" show-filter="{{showFilter && hasData()}}" template-pagination="scripts/common/ngtable/oo-ngtable-paginationTemplate.html">
             <tr ng-repeat="produkt in $data | filter: search.query.$ track by produkt.id">
               <td data-title="'Bezeichnung'|translate" sortable="'name'" ng-class="[{'col-md-3': produkt.editable}]">

diff --git a/app/scripts/produzenten/overview/produzentenoverview.html b/app/scripts/produzenten/overview/produzentenoverview.html
@@ -17,7 +17,7 @@ <h3  class="panel-title"><span class="navbar-brand" translate>Produzenten</span>
         <div ng-hide="entries">
           <p ng-show="loading"><i class="fa fa-circle-o-notch fa-spin fa-2x"></i></p>
         </div>
-        <div ng-show="entries" id="produzentTable" display-export="true" export-file-name="Produzenten">
+        <div ng-show="entries" id="produzentTable" display-export="true" export-file-name="{{'Produzenten'| translate}}">
           <script type="text/ng-template" id="headerCheckbox.html">
             <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" />
           </script>

diff --git a/app/scripts/rechnungen/overview/rechnungenoverview.controller.js b/app/scripts/rechnungen/overview/rechnungenoverview.controller.js
@@ -457,6 +457,7 @@ angular.module('openolitor-admin').controller('RechnungenOverviewController', [
             return {
               f: $scope.search.filterQuery,
               g: $scope.geschaeftsjahr,
+              q: $scope.search.queryQuery,
             };
           },
           getData: function (params) {

diff --git a/app/scripts/rechnungen/overview/rechnungenoverview.html b/app/scripts/rechnungen/overview/rechnungenoverview.html
@@ -21,7 +21,7 @@ <h3 class="panel-title"><span class="navbar-brand" translate>Rechnungen</span>
         <div ng-hide="entries">
           <p ng-show="loading"><i class="fa fa-circle-o-notch fa-spin fa-2x"></i></p>
         </div>
-        <div ng-show="entries" id="rechnungenTable" display-export="true" export-file-name="Rechnungen" class="horizontal-scroll">
+        <div ng-show="entries" id="rechnungenTable" display-export="true" export-file-name="{{'Rechnungen'| translate}}" class="horizontal-scroll">
           <script type="text/ng-template" id="headerCheckbox.html">
             <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" ng-change="updateChecked()" />
           </script>

diff --git a/app/scripts/rechnungspositionen/overview/rechnungspositionenoverview.html b/app/scripts/rechnungspositionen/overview/rechnungspositionenoverview.html
@@ -17,7 +17,7 @@ <h3 class="panel-title"><span class="navbar-brand" translate>Rechnungspositionen
         <div ng-hide="entries">
           <p ng-show="loading"><i class="fa fa-circle-o-notch fa-spin fa-2x"></i></p>
         </div>
-        <div ng-show="entries" id="rechnungsPositionTable" display-export="true" export-file-name="RechnungsPositionen" class="horizontal-scroll">
+        <div ng-show="entries" id="rechnungsPositionTable" display-export="true" export-file-name="{{'RechnungsPositionen'|translate}}" class="horizontal-scroll">
           <script type="text/ng-template" id="headerCheckbox.html">
             <input type="checkbox" ng-model="checkboxes.checked" ng-class="checkboxes.css" value="" />
           </script>