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

Prüfungsprotokoll:

Browse Source 
- phrases: multilingual database fields shown depending on language (e.g. beurteilung, studiengang,...
- added phrases
- added timepicker css
- if student not in condition, time can still be filled out
This commit is contained in:
KarpAlex
2020-05-28 20:53:21 +02:00
parent 2fc0b0f0ce
commit bc32a643f1
5 changed files with 306 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/lehre/Pruefungsprotokoll.php
+7 -4
View File
@@ -90,10 +90,13 @@ class Pruefungsprotokoll extends Auth_Controller
else
$abschlussbeurteilung = getData($abschlussbeurteilung);
$language = getUserLanguage();
$data = array(
'abschlusspruefung' => $abschlusspruefung,
'abschlussbeurteilung' => $abschlussbeurteilung,
'abschlusspruefung_saved' => $abschlusspruefung_saved
'abschlusspruefung_saved' => $abschlusspruefung_saved,
'language' => $language
);
$this->load->view('lehre/pruefungsprotokoll.php', $data);
@@ -127,12 +130,12 @@ class Pruefungsprotokoll extends Auth_Controller
$result = $this->authlib->checkUserAuthByUsernamePassword($this->_uid, $password);
if (isError($result))
{
return $this->outputJsonError('Falsches Passwort'); // exit if password is incorrect
return $this->outputJsonError($this->p->t('password', 'wrongPassword')); // exit if password is incorrect
}
}
else
{
return $this->outputJsonError('Passwort fehlt');
return $this->outputJsonError($this->p->t('password', 'passwordMissing'));
}
}
@@ -153,7 +156,7 @@ class Pruefungsprotokoll extends Auth_Controller
}
}
else
$this->outputJsonError('Ungültige Parameter');
$this->outputJsonError($this->p->t('ui', 'ungueltigeParameter'));
}
// -----------------------------------------------------------------------------------------------------------------