blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added filter button for geaenderte Lehrauftraege to LA bestellen/erteilen

Browse Source
This commit is contained in:
Cris
2019-10-16 12:42:13 +02:00
committed by hainberg
parent 280c4ca19f
commit 19a88a8648
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/lehre/lehrauftrag/approveLehrauftrag.php
+21
View File
@@ -105,6 +105,7 @@ $this->load->view(
<button id="show-ordered" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Nur bestellte anzeigen"><i class='fa fa-check-square-o'></i></button>
<button id="show-approved" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Nur erteilte anzeigen"><i class='fa fa-check-square'></i></button>
<button id="show-accepted" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Nur akzeptierte anzeigen"><i class='fa fa-handshake-o'></i></button>
<button id="show-changed" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Nur geänderte anzeigen"><i class='fa fa-pencil'></i></button>
<button id="show-dummies" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Nur verplante ohne Lektor anzeigen (Dummies)"><i class='fa fa-user-secret'></i></button>
</div>
</div>
@@ -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");
});
application/views/lehre/lehrauftrag/orderLehrauftrag.php
+20
View File
@@ -105,6 +105,7 @@ $this->load->view(
<button id="show-ordered" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Nur bestellte anzeigen"><i class='fa fa-check-square-o'></i></button>
<button id="show-approved" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Nur erteilte anzeigen"><i class='fa fa-check-square'></i></button>
<button id="show-accepted" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Nur akzeptierte anzeigen"><i class='fa fa-handshake-o'></i></button>
<button id="show-changed" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Nur geänderte anzeigen"><i class='fa fa-pencil'></i></button>
<button id="show-dummies" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Nur verplante ohne Lektor anzeigen (Dummies)"><i class='fa fa-user-secret'></i></button>
</div>
</div>
@@ -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',