blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 09:22:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

show Tags in CoreHeader

Browse Source
This commit is contained in:
ma0068
2026-03-31 12:48:27 +02:00
parent 5dbddb4beb
commit 50af6694d0
8 changed files with 257 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/stv.php
+1 -1
View File
@@ -144,7 +144,7 @@ $config['stv_prestudent_tags'] = [
'inwork_kf' => ['readonly' => false],
'dd_auto' => ['readonly' => false],
'wh_auto' => ['readonly' => false],
'prewh_auto' => ['readonly' => false],
'prewh_auto' => ['readonly' => true], //when readonly kein rendering für automatisierte tags
'out_auto' => ['readonly' => false],
'zgv_auto' => ['readonly' => false],
'wiedereinstieg_auto' => ['readonly' => false],
application/controllers/jobs/TagJob.php
+5 -5
View File
@@ -8,6 +8,8 @@ class TagJob extends JOB_Controller
{
const BATCHUSER = 'sftest';
const SEMESTER = 'SS2024'; //docker
//TODO semester
/**
* API constructor
@@ -22,8 +24,6 @@ class TagJob extends JOB_Controller
// Library
$this->load->library('TagLib');
// Tag-Helper
// Load Models
$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
@@ -103,7 +103,7 @@ class TagJob extends JOB_Controller
print_r(PHP_EOL . "create Tags wiederholer " . PHP_EOL);
$result = $this->PrestudentstatusModel-> loadWhere(array(
'statusgrund_id' => 16,
'studiensemester_kurzbz' => 'SS2026'
'studiensemester_kurzbz' => self::SEMESTER
));
$data = $result->retval;
$ids = array_map(function($item) {
@@ -126,7 +126,7 @@ class TagJob extends JOB_Controller
$result = $this->PrestudentstatusModel-> loadWhere(array(
'statusgrund_id' => 15,
'studiensemester_kurzbz' => 'SS2026'
'studiensemester_kurzbz' => self::SEMESTER
));
$data = $result->retval;
$ids = array_map(function($item) {
@@ -204,7 +204,7 @@ class TagJob extends JOB_Controller
/**
* delete All Automatic Tags
*/
public function deleteAllAutomatedTags()
public function deleteAutomatedTags()
{
print_r( PHP_EOL . "Start Job delete ALL Automated Tags" . PHP_EOL);
// $this->NotizModel->select('notiz_id');
application/core/Tag_Controller.php
+60 -1
View File
@@ -19,6 +19,7 @@ class Tag_Controller extends FHCAPI_Controller
'updateTag' => self::BERECHTIGUNG_KURZBZ,
'doneTag' => self::BERECHTIGUNG_KURZBZ,
'deleteTag' => self::BERECHTIGUNG_KURZBZ,
'getAllTags' => self::BERECHTIGUNG_KURZBZ,
];
$merged_permissions = array_merge($default_permissions, $permissions);
@@ -65,6 +66,7 @@ class Tag_Controller extends FHCAPI_Controller
array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $language. " as bezeichnung,
tbl_notiz.notiz_id,
tbl_notiz_typ.style,
tbl_notiz_typ.automatisiert,
tbl_notiz.erledigt as done,
tbl_notiz.insertamum,
tbl_notiz.updateamum,
@@ -82,6 +84,7 @@ class Tag_Controller extends FHCAPI_Controller
$notiz = $this->NotizModel->loadWhere(array('notiz_id' => $id));
$this->terminateWithSuccess(hasData($notiz) ? getData($notiz)[0] : array());
}
@@ -92,7 +95,8 @@ class Tag_Controller extends FHCAPI_Controller
array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung,
style,
beschreibung,
tag
tag,
automatisiert
'
);
$this->NotiztypModel->addOrder('prioritaet');
@@ -271,6 +275,61 @@ class Tag_Controller extends FHCAPI_Controller
$this->terminateWithSuccess($deleteNotiz);
}
public function getAllTags($readonly_tags = false){
$language = $this->_getLanguageIndex();
$prestudent_id = $this->input->get('prestudent_id');
// $this->terminateWithError("id: " . $prestudent_id, self::ERROR_TYPE_GENERAL);
//TODO check for readonly: necessary?
if (is_array($readonly_tags) && !isEmptyArray($readonly_tags))
{
$readonly_tags = $this->_filterTag($readonly_tags, true);
foreach ($readonly_tags as $key => $tag)
{
$readonly_tags[$key] = $this->NotizModel->db->escape($tag);
}
$tags = '(' . implode(',', $readonly_tags) . ')';
$this->NotizModel->addSelect("
CASE
WHEN tbl_notiz_typ.typ_kurzbz IN $tags
THEN TRUE
ELSE FALSE
END as readonly
");
}
$this->NotizModel->addSelect(
"tbl_notiz.titel,
tbl_notiz.text,
array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $language. " as bezeichnung,
tbl_notiz.notiz_id,
tbl_notiz_typ.style,
tbl_notiz_typ.automatisiert,
tbl_notiz.erledigt as done,
tbl_notiz.insertamum,
tbl_notiz.updateamum,
(verfasserperson.vorname || ' ' || verfasserperson.nachname || ' ' || '(' || verfasserbenutzer.uid || ')') as verfasser,
(bearbeiterperson.vorname || ' ' || bearbeiterperson.nachname || ' ' || '(' || bearbeiterbenutzer.uid || ')') as bearbeiter
"
);
$this->NotizModel->addJoin('public.tbl_notiz_typ', 'public.tbl_notiz.typ = public.tbl_notiz_typ.typ_kurzbz');
$this->NotizModel->addJoin('public.tbl_benutzer verfasserbenutzer', 'tbl_notiz.verfasser_uid = verfasserbenutzer.uid', 'LEFT');
$this->NotizModel->addJoin('public.tbl_person verfasserperson', 'verfasserbenutzer.person_id = verfasserperson.person_id', 'LEFT');
$this->NotizModel->addJoin('public.tbl_benutzer bearbeiterbenutzer', 'tbl_notiz.bearbeiter_uid = bearbeiterbenutzer.uid', 'LEFT');
$this->NotizModel->addJoin('public.tbl_person bearbeiterperson', 'bearbeiterbenutzer.person_id = bearbeiterperson.person_id', 'LEFT');
$this->NotizModel->addJoin('public.tbl_notizzuordnung notizzuordnung', 'tbl_notiz.notiz_id = notizzuordnung.notiz_id');
$notiz = $this->NotizModel->loadWhere(array('prestudent_id' => $prestudent_id));
$this->terminateWithSuccess(hasData($notiz) ? getData($notiz) : array());
}
private function _setAuthUID()
{
$this->_uid = getAuthUID();