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

Fixed: Excluded dummy lectors from all selections/filters

Browse Source 
Some selections/filters were not selecting/filtering correctly out the
dummy lectors OR filtering out Betreuung.
It needs: personalnummer >= 0
  . > to ensure no dummies
  . = to retrieve also Betreuungen
     (where personalnummer is provided with NULL)
This commit is contained in:
Cris
2019-10-24 14:14:48 +02:00
committed by hainberg
parent bceb11b420
commit 746f082121
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/lehre/lehrauftrag/approveLehrauftrag.php
+2 -2
View File
@@ -193,7 +193,7 @@ $this->load->view(
function filter_showChanged(data){
// Filters geaenderte from status bestellt on
return data.personalnummer > 0 && // NOT dummy lector AND
return data.personalnummer >= 0 && // NOT dummy lector AND
data.bestellt != null && // bestellt AND
data.betrag != data.vertrag_betrag; // geaendert
}
@@ -512,7 +512,6 @@ $(function() {
$("#show-new").click(function(){
$('#filterTabulator').tabulator('setFilter',
[
{field: 'personalnummer', type: '!=', value: null},
{field: 'personalnummer', type: '>=', value: 0},
{field: 'bestellt', type: '=', value: null},
{field: 'erteilt', type: '=', value: null},
@@ -525,6 +524,7 @@ $(function() {
$("#show-ordered").click(function(){
$('#filterTabulator').tabulator('setFilter',
[
{field: 'personalnummer', type: '>=', value: 0},
{field: 'bestellt', type: '!=', value: null},
{field: 'erteilt', type: '=', value: null},
{field: 'akzeptiert', type: '=', value: null}
application/views/lehre/lehrauftrag/orderLehrauftrag.php
+2 -2
View File
@@ -198,7 +198,7 @@ $this->load->view(
function filter_showChanged(data){
// Filters geaenderte from status bestellt on
return data.personalnummer > 0 && // NOT dummy lector AND
return data.personalnummer >= 0 && // NOT dummy lector AND
data.bestellt != null && // bestellt AND
data.betrag != data.vertrag_betrag; // geaendert
}
@@ -543,7 +543,6 @@ $(function() {
$("#show-new").click(function(){
$('#filterTabulator').tabulator('setFilter',
[
{field: 'personalnummer', type: '!=', value: null},
{field: 'personalnummer', type: '>=', value: 0},
{field: 'bestellt', type: '=', value: null},
{field: 'erteilt', type: '=', value: null},
@@ -556,6 +555,7 @@ $(function() {
$("#show-ordered").click(function(){
$('#filterTabulator').tabulator('setFilter',
[
{field: 'personalnummer', type: '>=', value: 0},
{field: 'bestellt', type: '!=', value: null},
{field: 'erteilt', type: '=', value: null},
{field: 'akzeptiert', type: '=', value: null}