diff --git a/application/controllers/api/frontend/v1/Filter.php b/application/controllers/api/frontend/v1/Filter.php index 45838fc5f..b195e0012 100644 --- a/application/controllers/api/frontend/v1/Filter.php +++ b/application/controllers/api/frontend/v1/Filter.php @@ -113,7 +113,7 @@ class Filter extends FHCAPI_Controller */ public function applyFilterFields() { - $this->form_validation->set_rules('filterFields', 'filterFields', 'required'); + $this->form_validation->set_rules('filterFields[]', 'filterFields', 'required'); if (!$this->form_validation->run()) $this->terminateWithValidationErrors($this->form_validation->error_array()); diff --git a/application/controllers/jobs/ReihungstestJob.php b/application/controllers/jobs/ReihungstestJob.php index 996354bb5..9b2532b4b 100644 --- a/application/controllers/jobs/ReihungstestJob.php +++ b/application/controllers/jobs/ReihungstestJob.php @@ -876,7 +876,7 @@ class ReihungstestJob extends JOB_Controller JOIN PUBLIC.tbl_studiengang ON (tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz) WHERE tbl_prestudent.person_id = ".$row_ps->person_id." AND tbl_prestudent.prestudent_id != ".$row_ps->prestudent_id." - AND get_rolle_prestudent (tbl_prestudent.prestudent_id, '".$row_ps->studiensemester_kurzbz."') IN ('Aufgenommener','Bewerber','Wartender') + AND get_rolle_prestudent (tbl_prestudent.prestudent_id, '".$row_ps->studiensemester_kurzbz."') IN ('Aufgenommener','Bewerber','Wartender', 'Student') AND studiensemester_kurzbz = '".$row_ps->studiensemester_kurzbz."' AND tbl_studiengang.typ IN ('b', 'm') AND priorisierung > ".$row_ps->priorisierung." @@ -894,12 +894,22 @@ class ReihungstestJob extends JOB_Controller { foreach ($resultNiedrPrios->retval as $rowNiedrPrios) { - // nur Info wenn aufgenommen oder master - if ($rowNiedrPrios->laststatus == 'Aufgenommener' || $rowNiedrPrios->studiengang_typ == 'm') + // nur Info wenn aufgenommen/student oder master + if ($rowNiedrPrios->laststatus == 'Aufgenommener' || $rowNiedrPrios->laststatus == 'Student' || $rowNiedrPrios->studiengang_typ == 'm') { - // Mail zur Info an Assistenz schicken, dass in höherer Prio aufgenommen wurde - $mailArray[$rowNiedrPrios->studiengang_kz][$rowNiedrPrios->orgform_kurzbz]['AufnahmeHoeherePrio'][] - = $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')'; + + if ($rowNiedrPrios->laststatus == 'Aufgenommener') + { + // Mail zur Info an Assistenz schicken, dass in höherer Prio aufgenommen wurde + $mailArray[$rowNiedrPrios->studiengang_kz][$rowNiedrPrios->orgform_kurzbz]['AufnahmeHoeherePrio'][] + = $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')'; + } + else if ($rowNiedrPrios->laststatus == 'Student') + { + $mailArray[$rowNiedrPrios->studiengang_kz][$rowNiedrPrios->orgform_kurzbz]['StudentHoeherePrio'][] + = $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')'; + } + } elseif ($rowNiedrPrios->laststatus == 'Bewerber' && $row_ps->prestudenstatus_datum > $rowNiedrPrios->datum) { @@ -1061,6 +1071,20 @@ class ReihungstestJob extends JOB_Controller $mailcontent .= ''; $content = true; } + if (isset($value['StudentHoeherePrio']) && !isEmptyArray($value['StudentHoeherePrio'])) + { + $mailcontent .= '

+ Folgende Studenten wurden in einem höher priorisierten Studiengang aufgenommen:

'; + $mailcontent .= ''; + $mailcontent .= ' '; + sort($value['StudentHoeherePrio']); + foreach ($value['StudentHoeherePrio'] AS $key=>$bewerber) + { + $mailcontent .= ''; + } + $mailcontent .= '
'.$bewerber.'
'; + $content = true; + } if (isset($value['AbgewiesenHoeherePrio']) && !isEmptyArray($value['AbgewiesenHoeherePrio'])) { $mailcontent .= '

diff --git a/application/libraries/FilterCmptLib.php b/application/libraries/FilterCmptLib.php index c1a2b47cb..272899de6 100644 --- a/application/libraries/FilterCmptLib.php +++ b/application/libraries/FilterCmptLib.php @@ -371,21 +371,21 @@ class FilterCmptLib foreach ($filterFields as $filterField) { // If not an empty array - if ($filterField != null) + if (!isEmptyArray($filterField)) { // - if (isset($filterField->name) && isset($filterField->operation) && isset($filterField->condition) - && !isEmptyString($filterField->name) && !isEmptyString($filterField->operation) - && !isEmptyString($filterField->condition)) + if (isset($filterField['name']) && isset($filterField['operation']) && isset($filterField['condition']) + && !isEmptyString($filterField['name']) && !isEmptyString($filterField['operation']) + && !isEmptyString((string)$filterField['condition'])) { // Fine $filter = new stdClass(); - $filter->name = $filterField->name; - $filter->operation = $filterField->operation; - $filter->condition = $filterField->condition; - if (isset($filterField->option) && !isEmptyString($filterField->option)) + $filter->name = $filterField['name']; + $filter->operation = $filterField['operation']; + $filter->condition = $filterField['condition']; + if (isset($filterField['option']) && !isEmptyString($filterField['option'])) { - $filter->option = $filterField->option; + $filter->option = $filterField['option']; } else { @@ -1173,4 +1173,4 @@ class FilterCmptLib return $filterName; } -} \ No newline at end of file +} diff --git a/application/views/system/logs/logsViewer.php b/application/views/system/logs/logsViewer.php index 8749806bc..ddfe855fe 100644 --- a/application/views/system/logs/logsViewer.php +++ b/application/views/system/logs/logsViewer.php @@ -8,11 +8,12 @@ 'filtercomponent' => true, 'navigationcomponent' => true, 'tabulator5' => true, + 'primevue3' => true, 'phrases' => array( 'global' => array('mailAnXversandt'), 'ui' => array('bitteEintragWaehlen') ), - 'customJSModules' => array('public/js/apps/LogsViewer/LogsViewer.js') + 'customJSModules' => array('public/js/apps/LogsViewer/LogsViewer.js'), ); $this->load->view('templates/FHC-Header', $includesArray); diff --git a/cis/private/tools/zeitaufzeichnung_projektliste.php b/cis/private/tools/zeitaufzeichnung_projektliste.php index 817f266a2..32c45c06a 100644 --- a/cis/private/tools/zeitaufzeichnung_projektliste.php +++ b/cis/private/tools/zeitaufzeichnung_projektliste.php @@ -264,6 +264,7 @@ for ($i = 0; $i < count($ztaufdata); $i++) { $phasetoadd = new stdClass(); $phasetoadd->bezeichnung = $ppitem->bezeichnung; + $phasetoadd->beschreibung = $ppitem->beschreibung; $phasetoadd->stunden = 0; $phasetoadd->alleZeiten = array(); @@ -276,8 +277,8 @@ for ($i = 0; $i < count($ztaufdata); $i++) $projektphasen[$ppitem->projektphase_id] = $phasetoadd; //add new projektphase to array with unique projekt phase names - if (!in_array($ppitem->bezeichnung, $projektphasenames[$ztaufrow->projekt_kurzbz])) - $projektphasenames[$ztaufrow->projekt_kurzbz][] = $ppitem->bezeichnung; + if (!in_array($ppitem->beschreibung, $projektphasenames[$ztaufrow->projekt_kurzbz])) + $projektphasenames[$ztaufrow->projekt_kurzbz][] = $ppitem->beschreibung; } } @@ -407,7 +408,7 @@ for ($i = 0; $i < count($ztaufdata); $i++) $projektmonthsums[$name]->sum += $projekthours; foreach ($projekt->projektphasen as $projektphase) { - $projektmonthsums[$name]->projektphasen[$projektphase->bezeichnung] += round($projektphase->stunden, 2, 0); + $projektmonthsums[$name]->projektphasen[$projektphase->beschreibung] += round($projektphase->stunden, 2, 0); } } else @@ -418,7 +419,7 @@ for ($i = 0; $i < count($ztaufdata); $i++) foreach ($projekt->projektphasen as $projektphase) { - $monthsum->projektphasen[$projektphase->bezeichnung] = round($projektphase->stunden, 2, 0); + $monthsum->projektphasen[$projektphase->beschreibung] = round($projektphase->stunden, 2, 0); } $projektmonthsums[$name] = $monthsum; } diff --git a/cis/public/testtool_test/testseite.php b/cis/public/testtool_test/testseite.php index da6fee355..a200b95b2 100644 --- a/cis/public/testtool_test/testseite.php +++ b/cis/public/testtool_test/testseite.php @@ -151,6 +151,7 @@ echo ''; + diff --git a/cis/testtool/admin/uebersichtFragen.php b/cis/testtool/admin/uebersichtFragen.php index f0e286698..46a70305e 100644 --- a/cis/testtool/admin/uebersichtFragen.php +++ b/cis/testtool/admin/uebersichtFragen.php @@ -307,13 +307,17 @@ if(isset($_REQUEST['AuswahlGebiet'])) echo ''.$vor->nummer.' '.$vorschlag->text.''; } } - if($vorschlag->bild!='') + if($vorschlag->bild != '') { // zeilenumbruch nach 4 bilder if($anzahlBild%4==0) echo ""; echo ""; echo "
"; + if ($vorschlag->text != '') + { + echo "$vorschlag->text
"; + } if ($loesungen) { echo "
".$vor->punkte.""; diff --git a/cis/testtool/login.php b/cis/testtool/login.php index d1944fe7a..5a2ae0dea 100644 --- a/cis/testtool/login.php +++ b/cis/testtool/login.php @@ -29,6 +29,7 @@ require_once('../../include/prestudent.class.php'); require_once('../../include/pruefling.class.php'); require_once('../../include/studiengang.class.php'); require_once('../../include/studienplan.class.php'); +require_once('../../include/studienordnung.class.php'); require_once('../../include/ablauf.class.php'); require_once('../../include/reihungstest.class.php'); require_once('../../include/sprache.class.php'); @@ -614,13 +615,26 @@ elseif (isset($prestudent_id)) { echo ''; $stg = new Studiengang($ps_obj->studiengang_kz); + $sto = new Studienordnung(); + $sto->getStudienordnungFromStudienplan($ps_obj->studienplan_id); + // Name des Studiengangs aus Studienordnung laden, ansonsten Fallback auf Studiengang + $stg_name = $sto->studiengangbezeichnung; + $stg_name_eng = $sto->studiengangbezeichnung_englisch; + if ($stg_name == '') + { + $stg_name = $stg->bezeichnung; + } + if ($stg_name_eng == '') + { + $stg_name_eng = $stg->english; + } if ($ps_obj->lastStatus == "Interessent" || $ps_obj->lastStatus == "Bewerber" || $ps_obj->lastStatus == "Wartender" || $ps_obj->lastStatus == "Aufgenommener") { - echo ''. $ps_obj->typ_bz .' '. ($sprache_user == 'English' ? $stg->english : $stg->bezeichnung). ' ('.$ps_obj->orgform_bezeichnung[$sprache_user].')'; + echo ''. $ps_obj->typ_bz .' '. ($sprache_user == 'English' ? $stg_name_eng : $stg_name). ' ('.$ps_obj->orgform_bezeichnung[$sprache_user].')'; if ($ps_obj->ausbildungssemester == '1') { echo ''. $p->t('testtool/regulaererEinstieg'). ' (1. Semester)'; @@ -634,7 +648,7 @@ elseif (isset($prestudent_id)) elseif ($ps_obj->lastStatus == "Abgewiesener") { echo ' - '. $ps_obj->typ_bz .' '. ($sprache_user == 'English' ? $stg->english : $stg->bezeichnung). ' + '. $ps_obj->typ_bz .' '. ($sprache_user == 'English' ? $stg_name_eng : $stg_name). ' '. $ps_obj->status_mehrsprachig[$sprache_user]. ' '; } @@ -648,7 +662,20 @@ elseif (isset($prestudent_id)) // Letzten Status für des Prestudenten einholen $ps_master = new Prestudent(); $ps_master->getLastStatus($prestudent_id); - echo ''. $typ->bezeichnung.' '.($sprache_user=='English'?$stg_obj->english:$stg_obj->bezeichnung).''; + $sto = new Studienordnung(); + $sto->getStudienordnungFromStudienplan($ps_master->studienplan_id); + // Name des Studiengangs aus Studienordnung laden, ansonsten Fallback auf Studiengang + $stg_name = $sto->studiengangbezeichnung; + $stg_name_eng = $sto->studiengangbezeichnung_englisch; + if ($stg_name == '') + { + $stg_name = $stg->bezeichnung; + } + if ($stg_name_eng == '') + { + $stg_name_eng = $stg->english; + } + echo ''. $typ->bezeichnung.' '.($sprache_user=='English'?$stg_name_eng : $stg_name).''; echo ''. $ps_master->status_mehrsprachig[$sprache_user]. ''; } diff --git a/composer.json b/composer.json index 216d315d9..5422e9dad 100644 --- a/composer.json +++ b/composer.json @@ -287,9 +287,9 @@ "name": "tomazdragar/simplecropper", "version": "1.0", "source": { - "url": "https://github.com/tomazdragar/SimpleCropper.git", + "url": "https://github.com/deveshsinghal22/SimpleCropper.git", "type": "git", - "reference": "9750b81fa55ed07b3b429297d18ffbeac07a2cde" + "reference": "873e5e1ca57c370bedd07a512d0bf562930d4b89" } } }, diff --git a/composer.lock b/composer.lock index 27132ecff..f8b01dd90 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "01ea35652d88680f8262c5365828eb46", + "content-hash": "6143f37d65128b8247e79714204932e7", "packages": [ { "name": "afarkas/html5shiv", @@ -322,9 +322,6 @@ "extra": { "component": { "name": "angularjs", - "scripts": [ - "angular.js" - ], "files": [ "angular-animate.js", "angular-animate.min.js", @@ -597,6 +594,9 @@ "i18n/angular-locale_zh.js", "i18n/angular-locale_zu-za.js", "i18n/angular-locale_zu.js" + ], + "scripts": [ + "angular.js" ] } }, @@ -629,15 +629,15 @@ "type": "component", "extra": { "component": { - "scripts": [ - "jquery.js" - ], "files": [ "jquery.min.js", "jquery.min.map", "jquery.slim.js", "jquery.slim.min.js", "jquery.slim.min.map" + ], + "scripts": [ + "jquery.js" ] } }, @@ -682,20 +682,20 @@ "extra": { "component": { "name": "jquery-ui", - "scripts": [ - "jquery-ui.js" - ], - "files": [ - "ui/**", - "themes/**", - "jquery-ui.min.js" - ], "shim": { "deps": [ "jquery" ], "exports": "jQuery" - } + }, + "files": [ + "ui/**", + "themes/**", + "jquery-ui.min.js" + ], + "scripts": [ + "jquery-ui.js" + ] } }, "notification-url": "https://packagist.org/downloads/", @@ -1015,12 +1015,12 @@ "version": "1.3.7", "source": { "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", + "url": "https://github.com/jsonrainbow/json-schema.git", "reference": "87b54b460febed69726c781ab67462084e97a105" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/87b54b460febed69726c781ab67462084e97a105", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/87b54b460febed69726c781ab67462084e97a105", "reference": "87b54b460febed69726c781ab67462084e97a105", "shasum": "" }, @@ -1075,8 +1075,8 @@ "schema" ], "support": { - "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/master" + "issues": "https://github.com/jsonrainbow/json-schema/issues", + "source": "https://github.com/jsonrainbow/json-schema/tree/1.3.7" }, "time": "2014-08-25T02:48:14+00:00" }, @@ -1116,6 +1116,7 @@ "issues": "https://github.com/kingsquare/json-schema-form/issues", "source": "https://github.com/kingsquare/json-schema-form/tree/master" }, + "abandoned": true, "time": "2014-07-10T12:27:19+00:00" }, { @@ -1297,16 +1298,16 @@ }, { "name": "mottie/tablesorter", - "version": "v2.31.3", + "version": "v2.32.0", "source": { "type": "git", "url": "https://github.com/Mottie/tablesorter.git", - "reference": "7202d5faf8105a5ecd1a2b7a653777618713ffe5" + "reference": "1423f5408982f58d5baa97648d2e5ee0b55fd3b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/7202d5faf8105a5ecd1a2b7a653777618713ffe5", - "reference": "7202d5faf8105a5ecd1a2b7a653777618713ffe5", + "url": "https://api.github.com/repos/Mottie/tablesorter/zipball/1423f5408982f58d5baa97648d2e5ee0b55fd3b6", + "reference": "1423f5408982f58d5baa97648d2e5ee0b55fd3b6", "shasum": "" }, "require": { @@ -1315,10 +1316,10 @@ "type": "component", "extra": { "component": { + "files": "dist/", "scripts": [ "dist/js/jquery.tablesorter.combined.js" - ], - "files": "dist/" + ] } }, "notification-url": "https://packagist.org/downloads/", @@ -1331,7 +1332,8 @@ }, { "name": "Rob Garrison", - "email": "wowmotty@gmail.com" + "email": "wowmotty@gmail.com", + "homepage": "https://github.com/Mottie" } ], "description": "tablesorter (FORK) is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.", @@ -1352,7 +1354,7 @@ "source": "https://github.com/Mottie/tablesorter", "wiki": "https://github.com/Mottie/tablesorter/wiki" }, - "time": "2020-03-03T13:46:03+00:00" + "time": "2024-08-14T01:23:57+00:00" }, { "name": "nategood/httpful", @@ -1520,16 +1522,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "2.0.46", + "version": "2.0.48", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "498e67a0c82bd5791fda9b0dd0f4ec8e8aebb02d" + "reference": "eaa7be704b8b93a6913b69eb7f645a59d7731b61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/498e67a0c82bd5791fda9b0dd0f4ec8e8aebb02d", - "reference": "498e67a0c82bd5791fda9b0dd0f4ec8e8aebb02d", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/eaa7be704b8b93a6913b69eb7f645a59d7731b61", + "reference": "eaa7be704b8b93a6913b69eb7f645a59d7731b61", "shasum": "" }, "require": { @@ -1610,7 +1612,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/2.0.46" + "source": "https://github.com/phpseclib/phpseclib/tree/2.0.48" }, "funding": [ { @@ -1626,7 +1628,7 @@ "type": "tidelift" } ], - "time": "2023-12-29T01:52:43+00:00" + "time": "2024-12-14T21:03:54+00:00" }, { "name": "rmariuzzo/jquery-checkboxes", @@ -1668,12 +1670,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + }, "branch-alias": { "dev-main": "1.19-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -1748,8 +1750,8 @@ "version": "1.0", "source": { "type": "git", - "url": "https://github.com/tomazdragar/SimpleCropper.git", - "reference": "9750b81fa55ed07b3b429297d18ffbeac07a2cde" + "url": "https://github.com/deveshsinghal22/SimpleCropper.git", + "reference": "873e5e1ca57c370bedd07a512d0bf562930d4b89" }, "type": "library" }, @@ -3273,16 +3275,16 @@ }, { "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "reference": "92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54", + "reference": "92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54", "shasum": "" }, "require": { @@ -3316,7 +3318,7 @@ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.3" }, "funding": [ { @@ -3324,7 +3326,7 @@ "type": "github" } ], - "time": "2020-11-30T08:15:22+00:00" + "time": "2024-03-01T13:45:45+00:00" }, { "name": "sebastian/comparator", @@ -3682,16 +3684,16 @@ }, { "name": "sebastian/object-enumerator", - "version": "3.0.4", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" + "reference": "ac5b293dba925751b808e02923399fb44ff0d541" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/ac5b293dba925751b808e02923399fb44ff0d541", + "reference": "ac5b293dba925751b808e02923399fb44ff0d541", "shasum": "" }, "require": { @@ -3727,7 +3729,7 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.5" }, "funding": [ { @@ -3735,20 +3737,20 @@ "type": "github" } ], - "time": "2020-11-30T07:40:27+00:00" + "time": "2024-03-01T13:54:02+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" + "reference": "1d439c229e61f244ff1f211e5c99737f90c67def" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/1d439c229e61f244ff1f211e5c99737f90c67def", + "reference": "1d439c229e61f244ff1f211e5c99737f90c67def", "shasum": "" }, "require": { @@ -3782,7 +3784,7 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" + "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.3" }, "funding": [ { @@ -3790,7 +3792,7 @@ "type": "github" } ], - "time": "2020-11-30T07:37:18+00:00" + "time": "2024-03-01T13:56:04+00:00" }, { "name": "sebastian/phpcpd", @@ -3849,16 +3851,16 @@ }, { "name": "sebastian/recursion-context", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" + "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/9bfd3c6f1f08c026f542032dfb42813544f7d64c", + "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c", "shasum": "" }, "require": { @@ -3900,7 +3902,7 @@ "homepage": "http://www.github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.2" }, "funding": [ { @@ -3908,7 +3910,7 @@ "type": "github" } ], - "time": "2020-11-30T07:34:24+00:00" + "time": "2024-03-01T14:07:30+00:00" }, { "name": "sebastian/resource-operations", @@ -4530,12 +4532,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + }, "branch-alias": { "dev-main": "1.19-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" } }, "autoload": { diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php index 0d4158b48..8cfc36bfb 100644 --- a/config/global.config-default.inc.php +++ b/config/global.config-default.inc.php @@ -31,6 +31,7 @@ define('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN', true); // Wenn gesetzt, werden die Digitale Anwesenheit-Icons nur fuer diese Studiengaenge angezeigt, sonst für alle // define('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG', serialize(array('257'))); +// define('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_LVA', serialize(array('39455','39481','39480','41906','41905','41904','39459','39512','39454','39482','42230','42231','39458','41921','41922','39457','42896'))); // Im CIS Menue Links bei Modulen anzeigen wenn Lehrauftrag define('CIS_LEHRVERANSTALTUNG_MODULE_LINK',true); diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php index a18af4bde..42df93fe3 100644 --- a/include/tw/cis_menu_lv.inc.php +++ b/include/tw/cis_menu_lv.inc.php @@ -242,8 +242,9 @@ function checkZeilenUmbruch() // Digitale Anwesenheiten if(defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet - && (!defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG') || in_array($lv->studiengang_kz, unserialize(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG))) - && ($rechte->isBerechtigt('extension/anw_ent_admin') + && (!defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG') || in_array($lv->studiengang_kz, unserialize(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG))) + && (!defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_LVA') || in_array($lv->lehrveranstaltung_id, unserialize(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_LVA))) + && ($rechte->isBerechtigt('extension/anw_ent_admin') || $rechte->isBerechtigt('extension/anwesenheit_lektor') || $rechte->isBerechtigt('extension/anwesenheit_student') || $rechte->isBerechtigt('extension/anwesenheit_admin'))) diff --git a/locale/de-AT/testtool.php b/locale/de-AT/testtool.php index 67f2a04ea..6977704cc 100644 --- a/locale/de-AT/testtool.php +++ b/locale/de-AT/testtool.php @@ -29,7 +29,7 @@ $this->phrasen['testtool/begruessungstext']="Willkommen zum Reihungstest der Fac $this->phrasen['testtool/anmeldedaten']= "Sie sind mit folgenden Daten angemeldet:"; $this->phrasen['testtool/keineAntwort']='Keine Antwort'; $this->phrasen['testtool/speichernUndWeiter']='Speichern und weiter'; -$this->phrasen['testtool/alleFragenBeantwortet']='GLÜCKWUNSCH! \n\nSie haben alle Fragen in der zur Verfügung stehenden Zeit beantwortet. \nNutzen Sie die verbleibende Zeit, um Ihre Antworten zu kontrollieren oder fahren Sie mit dem nächsten Teilgebiet fort'; +$this->phrasen['testtool/alleFragenBeantwortet']='GLÜCKWUNSCH! \n\nSie haben alle Fragen in der zur Verfügung stehenden Zeit beantwortet. \nNutzen Sie die verbleibende Zeit, um Ihre Antworten zu kontrollieren oder fahren Sie mit dem nächsten Teilgebiet fort.'; $this->phrasen['testtool/zeitAbgelaufen']='Die Maximalzeit für dieses Gebiet ist abgelaufen, oder alle Fragen wurden beantwortet'; $this->phrasen['testtool/spracheDerTestfragen']='Gewünschte Sprache der Testfragen'; $this->phrasen['testtool/einleitung']='Einleitung'; @@ -62,8 +62,8 @@ $this->phrasen['testtool/einfuehrungsText']='

Herzlich Willkommen zum Reihungstest

Einfuehrungsvideo

-  Bachelor-Leitfaden zum Ablauf des Reihungstests
-  Master-Leitfaden zum Ablauf des Reihungstests +  Bachelor-Leitfaden zum Ablauf des Reihungstests
+  Master-Leitfaden zum Ablauf des Reihungstests

Unter dem folgenden Link können Sie die korrekte Darstellung des Reihungstests testen:

Zum Darstellungstest