blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 18:02:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Anpassung FAS und Tempus an Datenbankklasse

Browse Source 
- Entfernung des alten FAS-Prototypen-Moduls
This commit is contained in:
Andreas Österreicher
2009-06-19 11:39:09 +00:00
parent 6241258141
commit 17ba3bab8d
97 changed files with 595 additions and 9487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.inc.php
+1
View File
@@ -19,6 +19,7 @@
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
// Auth: Benutzer des Webportals
function get_uid()
include/lehrstunde.class.php
+6 -6
View File
@@ -212,6 +212,7 @@ class lehrstunde extends basis_db
*/
public function load_lehrstunden($type, $datum_von, $datum_bis, $uid, $ort_kurzbz=NULL, $studiengang_kz=NULL, $sem=NULL, $ver=NULL, $grp=NULL, $gruppe_kurzbz=NULL, $stpl_view='stundenplan', $idList=null)
{
$num_rows_einheit=0;
///////////////////////////////////////////////////////////////////////
// Parameter Checken
// Bezeichnung der Stundenplan-Tabelle und des Keys
@@ -296,15 +297,13 @@ class lehrstunde extends basis_db
$this->ss=studiensemester::getNearest();
$sql_query="SELECT gruppe_kurzbz FROM public.tbl_benutzergruppe WHERE uid='".addslashes($uid)."' AND (studiensemester_kurzbz='".addslashes($this->ss)."' OR studiensemester_kurzbz IS NULL)";
if (!$this->db_query($sql_query))
if (!$result_einheit=$this->db_query($sql_query))
{
$this->errormsg=pg_last_error($this->conn);
return false;
}
else
{
$result_einheit = $this->db_result;
}
else
$num_rows_einheit=$db->db_num_rows($result_einheit);
}
///////////////////////////////////////////////////////////////////////
@@ -338,8 +337,9 @@ class lehrstunde extends basis_db
$sql_query.=' AND gruppe_kurzbz IS NULL';
$sql_query.=' )';
while($row=$this->db_fetch_object($result_einheit))
for ($i=0;$i<$num_rows_einheit;$i++)
{
$row=$db->db_fetch_object($result_einheit,$i);
$sql_query.=" OR gruppe_kurzbz='$row->gruppe_kurzbz'";
}
$sql_query.=')';
include/wochenplan.class.php
+9 -9
View File
@@ -246,7 +246,7 @@ class wochenplan extends basis_db
//echo $sql_query;
if(!($this->db_query($sql_query)))
die($this->db_last_error());
if($row = db_fetch_object())
if($row = $this->db_fetch_object())
{
$this->stg_bez = $row->bezeichnung;
$this->stg_kurzbz = $row->typ.$row->kurzbz;
@@ -982,21 +982,21 @@ class wochenplan extends basis_db
stg_kz="'.$this->stg_kz.'" sem="'.$this->sem.'" ver="'.$this->ver.'"
grp="'.$this->grp.'" gruppe="'.$this->gruppe_kurzbz.'"
datum="'.date("Y-m-d",$datum).'" stunde="'.$j.'"
pers_uid="'.$this->pers_uid.'" ort_kurzbz="'.utf8_encode($this->ort_kurzbz).'">';
pers_uid="'.$this->pers_uid.'" ort_kurzbz="'.$this->ort_kurzbz.'">';
echo '<label align="center">'.$blink_ein;
echo utf8_encode($lf);
echo $lf;
echo $lvb;
if ($this->type!='lektor')
echo utf8_encode($lkt);
echo $lkt;
if ($this->type!='ort')
echo utf8_encode($orte);
echo $orte;
echo $blink_aus.'</label></button>';
}
}
if (isset($this->std_plan[$i][$j][0]->frei_orte))
foreach ($this->std_plan[$i][$j][0]->frei_orte as $f_ort)
{
echo '<label value="'.utf8_encode($f_ort).'"
echo '<label value="'.$f_ort.'"
styleOrig=""
ondragenter="nsDragAndDrop.dragEnter(event,boardObserver)"
ondragexit="nsDragAndDrop.dragExit(event,boardObserver)"
@@ -1233,9 +1233,9 @@ class wochenplan extends basis_db
// Initialiseren der Variablen
$lehrverband=array();
// Name der View
$stpl_view=VIEW_BEGIN.$db_stpl_table;
$lva_stpl_view=VIEW_BEGIN.'lva_'.$db_stpl_table;
$stpl_table=TABLE_BEGIN.$db_stpl_table;
$stpl_view='lehre.'.VIEW_BEGIN.$db_stpl_table;
$lva_stpl_view='lehre.'.VIEW_BEGIN.'lva_'.$db_stpl_table;
$stpl_table='lehre.'.TABLE_BEGIN.$db_stpl_table;
//Kalenderdaten setzen
$this->datum=montag($datum);
$this->datum_begin=$this->datum;
include/zeitwunsch.class.php
+1
View File
@@ -27,6 +27,7 @@ class zeitwunsch extends basis_db
public $errormsg; // string
public $new; // boolean
public $zeitwuensche = array(); // zeitwunsch Objekt
public $zeitwunsch;
//Tabellenspalten
public $stunde; // smalint