blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Andreas Österreicher
2008-03-31 15:34:00 +00:00
parent 4f3e30bcf0
commit 54ca0df18b
7 changed files with 122 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/lehre/lesson.php
+38 -38
View File
@@ -79,50 +79,50 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link href="../../../skin/style.css.php" rel="stylesheet" type="text/css">
<style type="text/css">
.transparent {
filter:alpha(opacity=90);
-moz-opacity:0.9;
-khtml-opacity: 0.9;
opacity: 0.9;
</style>
<script language="JavaScript">
function showSemPlanHelp(){
document.getElementById("semplanhelp").style.visibility = "visible";
}
function hideSemPlanHelp(){
document.getElementById("semplanhelp").style.visibility = "hidden";
}
</script>
<style type="text/css">
.transparent {
filter:alpha(opacity=90);
-moz-opacity:0.9;
-khtml-opacity: 0.9;
opacity: 0.9;
</style>
<script language="JavaScript">
function showSemPlanHelp(){
document.getElementById("semplanhelp").style.visibility = "visible";
}
function hideSemPlanHelp(){
document.getElementById("semplanhelp").style.visibility = "hidden";
}
</script>
</head>
<body>
<div id="semplanhelp" style="position:absolute; top:200px; left:200px; width:500px; height:250px; background-color:#cccccc; visibility:hidden; border-style:solid; border-width:1px; border-color:#333333;" class="transparent">
<table width="100%">
<tr><td valign="top"><h2>&nbsp;Erstellung des Semesterplanes</h2></td><td align="right" valign="top"><a href="#" onclick="hideSemPlanHelp();">X</a>&nbsp;</td></tr>
<tr>
<td coslspan="2">
<ol style="font-size:8pt;">
<li>Speichern Sie die Vorlage (html oder doc - Version) auf Ihrem Computer.</li>
<li>&Ouml;ffnen Sie die gespeicherte Datei mit ihrem Textverarbeitungsprogramm (MS Word, OpenOffice ...) bzw die html-Vorlage auch mit einem geeigneten Editor.</li>
<li>Erstellen Sie Ihren Semesterplan.</li>
<li>Speichern Sie das Dokument als 'Webseite' mit dem Namen 'index.html'<br>(In MS Word: 'Datei' -> 'Speichern unter' -> Dateiname: index.html, Dateityp: Webseite )</li>
<li>Laden Sie diese Datei nun &uuml;ber den 'Upload'-Knopf hoch.</li>
<li>Fertig!</li>
<ol>
</td>
</tr>
<tr><td colspan="2" align="center"><a href="#" onClick="hideSemPlanHelp();">schlie&szlig;en</a></td></tr>
</table>
<body>
<div id="semplanhelp" style="position:absolute; top:200px; left:200px; width:500px; height:250px; background-color:#cccccc; visibility:hidden; border-style:solid; border-width:1px; border-color:#333333;" class="transparent">
<table width="100%">
<tr><td valign="top"><h2>&nbsp;Erstellung des Semesterplanes</h2></td><td align="right" valign="top"><a href="#" onclick="hideSemPlanHelp();">X</a>&nbsp;</td></tr>
<tr>
<td coslspan="2">
<ol style="font-size:8pt;">
<li>Speichern Sie die Vorlage (html oder doc - Version) auf Ihrem Computer.</li>
<li>&Ouml;ffnen Sie die gespeicherte Datei mit ihrem Textverarbeitungsprogramm (MS Word, OpenOffice ...) bzw die html-Vorlage auch mit einem geeigneten Editor.</li>
<li>Erstellen Sie Ihren Semesterplan.</li>
<li>Speichern Sie das Dokument als 'Webseite' mit dem Namen 'index.html'<br>(In MS Word: 'Datei' -> 'Speichern unter' -> Dateiname: index.html, Dateityp: Webseite )</li>
<li>Laden Sie diese Datei nun &uuml;ber den 'Upload'-Knopf hoch.</li>
<li>Fertig!</li>
<ol>
</td>
</tr>
<tr><td colspan="2" align="center"><a href="#" onClick="hideSemPlanHelp();">schlie&szlig;en</a></td></tr>
</table>
</div>
<table class="tabcontent" height="100%" id="inhalt">
<tr>
<td class="tdwidth10">&nbsp;</td>
<td class="ContentHeader"><font class="ContentHeader">&nbsp;
<?php
echo $lv_obj->bezeichnung.' / '.$kurzbz.'-'.$term_id;
echo $lv_obj->bezeichnung.' '.$lv_obj->lehrform_kurzbz.' / '.$kurzbz.'-'.$term_id;
$qry = "SELECT studiensemester_kurzbz FROM lehre.tbl_lehreinheit JOIN public.tbl_studiensemester USING(studiensemester_kurzbz) WHERE lehrveranstaltung_id='$lvid' ORDER BY ende DESC LIMIT 1";
$stsem = new studiensemester($sql_conn);
@@ -257,10 +257,10 @@ function hideSemPlanHelp(){
echo '&nbsp;&nbsp;&nbsp;<a class="Item" href="semdownhlp.php" >';
echo 'Vorlage [hml]';
echo '</a>';
echo '</a>';
echo '&nbsp;<a class="Item" href="semdownhlp.php?format=doc" >';
echo '[doc]';
echo '</a>';
echo '</a>';
echo '&nbsp;<a href="#" onClick="showSemPlanHelp()";>(hilfe)</a>';
}
cis/private/lehre/menu.php
+1 -1
View File
@@ -271,7 +271,7 @@ function js_toggle_container(conid)
{
echo '<tr>';
echo ' <td class="tdwrap"><ul style="margin: 0px; padding: 0px; padding-left: 20px;">';
echo "<li><a class=\"Item2\" title=\"".$row->bezeichnung."\" href=\"lesson.php?lvid=$row->lehrveranstaltung_id\" target=\"content\">".CutString($row->bezeichnung, 21)."</a></li>";
echo "<li><a class=\"Item2\" title=\"".$row->bezeichnung."\" href=\"lesson.php?lvid=$row->lehrveranstaltung_id\" target=\"content\">".CutString($row->bezeichnung, 21).' '.$row->lehrform_kurzbz."</a></li>";
echo ' </ul></td>';
echo '</tr>';
}
cis/private/lvplan/index.php
+1 -1
View File
@@ -57,7 +57,7 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
<td align="right" class="ContentHeader"><A href="help/index.html" class="hilfe" target="_blank"><font class="ContentHeader">HELP&nbsp;</font></A></td>
</tr>
</table>
<DIV align="right">Version: <?php echo VERSION; ?></DIV>
<!--<DIV align="right">Version: <?php echo VERSION; ?></DIV>-->
Username:
<?php
if (isset($uid))
cis/private/lvplan/stpl_reserve_list.php
+70 -8
View File
@@ -1,7 +1,28 @@
<?php
/* Copyright (C) 2006 Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
*/
require_once('../../config.inc.php');
require_once('../../../include/functions.inc.php');
$uid=$REMOTE_USER;
$uid=get_uid();
//$uid='pam';
if (isset($_GET['id']))
@@ -20,13 +41,7 @@
$erg=pg_exec($conn, $sql_query);
}
//Aktuelle Reservierungen abfragen.
$datum=mktime();
$datum=date("Y-m-d",$datum);
$sql_query="SELECT * FROM vw_reservierung WHERE datum>='$datum' ";
$sql_query.=" ORDER BY datum, titel, ort_kurzbz, stunde";
$erg_res=pg_exec($conn, $sql_query);
$num_rows_res=pg_numrows($erg_res);
?>
<html>
<head>
@@ -43,6 +58,53 @@
</table>
</H2>
<?php
//Aktuelle Reservierungen abfragen.
$datum=mktime();
$datum=date("Y-m-d",$datum);
//EIGENE
$sql_query="SELECT * FROM vw_reservierung WHERE datum>='$datum' AND uid='$uid'";
$sql_query.=" ORDER BY datum, titel, ort_kurzbz, stunde";
$erg_res=pg_query($conn, $sql_query);
$num_rows_res=pg_numrows($erg_res);
if ($num_rows_res>0)
{
echo '<table border="0">';
echo '<tr class="liste"><th>Datum</th><th>Titel</th><th>Stunde</th><th>Ort</th><th>Person</th><th>Beschreibung</th></tr>';
for ($i=0; $i<$num_rows_res; $i++)
{
$zeile=$i % 2;
$id=pg_result($erg_res,$i,"reservierung_id");
$datum=pg_result($erg_res,$i,"datum");
$titel=pg_result($erg_res,$i,"titel");
$stunde=pg_result($erg_res,$i,"stunde");
$ort_kurzbz=pg_result($erg_res,$i,"ort_kurzbz");
$pers_uid=pg_result($erg_res,$i,"uid");
//$lektor_kurzbz=pg_result($erg_res,$i,"lektor_kurzbz");
$beschreibung=pg_result($erg_res,$i,"beschreibung");
echo '<tr class="liste'.$zeile.'">';
echo '<td>'.$datum.'</td>';
echo '<td>'.$titel.'</td>';
echo '<td>'.$stunde.'</td>';
echo '<td>'.$ort_kurzbz.'</td>';
echo '<td>'.$pers_uid.'</td>';
echo '<td>'.$beschreibung.'<a name="liste'.$i.'">&nbsp;</a></td>';
$z=$i-1;
if (($pers_uid==$uid)||($uid=='pam')||($uid=='kindlm')||($uid=='dvorak')||($uid=='betty'))
echo '<td><A class="Item" href="stpl_reserve_list.php?id='.$id.'#liste'.$z.'">Delete</A></td>';
echo '</tr>';
}
echo '</table>';
}
echo '<br><br>';
//ALLE
$sql_query="SELECT * FROM vw_reservierung WHERE datum>='$datum' ";
$sql_query.=" ORDER BY datum, titel, ort_kurzbz, stunde";
$erg_res=pg_query($conn, $sql_query);
$num_rows_res=pg_numrows($erg_res);
if ($num_rows_res>0)
{
echo '<table border="0">';
cis/private/mailverteiler.php
+5 -5
View File
@@ -119,7 +119,7 @@
if($is_lector)
{
/* open a popup containing the final dispatcher address */
echo '<a href="#" onClick="javascript:window.open(\'open_grp.php?grp='.strtolower($row1->gruppe_kurzbz).'&desc='.$row1->beschreibung.'\',\'_blank\',\'width=500,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes\');return false;" class="Item"><img src="../../skin/images/open.gif" title="Verteiler &ouml;ffnen"></a>';
echo '<a href="#" onClick="javascript:window.open(\'open_grp.php?grp='.strtolower($row1->gruppe_kurzbz).'&desc='.$row1->beschreibung.'\',\'_blank\',\'width=500,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes, resizable=1\');return false;" class="Item"><img src="../../skin/images/open.gif" title="Verteiler &ouml;ffnen"></a>';
echo "</td>";
echo " <td width='200'>";
echo "<a href='mailto:".$row1->gruppe_kurzbz."@technikum-wien.at' class='Item'>".strtolower($row1->gruppe_kurzbz)."@technikum-wien.at</a></td>";
@@ -142,7 +142,7 @@
if(strtolower($row1->gruppe_kurzbz)=='tw_std')
echo '<td width=\"100\" align="right">&nbsp;</td>';
else
echo ' <td width=\"100\" align="right"><a href="#" onClick="javascript:window.open(\'pers_in_grp.php?grp='.$row1->gruppe_kurzbz.'\',\'_blank\',\'width=600,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes\');return false;" class="Item">Personen</a>';
echo ' <td width=\"100\" align="right"><a href="#" onClick="javascript:window.open(\'pers_in_grp.php?grp='.$row1->gruppe_kurzbz.'\',\'_blank\',\'width=600,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes, resizable=1\');return false;" class="Item">Personen</a>';
echo "</tr>\n";
}
@@ -167,7 +167,7 @@
if($is_lector || $std_obj->studiengang_kz==$row->studiengang_kz)
{
echo " <td width=\"20\">";
echo '<a href="#" onClick="javascript:window.open(\'open_grp.php?grp='.strtolower($row->kuerzel).'_std&desc=Alle Studenten von '.strtolower($row->kuerzel).'\',\'_blank\',\'width=600,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes\');return false;" class="Item"><img src="../../skin/images/open.gif" title="Verteiler &ouml;ffnen"></a></td>';
echo '<a href="#" onClick="javascript:window.open(\'open_grp.php?grp='.strtolower($row->kuerzel).'_std&desc=Alle Studenten von '.strtolower($row->kuerzel).'\',\'_blank\',\'width=600,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes, resizable=1\');return false;" class="Item"><img src="../../skin/images/open.gif" title="Verteiler &ouml;ffnen"></a></td>';
/* open a popup containing the final dispatcher address */
echo " <td width=\"200\" ><a href=\"mailto:".strtolower($row->kuerzel)."_std@technikum-wien.at\" class=\"Item\">".strtolower($row->kuerzel)."_std@technikum-wien.at</a></td>";
}
@@ -178,7 +178,7 @@
echo " <td width=\"200\" >gesperrt</td>";
}
echo ' <td width=\"100\" align="right"><a href="#" onClick="javascript:window.open(\'stud_in_grp.php?kz='.$row->studiengang_kz.'&all=true\',\'_blank\',\'width=600,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes\');return false;" class="Item">Personen</a>';
echo ' <td width=\"100\" align="right"><a href="#" onClick="javascript:window.open(\'stud_in_grp.php?kz='.$row->studiengang_kz.'&all=true\',\'_blank\',\'width=600,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes, resizable=1\');return false;" class="Item">Personen</a>';
echo "</tr>\n";
}
echo "\n";
@@ -228,7 +228,7 @@
echo "</td>";
echo " <td width='20'></td>";
echo " <td width=\"200\"><a href='mailto:$strhelp@technikum-wien.at' class=\"Item\">$strhelp@technikum-wien.at</a></td>";
echo " <td width=\"100\" align=\"right\"><a class=\"Item\" href=\"#\" onClick='javascript:window.open(\"stud_in_grp.php?".$param."\",\"_blank\",\"width=600,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes\");return false;'>Personen</a></td>";
echo " <td width=\"100\" align=\"right\"><a class=\"Item\" href=\"#\" onClick='javascript:window.open(\"stud_in_grp.php?".$param."\",\"_blank\",\"width=600,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes,resizable=1\");return false;'>Personen</a></td>";
echo "</tr>";
$zeilenzaehler++;
cis/private/profile/zeitsperre_resturlaub.php
+5 -5
View File
@@ -42,7 +42,7 @@
$datum_obj = new datum();
//Stundentabelleholen
if(! $result_stunde=pg_query($conn, "SET search_path TO campus; SELECT * FROM lehre.tbl_stunde ORDER BY stunde"))
if(! $result_stunde=pg_query($conn, "SELECT * FROM lehre.tbl_stunde ORDER BY stunde"))
die(pg_last_error($conn));
$num_rows_stunde=pg_num_rows($result_stunde);
@@ -275,9 +275,9 @@ for($i=0;$i<$num_rows_stunde;$i++)
$row = pg_fetch_object($result_stunde, $i);
if($zeitsperre->vonstunde==$row->stunde)
$content_form.= "<OPTION value='$row->stunde' selected>$row->stunde</OPTION>\n";
$content_form.= "<OPTION value='$row->stunde' selected>$row->stunde (".date('H:i',strtotime($row->beginn)).' - '.date('H:i',strtotime($row->ende))." Uhr)</OPTION>\n";
else
$content_form.= "<OPTION value='$row->stunde'>$row->stunde</OPTION>\n";
$content_form.= "<OPTION value='$row->stunde'>$row->stunde (".date('H:i',strtotime($row->beginn)).' - '.date('H:i',strtotime($row->ende))." Uhr)</OPTION>\n";
}
$content_form.= "</SELECT></td></tr>";
@@ -296,9 +296,9 @@ for($i=0;$i<$num_rows_stunde;$i++)
{
$row = pg_fetch_object($result_stunde, $i);
if($zeitsperre->bisstunde==$row->stunde)
$content_form.= "<OPTION value='$row->stunde' selected>$row->stunde</OPTION>\n";
$content_form.= "<OPTION value='$row->stunde' selected>$row->stunde (".date('H:i',strtotime($row->beginn)).' - '.date('H:i',strtotime($row->ende))." Uhr)</OPTION>\n";
else
$content_form.= "<OPTION value='$row->stunde'>$row->stunde</OPTION>\n";
$content_form.= "<OPTION value='$row->stunde'>$row->stunde (".date('H:i',strtotime($row->beginn)).' - '.date('H:i',strtotime($row->ende))." Uhr)</OPTION>\n";
}
$content_form.= "</SELECT></td></tr>";
content/fas.xul.php
+2 -1
View File
@@ -209,7 +209,8 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
label ="&menu-prefs-kontofilterstg.label;"
command ="menu-prefs-kontofilterstg:command"
accesskey ="&menu-prefs-kontofilterstg.accesskey;"
checkbox ="<?php echo $kontofilterstg;?>"
checkbox ="true"
checked ="<?php echo $kontofilterstg;?>"
/>
</menupopup>
</menu>