This commit is contained in:
Rudolf Hangl
2010-03-10 13:09:00 +00:00
parent e9b966a67a
commit a30bb83285
3 changed files with 110 additions and 23 deletions
+15 -8
View File
@@ -245,14 +245,21 @@ if($command=="update" && $error!=true)
$htmlstr .= "</SELECT> \n";
}
$htmlstr .= "</td></tr>\n";
$htmlstr .= "<tr><td width='30%'><b>Kontrollierte Schlagw&ouml;rter:*</b></td><td width='40%'><input type='text' name='kontrollschlagwoerter' id='kontrollschlagwoerter' value='".$kontrollschlagwoerter."' size='60' maxlength='150'></td>
<td width='30%' align='left'><input type='button' name='SWD' value=' SWD ' onclick='window.open(\"abgabe_student_swd.php\")'></td></tr>\n";
$htmlstr .= "<tr><td><b>Dt. Schlagw&ouml;rter:</b></td><td><input type='text' name='schlagwoerter' value='".$schlagwoerter."' size='60' maxlength='150'></td></tr>\n";
$htmlstr .= "<tr><td><b>Engl. Schlagw&ouml;rter:</b></td><td><input type='text' name='schlagwoerter_en' value='".$schlagwoerter_en."' size='60' maxlength='150'></td></tr>\n";
$htmlstr .= "<tr><td valign='top'><b>Abstract </b>(max. 5000 Zeichen):*</td><td><textarea name='abstract' cols='46' rows='7'>$abstract</textarea></td></tr>\n";
$htmlstr .= "<tr><td valign='top'><b>Abstract engl.</b>(max. 5000 Zeichen):*</td><td><textarea name='abstract_en' cols='46' rows='7'>$abstract_en</textarea></td></tr>\n";
$htmlstr .= "<tr><td><b>Seitenanzahl:*</b></td><td><input type='text' name='seitenanzahl' value='".$seitenanzahl."' size='5' maxlength='4'></td></tr>\n";
$htmlstr .= "<tr></tr><td>&nbsp;</td><tr><td style='font-size:70%'>* Pflichtfeld - bitte immer bef&uuml;llen</td></tr><tr><td>&nbsp;</td></tr>\n";
$htmlstr .= "<tr><td width='30%'><b>Kontrollierte Schlagw&ouml;rter:*</b></td>
<td width='40%'><input type='text' name='kontrollschlagwoerter' id='kontrollschlagwoerter' value='".$kontrollschlagwoerter."' size='60' maxlength='150'></td>
<td width='30%' align='left'><input type='button' name='SWD' value=' SWD ' onclick='window.open(\"abgabe_student_swd.php\")'></td></tr>\n";
$htmlstr .= "<tr><td><b>Dt. Schlagw&ouml;rter:</b></td>
<td><input type='text' name='schlagwoerter' value='".$schlagwoerter."' size='60' maxlength='150'></td></tr>\n";
$htmlstr .= "<tr><td><b>Engl. Schlagw&ouml;rter:</b></td>
<td><input type='text' name='schlagwoerter_en' value='".$schlagwoerter_en."' size='60' maxlength='150'></td></tr>\n";
$htmlstr .= "<tr><td valign='top'><b>Abstract </b>(max. 5000 Zeichen):*</td>
<td><textarea name='abstract' cols='46' rows='7'>$abstract</textarea></td></tr>\n";
$htmlstr .= "<tr><td valign='top'><b>Abstract engl.</b>(max. 5000 Zeichen):*</td>
<td><textarea name='abstract_en' cols='46' rows='7'>$abstract_en</textarea></td></tr>\n";
$htmlstr .= "<tr><td><b>Seitenanzahl:*</b></td>
<td><input type='text' name='seitenanzahl' value='".$seitenanzahl."' size='5' maxlength='4'></td></tr>\n";
$htmlstr .= "<tr></tr><td>&nbsp;</td><tr><td style='font-size:70%'>* Pflichtfeld - bitte immer bef&uuml;llen</td></tr>
<tr><td>&nbsp;</td></tr>\n";
$htmlstr .= "<tr><td><input type='submit' name='schick' value='abschicken'></td>";
$htmlstr .= "</tr>\n";
$htmlstr .= "</form>\n";
+23 -4
View File
@@ -20,6 +20,8 @@
* Rudolf Hangl < rudolf.hangl@technikum-wien.at >
* Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
*/
require_once('../../../config/cis.config.inc.php');
?>
<html>
<head>
@@ -29,16 +31,34 @@
<link rel="stylesheet" href="../../../include/js/tablesort/table.css" type="text/css">
<script src="../../../include/js/tablesort/table.js" type="text/javascript"></script>
<script language="JavaScript" type="text/javascript">
UTF8 = {
encode: function(s)
{
for(var c, i = -1, l = (s = s.split("")).length, o = String.fromCharCode; ++i < l;
s[i] = (c = s[i].charCodeAt(0)) >= 127 ? o(0xc0 | (c >>> 6)) + o(0x80 | (c & 0x3f)) : s[i]
);
return s.join("");
},
decode: function(s)
{
for(var a, b, i = -1, l = (s = s.split("")).length, o = String.fromCharCode, c = "charCodeAt"; ++i < l;
((a = s[i][c](0)) & 0x80) && (s[i] = (a & 0xfc) == 0xc0 && ((b = s[i + 1][c](0)) & 0xc0) == 0x80 ?
o(((a & 0x03) << 6) + (b & 0x3f)) : o(128), s[++i] = "")
);
return s.join("");
}
};
</script>
</head>
<body class="background_main">
<FORM NAME=weiter id=weiter METHOD=POST ACTION="http://www.bsz-bw.de/cgi-bin/oswd-suche.pl">
<input type="hidden" name="ruecksprung" value="http://dav.technikum-wien.at/ruhan/portal/trunk/cis/private/lehre/abgabe_student_swd.php">
</form>
<?php
echo '<input type="hidden" name="ruecksprung" value="'.APP_ROOT.'/cis/private/lehre/abgabe_student_swd.php">
</form>';
if(isset($_POST['subject_swd']))
{
$subject_swd=$_POST['subject_swd'];
$subject_swd=iconv("ISO-8859-1", "UTF-8", $_POST['subject_swd']);
echo "<script>document.getElementById(\"swd\").value='$subject_swd';</script>";
echo "<script>
if(opener.document.getElementById('kontrollschlagwoerter').value=='')
@@ -50,7 +70,6 @@ if(isset($_POST['subject_swd']))
opener.document.getElementById('kontrollschlagwoerter').value=opener.document.getElementById('kontrollschlagwoerter').value+', $subject_swd';window.close();
}
</script>";
}
else
{
@@ -69,6 +69,8 @@ if(!$lv_obj->load($lvid))
//Studiengang laden
$stg_obj = new studiengang($lv_obj->studiengang_kz);
$datum_obj = new datum();
if(isset($_GET['stsem']))
$stsem = $_GET['stsem'];
else
@@ -255,7 +257,7 @@ $uid = (isset($_GET['uid'])?$_GET['uid']:'');
y = y+50;
anlegendiv.style.top = y+"px";
str += "<tr><td colspan='2'><b>Prüfung für "+uid+" anlegen:</b></td></tr>";
str += "<tr><td colspan='2'><b>Pr&uuml;fung f&uuml;r "+uid+" anlegen:</b></td></tr>";
str += "<tr><td>Datum:</td>";
str += "<td><input type='hidden' name='uid' value='"+uid+"'><input type='hidden' name='le_id' value='"+lehreinheit_id+"'><input type='text' name='datum' value='"+datum+"'> [YYYY-MM-DD]</td>";
str += "</tr><tr><td>Note:</td>";
@@ -468,7 +470,7 @@ $uid = (isset($_GET['uid'])?$_GET['uid']:'');
}
else
{
alert('Zum Importieren der Noten markieren sie die Spalten Kennzeichen und Note im Excel-File und kopieren sie diese in die zwischenablage. Drücken sie danach diesen Knopf erneut um die Noten zu importieren');
alert('Zum Importieren der Noten markieren sie die Spalten Kennzeichen und Note im Excel-File und kopieren sie diese in die Zwischenablage. Drücken sie danach diesen Knopf erneut, um die Noten zu importieren');
}
}
@@ -723,13 +725,26 @@ $studpruef_arr = array();
$pr_all = new Pruefung();
if ($pr_all->getPruefungenLV($lvid,"Termin2",$stsem))
{
if ($pr_all->result)
{
//if ($pr_all->result)
//{
foreach ($pr_all->result as $pruefung)
{
$studpruef_arr[$pruefung->student_uid][$pruefung->lehreinheit_id]["note"] = $pruefung->note;
$studpruef_arr[$pruefung->student_uid][$pruefung->lehreinheit_id]["datum"] = $pruefung->datum;
#echo print_r($studpruef_arr[$pruefung->student_uid]);
$studpruef_arr[$pruefung->student_uid][$pruefung->lehreinheit_id]["datum"] = $datum_obj->formatDatum($pruefung->datum,'d.m.Y');
echo print_r($studpruef_arr[$pruefung->student_uid]);
}
//}
}
$studpruef_komm = array();
$pr_komm = new Pruefung();
if ($pr_komm->getPruefungenLV($lvid,"kommPruef",$stsem))
{
if ($pr_komm->result)
{
foreach ($pr_komm->result as $kpruefung)
{
$studpruef_komm[$kpruefung->student_uid][$kpruefung->lehreinheit_id]["note"] = $kpruefung->note;
$studpruef_komm[$kpruefung->student_uid][$kpruefung->lehreinheit_id]["datum"] = $datum_obj->formatDatum($kpruefung->datum,'d.m.Y');
}
}
}
@@ -754,10 +769,28 @@ echo '<table>';
</td>
<td class='ContentHeader2'>Zeugnisnote</td>
<td class='ContentHeader2' colspan='2'>Nachprüfung</td>
<td class='ContentHeader2' colspan='2'>Kommissionelle Prüfung</td>
</tr>
<tr>
<td colspan='9'>&nbsp;</td>
<td coslspan='2'><table><tr><td class='td_datum'>Datum</td><td class='td_note'>Note</td></td></td></tr></table></td>
<td colspan='2'>
<table>
<tr>
<td class='td_datum'>Datum</td>
<td class='td_note'>Note</td>
</td></td>
</tr>
</table>
</td>
<td colspan='2'>
<table>
<tr>
<td class='td_datum'>Datum</td>
<td class='td_note'>Note</td>
</td></td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan='11'>&nbsp;</td>
@@ -954,8 +987,8 @@ echo '<table>';
$stylestr ="";
echo "<td".$stylestr." align='center'>".$znote."</td>";
// Pruefungen ///////////////////////////////////////////////////////////////////////////
if (key_exists($row_stud->uid,$studpruef_arr))
// Pruefung 2.Termin ///////////////////////////////////////////////////////////////////////////
if (key_exists($row_stud->uid, $studpruef_arr))
{
echo "<td colspan='2'>";
echo "<span id='span_".$row_stud->uid."'>";
@@ -970,7 +1003,7 @@ echo '<table>';
echo "<tr><td class='td_datum'>";
echo $pr_datum."</td><td class='td_note'>".$pr_note."</td><td>";
echo "<input type='button' name='anlegen' value='ändern' onclick='pruefungAnlegen(\"".$row_stud->uid."\",\"".$pr_datum."\",\"".$pr_note."\",\"".$pr_le_id."\")'>";
echo "<input type='button' name='anlegen' value='Ändern' onclick='pruefungAnlegen(\"".$row_stud->uid."\",\"".$pr_datum."\",\"".$pr_note."\",\"".$pr_le_id."\")'>";
echo "</td></tr>";
}
echo "</table>";
@@ -986,7 +1019,35 @@ echo '<table>';
else
echo "<td colspan='2'></td>";
}
// komm Pruefung ///////////////////////////////////////////////////////////////////////////
if (key_exists($row_stud->uid,$studpruef_komm))
{
echo "<td colspan='2'>";
echo "<span id='span_".$row_stud->uid."'>";
echo "<table>";
$le_id_arr = array();
$le_id_arr = array_keys($studpruef_komm[$row_stud->uid]);
foreach ($le_id_arr as $le_id_stud)
{
$pr_note = $studpruef_komm[$row_stud->uid][$le_id_stud]["note"];
$pr_datum = $studpruef_komm[$row_stud->uid][$le_id_stud]["datum"];
$pr_le_id = $le_id_stud;
echo "<tr><td class='td_datum'>";
echo $pr_datum."</td><td class='td_note'>".$pr_note."</td>";
//echo "<td><input type='button' name='anlegen' value='Ändern' onclick='pruefungAnlegen(\"".$row_stud->uid."\",\"".$pr_datum."\",\"".$pr_note."\",\"".$pr_le_id."\")'></td>";
echo "</tr>";
}
echo "</table>";
echo "</span>";
//echo "<div id='nachpruefung_div_".$row_stud->uid."' style='position:relative; top:0px; left 5px; background-color:#cccccc; visibility:collapse;' class='transparent'></div>";
echo "</td>";
//echo "</form>";
}
else
{
echo "<td colspan='2'></td>";
}
echo "</tr>";
$i++;