From db694b998901c25c74ede2aa0d9f3b479b080acd Mon Sep 17 00:00:00 2001 From: ma0048 Date: Mon, 7 Mar 2022 10:30:41 +0100 Subject: [PATCH 01/17] nach dem Speichern werden die Felder disabled --- content/lvplanung/lehrveranstaltungoverlay.js.php | 1 + 1 file changed, 1 insertion(+) diff --git a/content/lvplanung/lehrveranstaltungoverlay.js.php b/content/lvplanung/lehrveranstaltungoverlay.js.php index 990bc71b8..dfb1bf4ec 100644 --- a/content/lvplanung/lehrveranstaltungoverlay.js.php +++ b/content/lvplanung/lehrveranstaltungoverlay.js.php @@ -707,6 +707,7 @@ function LeDetailSave() { netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); document.getElementById('lehrveranstaltung-detail-checkbox-new').checked=false; + LeDetailDisableFields(true); //LvTreeRefresh(); LvSelectLehreinheit_id=val.dbdml_data; LvOpenLehrveranstaltung_id=lehrveranstaltung; From afd03e414fe528f71e6fcea4560f00240c67c65c Mon Sep 17 00:00:00 2001 From: KarpAlex Date: Thu, 10 Mar 2022 13:39:53 +0100 Subject: [PATCH 02/17] Datenverbund filter: added new filter for bpk overview in extension and added storno uebersicht filter to dvuh app, and remaned dataset --- system/filtersupdate.php | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/system/filtersupdate.php b/system/filtersupdate.php index 641553096..a1536ca67 100644 --- a/system/filtersupdate.php +++ b/system/filtersupdate.php @@ -985,8 +985,8 @@ $filters = array( 'oe_kurzbz' => null, ), array( - 'app' => 'core', - 'dataset_name' => 'overview', + 'app' => 'dvuh', + 'dataset_name' => 'storno', 'filter_kurzbz' => 'DVUHStorno', 'description' => '{DVUH Storno Übersicht}', 'sort' => 1, @@ -1005,6 +1005,29 @@ $filters = array( } ', 'oe_kurzbz' => null, + ), + array( + 'app' => 'dvuh', + 'dataset_name' => 'overview', + 'filter_kurzbz' => 'BPKWartungDVUH', + 'description' => '{bPK Uebersicht}', + 'sort' => 1, + 'default_filter' => true, + 'filter' => ' + { + "name": "Fehlende bPK", + "columns": [ + {"name": "person_id"}, + {"name": "vorname"}, + {"name": "nachname"}, + {"name": "svnr"}, + {"name": "ersatzkennzeichen"}, + {"name": "mitarbeiter"} + ], + "filters": [] + } + ', + 'oe_kurzbz' => null, ) ); From a8e36f2f3e262bb9a91c71be9444c9deeaf3d888 Mon Sep 17 00:00:00 2001 From: KarpAlex Date: Fri, 11 Mar 2022 02:12:20 +0100 Subject: [PATCH 03/17] added studiengangskennzahl phrase --- system/phrasesupdate.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 139ab17b5..3b43a1ac0 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -2705,6 +2705,26 @@ $phrases = array( ) ) ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'studiengangskennzahlLehre', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Studiengangskennzahl', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Study program number', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), //********************** INFOCENTER/infocenter array( 'app' => 'infocenter', From 04b896ac132e6e04e1cf16ff9e1185c28224594b Mon Sep 17 00:00:00 2001 From: Christian Paminger Date: Wed, 16 Mar 2022 09:38:38 +0100 Subject: [PATCH 04/17] Update projektphasedetail.overlay.xul.php Services Added --- content/projekt/projektphasedetail.overlay.xul.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/projekt/projektphasedetail.overlay.xul.php b/content/projekt/projektphasedetail.overlay.xul.php index eeadf366f..3b48353e0 100644 --- a/content/projekt/projektphasedetail.overlay.xul.php +++ b/content/projekt/projektphasedetail.overlay.xul.php @@ -87,8 +87,9 @@ echo ''; - + + From 6fb0fd38283a72e33a0500373ac9c613138a29d3 Mon Sep 17 00:00:00 2001 From: Christian Paminger Date: Wed, 16 Mar 2022 12:04:10 +0100 Subject: [PATCH 05/17] Icon fuer Services im Planner --- skin/images/service.png | Bin 0 -> 841 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 skin/images/service.png diff --git a/skin/images/service.png b/skin/images/service.png new file mode 100644 index 0000000000000000000000000000000000000000..b8cbd13a3b42b4786cc5620cd867387e28b5339a GIT binary patch literal 841 zcmV-P1GfB$P)EX>4Tx04R}tkv&MmKpe$iTct%R3U&~2$WWauh!qhhtwIqhgj%6h2a`*`ph-iL z;^HW{799LotU9+0Yt2!bCVj!sUBE>hzEl0u6Z503ls?%w0>9pG10C4=2nH^D+1_82yx6v%+%*ZF$K@@bq^n3?_xa5``n+SSIL_U@Cn4TOgAjz4dSUy zOXs{#9APC%AwDM_Gw6cEk6f2se&bwp*v~T~MkYN^93d8p9V~Y+D;X;BBym(xHOlvA zT~;`6aaJoe*19KuVK}d?EOVXaFp^lr5=01)Q9~IOScuW8kzyiE`w0*KkmDE0C6lWR zMvetkp+a)};D7MDTeA?KaFfCbp!>zPKSqGyF3_yo_V=-EH&1}TGjOG~{nZ9A{YiSg ztwoQ3zHQ**x~<83z~v4w_@qmQg?^`Gp+u90K$`U$8$}bWB>pF24YJ`L;wH){{a7L*(&S$WViTFxYE%*>eCx2;Hl-oZa2H=f{DpUTPzlh^J{mRBA&p2oF35dYssxy>Q8kEx-W=>_ zzn_AQ;VXXQFP_K$10%5?7i!EE?R$iinmH(o*uhpBV5~yiOptFl4f%U6Z-(=^%%y>q zRDZ8fvVbW(jos_k?p4!x8*5jLb2n3XEw(~lPo8hGx_NNd;v)_-g(b$5@;S}`ghgm3 Tt0~~500000NkvXXu0mjf;W%%_ literal 0 HcmV?d00001 From 334460a23020c2e0c8b324eb9a8069d8e4255830 Mon Sep 17 00:00:00 2001 From: Manfred Date: Wed, 16 Mar 2022 16:04:58 +0100 Subject: [PATCH 06/17] =?UTF-8?q?Spalte=20"Anzahl=20Dokumente"=20bei=20BPK?= =?UTF-8?q?-=C3=9Cbersicht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/person/bpk/bpkData.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/application/views/person/bpk/bpkData.php b/application/views/person/bpk/bpkData.php index 3580ed4bc..1c70b44a6 100644 --- a/application/views/person/bpk/bpkData.php +++ b/application/views/person/bpk/bpkData.php @@ -3,7 +3,8 @@ 'query' => ' SELECT person_id, vorname, nachname, geschlecht, svnr, ersatzkennzeichen, matr_nr, - staatsbuergerschaft, gebdatum, false AS mitarbeiter + staatsbuergerschaft, gebdatum, false AS mitarbeiter, + (SELECT count(*) FROM public.tbl_akte WHERE person_id=tbl_person.person_id) AS anzahl_dokumente FROM public.tbl_person WHERE @@ -14,7 +15,8 @@ UNION SELECT person_id, vorname, nachname, geschlecht, svnr, ersatzkennzeichen, matr_nr, - staatsbuergerschaft, gebdatum, true AS mitarbeiter + staatsbuergerschaft, gebdatum, true AS mitarbeiter, + (SELECT count(*) FROM public.tbl_akte WHERE person_id=tbl_person.person_id) AS anzahl_dokumente FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) @@ -36,7 +38,8 @@ ucfirst($this->p->t('person', 'matrikelnummer')), ucfirst($this->p->t('person', 'staatsbuergerschaft')), ucfirst($this->p->t('person', 'geburtsdatum')), - 'Mitarbeiter' + 'Mitarbeiter', + 'Anzahl Dokumente' ), 'formatRow' => function($datasetRaw) { From a08c8d7a76a0a00f9d6c44c7446faf2e8434c535 Mon Sep 17 00:00:00 2001 From: Manfred Date: Wed, 16 Mar 2022 16:13:47 +0100 Subject: [PATCH 07/17] =?UTF-8?q?Filter=20f=C3=BCr=20Lehrende=20in=20FAS?= =?UTF-8?q?=20und=20Tempus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/fas.xul.php | 2 +- content/fasoverlay.js.php | 56 ++++++++++++++++++ content/fasoverlay.xul.php | 106 +++++++++++++++++++--------------- content/tempusoverlay.js.php | 4 ++ include/mitarbeiter.class.php | 2 + 5 files changed, 124 insertions(+), 46 deletions(-) diff --git a/content/fas.xul.php b/content/fas.xul.php index d1d43f473..19b24b0f0 100644 --- a/content/fas.xul.php +++ b/content/fas.xul.php @@ -903,7 +903,7 @@ foreach($addon_obj->result as $addon) echo ''; //echo ''; echo ''; - echo ''; + echo ''; } if($rechte->isBerechtigt('admin') || $rechte->isBerechtigt('mitarbeiter')) { diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php index db26a9180..fcdc20228 100644 --- a/content/fasoverlay.js.php +++ b/content/fasoverlay.js.php @@ -741,6 +741,10 @@ function onLektorSelect(event) var uid=tree.view.getCellText(tree.currentIndex,col); var stg_idx = tree.view.getParentIndex(tree.currentIndex); + //Wenn der Filter angewendet wurde, gibt es keinen Parent. Daher wird hier der stg_idx auf 0 gesetzt. + if(stg_idx == -1 && uid != '') + stg_idx = 0; + //wenn direkt ein studiengang markiert wurde dann abbrechen if(stg_idx==-1) return; @@ -789,6 +793,58 @@ function onLektorSelect(event) } } +// Lektorenliste aktualisieren +function onLektorRefresh() +{ + netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); + var treeLektorenTree=document.getElementById('tree-lektor'); + // Input-Feld leeren + document.getElementById('fas-lektor-filter').value = ''; + var url = 'rdf/mitarbeiter.rdf.php?user=true&'+gettimestamp(); + + var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService); + var datasource = rdfService.GetDataSource(url); + var oldDatasources = treeLektorenTree.database.GetDataSources(); + + datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource); + datasource.QueryInterface(Components.interfaces.nsIRDFXMLSink); + + treeLektorenTree.database.RemoveDataSource(oldDatasources.getNext()); + treeLektorenTree.database.AddDataSource(datasource); + treeLektorenTree.builder.rebuild(); +} + +// Lektorenliste filtern +function onLektorFilter() +{ + netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); + var filter=document.getElementById('fas-lektor-filter').value; + + var treeLektorenTree=document.getElementById('tree-lektor'); + + if(filter.length>2) + { + var url = 'rdf/mitarbeiter.rdf.php?filter='+encodeURIComponent(filter)+'&'+gettimestamp(); + var oldDatasources = treeLektorenTree.database.GetDataSources(); + + //Refresh damit die entfernten DS auch wirklich entfernt werden + treeLektorenTree.builder.rebuild(); + + var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService); + if(typeof(filter)=='undefined') + var datasource = rdfService.GetDataSource(url); + else + var datasource = rdfService.GetDataSourceBlocking(url); + datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource); + datasource.QueryInterface(Components.interfaces.nsIRDFXMLSink); + treeLektorenTree.database.RemoveDataSource(oldDatasources.getNext()); + treeLektorenTree.database.AddDataSource(datasource); + if(typeof(filter)!='undefined') + treeLektorenTree.builder.rebuild(); + treeLektorenTree.builder.addListener(LektorTreeListener); + } +} + function loadURL(event) { var contentFrame = document.getElementById('contentFrame'); diff --git a/content/fasoverlay.xul.php b/content/fasoverlay.xul.php index 51564dc19..eea32279b 100644 --- a/content/fasoverlay.xul.php +++ b/content/fasoverlay.xul.php @@ -133,52 +133,68 @@ echo ' - - - - - + + + + + + + + + + + + + + + + - - + + + titelpost = $row->titelpost; $obj->kurzbz = $row->kurzbz; $obj->vornamen = $row->vornamen; + $obj->aktiv =$this->db_parse_bool($row->aktiv); + $obj->fixangestellt = $this->db_parse_bool($row->fixangestellt); $this->result[] = $obj; } From d83e0cf52ce64173e8839b486188323354a61587 Mon Sep 17 00:00:00 2001 From: Christian Paminger Date: Wed, 16 Mar 2022 18:28:31 +0100 Subject: [PATCH 08/17] BugFix ressource.rdf.php --- rdf/ressource.rdf.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rdf/ressource.rdf.php b/rdf/ressource.rdf.php index 5306113b2..392ef0141 100644 --- a/rdf/ressource.rdf.php +++ b/rdf/ressource.rdf.php @@ -188,7 +188,7 @@ function draw_ressource($ressource) else die('Fehler beim Laden der Studenten-daten'); - $student.="\n\t\t\tressource_id."\" />"; + $student.="\n\t\t\tressource_id.'/'."\" />"; $typ ='Student'; } @@ -206,7 +206,7 @@ function draw_ressource($ressource) else die('Fehler beim Laden der Betriebsmittel-daten'); - $betriebsmittel.="\n\t\t\tressource_id."\" />"; + $betriebsmittel.="\n\t\t\tressource_id.'/'."\" />"; $typ = 'Betriebsmittel'; } @@ -224,7 +224,7 @@ function draw_ressource($ressource) else die('Fehler beim Laden der Firmen-daten'); - $firma.="\n\t\t\tressource_id."\" />"; + $firma.="\n\t\t\tressource_id.'/'."\" />"; $typ = 'Firma'; } @@ -249,4 +249,4 @@ function draw_ressource($ressource) '; } -?> \ No newline at end of file +?> From 253fdf141454310c822013c0d54be02442643754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Thu, 17 Mar 2022 09:23:46 +0100 Subject: [PATCH 09/17] =?UTF-8?q?Planner=20-=20Anzeigeproblem=20bei=20Proj?= =?UTF-8?q?ektressourcen=20f=C3=BCr=20Firmen=20und=20Studenten=20behoben?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/projekt/ressource.xml.php | 6 +++--- rdf/ressource.rdf.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/projekt/ressource.xml.php b/content/projekt/ressource.xml.php index d6f6c47c2..40d5ce204 100644 --- a/content/projekt/ressource.xml.php +++ b/content/projekt/ressource.xml.php @@ -160,15 +160,15 @@ echo '';