mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-02 12:49:27 +00:00
Appended errormessage when retrieving invalid Gebiete
Now if the method check_gebiete() returns false, a userfriendly errormessage will be displayed.
This commit is contained in:
Cris
@@ -434,7 +434,7 @@ if (isset($prestudent_id))
|
||||
<table class="table table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>'. $p->t('global/studiengang'). '</th>
|
||||
<th style="width: 50%;">'. $p->t('global/studiengang'). '</th>
|
||||
<th>Status</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
+22
-7
@@ -82,6 +82,9 @@ session_start();
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<link href="../../skin/style.css.php" rel="stylesheet" type="text/css">
|
||||
<link rel="stylesheet" href="../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css" type="text/css"/>
|
||||
<script type="text/javascript" src="../../vendor/components/jquery/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="../../vendor/twbs/bootstrap/dist/js/bootstrap.min.js"></script>
|
||||
</head>
|
||||
|
||||
<body scroll="no">
|
||||
@@ -106,7 +109,7 @@ if (isset($_SESSION['pruefling_id']))
|
||||
if($content_id->content_id!='')
|
||||
{
|
||||
echo '
|
||||
<tr><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
|
||||
<tr id="tr-einleitung"><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
|
||||
<a class="ItemTesttool navButton" href="../../cms/content.php?content_id='.$content_id->content_id.'&sprache='.$sprache.'" target="content">'.$p->t('testtool/einleitung').'</a>
|
||||
</td></tr>
|
||||
';
|
||||
@@ -228,7 +231,7 @@ if (isset($_SESSION['pruefling_id']))
|
||||
FROM (
|
||||
SELECT
|
||||
*
|
||||
FROM (
|
||||
FROM (
|
||||
(SELECT
|
||||
prestudent_data.semester AS ps_sem,
|
||||
gebiet_id,
|
||||
@@ -294,6 +297,7 @@ if (isset($_SESSION['pruefling_id']))
|
||||
$lastsemester = '';
|
||||
$quereinsteiger_stg = '';
|
||||
$gebiet_hasMathML = false; // true, wenn irgendein Gebiet eine/n Frage/Vorschlag im MathML-Format enthält
|
||||
$invalid_gebiete = false;
|
||||
while($row = $db->db_fetch_object($result))
|
||||
{
|
||||
//Jedes Semester in einer eigenen Tabelle anzeigen
|
||||
@@ -394,11 +398,7 @@ if (isset($_SESSION['pruefling_id']))
|
||||
}
|
||||
else
|
||||
{
|
||||
echo '<tr>
|
||||
<td nowrap>
|
||||
<span class="error"> '.$row->gebiet_bez.' (invalid)</span>
|
||||
</td>
|
||||
</tr>';
|
||||
$invalid_gebiete = true;
|
||||
}
|
||||
}
|
||||
echo '</table>';
|
||||
@@ -440,5 +440,20 @@ else
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Error massage if check_gebiet function returns false
|
||||
$(function() {
|
||||
var invalid_gebiete = "<?php echo $invalid_gebiete; ?>";
|
||||
if(invalid_gebiete == true)
|
||||
{
|
||||
$('#tr-einleitung').append('' +
|
||||
'<tr><td>' +
|
||||
'<div class="alert alert-danger small" style="margin-left: 20px; margin-bottom:-3px; width: 170px; margin-top: 3px;" role="alert">' +
|
||||
'<span class="text-uppercase"><strong><?php echo $p->t("errors/achtung"); ?></strong></span><br>' +
|
||||
'<?php echo $p->t("testtool/invalideGebiete"); ?>' +
|
||||
'</div>' +
|
||||
'</td></tr>');
|
||||
}
|
||||
});
|
||||
</script>
|
||||
</html>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<?php
|
||||
$this->phrasen['errors/rolleExistiertBereits']='Diese Rolle existiert bereits';
|
||||
$this->phrasen['errors/achtung']='Achtung!';
|
||||
|
||||
?>
|
||||
|
||||
@@ -46,4 +46,5 @@ $this->phrasen['testtool/fehlerBeimSpeichernDerErstansicht']='Fehler beim Speich
|
||||
$this->phrasen['testtool/startDrueckenUmZuBeginnen']='Um dieses Teilgebiet zu starten, drücken Sie bitte links oben auf <b>Gebiet starten</b>.';
|
||||
$this->phrasen['testtool/keinPrueflingseintragVorhanden']='Kein Prüflingseintrag vorhanden';
|
||||
$this->phrasen['testtool/fuerFolgendeStgAngemeldet']='Für folgende Studiengänge haben Sie sich angemeldet:';
|
||||
$this->phrasen['testtool/invalideGebiete']='Ein oder mehrere Fragengebiet/e inkorrekt!<br>Bitte melden Sie dies der Betreuungsperson.';
|
||||
?>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<?php
|
||||
$this->phrasen['errors/rolleExistiertBereits']='This role is already selected';
|
||||
$this->phrasen['errors/achtung']='Attention!';
|
||||
|
||||
?>
|
||||
|
||||
@@ -46,4 +46,5 @@ $this->phrasen['testtool/fehlerBeimSpeichernDerErstansicht']='Error in saving th
|
||||
$this->phrasen['testtool/startDrueckenUmZuBeginnen']='To start this section, please click on <b>Start section</b> in the top left corner.';
|
||||
$this->phrasen['testtool/keinPrueflingseintragVorhanden']='No candidate entry available.';
|
||||
$this->phrasen['testtool/fuerFolgendeStgAngemeldet']='You have applied for the following degree programs:';
|
||||
$this->phrasen['testtool/invalideGebiete']='One or more question areas incorrect!<br>Please inform an assisting person.';
|
||||
?>
|
||||
@@ -461,6 +461,7 @@ td.HeaderTesttool /*fuer die Button-Optik beim Testtool*/
|
||||
line-height: 25px;
|
||||
box-shadow: inset 0 0 2px #FFFFFF;
|
||||
padding: 10px;
|
||||
width: 170px;
|
||||
}
|
||||
td.HeaderTesttoolSTG /*fuer die Button-Optik der Quereinstiegs-Studiengänge beim Testtool*/
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user