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

issues table dataset:

Browse Source 
- made more readable for assistance (added vorname, nachname, removed some fields)
- added default filters (all new, last 7 days...)
- issues displayed for children oes of permitted arrays as well
- query: more exact check for prestudents future status by using studiensemester start date
- typo fixes
This commit is contained in:
KarpAlex
2021-09-28 15:57:27 +02:00
parent 76f3afdda5
commit cb3f3723ae
5 changed files with 135 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/IssuesLib.php
+20 -7
View File
@@ -72,7 +72,7 @@ class IssuesLib
return $this->_addIssue($fehlercode, $person_id, $oe_kurzbz, $fehlertext_params);
}
else
return error("Fehler nicht gefunden");
return error("Fehler $fehler_kurzbz nicht gefunden");
}
/**
@@ -81,26 +81,39 @@ class IssuesLib
* @param string $inhalt_extern error text in external system
* @param int $person_id
* @param int $oe_kurzbz
* @param array $fehlertext_params params for sprint replace of error text in system.tbl_fehler
* @param array $fehlertext_params params for replacement of parts of error text
* @param bool $force_predefined if true, only predefined external issues are added
* @return object success or error
*/
public function addExternalIssue($fehlercode_extern, $inhalt_extern, $person_id = null, $oe_kurzbz = null, $fehlertext_params = null)
public function addExternalIssue($fehlercode_extern, $inhalt_extern, $person_id = null, $oe_kurzbz = null, $fehlertext_params = null, $force_predefined = false)
{
if (isEmptyString($fehlercode_extern))
return error("fehlercode_extern fehlt");
// get external fehlercode (unique for each app)
$this->_ci->FehlerModel->addSelect('fehlercode');
$fehlerRes = $this->_ci->FehlerModel->loadWhere(array('fehlercode_extern' => $fehlercode_extern, 'app' => $this->_app));
$fehlerRes = $this->_ci->FehlerModel->loadWhere(
array(
'fehlercode_extern' => $fehlercode_extern,
'app' => $this->_app
)
);
if (isError($fehlerRes))
return $fehlerRes;
$fehlerData = getData($fehlerRes)[0];
// check if there is a predefined custom error for the external issue
if (hasData($fehlerRes))
{
// if found, use the code
$fehlercode = getData($fehlerRes)[0]->fehlercode;
$fehlercode = $fehlerData->fehlercode;
}
elseif ($force_predefined === true)
{
// only added if predefined
return success("No definition found - not added");
}
else
{
@@ -180,7 +193,7 @@ class IssuesLib
* @param array $fehlertext_params
* @param string $fehlercode_extern
* @param string $inhalt_extern
* @return array|stdClass
* @return object success or error
*/
private function _addIssue($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlertext_params = null, $fehlercode_extern = null, $inhalt_extern = null)
{
@@ -226,6 +239,6 @@ class IssuesLib
return error("Anzahl offener Issues konnte nicht ermittelt werden.");
}
else
return error("Fehler nicht gefunden");
return error("Fehler $fehlercode nicht gefunden");
}
}