mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-22 01:12:17 +00:00
This commit is contained in:
@@ -22,7 +22,7 @@ function onJumpNow()
|
||||
var sem=daten.getAttribute("sem");
|
||||
var ver=daten.getAttribute("ver");
|
||||
var grp=daten.getAttribute("grp");
|
||||
var einheit=daten.getAttribute("einheit");
|
||||
var gruppe=daten.getAttribute("gruppe");
|
||||
var ort=daten.getAttribute("ort");
|
||||
var pers_uid=daten.getAttribute("pers_uid");
|
||||
|
||||
@@ -31,7 +31,7 @@ function onJumpNow()
|
||||
//Aktuelles Datum ermitteln
|
||||
datum = ((d.getDate()+3)*60*60*24)+((d.getMonth())*31*24*60*60)+((d.getFullYear()-1970)*365*24*60*60);
|
||||
//alert(datum);
|
||||
var attributes="?type="+type+"&datum="+datum+"&ort="+ort+"&pers_uid="+pers_uid+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&einheit="+einheit;
|
||||
var attributes="?type="+type+"&datum="+datum+"&ort="+ort+"&pers_uid="+pers_uid+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
|
||||
var url = "<?php echo APP_ROOT; ?>content/timetable-week.xul.php";
|
||||
url+=attributes;
|
||||
if (url)
|
||||
@@ -48,14 +48,14 @@ function onJumpDate(wochen)
|
||||
var sem=daten.getAttribute("sem");
|
||||
var ver=daten.getAttribute("ver");
|
||||
var grp=daten.getAttribute("grp");
|
||||
var einheit=daten.getAttribute("einheit");
|
||||
var gruppe=daten.getAttribute("gruppe");
|
||||
var ort=daten.getAttribute("ort");
|
||||
var pers_uid=daten.getAttribute("pers_uid");
|
||||
|
||||
// neues Datum berechnen. Eine Woche sind 604800 Sekunden.
|
||||
datum+=(604800*wochen)+1;
|
||||
|
||||
var attributes="?type="+type+"&datum="+datum+"&ort="+ort+"&pers_uid="+pers_uid+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&einheit="+einheit;
|
||||
var attributes="?type="+type+"&datum="+datum+"&ort="+ort+"&pers_uid="+pers_uid+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
|
||||
var url = "<?php echo APP_ROOT; ?>content/timetable-week.xul.php";
|
||||
url+=attributes;
|
||||
if (url)
|
||||
@@ -72,7 +72,7 @@ function onJumpDateRel(evt)
|
||||
var sem=daten.getAttribute("sem");
|
||||
var ver=daten.getAttribute("ver");
|
||||
var grp=daten.getAttribute("grp");
|
||||
var einheit=daten.getAttribute("einheit");
|
||||
var gruppe=daten.getAttribute("gruppe");
|
||||
var ort=daten.getAttribute("ort");
|
||||
var pers_uid=daten.getAttribute("pers_uid");
|
||||
var kw=daten.getAttribute("kw");
|
||||
@@ -82,7 +82,7 @@ function onJumpDateRel(evt)
|
||||
// neues Datum berechnen. Eine Woche sind 604800 Sekunden.
|
||||
datum+=(604800*wochen)+1;
|
||||
|
||||
var attributes="?type="+type+"&datum="+datum+"&ort="+ort+"&pers_uid="+pers_uid+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&einheit="+einheit;
|
||||
var attributes="?type="+type+"&datum="+datum+"&ort="+ort+"&pers_uid="+pers_uid+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
|
||||
var url = "<?php echo APP_ROOT; ?>content/timetable-week.xul.php";
|
||||
url+=attributes;
|
||||
if (url)
|
||||
@@ -99,7 +99,7 @@ function onLVAdoStpl(evt)
|
||||
var sem=daten.getAttribute("sem");
|
||||
var ver=daten.getAttribute("ver");
|
||||
var grp=daten.getAttribute("grp");
|
||||
var einheit=daten.getAttribute("einheit");
|
||||
var gruppe=daten.getAttribute("gruppe");
|
||||
var ort=daten.getAttribute("ort");
|
||||
var pers_uid=daten.getAttribute("pers_uid");
|
||||
var aktion=evt.target.getAttribute("aktion");
|
||||
@@ -114,7 +114,7 @@ function onLVAdoStpl(evt)
|
||||
aktion+="_search";
|
||||
var idList=evt.target.getAttribute("idList");
|
||||
|
||||
var attributes="?type="+type+"&datum="+datum+"&ort="+ort+"&pers_uid="+pers_uid+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&einheit="+einheit;
|
||||
var attributes="?type="+type+"&datum="+datum+"&ort="+ort+"&pers_uid="+pers_uid+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
|
||||
attributes+=idList+"&aktion="+aktion+"&time="+oneDate.getTime();
|
||||
var url = "<?php echo APP_ROOT; ?>content/timetable-week.xul.php";
|
||||
url+=attributes+"&bla=";
|
||||
@@ -136,14 +136,14 @@ function onStplSearchRoom(event)
|
||||
var sem=daten.getAttribute("sem");
|
||||
var ver=daten.getAttribute("ver");
|
||||
var grp=daten.getAttribute("grp");
|
||||
var einheit=daten.getAttribute("einheit");
|
||||
var gruppe=daten.getAttribute("gruppe");
|
||||
var ort=daten.getAttribute("ort");
|
||||
var pers_uid=daten.getAttribute("pers_uid");
|
||||
var aktion=event.target.getAttribute("aktion");
|
||||
aktion+="_single_search";
|
||||
var idList=event.target.getAttribute("idList");
|
||||
|
||||
var attributes="\n?type="+type+"&datum="+datum+"&ort="+ort+"&pers_uid="+pers_uid+"\n&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"\n&einheit="+einheit;
|
||||
var attributes="\n?type="+type+"&datum="+datum+"&ort="+ort+"&pers_uid="+pers_uid+"\n&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"\n&gruppe="+gruppe;
|
||||
attributes+=idList+"&aktion="+aktion;
|
||||
var url = "<?php echo APP_ROOT; ?>content/timetable-week.xul.php";
|
||||
url+=attributes;
|
||||
@@ -163,14 +163,14 @@ function onStplDelete(aktion)
|
||||
var sem=daten.getAttribute("sem");
|
||||
var ver=daten.getAttribute("ver");
|
||||
var grp=daten.getAttribute("grp");
|
||||
var einheit=daten.getAttribute("einheit");
|
||||
var gruppe=daten.getAttribute("gruppe");
|
||||
var ort=daten.getAttribute("ort");
|
||||
var pers_uid=daten.getAttribute("pers_uid");
|
||||
var idList=document.popupNode.getAttribute("idList");
|
||||
var doIt=true;
|
||||
doIt=confirm('Es werden die gewaehlten Eintraege aus dem Stundenplan geloescht!\nSind Sie sicher?')
|
||||
|
||||
var attributes="\n?type="+type+"&datum="+datum+"&ort="+ort+"&pers_uid="+pers_uid+"\n&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"\n&einheit="+einheit;
|
||||
var attributes="\n?type="+type+"&datum="+datum+"&ort="+ort+"&pers_uid="+pers_uid+"\n&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"\n&gruppe="+gruppe;
|
||||
attributes+=idList+"&aktion="+aktion;
|
||||
var url = "<?php echo APP_ROOT; ?>content/timetable-week.xul.php";
|
||||
url+=attributes;
|
||||
@@ -187,13 +187,13 @@ function onStplDetail(event)
|
||||
var sem=event.target.getAttribute("sem");
|
||||
var ver=event.target.getAttribute("ver");
|
||||
var grp=event.target.getAttribute("grp");
|
||||
var einheit=event.target.getAttribute("einheit");
|
||||
var gruppe=event.target.getAttribute("gruppe");
|
||||
var datum=event.target.getAttribute("datum");
|
||||
var stunde=event.target.getAttribute("stunde");
|
||||
var pers_uid=event.target.getAttribute("pers_uid");
|
||||
var ort_kurzbz=event.target.getAttribute("ort_kurzbz");
|
||||
|
||||
var attributes="?type="+type+"&datum="+datum+"&stunde="+stunde+"&ort_kurzbz="+ort_kurzbz+"&pers_uid="+pers_uid+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&einheit="+einheit+"&ort_kurzbz="+ort_kurzbz;
|
||||
var attributes="?type="+type+"&datum="+datum+"&stunde="+stunde+"&ort_kurzbz="+ort_kurzbz+"&pers_uid="+pers_uid+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe+"&ort_kurzbz="+ort_kurzbz;
|
||||
attributes+=idList;
|
||||
var url = "<?php echo APP_ROOT; ?>content/lehrstunde.rdf.php";
|
||||
url+=attributes;
|
||||
|
||||
@@ -142,14 +142,14 @@ $num_rows_stunde=pg_numrows($result_stunde);
|
||||
onclick="onLVAdoStpl(event);"
|
||||
idList="rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#lva_ids"
|
||||
aktion="lva_stpl_del_single"
|
||||
tooltiptext="Löschen SingleWeek"
|
||||
tooltiptext="Löschen SingleWeek"
|
||||
/>
|
||||
<toolbarbutton
|
||||
image="../skin/images/lvaMultiDel.png"
|
||||
onclick="onLVAdoStpl(event);"
|
||||
idList="rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#lva_ids"
|
||||
aktion="lva_stpl_del_multi"
|
||||
tooltiptext="Löschen MultiWeek"
|
||||
tooltiptext="Löschen MultiWeek"
|
||||
/>
|
||||
</hbox>
|
||||
</row>
|
||||
|
||||
@@ -23,8 +23,10 @@ $uid=$REMOTE_USER;
|
||||
$error_msg='';
|
||||
if (!$conn = pg_pconnect(CONN_STRING))
|
||||
$error_msg.='Es konnte keine Verbindung zum Server aufgebaut werden!';
|
||||
|
||||
// Benutzerdefinierte Variablen laden
|
||||
$error_msg.=loadVariables($conn,$uid);
|
||||
|
||||
if (!isset($ignore_kollision))
|
||||
$ignore_kollision=(boolean)false;
|
||||
elseif ($ignore_kollision=='false')
|
||||
@@ -264,11 +266,12 @@ elseif ($aktion=='lva_multi_set')
|
||||
$ferien->getAll(0);
|
||||
|
||||
// Ende holen
|
||||
$result_semester=@pg_query($conn,"SELECT start,ende FROM tbl_studiensemester WHERE studiensemester_kurzbz='$semester_aktuell';");
|
||||
if (!$result_semester=pg_query($conn,"SELECT * FROM public.tbl_studiensemester WHERE studiensemester_kurzbz='$semester_aktuell';"))
|
||||
die (pg_last_error($conn));
|
||||
if (pg_numrows($result_semester)>0)
|
||||
$ende=pg_result($result_semester,0,'ende');
|
||||
else
|
||||
$error_msg.='Fatal Error: Ende Datum ist nicht gesetzt!';
|
||||
$error_msg.="Fatal Error: Ende Datum ist nicht gesetzt ($semester_aktuell)!";
|
||||
//echo '<label>'.$ende.'</label>';
|
||||
$ende=mktime(0,0,1,substr($ende,5,2),substr($ende,8,2),substr($ende,0,4));
|
||||
$anz_lvas=count($lva_id);
|
||||
@@ -280,13 +283,13 @@ elseif ($aktion=='lva_multi_set')
|
||||
$semesterstunden=array();
|
||||
$offenestunden=array();
|
||||
// LVAs holen
|
||||
$sql_query='SELECT * FROM '.$lva_stpl_view.' WHERE';
|
||||
$sql_query='SELECT * FROM lehre.'.$lva_stpl_view.' WHERE';
|
||||
$lvas='';
|
||||
foreach ($lva_id as $id)
|
||||
$lvas.=' OR lehrveranstaltung_id='.$id;
|
||||
$lvas.=' OR lehreinheit_id='.$id;
|
||||
$lvas=substr($lvas,3);
|
||||
$sql_query.=$lvas;
|
||||
if(!$result_lva=pg_exec($conn, $sql_query))
|
||||
if(!$result_lva=pg_query($conn, $sql_query))
|
||||
$error_msg.=pg_last_error($conn);
|
||||
$num_rows_lva=pg_numrows($result_lva);
|
||||
// Daten aufbereiten
|
||||
@@ -348,7 +351,8 @@ elseif ($aktion=='lva_multi_set')
|
||||
//LVAs holen und pruefen ob moeglich
|
||||
for ($i=0;$i<$anz_lvas;$i++)
|
||||
{
|
||||
$lva[$i]=new lehrveranstaltung($conn,$lva_id[$i]);
|
||||
$lva[$i]=new lehreinheit($conn);
|
||||
$lva[$i]->loadLE($lva_id[$i]);
|
||||
for ($j=0;$j<$block;$j++)
|
||||
if (!$lva[$i]->check_lva($new_datum,$new_stunde+$j,$new_ort,$db_stpl_table) && !$ignore_kollision)
|
||||
$error_msg.=$lva[$i]->errormsg;
|
||||
@@ -371,7 +375,7 @@ elseif ($aktion=='lva_multi_set')
|
||||
// Lehrveranstaltungen aus dem Stundenplan loeschen
|
||||
elseif ($aktion=='lva_stpl_del_multi' || $aktion=='lva_stpl_del_single')
|
||||
{
|
||||
$result_semester=@pg_query($conn,"SELECT start,ende FROM tbl_studiensemester WHERE studiensemester_kurzbz='$semester_aktuell';");
|
||||
$result_semester=pg_query($conn,"SELECT start,ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz='$semester_aktuell';");
|
||||
if (pg_numrows($result_semester)>0)
|
||||
{
|
||||
$start=date('Y-m-d',$datum);
|
||||
@@ -381,9 +385,9 @@ elseif ($aktion=='lva_stpl_del_multi' || $aktion=='lva_stpl_del_single')
|
||||
$ende=date('Y-m-d',jump_week($datum,1));
|
||||
$anz_lvas=count($lva_id);
|
||||
$sql_query_lvaid='';
|
||||
$sql_query='DELETE FROM '.TABLE_BEGIN.$db_stpl_table.' WHERE (';
|
||||
$sql_query='DELETE FROM lehre.'.TABLE_BEGIN.$db_stpl_table.' WHERE (';
|
||||
for ($i=0;$i<$anz_lvas;$i++)
|
||||
$sql_query_lvaid.=' OR lehrveranstaltung_id='.$lva_id[$i];
|
||||
$sql_query_lvaid.=' OR lehreinheit_id='.$lva_id[$i];
|
||||
$sql_query_lvaid=substr($sql_query_lvaid,3);
|
||||
$sql_query.=$sql_query_lvaid;
|
||||
$sql_query.=") AND datum>='$start' AND datum<'$ende'";
|
||||
@@ -407,7 +411,7 @@ if (!isset($semesterplan) || !$semesterplan)
|
||||
$begin=$ende=$datum;
|
||||
else
|
||||
{
|
||||
$result_semester=@pg_query($conn,"SELECT start,ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz='$semester_aktuell';");
|
||||
$result_semester=pg_query($conn,"SELECT start,ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz='$semester_aktuell';");
|
||||
if (pg_numrows($result_semester)>0)
|
||||
{
|
||||
$begin=strtotime(pg_result($result_semester,0,'start'));
|
||||
|
||||
Reference in New Issue
Block a user