From 8bd148f7e50aa4cb2ec007a903b9ee0a45e3498c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Fri, 26 Feb 2021 15:01:23 +0100 Subject: [PATCH 01/11] =?UTF-8?q?Hinweistext=20f=C3=BCr=20Zahlungen=20ange?= =?UTF-8?q?passt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/de-AT/tools.php | 2 +- locale/en-US/tools.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/de-AT/tools.php b/locale/de-AT/tools.php index 89bd25caa..8b5095075 100644 --- a/locale/de-AT/tools.php +++ b/locale/de-AT/tools.php @@ -40,7 +40,7 @@ $this->phrasen['tools/zahlungsbestaetigung']='Zahlungsbestätigung'; $this->phrasen['tools/bestaetigungDrucken']='Bestaetigung drucken'; $this->phrasen['tools/offen']='offen'; $this->phrasen['tools/keineZahlungenVorhanden']='Derzeit sind keine Zahlungen vorhanden'; -$this->phrasen['tools/zahlungenHinweis']='Bitte beachten Sie, dass es bis zu 3 Werktage dauern kann bis der Zahlungseingang hier aufscheint.'; +$this->phrasen['tools/zahlungenHinweis']='Bitte beachten Sie, dass es bis zu 5 Werktage dauern kann bis der Zahlungseingang hier aufscheint.'; //Ampeln $this->phrasen['tools/ampelsystem']='Ampelsystem'; diff --git a/locale/en-US/tools.php b/locale/en-US/tools.php index 4139c1c20..6fd6af8f7 100644 --- a/locale/en-US/tools.php +++ b/locale/en-US/tools.php @@ -40,7 +40,7 @@ $this->phrasen['tools/zahlungsbestaetigung']='Confirmation of payment '; $this->phrasen['tools/bestaetigungDrucken']='Print Confirmation'; $this->phrasen['tools/offen']='outstanding'; $this->phrasen['tools/keineZahlungenVorhanden']='Currently there are no payments'; -$this->phrasen['tools/zahlungenHinweis']='Please note that it can take up to 3 working days for the receipt of payment to appear here.'; +$this->phrasen['tools/zahlungenHinweis']='Please note that it can take up to 5 working days for the receipt of payment to appear here.'; //Ampeln $this->phrasen['tools/ampelsystem']='Notification System'; From 9cbcec723128cd24b0f9eeabf8a59ab01807d356 Mon Sep 17 00:00:00 2001 From: Nikolaus Krondraf Date: Tue, 2 Mar 2021 15:26:44 +0100 Subject: [PATCH 02/11] =?UTF-8?q?Fallback-L=C3=B6sung=20f=C3=BCr=20LV-Rege?= =?UTF-8?q?l=20wenn=20im=20aktuellen=20Semester=20kein=20Status=20vorhande?= =?UTF-8?q?n=20ist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/lvregel.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/lvregel.class.php b/include/lvregel.class.php index 97e3a68fe..b5a109988 100644 --- a/include/lvregel.class.php +++ b/include/lvregel.class.php @@ -596,10 +596,17 @@ class lvregel extends basis_db // Ausbildungssemester aus dem Status holen $prestudent = new prestudent(); + $studiensemester = new studiensemester(); + $prev_studiensemester_kurzbz = $studiensemester->getPrevious(); + if($prestudent->getLastStatus($student->prestudent_id, $studiensemester_kurzbz)) { $this->cache[$uid][$studiensemester_kurzbz]=$prestudent->ausbildungssemester; } + else if($prestudent->getLastStatus($student->prestudent_id, $prev_studiensemester_kurzbz)) + { + $this->cache[$uid][$studiensemester_kurzbz]=$prestudent->ausbildungssemester + 1; + } } $ausbildungssemester = $this->cache[$uid][$studiensemester_kurzbz]; From 9ba6f3b538b123c67ee7d3a045816ed0b3e656d6 Mon Sep 17 00:00:00 2001 From: Cris Date: Tue, 2 Mar 2021 15:44:46 +0100 Subject: [PATCH 03/11] Fixed HTML code appearing within mail message body . by breaking lines with \n . using nowrap to avoid breaking text Signed-off-by: cris-technikum --- content/statistik/bewerberstatistik.php | 36 ++++++++++++++----------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/content/statistik/bewerberstatistik.php b/content/statistik/bewerberstatistik.php index 932a8c6cb..47e5dd0ec 100644 --- a/content/statistik/bewerberstatistik.php +++ b/content/statistik/bewerberstatistik.php @@ -1733,6 +1733,7 @@ else $content .= ""; $content .= ''; + $content .= "\n"; } //Aufsplittungen für Mischformen holen @@ -1744,28 +1745,32 @@ else { if ($db->db_num_rows($result) > 0) { - $content .= "

