mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-19 16:02:15 +00:00
Diverse Anpassungen
- Testseite optisch verbessert - Gebiet kann nicht mehr gestartet werden, wenn RT gesperrt wurde. - Loginseite mit Einführungsvideo und check, ob Browser Firefox ist
This commit is contained in:
Unknown
@@ -24,123 +24,146 @@ echo '<?xml version="1.0" encoding="ISO-8859-1" ?>';
|
||||
<head>
|
||||
<title>Testsite MathML</title>
|
||||
<meta http-equiv="content-type" content="text/xhtml; charset=UTF-8"/>
|
||||
<link rel="stylesheet" href="../../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css" type="text/css"/>
|
||||
<!-- <link href="../../skin/style.css.php" rel="stylesheet" type="text/css">-->
|
||||
<!-- <link rel="stylesheet" href="../../vendor/components/jqueryui/themes/base/jquery-ui.min.css" type="text/css"/>-->
|
||||
<script type="text/javascript" src="../../../vendor/components/jquery/jquery.min.js"></script>
|
||||
<!-- <script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>-->
|
||||
<script type="text/javascript" src="../../../vendor/components/jqueryui/ui/i18n/datepicker-de.js"></script>
|
||||
<!-- <script type="text/javascript" src="../../vendor/twbs/bootstrap/dist/js/bootstrap.min.js"></script>-->
|
||||
|
||||
<style>
|
||||
body {
|
||||
background-color: #FFFFFF;
|
||||
margin:10px 10px 10px 90px;
|
||||
padding-left:50px;
|
||||
padding-top:50px;
|
||||
}
|
||||
body, td {
|
||||
background-color:transparent;
|
||||
font-family:"Tahoma";
|
||||
font-size:20px;
|
||||
line-height:30px;
|
||||
text-decoration:none;
|
||||
}
|
||||
h1 {
|
||||
color:#459F8C;
|
||||
font-weight:bold;
|
||||
text-align: left;
|
||||
padding: 0px;
|
||||
font-size:25px;
|
||||
}
|
||||
/*body {*/
|
||||
/*background-color: #FFFFFF;*/
|
||||
/*margin:10px 10px 10px 90px;*/
|
||||
/*padding-left:50px;*/
|
||||
/*padding-top:50px;*/
|
||||
/*}*/
|
||||
/*body, td {*/
|
||||
/* background-color:transparent;*/
|
||||
/* font-family:"Tahoma";*/
|
||||
/* font-size:20px;*/
|
||||
/* line-height:30px;*/
|
||||
/* text-decoration:none;*/
|
||||
/* }*/
|
||||
/*h1 {*/
|
||||
/* color:#459F8C;*/
|
||||
/* font-weight:bold;*/
|
||||
/* text-align: left; */
|
||||
/* padding: 0px;*/
|
||||
/* font-size:25px;*/
|
||||
/*}*/
|
||||
|
||||
</style></head>
|
||||
|
||||
<body>
|
||||
|
||||
<table cellpadding="0" cellspacing="0px">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td><h1>MathML</h1></td>
|
||||
<td width="40px"></td>
|
||||
<td><h1>Picture</h1></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<math xmlns="http://www.w3.org/1998/Math/MathML">
|
||||
<mfrac>
|
||||
<mn> 5 </mn>
|
||||
<mn> 3 </mn>
|
||||
</mfrac>
|
||||
|
||||
<mo> + </mo>
|
||||
<mfrac>
|
||||
<mn> 7 </mn>
|
||||
<mn> 6 </mn>
|
||||
</mfrac>
|
||||
<mo> = </mo>
|
||||
|
||||
<mfrac>
|
||||
<mn> 10 </mn>
|
||||
<mn> 6 </mn>
|
||||
</mfrac>
|
||||
<mo> + </mo>
|
||||
<mfrac>
|
||||
|
||||
<mn> 7 </mn>
|
||||
<mn> 6 </mn>
|
||||
</mfrac>
|
||||
<mo> = </mo>
|
||||
<mfrac>
|
||||
<mn> 17 </mn>
|
||||
|
||||
<mn> 6 </mn>
|
||||
</mfrac>
|
||||
</math><br/><br/>
|
||||
<math xmlns="http://www.w3.org/1998/Math/MathML">
|
||||
<mrow>
|
||||
<munderover>
|
||||
<mo movablelimits="false">∑</mo>
|
||||
<mn><mi>k</mi>=1</mn>
|
||||
<mn>5</mn>
|
||||
</munderover>
|
||||
<mrow>
|
||||
<msup>
|
||||
<mo>(-1)</mo>
|
||||
<mn><mi>k</mi>+1</mn>
|
||||
</msup>
|
||||
</mrow>
|
||||
<mfrac>
|
||||
<mrow>
|
||||
<msup>
|
||||
<mi>x</mi>
|
||||
<mn>2<mi>k</mi> + 1</mn>
|
||||
</msup>
|
||||
</mrow>
|
||||
<mrow>
|
||||
<mo>(2<mi>k</mi>+1)!</mo>
|
||||
</mrow>
|
||||
</mfrac>
|
||||
</mrow>
|
||||
|
||||
</math>
|
||||
</td>
|
||||
<td width="10"> </td>
|
||||
<td style="width: 233px;" align="left">
|
||||
<img alt="Beispielbild" src="MathML_Beispiel.jpg" border="1" height="154" width="233"></img>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" colspan="3"><br>The formula on the left side should be equal <br/>to the picture on the right side.</td>
|
||||
</tr>
|
||||
<?php
|
||||
//Sound einbinden
|
||||
echo ' <tr>
|
||||
<td align="center" colspan="3"><hr><br/>Audio-Testfile<br/><br/>
|
||||
<!--<audio src="sound.php?src=frage&frage_id='.$frage->frage_id.'&sprache='.$_SESSION['sprache'].'" controls="controls" type="audio/mpeg">-->
|
||||
<audio src="audio_testfile.ogg" controls="controls" type="audio/ogg">
|
||||
<div>
|
||||
<p>Ihr Browser unterstützt dieses Audioelement leider nicht.</p>
|
||||
<div class="text-center">
|
||||
<h1>Testseite zur Darstellung des Reihungstests an der FHTW</h1>
|
||||
</div>
|
||||
<div class="container">
|
||||
|
||||
<noscript>
|
||||
<div class="row alert alert-danger">
|
||||
<div class="col-sm-12 ">
|
||||
Javascript ist in diesem Browser nicht aktiviert.<br>
|
||||
Bitte aktivieren Sie Javascript, um den Reihungstest durchführen zu können.<br>
|
||||
<br>
|
||||
Javascript is not activated in this browser.<br>
|
||||
Please activate Javascript before starting the test.
|
||||
</div>
|
||||
</div>
|
||||
</noscript>
|
||||
<div class="row well">
|
||||
<div class="col-sm-12">
|
||||
<h2>Fomeln</h2>
|
||||
<p>Die Formeln auf der linken Seite sollten möglichst gleich dargestellt werden, wie in dem Bild auf der rechten Seite.<br>
|
||||
Abweichungen in Schriftgröße und -art können vorkommen.</p>
|
||||
<p>The formula on the left side should be equal to the picture on the right side.<br>
|
||||
Differences in font size and font styling are acceptable.</p>
|
||||
<div class="row">
|
||||
<div class="col-sm-6 text-right">
|
||||
<h3>Formel / Formula</h3>
|
||||
<div style="font-size: large; padding-top: 15px">
|
||||
<math xmlns="http://www.w3.org/1998/Math/MathML">
|
||||
<mfrac>
|
||||
<mn> 5 </mn>
|
||||
<mn> 3 </mn>
|
||||
</mfrac>
|
||||
|
||||
<mo> + </mo>
|
||||
<mfrac>
|
||||
<mn> 7 </mn>
|
||||
<mn> 6 </mn>
|
||||
</mfrac>
|
||||
<mo> = </mo>
|
||||
|
||||
<mfrac>
|
||||
<mn> 10 </mn>
|
||||
<mn> 6 </mn>
|
||||
</mfrac>
|
||||
<mo> + </mo>
|
||||
<mfrac>
|
||||
|
||||
<mn> 7 </mn>
|
||||
<mn> 6 </mn>
|
||||
</mfrac>
|
||||
<mo> = </mo>
|
||||
<mfrac>
|
||||
<mn> 17 </mn>
|
||||
|
||||
<mn> 6 </mn>
|
||||
</mfrac>
|
||||
</math><br/><br/>
|
||||
<math xmlns="http://www.w3.org/1998/Math/MathML">
|
||||
<mrow>
|
||||
<munderover>
|
||||
<mo movablelimits="false">∑</mo>
|
||||
<mn><mi>k</mi>=1</mn>
|
||||
<mn>5</mn>
|
||||
</munderover>
|
||||
<mrow>
|
||||
<msup>
|
||||
<mo>(-1)</mo>
|
||||
<mn><mi>k</mi>+1</mn>
|
||||
</msup>
|
||||
</mrow>
|
||||
<mfrac>
|
||||
<mrow>
|
||||
<msup>
|
||||
<mi>x</mi>
|
||||
<mn>2<mi>k</mi> + 1</mn>
|
||||
</msup>
|
||||
</mrow>
|
||||
<mrow>
|
||||
<mo>(2<mi>k</mi>+1)!</mo>
|
||||
</mrow>
|
||||
</mfrac>
|
||||
</mrow>
|
||||
|
||||
</math>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<h3>Bild / Picture</h3>
|
||||
<img alt="Beispielbild" src="MathML_Beispiel.jpg" border="1" height="154" width="233"></img>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row well">
|
||||
<div class="col-sm-12">
|
||||
<h2>Audiofiles</h2>
|
||||
<p>Manche Module beinhalten Hörbeispiele</p>
|
||||
<p>Testen Sie hier, ob Sie den Ton hören können.</p>
|
||||
<audio controls>
|
||||
<source src="audio_testfile.ogg" type="audio/ogg">
|
||||
<source src="audio_testfile.mp3" type="audio/mpeg">
|
||||
<p>Ihr Browser unterstützt dieses Audioelement leider nicht.</p>
|
||||
</audio>
|
||||
</td>
|
||||
</tr>';
|
||||
?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -36,6 +36,7 @@ require_once('../../include/antwort.class.php');
|
||||
require_once('../../include/gebiet.class.php');
|
||||
require_once('../../include/sprache.class.php');
|
||||
require_once '../../include/phrasen.class.php';
|
||||
require_once '../../include/reihungstest.class.php';
|
||||
|
||||
if (!$db = new basis_db())
|
||||
die('Fehler beim Oeffnen der Datenbankverbindung');
|
||||
@@ -174,6 +175,17 @@ if(!$gestartet && $gebiet->errormsg!='')
|
||||
//Start des Pruefungsvorganges
|
||||
if(isset($_GET['start']) && !$gestartet)
|
||||
{
|
||||
//Wenn der Reihungstest nicht freigeschaltet ist, kann das Gebiet nicht gestartet werden
|
||||
if (isset($_SESSION['reihungstestID']) && $_SESSION['reihungstestID'] != '')
|
||||
{
|
||||
$rt = new reihungstest($_SESSION['reihungstestID']);
|
||||
if ($rt->freigeschaltet == false)
|
||||
{
|
||||
echo '<div class="alert alert-danger">Die Gesamtbearbeitungszeit des Reihungstests ist vorbei und der Test wurde gesperrt.</div></body>';
|
||||
die();
|
||||
}
|
||||
}
|
||||
|
||||
//Fragenpool generieren
|
||||
$frage = new frage();
|
||||
if(!$frage->generateFragenpool($_SESSION['pruefling_id'], $gebiet_id))
|
||||
|
||||
+18
-18
@@ -127,7 +127,7 @@ if (isset($_REQUEST['prestudent']))
|
||||
$reihungstest_id = $rt->result[0]->reihungstest_id;
|
||||
else
|
||||
{
|
||||
echo '<span class="error">'.$p->t('testtool/reihungstestKannNichtGeladenWerden').'</span>';
|
||||
$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestKannNichtGeladenWerden').'</div>';
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -139,7 +139,7 @@ if (isset($_REQUEST['prestudent']))
|
||||
$reihungstest_id = $rt->result[0]->reihungstest_id;
|
||||
else
|
||||
{
|
||||
echo '<span class="error">'.$p->t('testtool/reihungstestKannNichtGeladenWerden').'</span>';
|
||||
$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestKannNichtGeladenWerden').'</div>';
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -177,6 +177,7 @@ if (isset($_REQUEST['prestudent']))
|
||||
$stg_obj = new studiengang($studiengang);
|
||||
|
||||
$_SESSION['semester']=$semester;
|
||||
$_SESSION['reihungstestID'] = $reihungstest_id;
|
||||
$stg_obj->getStudiengangTyp($stg_obj->typ);
|
||||
|
||||
// STG und Studienplan mit der höchsten Prio ermitteln
|
||||
@@ -367,6 +368,7 @@ if (isset($_POST['save']) && isset($_SESSION['prestudent_id']))
|
||||
<script type="text/javascript" src="../../vendor/components/jqueryui/ui/i18n/datepicker-de.js"></script>
|
||||
<script type="text/javascript" src="../../vendor/twbs/bootstrap/dist/js/bootstrap.min.js"></script>
|
||||
<script type="text/javascript">
|
||||
|
||||
$(document).ready(function()
|
||||
{
|
||||
$.datepicker.setDefaults( $.datepicker.regional[ "" ] );
|
||||
@@ -393,6 +395,14 @@ if (isset($_POST['save']) && isset($_SESSION['prestudent_id']))
|
||||
});';
|
||||
?>
|
||||
|
||||
// If Browser is any other than Mozilla Firefox and the test includes any MathML,
|
||||
// show message to use Mozilla Firefox
|
||||
var ua = navigator.userAgent;
|
||||
if ((ua.indexOf("Firefox") > -1) == false)
|
||||
{
|
||||
$("#alertmsgdiv").html("<div class='alert alert-danger'>BITTE VERWENDEN SIE DEN MOZILLA FIREFOX BROWSER!<br>(Manche Prüfungsfragen werden sonst nicht korrekt dargestellt.<br><br>PLEASE USE MOZILLA FIREFOX BROWSER!<br>(Otherwise some exam items will not be displayed correctly</div>");
|
||||
//alert('BITTE VERWENDEN SIE DEN MOZILLA FIREFOX BROWSER!\n(Manche Prüfungsfragen werden sonst nicht korrekt dargestellt.\n\nPLEASE USE MOZILLA FIREFOX BROWSER!\n(Ohterwise some exam items will not be displayed correctly.)');
|
||||
}
|
||||
});
|
||||
</script>
|
||||
<?php
|
||||
@@ -596,19 +606,8 @@ else // LOGIN Site (vor Login)
|
||||
if (defined('TESTTOOL_LOGIN_BEWERBUNGSTOOL') && TESTTOOL_LOGIN_BEWERBUNGSTOOL)
|
||||
{
|
||||
echo '<div class="col-xs-11">';
|
||||
echo $alertmsg;
|
||||
echo '
|
||||
<div class="row" style="margin-bottom: 10%; margin-top: 3%;">
|
||||
<div class="col-xs-6 text-center" style="border-right: 1px solid lightgrey;">
|
||||
<h1 style="white-space: normal">Herzlich Willkommen zum Reihungstest</h1><br><br>
|
||||
Wir wünschen Ihnen einen erfolgreichen Start ins Studium.<br>
|
||||
</div>
|
||||
<div class="col-xs-6 text-center">
|
||||
<h1 style="white-space: normal">Welcome to the placement test</h1> <br><br>
|
||||
We wish you a good start to your studies.
|
||||
</div>
|
||||
</div>
|
||||
';
|
||||
echo '<div id="alertmsgdiv">'.$alertmsg.'</div>';
|
||||
echo $p->t('testtool/einfuehrungsText');
|
||||
|
||||
if (isset($_SESSION['bewerbung/personId']))
|
||||
{
|
||||
@@ -619,12 +618,13 @@ else // LOGIN Site (vor Login)
|
||||
}
|
||||
</script>';
|
||||
echo '<div class="row text-center">
|
||||
'.$p->t('testtool/loginNoetig').'<br /><br />
|
||||
<form action="login.php">
|
||||
<input type="hidden" name="prestudent" value="'.$_REQUEST['prestudent'].'" />
|
||||
<input id="confirmationCheckbox" type="checkbox" name="confirmation" onclick="changeconfirmation()" />
|
||||
'.$p->t('testtool/confirmationText').'
|
||||
<br><br>
|
||||
<button id="confirmationSubmit" type="submit" class="btn btn-default" disabled/>
|
||||
<button id="confirmationSubmit" type="submit" class="btn btn-primary" disabled/>
|
||||
'.$p->t('testtool/start').'
|
||||
</button>
|
||||
</form>';
|
||||
@@ -634,7 +634,7 @@ else // LOGIN Site (vor Login)
|
||||
echo '<div class="row text-center">
|
||||
'.$p->t('testtool/loginNoetig').'<br /><br />
|
||||
<form action="'.APP_ROOT.'/addons/bewerbung/cis/." target="_top">
|
||||
<button type="submit" class="btn btn-default" />
|
||||
<button type="submit" class="btn btn-primary" />
|
||||
'.$p->t('testtool/login').'
|
||||
</button>
|
||||
</form>';
|
||||
@@ -649,7 +649,7 @@ else // LOGIN Site (vor Login)
|
||||
echo '<div class="col-xs-11">';
|
||||
|
||||
// Welcome text
|
||||
echo $alertmsg;
|
||||
echo '<div id="alertmsgdiv">'.$alertmsg.'</div>';
|
||||
echo '
|
||||
<div class="row" style="margin-bottom: 10%; margin-top: 3%;">
|
||||
<div class="col-xs-6 text-center" style="border-right: 1px solid lightgrey;">
|
||||
|
||||
@@ -50,7 +50,37 @@ $this->phrasen['testtool/startDrueckenUmZuBeginnen']='Um dieses Teilgebiet zu st
|
||||
$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.';
|
||||
$this->phrasen['testtool/confirmationText']='Hiermit bestätige ich, dass der Test von mir alleine und ohne Zuhilfenahme zusätzlicher Hilfsmittel absolviert wird.';
|
||||
$this->phrasen['testtool/loginNoetig']='Bitte loggen Sie sich zuerst ein um an dem Reihungstest teilnehmen zu können:';
|
||||
$this->phrasen['testtool/confirmationText']='Ich bestätige, den Online-Reihungstest persönlich, selbständig, ohne Hilfe einer zusätzlichen Person und ohne Hilfsmittel zu absolvieren.';
|
||||
$this->phrasen['testtool/loginNoetig']='Bitte beachten Sie, dass der Reihungstest erst <b>unmittelbar</b> vor Testbeginn von uns aktiviert wird.<br>
|
||||
Please note, that the test will be enabled straight before the beginning';
|
||||
$this->phrasen['testtool/start']='Reihungstest jetzt starten';
|
||||
$this->phrasen['testtool/einfuehrungsText']='
|
||||
<div class="row" style="margin-bottom: 20px; margin-top: 3%%;">
|
||||
<div class="col-xs-6 text-center" style="border-right: 1px solid lightgrey;">
|
||||
<h1 style="white-space: normal">Herzlich Willkommen zum Reihungstest</h1>
|
||||
<a href="'.APP_ROOT.'dms.php?id=142964" target="_blank"><img src="'.APP_ROOT.'cms/dms.php?id=142976" alt="Einfuehrungsvideo" style="border: 1px solid lightgray; border-radius: 10px; width:350px;"></a>
|
||||
<!--<video controls poster="'.APP_ROOT.'cms/dms.php?id=2786&version=2" style="border: 1px solid lightgray; border-radius: 10px; width:350px; max-width:100%%;">
|
||||
<source src="'.APP_ROOT.'cms/dms.php?id=142964" type="video/mp4">
|
||||
<p>Ihr Browser unterstützt dieses Videoelement leider nicht.</p>
|
||||
</video>-->
|
||||
<br><br>
|
||||
<a href="#" target="_blank"><img src="'.APP_ROOT.'cms/dms.php?id=46&version=1"> Leitfaden zum Ablauf des Reihungstests (folgt in Kürze)</a>
|
||||
<br><br>
|
||||
Unter dem folgenden Link können Sie die korrekte Darstellung des Reihungstests testen:<br><br>
|
||||
<a href="../public/testtool_test/testseite.php" target="_blank" class="btn btn-default">Zum Darstellungstest</a>
|
||||
</div>
|
||||
<div class="col-xs-6 text-center">
|
||||
<h1 style="white-space: normal">Welcome to the placement test</h1>
|
||||
<a href="'.APP_ROOT.'cms/dms.php?id=142964" target="_blank"><img src="'.APP_ROOT.'cms/dms.php?id=142977" alt="Einfuehrungsvideo" style="border: 1px solid lightgray; border-radius: 10px; width:350px;"></a>
|
||||
<!--<video width="320" controls poster="'.APP_ROOT.'cms/dms.php?id=2786&version=2" style="border: 1px solid lightgray; border-radius: 10px;">
|
||||
<source src="'.APP_ROOT.'cms/dms.php?id=142964" type="video/mp4">
|
||||
<p>Ihr Browser unterstützt dieses Videoelement leider nicht.</p>
|
||||
</video>-->
|
||||
<br><br>
|
||||
<a href="#" target="_blank"><img src="'.APP_ROOT.'cms/dms.php?id=46&version=1"> Guideline for placement test (coming soon)</a>
|
||||
<br><br>
|
||||
Under the following link you can test the correct display of the placement test:<br><br>
|
||||
<a href="../public/testtool_test/testseite.php" target="_blank" class="btn btn-default">To display testpage</a>
|
||||
</div>
|
||||
</div>';
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user