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

remove frontend filtering list for studiensemester, update logs TagJob

Browse Source
This commit is contained in:
ma0068
2026-05-11 15:12:53 +02:00
parent dbcacdddd6
commit 368eded1fd
5 changed files with 26 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/jobs/TagJob.php
+8 -6
View File
@@ -34,7 +34,7 @@ class TagJob extends JOB_Controller
public function rebuildAutomatedTags()
{
$this->logInfo('Start Job rebuild Automated Tags');
$automatedTagsRes = $this->NotiztypModel->loadWhere(array('automatisiert' => true, 'taglib IS NOT NULL' => null));
$automatedTags = hasData($automatedTagsRes) ? getData($automatedTagsRes) : [];
@@ -43,12 +43,14 @@ class TagJob extends JOB_Controller
$result = $this->StudiensemesterModel->getAktOrNextSemester();
if (isError($result))
{
$this->logInfo('Start Job rebuild Automated Tags');
$this->logError('Error occurred during retrieving studiensemester');
return $this->logInfo('End Job rebuild Automated Tags');
}
if (empty($result->retval) || !isset($result->retval[0])) {
$this->logInfo('No Studiensemester found');
$this->logInfo('Start Job rebuild Automated Tags');
$this->logError('No Studiensemester found');
return $this->logInfo('End Job rebuild Automated Tags');
}
$studiensemester_kurzbz = $result->retval[0]->studiensemester_kurzbz ?? null;
@@ -56,6 +58,7 @@ class TagJob extends JOB_Controller
'studiensemester_kurzbz' => $studiensemester_kurzbz
);
$this->logInfo('Start Job rebuild Automated Tags ' . $studiensemester_kurzbz);
foreach($automatedTags as $autoTag)
{
// getPath: must not be lost
@@ -64,7 +67,7 @@ class TagJob extends JOB_Controller
if(file_exists($filePath)) {
require_once($filePath);
} else {
$this->logInfo("File not found: " . $filePath . PHP_EOL);
$this->logInfo("File not found: " . $filePath);
continue;
}
@@ -93,9 +96,8 @@ class TagJob extends JOB_Controller
$data = is_array($result) ? $result['retval'] : $result->retval;
//PRINT OUTPUT CONSOLE
//SUMMARY
$this->logInfo("Tag " . $result->retval['input']['tag'] . " | TYPE_ID " . $typeId . " --"
$this->logInfo("Tag " . $result->retval['input']['tag'] . " | type_id " . $typeId . " --"
. " Count Recycled: " . $result->retval['summary']['recycled']
. " Count Added: ". $result->retval['summary']['added']
. " Count Deleted: ". $result->retval['summary']['deleted']);
@@ -109,7 +111,7 @@ class TagJob extends JOB_Controller
$this->logInfo("Tag " . $result->retval['input']['tag'] . "Recycled tag(s): " . implode(', ', $result->retval['results']['retaggedIds']));
}
$this->logInfo( PHP_EOL . "End Job rebuild Automated Tags");
$this->logInfo( "End Job rebuild Automated Tags");
}
}
application/core/Tag_Controller.php
-19
View File
@@ -19,7 +19,6 @@ class Tag_Controller extends FHCAPI_Controller
'doneTag' => self::BERECHTIGUNG_KURZBZ,
'deleteTag' => self::BERECHTIGUNG_KURZBZ,
'getAllTags' => self::BERECHTIGUNG_KURZBZ,
'getAllStartAndEndAutomatedTags' => self::BERECHTIGUNG_KURZBZ,
'rebuildTagsForTypeId' => self::BERECHTIGUNG_KURZBZ,
];
@@ -351,24 +350,6 @@ class Tag_Controller extends FHCAPI_Controller
$this->terminateWithSuccess($result);
}
public function getAllStartAndEndAutomatedTags()
{
$this->NotizModel->addSelect('notiz_id as id');
$this->NotizModel->addSelect('start');
$this->NotizModel->addSelect('ende');
$this->NotizModel->addSelect('typ');
$result = $this->NotizModel->loadWhere(array(
'titel' => 'TAG',
'verfasser_uid' => 'sftest'
));
if (isError($result))
return error('Error occurred during retrieving intervalls automated tags');
$data = getData($result);
$this->terminateWithSuccess($data);
}
private function _setAuthUID()
{
$this->_uid = getAuthUID();