diff --git a/application/views/lehre/lehrauftrag/approveLehrauftrag.php b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
index 350cd406a..0e3f7ea0b 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
@@ -105,6 +105,7 @@ $this->load->view(
+
@@ -148,6 +149,19 @@ $this->load->view(
return parseFloat(headerValue) <= parseFloat(rowValue); //must return a boolean, true if it passes the filter.
}
+ // -----------------------------------------------------------------------------------------------------------------
+ // Custom filters
+ // -----------------------------------------------------------------------------------------------------------------
+
+ // Filters geaenderte
+ function filter_showChanged(data){
+
+ // Filters geaenderte from status bestellt on
+ return data.personalnummer > 0 && // NOT dummy lector AND
+ data.bestellt != null && // bestellt AND
+ data.betrag != data.vertrag_betrag; // geaendert
+ }
+
// -----------------------------------------------------------------------------------------------------------------
// Tabulator table format functions
// -----------------------------------------------------------------------------------------------------------------
@@ -428,6 +442,13 @@ $(function() {
);
});
+ // Show only rows with dummy lectors
+ $("#show-changed").click(function(){
+ // needs custom filter to compare fields betrag and vertrag_betrag
+ $('#filterTabulator').tabulator('setFilter', filter_showChanged);
+ });
+
+
$("#download-cvs").click(function(){
$('#filterTabulator').tabulator("download", "csv", "data.csv");
});
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
index 9643f359d..5803d297d 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
@@ -105,6 +105,7 @@ $this->load->view(
+
@@ -148,6 +149,19 @@ $this->load->view(
return parseFloat(headerValue) <= parseFloat(rowValue); //must return a boolean, true if it passes the filter.
}
+ // -----------------------------------------------------------------------------------------------------------------
+ // Custom filters
+ // -----------------------------------------------------------------------------------------------------------------
+
+ // Filters geaenderte
+ function filter_showChanged(data){
+
+ // Filters geaenderte from status bestellt on
+ return data.personalnummer > 0 && // NOT dummy lector AND
+ data.bestellt != null && // bestellt AND
+ data.betrag != data.vertrag_betrag; // geaendert
+ }
+
// -----------------------------------------------------------------------------------------------------------------
// Tabulator table format functions
// -----------------------------------------------------------------------------------------------------------------
@@ -431,6 +445,12 @@ $(function() {
);
});
+ // Show only rows with dummy lectors
+ $("#show-changed").click(function(){
+ // needs custom filter to compare fields betrag and vertrag_betrag
+ $('#filterTabulator').tabulator('setFilter', filter_showChanged);
+ });
+
// Show only rows with dummy lectors
$("#show-dummies").click(function(){
$('#filterTabulator').tabulator('setFilter',