mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-16 22:42:16 +00:00
Problem behoben bei DropAufLehrstunde wodruch die Blockung nicht immer
korrekt übernommen wurde
This commit is contained in:
+23
-23
@@ -89,7 +89,7 @@ var studentDDObserver=
|
||||
{
|
||||
onDragStart: function (evt,transferData,action)
|
||||
{
|
||||
|
||||
|
||||
var tree = document.getElementById('student-tree')
|
||||
var row = { }
|
||||
var col = { }
|
||||
@@ -106,7 +106,7 @@ var studentDDObserver=
|
||||
var end = new Object();
|
||||
var numRanges = tree.view.selection.getRangeCount();
|
||||
var paramList= '';
|
||||
|
||||
|
||||
for (var t = 0; t < numRanges; t++)
|
||||
{
|
||||
tree.view.selection.getRangeAt(t,start,end);
|
||||
@@ -122,7 +122,7 @@ var studentDDObserver=
|
||||
paramList += ';'+uid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
transferData.data=new TransferData();
|
||||
transferData.data.addDataForFlavour("application/tempus-student",paramList);
|
||||
}
|
||||
@@ -298,7 +298,7 @@ var LektorFunktionDDObserver=
|
||||
alert('Mitarbeiter kann nur auf einen Studiengang gezogen werden');
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
uid=dropdata.data;
|
||||
|
||||
var req = new phpRequest('tempusDBDML.php','','');
|
||||
@@ -421,11 +421,11 @@ var listObserver=
|
||||
var paramList="?dragtype="+type+"&dragdatum="+dragdatum+"&pers_uid="+pers_uid+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&einheit="+einheit+"&old_ort="+old_ort+idList+"&aktion="+aktion;
|
||||
idList = TimeTableWeekGetMarkedIdList();
|
||||
paramList = paramList+idList;
|
||||
|
||||
|
||||
//die Buttons die verschoben werden grau einfaerben
|
||||
var styleNow=evt.target.getAttribute("style");
|
||||
evt.target.setAttribute("style",styleNow+"color:gray;");
|
||||
|
||||
|
||||
var items = document.getElementsByTagName('button');
|
||||
for each(var button in items)
|
||||
{
|
||||
@@ -439,8 +439,8 @@ var listObserver=
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
transferData.data=new TransferData();
|
||||
transferData.data.addDataForFlavour("application/tempus-lehrstunde",paramList);
|
||||
}
|
||||
@@ -545,7 +545,7 @@ var boardObserver=
|
||||
}
|
||||
else if(evt.target.tagName=="button")
|
||||
{
|
||||
|
||||
|
||||
if(getvariable('allow_lehrstunde_drop')=='true')
|
||||
{
|
||||
// Wenn direkt auf die Stunde gezogen wird, wird der Raum uebernommen und die unr gleich gesetzt
|
||||
@@ -579,7 +579,7 @@ var boardObserver=
|
||||
url+="&new_ort="+new_ort+"&kollisionsanzahl="+kollisionsanzahl;
|
||||
else
|
||||
url+="&aktion=stpl_move";
|
||||
|
||||
|
||||
if(new_unr)
|
||||
url+="&new_unr="+new_unr;
|
||||
if(new_blockung)
|
||||
@@ -617,8 +617,8 @@ function getNewBlockung(item)
|
||||
buttonunr=button.getAttribute('unr');
|
||||
buttonwochentag=button.getAttribute('wochentag');
|
||||
buttonstunde=button.getAttribute('stunde');
|
||||
|
||||
if(buttonunr==unr && buttonwochentag==wochentag && buttonstunde>stunde)
|
||||
|
||||
if(buttonunr==unr && buttonwochentag==wochentag && parseInt(buttonstunde)>parseInt(stunde))
|
||||
{
|
||||
blockung=blockung+1;
|
||||
}
|
||||
@@ -666,40 +666,40 @@ var verbandtreeDDObserver=
|
||||
var row = { }
|
||||
var col = { }
|
||||
var child = { }
|
||||
|
||||
|
||||
tree.treeBoxObject.getCellAt(evt.pageX, evt.pageY, row, col, child)
|
||||
|
||||
|
||||
if(row.value!=-1) //Drop on Row
|
||||
{
|
||||
//Ziel holen
|
||||
col = tree.columns ? tree.columns["gruppe"] : "gruppe";
|
||||
gruppe_kurzbz=tree.view.getCellText(row.value,col);
|
||||
|
||||
|
||||
col = tree.columns ? tree.columns["stg_kz"] : "stg_kz";
|
||||
stg_kz=tree.view.getCellText(row.value,col);
|
||||
|
||||
|
||||
col = tree.columns ? tree.columns["sem"] : "sem";
|
||||
sem=tree.view.getCellText(row.value,col);
|
||||
|
||||
|
||||
col = tree.columns ? tree.columns["ver"] : "ver";
|
||||
ver=tree.view.getCellText(row.value,col);
|
||||
|
||||
|
||||
col = tree.columns ? tree.columns["grp"] : "grp";
|
||||
grp=tree.view.getCellText(row.value,col);
|
||||
}
|
||||
else
|
||||
return false;
|
||||
|
||||
|
||||
if(gruppe_kurzbz=='' && sem=='')
|
||||
{
|
||||
alert('Zuteilung ist nur zu Spezial- oder Lehrverbandsgruppen moeglich');
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
uid=dropdata.data;
|
||||
|
||||
|
||||
var req = new phpRequest('student/studentDBDML.php','','');
|
||||
|
||||
|
||||
req.add('type','gruppenzuteilung');
|
||||
|
||||
req.add('uid', uid);
|
||||
@@ -708,7 +708,7 @@ var verbandtreeDDObserver=
|
||||
req.add('semester', sem);
|
||||
req.add('verband', ver);
|
||||
req.add('gruppe', grp);
|
||||
|
||||
|
||||
var response = req.executePOST();
|
||||
|
||||
var val = new ParseReturnValue(response)
|
||||
|
||||
@@ -595,7 +595,7 @@ elseif ($aktion=='lva_stpl_del_multi' || $aktion=='lva_stpl_del_single')
|
||||
{
|
||||
if($rechte->isBerechtigt('lehre/lvplan',null,'uid'))
|
||||
{
|
||||
$result_semester = $db->db_query("SELECT start,ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz='".addslashes($semester_aktuell)."';");
|
||||
$result_semester = $db->db_query("SELECT start,ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=".$db->db_add_param($semester_aktuell).";");
|
||||
if ($db->db_num_rows()>0)
|
||||
{
|
||||
$start=date('Y-m-d',$datum);
|
||||
@@ -643,7 +643,7 @@ if (!isset($semesterplan) || !$semesterplan)
|
||||
$begin=$ende=$datum;
|
||||
else
|
||||
{
|
||||
$db->db_query("SELECT start,ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz='".addslashes($semester_aktuell)."';");
|
||||
$db->db_query("SELECT start,ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=".$db->db_add_param($semester_aktuell).";");
|
||||
if ($db->db_num_rows()>0)
|
||||
{
|
||||
$row = $db->db_fetch_object();
|
||||
|
||||
Reference in New Issue
Block a user