diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragData.php b/application/views/lehre/lehrauftrag/approveLehrauftragData.php index 635fd9da9..0414ddbf6 100644 --- a/application/views/lehre/lehrauftrag/approveLehrauftragData.php +++ b/application/views/lehre/lehrauftrag/approveLehrauftragData.php @@ -25,6 +25,7 @@ SELECT lv_oe_kurzbz, lektor, stunden, + stundensatz, betrag, vertrag_id, vertrag_stunden, @@ -149,6 +150,7 @@ FROM END AS "lv_oe_kurzbz", (person.nachname || \' \' || person.vorname) AS "lektor", TRUNC(lema.semesterstunden, 1) AS "stunden", + lema.stundensatz, TRUNC((lema.semesterstunden * lema.stundensatz), 2) AS "betrag", vertrag_id, vertragsstunden AS "vertrag_stunden", @@ -270,6 +272,7 @@ FROM END AS "lv_oe_kurzbz", (nachname || \' \' || vorname) AS "lektor", TRUNC(pb.stunden, 1) AS "stunden", + pb.stundensatz, TRUNC((pb.stunden * pb.stundensatz), 2) AS "betrag", vertrag_id, vertragsstunden AS "vertrag_stunden", @@ -325,6 +328,7 @@ $filterWidgetArray = array( ucfirst($this->p->t('lehre', 'organisationseinheit')), ucfirst($this->p->t('lehre', 'lektor')), ucfirst($this->p->t('ui', 'stunden')), + ucfirst($this->p->t('ui', 'stundensatz')), ucfirst($this->p->t('ui', 'betrag')), ucfirst($this->p->t('ui', 'vertrag')). '-ID', ucfirst($this->p->t('ui', 'vertrag')). '-'. ucfirst($this->p->t('ui', 'stunden')), @@ -399,6 +403,8 @@ $filterWidgetArray = array( stunden: {align:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:1}, headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator, bottomCalc:"sum", bottomCalcParams:{precision:1}}, + stundensatz: {visible: true, align:"right", formatter: form_formatNulltoStringNumber, + headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator}, betrag: {align:"right", formatter: form_formatNulltoStringNumber, headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator, bottomCalc:"sum", bottomCalcParams:{precision:2}, bottomCalcFormatter:"money", bottomCalcFormatterParams:{decimal: ",", thousand: ".", symbol:"€"}},