blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-20 13:39:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Anpassungen an CIS-Redesign

Browse Source 
benutzer.class.php: Globale Suche sucht nun auch nach telefonklappe
content.class.php: Optionale Limits bei Content-Suche
dms.class.php: Suche nach Dokumenten aus dms
ort.class.php: optionale Parameter "Aktiv" und "Lehre" bei Suche nach ort
service.class.php: Suche nach service -> Derzeit keine Funktion bei der Suche, da von Christian nicht gewünscht
studiensemester.class.php: Neue Funktion "getTimestamp": Liefert den UNIX Timestamp (Beginn,Ende) eines Studiensemesters
cis_menu_global.inc.php: Links zu Lehrveranstaltungen, Mein CIS und dgl auskommentiert, da im Redesign nicht mehr notwendig.
cis_menu_lv.inc.php: Neue Buttons bei den Links
wochenplan.class.php: Neue Buttons für den Export, Kalenderwochenjump mit Hoverbox, Jump zu aktuelle KW
This commit is contained in:
Manfred Kindl
2013-07-19 15:47:51 +00:00
parent 5b4a9c50e4
commit 200133e803
11 changed files with 294 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/benutzer.class.php
+13 -2
View File
@@ -259,10 +259,15 @@ class benutzer extends person
}
}
public function search($searchItems)
/**
* Sucht nach Benutzern. Limit optional.
*
* @param $limit (optional)
*/
public function search($searchItems, $limit=null)
{
$qry = "SELECT * FROM (SELECT
distinct on (uid) vorname, nachname, uid, titelpre, titelpost,alias,
distinct on (uid) vorname, nachname, uid, mitarbeiter_uid, titelpre, titelpost,alias,
(SELECT UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz)
FROM public.tbl_student JOIN public.tbl_studiengang USING(studiengang_kz)
WHERE student_uid=tbl_benutzer.uid) as studiengang,
@@ -281,6 +286,7 @@ class benutzer extends person
FROM
public.tbl_person
JOIN public.tbl_benutzer USING(person_id)
LEFT JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
WHERE
tbl_benutzer.aktiv
AND (";
@@ -288,6 +294,7 @@ class benutzer extends person
$qry.=" lower(vorname || ' ' || nachname) like lower('%".addslashes(implode(' ',$searchItems))."%')";
$qry.=" OR lower(nachname || ' ' || vorname) like lower('%".addslashes(implode(' ',$searchItems))."%')";
$qry.=" OR lower(uid) like lower('%".addslashes(implode(' ',$searchItems))."%')";
$qry.=" OR lower(telefonklappe) like lower('%".addslashes(implode(' ',$searchItems))."%')";
foreach($searchItems as $value)
{
@@ -295,6 +302,9 @@ class benutzer extends person
}
$qry.=")) a ORDER BY nachname, vorname";
if(!is_null($limit) && is_numeric($limit))
$qry.=" LIMIT ".$limit;
if($result = $this->db_query($qry))
{
while($row = $this->db_fetch_object($result))
@@ -306,6 +316,7 @@ class benutzer extends person
$obj->nachname = $row->nachname;
$obj->titelpost = $row->titelpost;
$obj->uid = $row->uid;
$obj->mitarbeiter_uid = $row->mitarbeiter_uid;
$obj->studiengang = $row->studiengang;
$obj->studiengang_kz = $row->studiengang_kz;
$obj->telefonklappe = $row->klappe;
include/content.class.php
+7 -3
View File
@@ -779,7 +779,7 @@ class content extends basis_db
}
/**
* Laedt alle Content Eintraege die keine Childs von anderen Contenteintraegen sind
* Laedt alle aktuellen News, die aelter als zwei Monate sind
* @return boolean
*/
public function getNews()
@@ -1264,11 +1264,12 @@ class content extends basis_db
}
/**
* Durchsucht den Content
* Durchsucht den Content. Limit optional.
*
* @param array $searchItems
* @param $limit (optional)
*/
public function search($searchItems)
public function search($searchItems, $limit=null)
{
$qry = "SELECT
distinct on(content_id) *
@@ -1284,6 +1285,9 @@ class content extends basis_db
OR lower(content::text) like lower('%".$this->db_escape(htmlentities($value,ENT_NOQUOTES,'UTF-8'))."%'))";
$qry.=" ORDER BY content_id DESC";
if(!is_null($limit) && is_numeric($limit))
$qry.=" LIMIT ".$limit;
if($result = $this->db_query($qry))
{
while($row = $this->db_fetch_object($result))
include/dms.class.php
+49
View File
@@ -667,6 +667,55 @@ class dms extends basis_db
}
}
/**
* Sucht nach Dokumenten (nur Spalte Beschreibung) mit der aktuellsten Version.
* Optional kann die Anzahl an Suchergebnissen übergeben werden.
*
* @param suchstring
* @param limit (optional)
*/
public function searchLastVersion($suchstring, $limit=null)
{
$qry = "SELECT * FROM campus.tbl_dms JOIN campus.tbl_dms_version USING(dms_id)
WHERE 1=1 ";
foreach($suchstring as $value)
$qry.=" AND (lower(beschreibung::text) like lower('%".$this->db_escape($value)."%')
OR lower (beschreibung::text) like lower ('%".$this->db_escape(htmlentities($value,ENT_NOQUOTES,'UTF-8'))."%'))";
$qry.= "AND version=(SELECT MAX(version) FROM campus.tbl_dms_version where dms_id=tbl_dms.dms_id)";
if(!is_null($limit) && is_numeric($limit))
$qry.=" LIMIT ".$limit;
if($result = $this->db_query($qry))
{
while($row = $this->db_fetch_object($result))
{
$obj = new dms();
$obj->dms_id = $row->dms_id;
$obj->version = $row->version;
$obj->oe_kurzbz = $row->oe_kurzbz;
$obj->dokument_kurzbz = $row->dokument_kurzbz;
$obj->kategorie_kurzbz = $row->kategorie_kurzbz;
$obj->filename = $row->filename;
$obj->mimetype = $row->mimetype;
$obj->name = $row->name;
$obj->beschreibung = $row->beschreibung;
$obj->letzterzugriff = $row->letzterzugriff;
$obj->insertamum = $row->insertamum;
$obj->insertvon = $row->insertvon;
$obj->updateamum = $row->updateamum;
$this->result[] = $obj;
}
}
else
{
$this->errormsg = 'Fehler beim Laden der Daten';
return false;
}
}
/**
*
* lädt alle Versionen zu einer übergebenen ID
include/js/flexcroll.js
+22
View File
File diff suppressed because one or more lines are too long
include/news.class.php
+1 -1
View File
@@ -81,7 +81,7 @@ class news extends basis_db
$qry.=" AND fachbereich_kurzbz='".addslashes(trim($fachbereich_kurzbz))."'";
}
if(trim($studiengang_kz)=='0' || trim($studiengang_kz)=='10006')
if(trim($studiengang_kz)=='0')
$qry.=" AND studiengang_kz='".$studiengang_kz."' ".(trim($semester)!=''?(trim($semester)=='0'?' AND semester=0':''):' AND semester is null');
elseif(trim($studiengang_kz)=='')
$qry.='';
include/ort.class.php
+13 -6
View File
@@ -373,20 +373,27 @@ class ort extends basis_db
}
/**
* Sucht nach einem Ort
* Sucht nach einem Ort. Wenn aktiv-parameter true, dann nur aktive. Wenn lehre-parameter true, dann nur lehre
* @return true wenn ok, false im Fehlerfall
*
* @param aktiv (optional)
* @param lehre (optional)
*/
public function filter($filter)
public function filter($filter, $aktiv=false, $lehre=false)
{
$qry = "
SELECT
*
FROM
public.tbl_ort
WHERE
WHERE (
lower(ort_kurzbz) like '%".$this->db_escape(mb_strtolower($filter))."%'
OR lower(bezeichnung) like '%".$this->db_escape(mb_strtolower($filter))."%'
ORDER BY ort_kurzbz;";
OR lower(bezeichnung) like '%".$this->db_escape(mb_strtolower($filter))."%')";
if ($aktiv==true)
$qry.= " AND aktiv=true";
if ($lehre==true)
$qry.= " AND lehre=true";
$qry.= " ORDER BY ort_kurzbz;";
if(!$this->db_query($qry))
{
@@ -412,7 +419,7 @@ class ort extends basis_db
$ort_obj->stockwerk = $row->stockwerk;
$ort_obj->standort_id = $row->standort_id;
$ort_obj->telefonklappe = $row->telefonklappe;
$ort_obj->content_id = $row->content_id;
//$ort_obj->content_id = $row->content_id;
$this->result[] = $ort_obj;
}
include/service.class.php
+36
View File
@@ -119,6 +119,42 @@ class service extends basis_db
}
}
/**
* Sucht ein Service
*
* @param $suchstring
*/
public function search($suchstring)
{
$qry = "SELECT * FROM public.tbl_service WHERE 1=1 ";
foreach($suchstring as $value)
$qry.="AND (lower(beschreibung::text) like lower('%".$this->db_escape($value)."%')
OR lower(beschreibung::text) like lower('%".$this->db_escape(htmlentities($value,ENT_NOQUOTES,'UTF-8'))."%'))";
$qry.=" ORDER BY oe_kurzbz, bezeichnung";
if($result = $this->db_query($qry))
{
while($row = $this->db_fetch_object($result))
{
$obj = new service();
$obj->service_id = $row->service_id;
$obj->bezeichnung = $row->bezeichnung;
$obj->beschreibung = $row->beschreibung;
$obj->ext_id = $row->ext_id;
$obj->oe_kurzbz = $row->oe_kurzbz;
$this->result[] = $obj;
}
return true;
}
else
{
$this->errormsg='Fehler beim Laden der Daten';
return false;
}
}
public function getServicesOrganisationseinheit($oe_kurzbz)
{
$qry = 'SELECT
include/studiensemester.class.php
+33 -3
View File
@@ -623,9 +623,39 @@ class studiensemester extends basis_db
return false;
}
}
/**
* Liefert den UNIX Timestamp (Beginn,Ende) eines Studiensemesters
*
* @param $studiensemester_kurzbz
* @return Beginn und Ende eines Studiensemesters als Timestamp
*/
public function getTimestamp($studiensemester_kurzbz)
{
$qry = "SELECT start,ende,studiensemester_kurzbz FROM public.tbl_studiensemester
WHERE studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."";
if($this->db_query($qry))
{
if($row = $this->db_fetch_object())
{
$this->begin->start=mktime(0,0,0,mb_substr($row->start,5,2),mb_substr($row->start,8,2),mb_substr($row->start,0,4));
$this->ende->ende=mktime(0,0,0,mb_substr($row->ende,5,2),mb_substr($row->ende,8,2),mb_substr($row->ende,0,4));
return true;
}
else
{
$this->errormsg = 'Es wurde kein Studiensemester gefunden';
return false;
}
}
else
{
$this->errormsg = 'Fehler beim Ermitteln des Studiensemesters';
return false;
}
}
/**
* untersucht das übergebene datum in welchem semester es sich befindet
* untersucht das �bergebene datum in welchem semester es sich befindet
* @param type $datum
* @return boolean
*/
@@ -633,7 +663,7 @@ class studiensemester extends basis_db
{
if($datum == '')
{
$this->errormsg = "Ungueltiges Datum übergeben";
$this->errormsg = "Ungueltiges Datum �bergeben";
return false;
}
$qry = "SELECT * FROM public.tbl_studiensemester WHERE start <=".$this->db_add_param($datum, FHC_STRING)." AND ende >= ".$this->db_add_param($datum).';';
include/tw/cis_menu_global.inc.php
+9 -8
View File
@@ -29,14 +29,15 @@ require_once ('../include/functions.inc.php');
$sprache = getSprache();
$p = new phrasen($sprache);
?>
<div id="GlobalMenu" style="display: inline">
[ <a class='Item' href="index.html" target="_top"><?php echo $p->t('profil/home');?></a>
| <a class='Item' href="menu.php?content_id=173" target="menu"><?php echo $p->t('profil/meinCis');?></a>
| <a class='Item' href="menu.php?content_id=166" target="menu"><?php echo $p->t('lvaliste/lehrveranstaltungen');?></a>
<td style="border-right-width:1px; border-right-style:solid; border-color:#626B71;padding-right:3px;padding-left:3px;"><div id="GlobalMenu" style="display: inline; text-transform:uppercase; font-weight: bold"><a class='Item' href="index.html" target="_top"><?php echo $p->t('profil/home');?></a></div></td>
<!--<td style="border-right-width:1px; border-right-style:solid; border-color:#626B71;padding-right:3px;"><div id="GlobalMenu" style="display: inline; text-transform:uppercase; font-weight: bold"><a class='Item' href="menu.php?content_id=173" target="menu"><?php echo $p->t('profil/meinCis');?></a></div></td>-->
<!--<td style="border-right-width:1px; border-right-style:solid; border-color:#626B71;padding-right:3px;padding-left:3px;"><div id="GlobalMenu" style="display: inline; text-transform:uppercase; font-weight: bold"><a class='Item' href="menu.php?content_id=166" target="menu"><?php echo $p->t('lvaliste/lehrveranstaltungen');?></a></div></td>-->
<!--<td style="border-right-width:1px; border-right-style:solid; border-color:#626B71;padding-right:3px;padding-left:3px;"><div id="GlobalMenu" style="display: inline; text-transform:uppercase; font-weight: bold"><a class='Item' href="../cis/private/lvplan/stpl_week.php" target="blank">Mein LV-Plan</a></div></td>-->
<td style="border-right-width:1px; border-right-style:solid; border-color:#626B71;padding-right:3px;padding-left:3px;"><div id="GlobalMenu" style="display: inline; text-transform:uppercase; font-weight: bold"><a class='Item' href="http://fhcomplete.technikum-wien.at/dokuwiki/doku.php" target="blank">WIKI</a></div></td>
<?php
if(CHOOSE_LAYOUT)
echo '| <a class="Item" href="../layouts.php" target="content">Layouts</a>';
echo '<td style="border-right-width:1px; border-right-style:solid; border-color:#626B71;padding-right:5px;padding-left:5px;"><div id="GlobalMenu" style="display: inline; text-transform:uppercase; font-weight: bold"><a class="Item" href="../layouts.php" target="content">Layouts</a></div></td>';
?>
| <a class='Item' href="../cms/dms.php?id=<?php echo $p->t('dms_link/cisHandbuch');?>" target="_blank"><?php echo $p->t('global/handbuch');?></a>
]
</div>
<td style="padding-left:3px;"><div id="GlobalMenu" style="display: inline; text-transform:uppercase; font-weight: bold"><a class='Item' href="../cms/dms.php?id=<?php echo $p->t('dms_link/cisHandbuch');?>" target="_blank"><?php echo $p->t('global/handbuch');?></a></div></td>
&nbsp;&nbsp;&nbsp;&nbsp;
include/tw/cis_menu_lv.inc.php
+39 -37
View File
@@ -31,7 +31,7 @@
<?php
//Lehrveranstaltungsinformation
echo "<img src=\"../../../skin/images/button_i.jpg\" width=\"67\" height=\"45\"><br><strong>".$p->t('lehre/lehrveranstaltungsinformation')."</strong><br>";
echo "<img class=\"lv\" src=\"../../../skin/images/button_lvinfo.png\"><strong><br>".$p->t('lehre/lehrveranstaltungsinformation')."</strong><br>";
$qry = "SELECT * FROM campus.tbl_lvinfo WHERE lehrveranstaltung_id='".addslashes($lvid)."' AND genehmigt=true AND sprache='German' AND aktiv=true";
$need_br=false;
@@ -62,7 +62,7 @@
}
?>
<p>&nbsp;</p>
</td>
<td class="tdvertical" align="center">
<?php
@@ -122,13 +122,13 @@
if(isset($dir_empty) && $dir_empty == false)
{
echo '<a href="'.$dest_dir->path.'/" target="_blank">';
echo '<img src="../../../skin/images/button_semplan.jpg" width="67" height="45"><br>';
echo '<img class="lv" src="../../../skin/images/button_semplan.png"><br>';
echo '<strong>'.$p->t('lehre/semesterplan').'</strong>';
echo '</a>';
}
else
{
echo '<img src="../../../skin/images/button_semplan.jpg" width="67" height="45"><br>';
echo '<img class="lv" src="../../../skin/images/button_semplan.png"><br>';
echo '<strong>'.$p->t('lehre/semesterplan').'</strong>';
}
@@ -149,7 +149,7 @@
?>
<p>&nbsp;</p>
</td>
<td class="tdvertical" align="center">
<?php
@@ -199,13 +199,13 @@
if(isset($dir_empty) && $dir_empty == false)
{
echo '<a href="'.$dest_dir->path.'/" target="_blank" class="Item">';
echo '<img src="../../../skin/images/button_dl.jpg" width="67" height="45"><br>';
echo '<img class="lv" src="../../../skin/images/button_download.png"><br>';
echo '<strong>'.$p->t('lehre/download').'</strong>';
echo '</a>';
}
else
{
echo '<img src="../../../skin/images/button_dl.jpg" width="67" height="45"><br>';
echo '<img class="lv" src="../../../skin/images/button_download.png"><br>';
echo '<strong>'.$p->t('lehre/download').'</strong>';
}
@@ -224,7 +224,7 @@
echo $p->t('lehre/ziparchiv');
}
?>
<p>&nbsp;</p>
</td>
<td>
</td>
@@ -234,7 +234,7 @@
<td class="tdvertical" align="center">
<?php
echo '<img src="../../../skin/images/button_lb.jpg" width="67" height="45"><br>';
echo '<img class="lv" src="../../../skin/images/button_listen.png"><br>';
if($is_lector)
{
//Anwesenheitsliste
@@ -296,7 +296,7 @@
}
?>
<p>&nbsp;</p>
</td>
<td class="tdvertical" align="center">
<?php
@@ -304,22 +304,22 @@
if($studiengang_kz!='0')
{
echo '<a href="news://news.technikum-wien.at/'.mb_strtolower($stg_obj->kurzbzlang).'.'.$semester.'sem.'.mb_strtolower($short_short_name).'" class="Item">
<img src="../../../skin/images/button_ng.jpg" width="67" height="45"><br>
<img class="lv" src="../../../skin/images/button_newsgroups.png"><br>
<strong>'.$p->t('lehre/newsgroups').'</strong>
</a>';
}
?>
<p>&nbsp;</p>
</td>
<td class="tdvertical" align="center">
<?php
//FEEDBACK
echo '<a href="feedback.php?lvid='.$lvid.'" target="_blank" class="Item"><img border="0" src="../../../skin/images/button_fb.jpg" width="67" height="45"><br><strong>'.$p->t('lehre/feedback').'</strong></a>';
echo '<a href="feedback.php?lvid='.$lvid.'" target="_blank" class="Item"><img class="lv" src="../../../skin/images/button_feedback.png"><br><strong>'.$p->t('lehre/feedback').'</strong></a>';
?>
<p>&nbsp;</p>
</td>
</tr>
<tr>
@@ -368,7 +368,7 @@
$studiensem = '';
echo '<a href="benotungstool/verwaltung.php?lvid='.$lvid.$studiensem.'" class="Item">
<img src="../../../skin/images/button_kt.jpg" width="67" height="45"><br>
<img class="lv" src="../../../skin/images/button_kreuzerltool.png"><br>
<strong>'.$p->t('lehre/kreuzerltool').'</strong></a><br>
<a href="'.APP_ROOT.'cms/dms.php?id='.$p->t('dms_link/benotungstoolHandbuch').'" class="Item" target="_blank">'.$p->t('lehre/benotungstoolHandbuch').' [PDF]</a>';
}
@@ -380,7 +380,7 @@
$studiensem = '';
echo '<a href="benotungstool/studentenansicht.php?lvid='.$lvid.$studiensem.'" class="Item">
<img src="../../../skin/images/button_kt.jpg" width="67" height="45"><br>
<img class="lv" src="../../../skin/images/button_kreuzerltool.png"><br>
<strong>'.$p->t('lehre/kreuzerltool').'</strong></a>';
}
@@ -390,14 +390,14 @@
if($is_lector)
{
echo '<a href="#" onclick="alert(\''.$p->t('lehre/kreuzerltoolMitMoodleInfo').'\');" class="Item">
<img src="../../../skin/images/button_kt.jpg" width="67" height="45"><br>
<img class="lv" src="../../../skin/images/button_kreuzerltool.png"><br>
<strong>'.$p->t('lehre/kreuzerltool').'</strong></a><br>
<a href="'.APP_ROOT.'cms/dms.php?id='.$p->t('dms_link/benotungstoolHandbuch').'" class="Item" target="_blank">'.$p->t('lehre/benotungstoolHandbuch').' [PDF]</a>';
}
}
echo'
<p>&nbsp;</p>
</td>
<td class="tdvertical" align="center">
';
@@ -458,29 +458,28 @@
else
$link = "moodle_choice.php?lvid=$lvid&stsem=$angezeigtes_stsem";
}
echo '<a href="'.$link.'" target="_blank" class="Item" >
<img src="../../../skin/images/button_moodle.jpg" width="68" height="45"><br>
echo '<a href="'.$link.'" target="_blank">
<img class="lv" src="../../../skin/images/button_moodle.png"><br>
<strong>'.$p->t('lehre/moodle').'</strong></a><br>';
}
else
{
echo '<img src="../../../skin/images/button_moodle.jpg" width="68" height="45"><br>
echo '<img class="lv" src="../../../skin/images/button_moodle.png"><br>
<strong>'.$p->t('lehre/moodle').'</strong><br>';
}
if($is_lector)
echo '<a href="moodle_wartung_choice.php?lvid='.$lvid.'&stsem='.$angezeigtes_stsem.'" class="Item">'.$p->t('lehre/moodleWartung').'</a>
<br /><a href="'.APP_ROOT.'cms/dms.php?id='.$p->t('dms_link/moodleHandbuch').'" class="Item" target="_blank">'.$p->t('lehre/moodleHandbuch').' [PDF]</a>';
}
echo ' <a href="moodle_wartung_choice.php?lvid='.$lvid.'&stsem='.$angezeigtes_stsem.'" class="Item">'.$p->t('lehre/moodleWartung').'</a>
<br /><a href="'.APP_ROOT.'cms/dms.php?id='.$p->t('dms_link/moodleHandbuch').'" class="Item" target="_blank">'.$p->t('lehre/moodleHandbuch').' [PDF]</a>';
else
{
if($is_lector)
echo '<a href="#" onclick="alert(\''.$p->t('lehre/moodleMitKreuzerltoolInfo').'\'); return false" class="Item" >
<img src="../../../skin/images/button_moodle.jpg" width="68" height="45"><br>
echo '<a href="#" onclick="alert(\''.$p->t('lehre/moodleMitKreuzerltoolInfo').'\'); return false">
<img class="lv" src="../../../skin/images/button_moodle.png"><br>
<strong>'.$p->t('lehre/moodle').'</strong></a><br>';
}
echo '
<p>&nbsp;</p>
</td>';
//Gesamtnote
@@ -488,9 +487,9 @@
{
echo '<td class="tdvertical" align="center">';
echo '<a href="benotungstool/lvgesamtnoteverwalten.php?lvid='.$lvid.'&stsem='.$angezeigtes_stsem.'" class="Item" >
<img src="../../../skin/images/button_endnote.jpg" width="68" height="45"><br>
<img class="lv" src="../../../skin/images/button_endnote.png"><br>
<strong>'.$p->t('lehre/gesamtnote').'</strong></a><br>';
echo '<p>&nbsp;</p>
echo '
</td>';
}
@@ -556,14 +555,14 @@
if($islector == true)
{
echo "<a href=\"lector_choice.php?lvid=$lvid\" target=\"_blank\">";
echo "<img src=\"../../../skin/images/button_ul.jpg\" width=\"67\" height=\"45\"><br>
echo "<img class=\"lv\" src=\"../../../skin/images/button_studiupload.png\"><br>
<strong>".$p->t('lehre/studentenAbgabe')."</strong>
</a>";
}
else
{
echo "<a href=\"upload.php?course_id=$studiengang_kz&term_id=$semester&short=$short\" target=\"_blank\">";
echo "<img src=\"../../../skin/images/button_ul.jpg\" width=\"67\" height=\"45\"><br>
echo "<img class=\"lv\" src=\"../../../skin/images/button_studiupload.png\"><br>
<strong>".$p->t('lehre/studentenAbgabe')."</strong>
</a>";
}
@@ -581,19 +580,20 @@
if($islector == true)
{
echo "<img src=\"../../../skin/images/button_ul.jpg\" width=\"67\" height=\"45\"><br>
echo "<img class=\"lv\" src=\"../../../skin/images/button_studiupload.png\"><br>
<strong>".$p->t('lehre/studentenAbgabe')."</strong>";
}
else
{
echo "<a href=\"upload.php?course_id=$studiengang_kz&term_id=$semester&short=$short\" target=\"_blank\">";
echo "<img src=\"../../../skin/images/button_ul.jpg\" width=\"67\" height=\"45\"><br>
echo "<img class=\"lv\" src=\"../../../skin/images/button_studiupload.png\"><br>
<strong>".$p->t('lehre/studentenAbgabe')."</strong>
</a>";
}
}
echo '<p>&nbsp;</p>
</td>';
echo '</td>';
// Email an Studierende
$mailto='mailto:';
$qry = 'SELECT
@@ -632,9 +632,11 @@
echo '</tr><tr>';
}
echo '<td class="tdvertical" align="center">';
echo '<a href="'.$mailto.'" '.$nomail.'><img border="0" src="../../../skin/images/button_fb.jpg" width="67" height="45"><br><strong>'.$p->t('lehre/mail').'</strong></a>';
echo '<a href="'.$mailto.'" '.$nomail.'><img class="lv" src="../../../skin/images/button_feedback.png"><br><strong>'.$p->t('lehre/mail').'</strong></a>';
echo '</td>';
//Anzeigen von zus�tzlichen Lehre-Tools
$lehretools = new lehre_tools();
if($lehretools->getTools($lvid, $angezeigtes_stsem))
{
@@ -647,7 +649,7 @@
echo '<td class="tdvertical" align="center">';
echo '<a href="'.$row->basis_url.'" target="_blank">';
if($row->logo_dms_id!='')
echo '<img src="../../../cms/dms.php?id='.$row->logo_dms_id.'" width="67" height="45"><br>';
echo '<img class="lv" src="../../../cms/dms.php?id='.$row->logo_dms_id.'"><br>';
echo ' <strong>'.$row->bezeichnung[$sprache].'</strong>';
include/wochenplan.class.php
+72 -50
View File
@@ -38,7 +38,7 @@ require_once(dirname(__FILE__).'/datum.class.php');
require_once(dirname(__FILE__).'/zeitsperre.class.php');
require_once(dirname(__FILE__).'/phrasen.class.php');
require_once(dirname(__FILE__).'/globals.inc.php');
require_once(dirname(__FILE__).'/sprache.class.php');
require_once(dirname(__FILE__).'/sprache.class.php');
class wochenplan extends basis_db
{
@@ -407,9 +407,11 @@ class wochenplan extends basis_db
$sprache = getSprache();
$p=new phrasen($sprache);
echo '<TABLE width="100%" bgcolor="#EEEEEE" border="0" cellspacing="0">'.$this->crlf;
//$datum=mktime();
echo '<TABLE width="100%" border="0" cellspacing="0">'.$this->crlf;
echo ' <TR>'.$this->crlf;
echo ' <TD valign="bottom">'.$this->crlf;
echo ' <TD style="padding-bottom: 5px;" valign="top">'.$this->crlf;
echo ' <P valign="top">';
if ($this->type=='student' || $this->type=='lektor')
echo '<strong>Person: </strong>'.$this->pers_titelpre.' '.$this->pers_vorname.' '.$this->pers_nachname.' '.$this->pers_titelpost.' - '.$this->pers_uid.'<br>';
@@ -424,9 +426,11 @@ class wochenplan extends basis_db
$this->link.='&stg_kz='.$this->stg_kz.'&sem='.$this->sem.'&ver='.$this->ver.'&grp='.$this->grp;
}
if ($this->type=='ort')
echo '<strong>'.$p->t('lvplan/raum').': </strong>'.(1==1 || is_file(RAUMINFO_PATH.trim($this->ort_kurzbz).'.html')?'<a href="'.RAUMINFO_PATH.trim($this->ort_kurzbz).'.html" target="_blank">'.$this->ort_kurzbz.'</a>':$this->ort_kurzbz).' - '.$this->ort_bezeichnung.' - '.($this->ort_max_person!=''?'( '.$this->ort_max_person.' Personen )':'').'<br>'.$this->ort_ausstattung.'<br>';
echo '<strong>'.$p->t('lvplan/raum').': </strong>'.(1==1 || is_file(RAUMINFO_PATH.trim($this->ort_kurzbz).'.html')?'<a href="'.RAUMINFO_PATH.trim($this->ort_kurzbz).'.html" target="_blank">'.$this->ort_kurzbz.'</a>':$this->ort_kurzbz).' - '.$this->ort_bezeichnung.' - '.($this->ort_max_person!=''?'( '.$this->ort_max_person.' Personen )':'').'<br>'.$this->ort_ausstattung;
echo '</P>'.$this->crlf;
echo ' <div valign="bottom" align="center">'.$this->crlf;
echo ' <table class="stdplan" style="width: auto; margin: auto;" valign="bottom" align="center">';
//echo ' <tr><td colspan="2" class="stdplan" style="padding:3px;" align="center">'.$p->t('lvplan/semesterplaene').'</td></tr>';
echo ' <tr><td style="padding:3px 15px 0px 15px; margin: 0,0,20px,0;" align="center">'.$this->crlf;
//Kalender
$this->kal_link.='&pers_uid='.$this->pers_uid.'&ort_kurzbz='.$this->ort_kurzbz.'&stg_kz='.$this->stg_kz.'&sem='.$this->sem.'&ver='.$this->ver.'&grp='.$this->grp.'&gruppe_kurzbz='.$this->gruppe_kurzbz;
@@ -435,27 +439,30 @@ class wochenplan extends basis_db
$kal_link_ss=$this->kal_link.'&begin='.$this->studiensemester_next->start.'&ende='.$this->studiensemester_next->ende;
//echo ' &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>'.$p->t('global/kalender').':&nbsp;&nbsp;&nbsp;</strong>'.$this->crlf;
echo $this->crlf;
echo ' '.$p->t('lvplan/uebersicht').':&nbsp;<A href="'.$kal_link_ws.'&format=html" target="_blank" title="HTML">'.$this->studiensemester_now->name.'</A>&nbsp;'.$this->crlf;
echo ' <A href="'.$kal_link_ws.'&format=html" target="_blank" title="HTML"><IMG src="../../../skin/images/html.png" height="36" alt="HTML" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ws.'&format=csv" title="CSV"><IMG src="../../../skin/images/csv.png" height="36" alt="CSV" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ws.'&format=csv&target=outlook" title="CSV-Outlook"><IMG src="../../../skin/images/outlook.png" height="36" alt="CSV-Outlook" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ws.'&format=ical&version=1&target=ical" title="iCal Version 1.0"><IMG src="../../../skin/images/ical1.0.png" height="36" alt="vCal Version 1.0" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ws.'&format=ical&version=2&target=ical" title="iCal Version 2.0"><IMG src="../../../skin/images/ical2.0.png" height="36" alt="vCal Version 2.0" border="0"></A>'.$this->crlf;
echo ' &nbsp;&nbsp;&nbsp;&nbsp;'.$p->t('lvplan/uebersicht').':&nbsp;<A href="'.$kal_link_ss.'&format=html" target="_blank" title="HTML">'.$this->studiensemester_next->name.'</A>&nbsp;'.$this->crlf;
echo ' <A href="'.$kal_link_ss.'&format=html" target="_blank" title="HTML"><IMG src="../../../skin/images/html.png" height="36" alt="HTML" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ss.'&format=csv" title="CSV"><IMG src="../../../skin/images/csv.png" height="36" alt="CSV" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ss.'&format=csv&target=outlook" title="CSV-Outlook"><IMG src="../../../skin/images/outlook.png" height="36" alt="CSV-Outlook" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ss.'&format=ical&version=1&target=ical" title="iCal Version 1.0"><IMG src="../../../skin/images/ical1.0.png" height="36" alt="iCal Version 1.0" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ss.'&format=ical&version=2&target=ical" title="iCal Version 2.0"><IMG src="../../../skin/images/ical2.0.png" height="36" alt="iCal Version 2.0" border="0"></A>'.$this->crlf;
echo ' </div>'.$this->crlf;
//echo ' '.$p->t('lvplan/uebersicht').':&nbsp;<A href="'.$kal_link_ws.'&format=html" target="_blank" title="HTML">'.$this->studiensemester_now->name.'</A>&nbsp;'.$this->crlf;
echo $this->studiensemester_now->name.'<br>'.$this->crlf;
echo ' <A href="'.$kal_link_ws.'&format=html" target="_blank" title="HTML"><IMG src="../../../skin/images/html.png" height="30" alt="HTML" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ws.'&format=csv" title="CSV"><IMG src="../../../skin/images/csv.png" height="30" alt="CSV" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ws.'&format=csv&target=outlook" title="CSV-Outlook"><IMG src="../../../skin/images/outlook.png" height="30" alt="CSV-Outlook" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ws.'&format=ical&version=1&target=ical" title="iCal Version 1.0"><IMG src="../../../skin/images/ical1.0.png" height="30" alt="vCal Version 1.0" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ws.'&format=ical&version=2&target=ical" title="iCal Version 2.0"><IMG src="../../../skin/images/ical2.0.png" height="30" alt="vCal Version 2.0" border="0"></A>'.$this->crlf;
echo ' </td><td class="stdplan" style="padding:8px;" align="center">'.$p->t('lvplan/semesterplaene').'</td><td style="padding:3px 15px 0px 15px;" align="center">';
//echo ' &nbsp;&nbsp;&nbsp;&nbsp;'.$p->t('lvplan/uebersicht').':&nbsp;<A href="'.$kal_link_ss.'&format=html" target="_blank" title="HTML">'.$this->studiensemester_next->name.'</A>&nbsp;'.$this->crlf;
echo ' <span style="color:#999">'.$this->studiensemester_next->name.'</span><br>'.$this->crlf;
echo ' <A href="'.$kal_link_ss.'&format=html" target="_blank" title="HTML"><IMG src="../../../skin/images/html_light.png" height="30" alt="HTML" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ss.'&format=csv" title="CSV"><IMG src="../../../skin/images/csv_light.png" height="30" alt="CSV" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ss.'&format=csv&target=outlook" title="CSV-Outlook"><IMG src="../../../skin/images/outlook_light.png" height="30" alt="CSV-Outlook" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ss.'&format=ical&version=1&target=ical" title="iCal Version 1.0"><IMG src="../../../skin/images/ical1.0_light.png" height="30" alt="iCal Version 1.0" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ss.'&format=ical&version=2&target=ical" title="iCal Version 2.0"><IMG src="../../../skin/images/ical2.0_light.png" height="30" alt="iCal Version 2.0" border="0"></A>'.$this->crlf;
echo ' </td></tr></table>'.$this->crlf;
echo ' </TD>'.$this->crlf;
// Kalenderjump
echo ' <TD align="right" valign="top">'.$this->crlf;
jahreskalenderjump($this->link);
echo ' </TD>'.$this->crlf;
//echo ' <TD align="right" valign="top">'.$this->crlf;
//jahreskalenderjump($this->link);
//echo ' </TD>'.$this->crlf;
echo ' </TR>'.$this->crlf;
echo '</TABLE><HR>'.$this->crlf.$this->crlf;
echo '</TABLE>'.$this->crlf.$this->crlf;
// Jump Wochenweise
if ($this->type=='verband')
@@ -494,8 +501,8 @@ class wochenplan extends basis_db
//$datum=mktime($this->datum[hours], $this->datum[minutes], $this->datum[seconds], $this->datum[mon], $this->datum[mday], $this->datum[year]);
if (isset($prev_ort))
{
echo ' <a href="stpl_week.php?type='.$this->type.'&datum='.$this->datum.'&ort_kurzbz='.$prev_ort->ort_kurzbz.'">'.$this->crlf;
echo ' <img src="../../../skin/images/left.gif" border="0" title="'.$prev_ort->ort_kurzbz.'" />'.$this->crlf;
echo ' <a style="text-decoration:none" href="stpl_week.php?type='.$this->type.'&datum='.$this->datum.'&ort_kurzbz='.$prev_ort->ort_kurzbz.'">'.$this->crlf;
echo ' &nbsp;&nbsp;<img class="lvplanbutton" src="../../../skin/images/left_lvplan.png" title="'.$prev_ort->ort_kurzbz.'" />&nbsp;&nbsp;'.$this->crlf;
echo ' </a>'.$this->crlf;
}
echo " <SELECT name=\"select\" onChange=\"MM_jumpMenu('self',this,0)\" class=\"xxxs_black\">".$this->crlf;
@@ -510,37 +517,46 @@ class wochenplan extends basis_db
echo ' </SELECT>'.$this->crlf;
if (isset($next_ort))
{
echo ' <a href="stpl_week.php?type='.$this->type.'&datum='.$this->datum.'&ort_kurzbz='.$next_ort->ort_kurzbz.'">'.$this->crlf;
echo ' <img src="../../../skin/images/right.gif" border="0" title="'.$next_ort->ort_kurzbz.'">'.$this->crlf;
echo ' <a style="text-decoration:none" href="stpl_week.php?type='.$this->type.'&datum='.$this->datum.'&ort_kurzbz='.$next_ort->ort_kurzbz.'">'.$this->crlf;
echo ' &nbsp;&nbsp;<img class="lvplanbutton" src="../../../skin/images/right_lvplan.png" title="'.$next_ort->ort_kurzbz.'">&nbsp;&nbsp;'.$this->crlf;
echo ' </a>'.$this->crlf;
}
echo ' </p>';
$link_parameter='&ort_kurzbz='.$this->ort_kurzbz;
}
echo ' <p align="center">';
echo ' <p style="color:grey; font-size:17px; vertical-align:center; margin-bottom:0px;" align="center">';
// 4 Wochen zurueck
echo ' <a href="stpl_week.php?type='.$this->type.$link_parameter.'&datum='.$this->datum_prev4week.'">'.$this->crlf;
echo ' <img src="../../../skin/images/moreleft.gif" border="0" title="4 Wochen zurueck">'.$this->crlf;
echo ' </a>';
echo '<a style="text-decoration:none" href="stpl_week.php?type='.$this->type;
echo $link_parameter;
echo '&datum='.$this->datum_prev4week.'">'.$this->crlf;
echo '<img class="lvplanbutton" src="../../../skin/images/moreleft_lvplan.png" title="'.$p->t('lvplan/vierWochenZurueck').'">'.$this->crlf;
echo '</a>';
// 1 Woche zurueck
echo '<a href="stpl_week.php?type='.$this->type;
echo '<a style="text-decoration:none" href="stpl_week.php?type='.$this->type;
echo $link_parameter;
echo '&datum='.$this->datum_prevweek;
echo '"><img src="../../../skin/images/left.gif" border="0"></a> KW '.$this->kalenderwoche;
echo '">&nbsp;&nbsp;<img class="lvplanbutton" src="../../../skin/images/left_lvplan.png" title="'.$p->t('lvplan/eineWocheZurueck').'">&nbsp;&nbsp;</a>';
// Aktuelle KW
echo '<a style="text-decoration:none" href="stpl_week.php?type='.$this->type;
echo $link_parameter;
echo '" title="Aktuelle KW">'.$p->t('eventkalender/kw').' '.$this->kalenderwoche;
echo '</a>';
// 1 Woche nach vor
echo '<a href="stpl_week.php?type='.$this->type;
echo '<a style="text-decoration:none" href="stpl_week.php?type='.$this->type;
echo $link_parameter;
echo '&datum='.$this->datum_nextweek;
echo '"><img src="../../../skin/images/right.gif" border="0"></a>';
echo '">&nbsp;&nbsp;<img class="lvplanbutton" src="../../../skin/images/right_lvplan.png" title="'.$p->t('lvplan/eineWocheVor').'">&nbsp;&nbsp;</a>';
// 4 Wochen nach vor
echo '<a href="stpl_week.php?type='.$this->type;
echo '<a style="text-decoration:none" href="stpl_week.php?type='.$this->type;
echo $link_parameter;
echo '&datum='.$this->datum_next4week;
echo '"><img src="../../../skin/images/moreright.gif" border="0"></a>';
echo '"><img class="lvplanbutton" src="../../../skin/images/moreright_lvplan.png" title="'.$p->t('lvplan/vierWochenVor').'"></a>';
echo '</p>';
//Kalenderjump mit Hoverbox
jahreskalenderjump_hoverbox($this->link);
return true;
}
/**
* Zeichnen der Stundenplanwoche in HTML
*/
@@ -565,7 +581,7 @@ class wochenplan extends basis_db
echo '<form name="reserve" method="post" action="stpl_week.php">'.$this->crlf;
//Tabelle zeichnen
echo ' <table class="stdplan" width="100%" border="1" cellpadding="0" cellspacing="0" name="Stundenplantabelle" align="center">'.$this->crlf;
echo ' <table class="stdplan" width="100%" border="0" cellpadding="1" cellspacing="1" name="Stundenplantabelle" align="center">'.$this->crlf;
// Kopfzeile darstellen
echo '<thead><tr>'.$this->crlf;
echo ' <th align="right">'.$p->t('global/stunde').'&nbsp;<br>'.$p->t('global/beginn').'&nbsp;<br>'.$p->t('global/ende').'&nbsp;</th>'.$this->crlf;
@@ -737,7 +753,7 @@ class wochenplan extends basis_db
}
else
{
echo ' <td align="center"><br>';
echo ' <td valign="center" align="center">';
$datum_res_lektor_start_m = date('Y-m-d', $datum_res_lektor_start);
$datum_res_lektor_ende_m = date('Y-m-d', $datum_res_lektor_ende);
$datum_m = date('Y-m-d',$datum);
@@ -752,7 +768,7 @@ class wochenplan extends basis_db
echo ' </tbody></table>'.$this->crlf;
if ($raumres && $this->type=='ort' && ($datum>=$datum_now && $datum>=$datum_res_lektor_start && $datum_mon<=$datum_res_lektor_ende))
{
echo '<table><tr>';
echo '<table><tr><br>';
echo ' <td>'.$p->t('global/titel').':</td><td><input onchange="if (this.value.length>0 && document.getElementById(\'beschreibung\').value.length<1) {document.getElementById(\'beschreibung\').value=document.getElementById(\'titel\').value;document.getElementById(\'beschreibung\').focus();};" type="text" id="titel" name="titel" size="10" maxlength="10" value="" /></td> '.$this->crlf;
echo ' <td>'.$p->t('global/beschreibung').':</td><td colspan="6"> <input onchange="if (this.value.length<1 && document.getElementById(\'titel\').value.length>0) {alert(\'Achtung! Speichern nur mit Beschreibung moeglich!\');this.focus();};" type="text" id="beschreibung" name="beschreibung" size="20" maxlength="32" value="" /> </td>'.$this->crlf;
@@ -2253,28 +2269,34 @@ class wochenplan extends basis_db
}
}
function jahreskalenderjump($link)
function jahreskalenderjump_hoverbox($link) //Mit Hoverbox Effekt
{
$sprache = getSprache();
$p=new phrasen($sprache);
$crlf=crlf();
$datum=mktime();
$woche=kalenderwoche($datum);
$datum=montag($datum);
echo ' <SMALL><CENTER><B>'.$p->t('lvplan/springeZuKw').'</B><BR><SMALL>'.$crlf;
for ($anz=1;$anz<26;$anz++)
$wochenmontag=montag($datum);
echo '<table align="center"><tr valign="top"><td>
<div class="hoverbox">
<div class="preview">
<img src="../../../skin/images/down_lvplan.png" border="0"/>
<div class="hoverbox_inhalt">
<table class="hoverbox"><tr>'.$crlf;
for ($anz=1;$anz<25;$anz++)
{
$linknew=$link.'&datum='.$datum;
if ($woche==53)
$woche=1;
echo ' <A HREF="'.$linknew.'">'.$woche.'</A>'.$crlf;
if ($anz%5==0)
echo ' <br>'.$crlf;
echo ' <td style="padding: 3px;" align="center"><A HREF="'.$linknew.'"><nobr>KW '.$woche.'</nobr><br>'.date('d.m', $wochenmontag).'</A></td>'.$crlf;
if ($anz%8==0)
echo ' </tr><tr align="center">'.$crlf;
$datum+=60*60*24*7;
$woche++;
$wochenmontag+=60*60*24*7;
}
echo ' </SMALL></CENTER></SMALL>'.$crlf;
echo ' </tr></table></div></div></div></tr></td></table>'.$crlf;
}
?>