Aufsplittung Mischformen


"; - $content .= "\n - - - "; + $content .= "

"; + $content .= "

Aufsplittung Mischformen


"; + $content .= "\n
Studiengang
"; + $content .= "\n"; + $content .= "\n"; + $content .= "\n"; foreach ($studenttypes as $heading) { - $content .= ""; + $content .= "\n"; } - $content .= ""; + $content .= "\n"; + $content .= "\n\n"; //orgformheadings (VZ, BB,...) ausgeben for ($i = 0; $i < $noStudenttypes; $i++) { foreach ($orgform_arr as $row_orgform) { - $content .= ""; } } - $content .= ""; + $content .= "\n"; + $content .= "\n"; + $content .= "\n"; $sumarr = array(); @@ -1773,13 +1778,13 @@ else { $content .= "\n"; $content .= ''; - $content .= ""; + $content .= "\n"; foreach ($studenttypes as $key => $value) { foreach ($orgform_arr as $row_orgform) { $fullAlias = $key."_".mb_strtolower($row_orgform); - $content .= ""; //Summe berechnen @@ -1794,14 +1799,15 @@ else } } } - $content .= ""; + $content .= "\n"; $content .= "\n"; - $content .= ''; - $content .= ""; + $content .= ""; + $content .= ''; + $content .= "\n"; foreach ($sumarr as $sum) { - $content .= ""; + $content .= "\n"; } $content .= ""; $content .= '
Studiengang$heading$heading
 
"; + $content .= "\n"; $content .= $row_orgform; $content .= "
".mb_strtoupper($row->typ.$row->kurzbz)." ($row->kurzbzlang)".mb_strtoupper($row->typ.$row->kurzbz)." ($row->kurzbzlang)"; + $content .= "\n"; $content .= $row->{$fullAlias}; $content .= "
Summe
Summe".$sum."".$sum."
'; From 5da754c9dbe9196265bca2a2a386ae75ae38cc5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Thu, 4 Mar 2021 07:59:38 +0100 Subject: [PATCH 04/11] Anmerkung bei Lehreinheitmitarbeiter verschoben --- .../lehrveranstaltungdetailoverlay.xul.php | 45 ++++++++++--------- locale/de-AT/lehrveranstaltung.php | 5 +++ 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 locale/de-AT/lehrveranstaltung.php diff --git a/content/lvplanung/lehrveranstaltungdetailoverlay.xul.php b/content/lvplanung/lehrveranstaltungdetailoverlay.xul.php index 57338add2..0efbfae2c 100644 --- a/content/lvplanung/lehrveranstaltungdetailoverlay.xul.php +++ b/content/lvplanung/lehrveranstaltungdetailoverlay.xul.php @@ -28,6 +28,7 @@ header("Content-type: application/vnd.mozilla.xul+xml"); require_once('../../config/vilesci.config.inc.php'); require_once('../../config/global.config.inc.php'); require_once('../../include/benutzerberechtigung.class.php'); +require_once('../../include/phrasen.class.php'); $user = get_uid(); $rechte = new benutzerberechtigung(); @@ -38,6 +39,8 @@ echo ''; // Vertragsdetails: Anzeige wird über config Eintrag bestimmt $is_hidden = (!defined('FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN') || FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN == true) ? 'false' : 'true'; +$sprache = getSprache(); +$p = new phrasen($sprache); ?> -