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

Plausichecks: beautified GUI output

Browse Source
This commit is contained in:
KarpAlex
2022-10-04 03:17:41 +02:00
parent b28e780aa6
commit 5670f931ef
3 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/issues/Plausichecks.php
+7 -22
View File
@@ -25,17 +25,6 @@ class Plausichecks extends Auth_Controller
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
//~ $this->loadPhrases(
//~ array(
//~ 'global',
//~ 'ui',
//~ 'filter',
//~ 'lehre',
//~ 'person',
//~ 'fehlermonitoring'
//~ )
//~ );
$this->_setAuthUID(); // sets property uid
}
@@ -51,20 +40,18 @@ class Plausichecks extends Auth_Controller
$studiengang_kz = $this->input->get('studiengang_kz');
$fehler_kurzbz = $this->input->get('fehler_kurzbz');
// message array for storing info output
$messages = array();
// issues array for passing issue texts
$issueTexts = array();
// all fehler kurzbz which are going to be checked
$fehlerKurzbz = !isEmptyString($fehler_kurzbz) ? array($fehler_kurzbz) : $this->plausicheckproducerlib->getFehlerKurzbz();
// set Studiengang to null if not passed
if (isEmptyString($studiengang_kz)) $studiengang_kz = null;
$messages[] = "Plausicheck Lauf gestartet";
// get the data returned by Plausicheck
foreach ($fehlerKurzbz as $fehler_kurzbz)
{
// execute the check
$messages[] = "Prüfe " . $fehler_kurzbz . "...";
$issueTexts[$fehler_kurzbz] = array();
$plausicheckRes = $this->plausicheckproducerlib->producePlausicheck($fehler_kurzbz, $studiensemester_kurzbz, $studiengang_kz);
if (isError($plausicheckRes)) $this->terminateWithJsonError(getError($plausicheckRes));
@@ -92,17 +79,15 @@ class Plausichecks extends Auth_Controller
{
$fehlerText = getData($fehlerRes)[0]->fehlertext;
$fehlerText = isEmptyArray($fehlertext_params) ? $fehlerText : vsprintf($fehlerText, $fehlertext_params);
$messages[] = $fehlerText;
if (isset($person_id)) $fehlerText .= ", person_id: $person_id";
if (isset($oe_kurzbz)) $fehlerText .= ", oe_kurzbz: $oe_kurzbz";
$issueTexts[$fehler_kurzbz][] = $fehlerText;
}
}
}
else
$messages[] = "Nichts gefunden für Fehler $fehler_kurzbz";
}
$messages[] = "Plausicheck Lauf gestoppt";
$this->outputJsonSuccess($messages);
$this->outputJsonSuccess($issueTexts);
}
private function _getFilterData()
application/views/system/issues/plausichecks.php
-5
View File
@@ -12,10 +12,6 @@ $this->load->view(
'ajaxlib' => true,
'navigationwidget' => true,
'dialoglib' => true,
//~ 'phrases' => array(
//~ 'ui',
//~ 'fehlermonitoring'
//~ ),
//'customCSSs' => array('public/css/issues/issuesZustaendigkeiten.css', 'public/css/sbadmin2/tablesort_bootstrap.css'),
'customJSs' => array('public/js/issues/plausichecks.js')
)
@@ -101,7 +97,6 @@ $this->load->view(
</div>
</div>
</div>
</div>
</body>
public/js/issues/plausichecks.js
+19 -6
View File
@@ -16,18 +16,30 @@ var Plausichecks = {
successCallback: function (data, textStatus, jqXHR) {
if (FHC_AjaxClient.isError(data)) FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
let messageStr = "<strong>Plausichecks Prüfung Start</strong>";
if (FHC_AjaxClient.hasData(data))
{
let messageStr = "";
let messages = FHC_AjaxClient.getData(data);
let issueTexts = FHC_AjaxClient.getData(data);
for (let i = 0; i < messages.length; i++)
for (let fehler_kurzbz in issueTexts)
{
messageStr += messages[i]+"<br />";
}
messageStr += "<br /><br /><span>Prüfe " + fehler_kurzbz + "...</span>";
let texts = issueTexts[fehler_kurzbz];
$("#plausioutput").html(messageStr);
if (texts.length == 0) {
messageStr += "<br /><span class='text-success'>Keine Issues für " + fehler_kurzbz + "</span>";
continue;
}
for (i = 0; i < texts.length; i++)
{
messageStr += "<br /><span class='text-danger'>" + texts[i] + "</span>";
}
}
}
messageStr += "<br /><br /><strong>Plausichecks Prüfung Ende</strong>";
$("#plausioutput").html(messageStr);
},
errorCallback: function (jqXHR, textStatus, errorThrown) {
FHC_DialogLib.alertError(textStatus);
@@ -35,6 +47,7 @@ var Plausichecks = {
}
);
},
};
/**