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

Added FORMATTER form_formatNullToStringNumber: formats NULL to '0.00'

Browse Source 
Now this is used to display 0.00 in Betrag-column when the value is null.
This commit is contained in:
Cris
2019-10-29 17:40:12 +01:00
committed by hainberg
parent 3129707a10
commit 998dbe7528
6 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/lehre/lehrauftrag/acceptLehrauftrag.php
+14
View File
@@ -126,6 +126,20 @@ $this->load->view(
}
}
// -----------------------------------------------------------------------------------------------------------------
// Formatters - changes display information, not the data itself
// -----------------------------------------------------------------------------------------------------------------
// Formats null values to a string number '0.00'
var form_formatNulltoStringNumber = function(cell){
if (cell.getValue() == null){
return '0.00';
}
else {
return cell.getValue();
}
}
// -----------------------------------------------------------------------------------------------------------------
// Header filter
// -----------------------------------------------------------------------------------------------------------------
application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+1 -1
View File
@@ -370,7 +370,7 @@ $filterWidgetArray = array(
stunden: {align:"right",
headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
bottomCalc:"sum", bottomCalcParams:{precision:1}, width: "5%"},
betrag: {align:"right",
betrag: {align:"right", formatter: form_formatNulltoStringNumber,
headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
bottomCalc:"sum", bottomCalcParams:{precision:2}, bottomCalcFormatter:"money", bottomCalcFormatterParams:{decimal: ",", thousand: ".", symbol:"€"},
width: "8%"},
application/views/lehre/lehrauftrag/approveLehrauftrag.php
+14
View File
@@ -151,6 +151,20 @@ $this->load->view(
}
}
// -----------------------------------------------------------------------------------------------------------------
// Formatters - changes display information, not the data itself
// -----------------------------------------------------------------------------------------------------------------
// Formats null values to a string number '0.00'
var form_formatNulltoStringNumber = function(cell){
if (cell.getValue() == null){
return '0.00';
}
else {
return cell.getValue();
}
}
// -----------------------------------------------------------------------------------------------------------------
// Header filter
// -----------------------------------------------------------------------------------------------------------------
application/views/lehre/lehrauftrag/approveLehrauftragData.php
+1 -1
View File
@@ -390,7 +390,7 @@ $filterWidgetArray = array(
stunden: {align:"right",
headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
bottomCalc:"sum", bottomCalcParams:{precision:1}},
betrag: {align:"right",
betrag: {align:"right", formatter: form_formatNulltoStringNumber,
headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
bottomCalc:"sum", bottomCalcParams:{precision:2}, bottomCalcFormatter:"money", bottomCalcFormatterParams:{decimal: ",", thousand: ".", symbol:"€"}},
vertrag_id: {visible: false},
application/views/lehre/lehrauftrag/orderLehrauftrag.php
+17
View File
@@ -150,6 +150,20 @@ $this->load->view(
}
}
// -----------------------------------------------------------------------------------------------------------------
// Formatters - changes display information, not the data itself
// -----------------------------------------------------------------------------------------------------------------
// Formats null values to a string number '0.00'
var form_formatNulltoStringNumber = function(cell){
if (cell.getValue() == null){
return '0.00';
}
else {
return cell.getValue();
}
}
// -----------------------------------------------------------------------------------------------------------------
// Header filter
// -----------------------------------------------------------------------------------------------------------------
@@ -218,6 +232,9 @@ $this->load->view(
var betrag = parseFloat(row.getData().betrag);
var vertrag_betrag = parseFloat(row.getData().vertrag_betrag);
// console.log(betrag);
// console.log(vertrag_betrag);
if (isNaN(betrag))
{
betrag = 0;
application/views/lehre/lehrauftrag/orderLehrauftragData.php
+1 -1
View File
@@ -395,7 +395,7 @@ $filterWidgetArray = array(
headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
bottomCalc:"sum", bottomCalcParams:{precision:1}},
stundensatz: {visible: false},
betrag: {align:"right",
betrag: {align:"right", formatter: form_formatNulltoStringNumber,
headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
bottomCalc:"sum", bottomCalcParams:{precision:2}, bottomCalcFormatter:"money",
bottomCalcFormatterParams:{decimal: ",", thousand: ".", symbol:"€"}},