From ee827983b08187f9cbc8504a519d2978fafacb40 Mon Sep 17 00:00:00 2001 From: Paolo Date: Mon, 27 Mar 2017 10:48:12 +0200 Subject: [PATCH] Fixed widgets to show if data are not present --- application/widgets/Aufnahmegruppe_widget.php | 10 ++++++++- application/widgets/Reihungstest_widget.php | 21 ++++++++++++++----- application/widgets/Studiengang_widget.php | 11 +++++++++- .../widgets/Studiensemester_widget.php | 10 ++++++++- application/widgets/Stufe_widget.php | 10 ++++++++- 5 files changed, 53 insertions(+), 9 deletions(-) diff --git a/application/widgets/Aufnahmegruppe_widget.php b/application/widgets/Aufnahmegruppe_widget.php index a0bc21d45..964719954 100644 --- a/application/widgets/Aufnahmegruppe_widget.php +++ b/application/widgets/Aufnahmegruppe_widget.php @@ -22,10 +22,18 @@ class Aufnahmegruppe_widget extends Widget $emptyElement->beschreibung = 'Select a group...'; array_unshift($gruppen->retval, $emptyElement); } - else + else if (isError($gruppen)) { show_error($gruppen); } + else + { + // Adding an element to the array + $emptyElement = new stdClass(); + $emptyElement->gruppe_kurzbz = Partial::HTML_DEFAULT_VALUE; + $emptyElement->beschreibung = 'No aufnahmegruppe found'; + array_unshift($gruppen->retval, $emptyElement); + } // Data to be used in the widget view $widgetData['aufnahmegruppen'] = $gruppen->retval; diff --git a/application/widgets/Reihungstest_widget.php b/application/widgets/Reihungstest_widget.php index bd49b8863..fef74fce3 100644 --- a/application/widgets/Reihungstest_widget.php +++ b/application/widgets/Reihungstest_widget.php @@ -40,11 +40,22 @@ class Reihungstest_widget extends Widget if (!isError($reihungstest)) { - // Adding an empty element at the beginning - $emptyElement = new stdClass(); - $emptyElement->reihungstest_id = Partial::HTML_DEFAULT_VALUE; - $emptyElement->beschreibung = 'Select a reihungstest...'; - array_unshift($reihungstest->retval, $emptyElement); + if (hasData($reihungstest)) + { + // Adding an empty element at the beginning + $emptyElement = new stdClass(); + $emptyElement->reihungstest_id = Partial::HTML_DEFAULT_VALUE; + $emptyElement->beschreibung = 'Select a reihungstest...'; + array_unshift($reihungstest->retval, $emptyElement); + } + else + { + // Adding an element to the array + $emptyElement = new stdClass(); + $emptyElement->reihungstest_id = Partial::HTML_DEFAULT_VALUE; + $emptyElement->beschreibung = 'No reihungstest found'; + array_unshift($reihungstest->retval, $emptyElement); + } } // Data to be used in the widget view diff --git a/application/widgets/Studiengang_widget.php b/application/widgets/Studiengang_widget.php index 43fcacb45..f3c3025ca 100644 --- a/application/widgets/Studiengang_widget.php +++ b/application/widgets/Studiengang_widget.php @@ -23,10 +23,19 @@ class Studiengang_widget extends Widget $emptyElement->bezeichnung = ''; array_unshift($studiengaenge->retval, $emptyElement); } - else + else if (isError($studiengaenge)) { show_error($studiengaenge); } + else + { + // Adding an element to the array + $emptyElement = new stdClass(); + $emptyElement->studiengang_kz = Partial::HTML_DEFAULT_VALUE; + $emptyElement->kurzbzlang = 'No studiengaenge found'; + $emptyElement->bezeichnung = ''; + array_unshift($studiengaenge->retval, $emptyElement); + } // Data to be used in the widget view $widgetData['studiengaenge'] = $studiengaenge->retval; diff --git a/application/widgets/Studiensemester_widget.php b/application/widgets/Studiensemester_widget.php index 2b6c13228..e9d507cdf 100644 --- a/application/widgets/Studiensemester_widget.php +++ b/application/widgets/Studiensemester_widget.php @@ -23,10 +23,18 @@ class Studiensemester_widget extends Widget $emptyElement->beschreibung = 'Select a studiensemester...'; array_unshift($studiensemester->retval, $emptyElement); } - else + else if (isError($studiensemester)) { show_error($studiensemester); } + else + { + // Adding an element to the array + $emptyElement = new stdClass(); + $emptyElement->studiensemester_kurzbz = Partial::HTML_DEFAULT_VALUE; + $emptyElement->beschreibung = 'No studiensemester found'; + array_unshift($studiensemester->retval, $emptyElement); + } // Data to be used in the widget view $widgetData['studiensemesters'] = $studiensemester->retval; diff --git a/application/widgets/Stufe_widget.php b/application/widgets/Stufe_widget.php index a3a556d32..5a188a636 100644 --- a/application/widgets/Stufe_widget.php +++ b/application/widgets/Stufe_widget.php @@ -23,10 +23,18 @@ class Stufe_widget extends Widget $emptyElement->beschreibung = 'Select a stufe...'; array_unshift($stufen->retval, $emptyElement); } - else + else if (isError($stufen)) { show_error($stufen); } + else + { + // Adding an element to the array + $emptyElement = new stdClass(); + $emptyElement->stufe = Partial::HTML_DEFAULT_VALUE; + $emptyElement->beschreibung = 'No stufen found'; + array_unshift($stufen->retval, $emptyElement); + } // Data to be used in the widget view $widgetData['stufen'] = $stufen->retval;