From 00c94778c1a24fb35238608c6b79b5a6ede2ef83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Thu, 22 Mar 2018 10:03:06 +0100 Subject: [PATCH 01/16] Fixed Problem with Personal Filters --- application/views/widgets/navigationMenu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/widgets/navigationMenu.php b/application/views/widgets/navigationMenu.php index 1fdb4b6b3..427fecf2e 100644 --- a/application/views/widgets/navigationMenu.php +++ b/application/views/widgets/navigationMenu.php @@ -139,7 +139,7 @@ { // Hiding/showing navigation menu - works only with sb admin 2 template!! - $("#side-menu").prepend('
    • '); + $("#side-menu").html('
    • '); $("#collapseicon").click(function() { $("#page-wrapper").css('margin-left', '0px'); $("#side-menu").hide(); From a1c4537540284ea8ffdc1ad1ebacdb1cf2dca4ad Mon Sep 17 00:00:00 2001 From: Gerald Raab Date: Fri, 23 Mar 2018 09:57:01 +0100 Subject: [PATCH 02/16] Filter Infocenter angepasst --- application/views/system/infocenter/infocenterData.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php index 48df269b2..4a30c137b 100755 --- a/application/views/system/infocenter/infocenterData.php +++ b/application/views/system/infocenter/infocenterData.php @@ -14,7 +14,7 @@ SELECT zeitpunkt FROM system.tbl_log WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\') - AND logdata->>\'name\' != \'Login with code\' + AND logdata->>\'name\' NOT IN (\'Login with code\', \'New application\') AND person_id = p.person_id ORDER BY zeitpunkt DESC LIMIT 1 @@ -23,7 +23,7 @@ SELECT insertvon FROM system.tbl_log WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\') - AND logdata->>\'name\' != \'Login with code\' + AND logdata->>\'name\' NOT IN (\'Login with code\', \'New application\') AND person_id = p.person_id ORDER BY zeitpunkt DESC LIMIT 1 From 546b3bfef3dd89ff759900f8b8267685a2200991 Mon Sep 17 00:00:00 2001 From: Paolo Date: Fri, 23 Mar 2018 11:03:46 +0100 Subject: [PATCH 03/16] Bugfix: removed redundant event binding for element remove-filter in view selecteFilters --- .../views/widgets/filter/selectFilters.php | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php index f79a1e449..eb14f41ae 100644 --- a/application/views/widgets/filter/selectFilters.php +++ b/application/views/widgets/filter/selectFilters.php @@ -29,28 +29,6 @@ }); - $(".remove-filter").click(function(event) { - - $.ajax({ - url: "", - method: "POST", - data: { - fieldName: $(this).attr('filterToRemove') - } - }) - .done(function(data, textStatus, jqXHR) { - - resetSelectedFilters(); - renderSelectedFilters(); - - renderTableDataset(); - - }).fail(function(jqXHR, textStatus, errorThrown) { - alert(textStatus); - }); - - }); - $(".select-filter-operation").change(function() { if ($(this).val() == "set" || $(this).val() == "nset") From 24c54c6b3cae844d88d76a4cd2aef15bc721f870 Mon Sep 17 00:00:00 2001 From: Gerald Raab Date: Fri, 23 Mar 2018 11:32:28 +0100 Subject: [PATCH 04/16] Index fuer system.tbl_log added --- system/dbupdate_3.3.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) mode change 100644 => 100755 system/dbupdate_3.3.php diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php old mode 100644 new mode 100755 index cd41a1abb..3f56f7f55 --- a/system/dbupdate_3.3.php +++ b/system/dbupdate_3.3.php @@ -860,6 +860,7 @@ if ($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berech // End extensions //--------------------------------------------------------------------------------------------------------------------- +// Tabellen fuer Person Log if (!$result = @$db->db_query("SELECT 1 FROM system.tbl_log LIMIT 1")) { $qry = "CREATE TABLE system.tbl_log @@ -910,6 +911,20 @@ if (!$result = @$db->db_query("SELECT 1 FROM system.tbl_log LIMIT 1")) echo ' system.tbl_log hinzugefügt
    '; } +// Add index to system.tbl_log +if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_log_person_id'")) +{ + if ($db->db_num_rows($result) == 0) + { + $qry = "CREATE INDEX idx_tbl_log_person_id ON system.tbl_log USING btree (person_id)"; + + if (! $db->db_query($qry)) + echo 'Indizes: ' . $db->db_last_error() . '
    '; + else + echo 'Index fuer system.tbl_log hinzugefuegt'; + } +} + //--------------------------------------------------------------------------------------------------------------------- // Start filters @@ -1822,7 +1837,7 @@ if(!@$db->db_query("SELECT oe_kurzbz FROM campus.tbl_dms_kategorie LIMIT 1")) { $qry = "ALTER TABLE campus.tbl_dms_kategorie ADD COLUMN oe_kurzbz varchar(32); ALTER TABLE campus.tbl_dms_kategorie ADD COLUMN berechtigung_kurzbz varchar(32); - + ALTER TABLE campus.tbl_dms_kategorie ADD CONSTRAINT fk_dms_kategorie_oe_kurzbz FOREIGN KEY (oe_kurzbz) REFERENCES public.tbl_organisationseinheit(oe_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT; ALTER TABLE campus.tbl_dms_kategorie ADD CONSTRAINT fk_dms_kategorie_berechtigung_kurzbz FOREIGN KEY (berechtigung_kurzbz) REFERENCES system.tbl_berechtigung(berechtigung_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT; "; From afeb3c1e5cb226962bcf34fb15916397e3f1afde Mon Sep 17 00:00:00 2001 From: Manfred Kindl Date: Fri, 23 Mar 2018 17:50:17 +0100 Subject: [PATCH 05/16] Freischaltung gesperrte Mailverteiler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Der generierte Verteiler wird automatisch ins BCC-Feld übernommen. Ein Hinweis wird angezeigt, dass man bei manuellem kopieren des Verteilers, diesen ins BCC-Feld schreiben soll - GUI Behübschung --- cis/private/open_grp.php | 86 ++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 25 deletions(-) diff --git a/cis/private/open_grp.php b/cis/private/open_grp.php index 2973ac7cd..aca6272d4 100644 --- a/cis/private/open_grp.php +++ b/cis/private/open_grp.php @@ -87,16 +87,62 @@ echo ' '.$p->t('mailverteiler/oeffnenEinesVerteilers').' + '; if (isset($_REQUEST['token']) && isset($_REQUEST['grp'])) { echo ' - - - - - '; +

    '.$p->t('mailverteiler/oeffnenEinesVerteilers').'

    '; /* Generate an random String */ $mail_id = mail_id_generator(); @@ -116,30 +162,18 @@ if (isset($_REQUEST['token']) && isset($_REQUEST['grp'])) fwrite($filet, $message, mb_strlen($message)); fclose($filet); - echo " - - - - - - - - "; + echo ' +

    '.$p->t('mailverteiler/geoeffnet',$db->convert_html_chars($_REQUEST['desc'])).'

    +

    Code: '.$mail_id.'
    + Adresse: '.$_REQUEST["grp"].$mail_id.'@'.DOMAIN.'

    +

    '.$p->t('mailverteiler/klickenZumSchicken').'

    +

    '.$p->t('mailverteiler/infoBenutzung').'

    '; } else { echo ' - - - '; +

    '.$p->t('mailverteiler/oeffnenFehlgeschlagen').'

    '; } - echo '
    '.$p->t('mailverteiler/mailverteiler').''.$p->t('mailverteiler/status').'
    ".$db->convert_html_chars($_REQUEST['desc'])."".$p->t('mailverteiler/geoeffnet')." (Code: ".$mail_id.")
    -

    ".$p->t('mailverteiler/klickenZumSchicken')."

    - -

    ".$p->t('mailverteiler/infoBenutzung',array($_REQUEST['grp'].$mail_id."@".DOMAIN))."

    -
    - '.$p->t('mailverteiler/oeffnenFehlgeschlagen').' -
    '; } else { @@ -149,7 +183,9 @@ else } else { - echo $p->t('mailverteiler/bestaetigeOeffnen',array($_REQUEST['grp']))." : convert_html_chars($_REQUEST['desc'])."&token=1\">".$p->t('mailverteiler/bestaetige').""; + echo '

    '.$p->t('mailverteiler/oeffnenEinesVerteilers').'

    '; + echo $p->t('mailverteiler/bestaetigeOeffnen').':'; + echo ''; } } From 2dcf4dd09fa3cc26662ef7f21f7fa60cd1b5e396 Mon Sep 17 00:00:00 2001 From: Manfred Kindl Date: Fri, 23 Mar 2018 17:51:00 +0100 Subject: [PATCH 06/16] =?UTF-8?q?Updateamum=20und=20-von=20bei=20=C3=84nde?= =?UTF-8?q?rung=20von=20Dokumenttyp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/student/studentDBDML.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php index 3e1942468..50d3a7612 100644 --- a/content/student/studentDBDML.php +++ b/content/student/studentDBDML.php @@ -2199,6 +2199,8 @@ if(!$error) $akte->anmerkung_intern = $_POST['anmerkung_intern']; $akte->titel_intern = $_POST['titel_intern']; $akte->dokument_kurzbz = $_POST['dokument_kurzbz']; + $akte->updateamum = date('Y-m-d H:i:s'); + $akte->updatevon = $user; if(!$akte->save()) { From 2e90718469a34b4820f51f9aa542b71d9499fdf1 Mon Sep 17 00:00:00 2001 From: Manfred Kindl Date: Fri, 23 Mar 2018 17:52:49 +0100 Subject: [PATCH 07/16] Person ID wird angezeigt, Spalte "AbgeschicktAm" wird default angezeigt --- content/student/studentdetailoverlay.xul.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php index da5da869c..96687018e 100644 --- a/content/student/studentdetailoverlay.xul.php +++ b/content/student/studentdetailoverlay.xul.php @@ -52,8 +52,6 @@ echo ''; @@ -68,6 +66,10 @@ echo ''; + + - + '; > -