User story #893: Set correct link from FAS

This commit is contained in:
bison-paolo
2017-03-08 18:26:50 +01:00
parent faed608435
commit 599e57dd4f
3 changed files with 76 additions and 6 deletions
+13 -5
View File
@@ -23,10 +23,15 @@
require_once('../config/vilesci.config.inc.php');
require_once('../include/functions.inc.php');
require_once('../include/variable.class.php');
require_once('../include/benutzer.class.php');
$user = get_uid();
$variable = new variable();
$variable->loadVariables(get_uid());
if(false): ?> <script type="text/javascript"> <?php endif;
$variable->loadVariables($user);
$benutzer = new benutzer();
$benutzer->load($user);
?>
var currentAuswahl=new auswahlValues();
@@ -1191,14 +1196,17 @@ function MessageNew()
{
var tree = document.getElementById('student-tree');
if(tree.currentIndex==-1)
if (tree.currentIndex == -1)
{
alert("Bitte markieren Sie zuerst eine Person");
}
else
{
var person_id = getTreeCellText(tree, 'student-treecol-person_id', tree.currentIndex);
window.open('<?php echo APP_ROOT ?>/index.ci.php/system/Messages/outbox/'+person_id,'Outbox','');
var prestudentIdArray = getMultipleTreeCellText(tree, 'student-treecol-prestudent_id');
var action = '<?php echo APP_ROOT ?>index.ci.php/system/Messages/write/' + <?php echo $benutzer->person_id; ?>;
openWindowPostArray(action, 'prestudent_id', prestudentIdArray);
}
}
+49
View File
@@ -261,6 +261,55 @@ function getTreeCellText(tree, col, idx)
return tree.view.getCellText(idx, col);
}
/**
* Like getTreeCellText, but returns all the selected values (= cooler!)
* @param: tree
* @param: col
*/
function getMultipleTreeCellText(tree, col)
{
var start = new Object();
var end = new Object();
var numRanges = tree.view.selection.getRangeCount();
var returnArray = new Array();
for (var t = 0; t < numRanges; t++)
{
tree.view.selection.getRangeAt(t, start, end);
for (var v = start.value; v <= end.value; v++)
{
returnArray.push(getTreeCellText(tree, col, v));
}
}
return returnArray;
}
/**
* Create a window with a form inside and a hidden input for each element of the given array
* @param: action
* @param: dataName
* @param: data
*/
function openWindowPostArray(action, dataName, data)
{
var FORM_HEAD = "<form id='postform-form' name='postfrm' action='' method='POST'>\n";
var FORM_FOOT = "</form>";
var inputsHidden = "";
for (var i = 0; i < data.length; i++)
{
inputsHidden += " <input type='hidden' name='" + dataName + "[]' value='" + data[i] + "' />\n";
}
var newwindow = window.open("", "FAS");
newwindow.document.getElementsByTagName('body')[0].innerHTML = FORM_HEAD + inputsHidden + FORM_FOOT;
newwindow.document.getElementById('postform-form').action = action;
newwindow.document.postfrm.submit();
}
// ****
// * Trim Member Function fuer Strings
// ****
+14 -1
View File
@@ -93,7 +93,20 @@ function loadMessages(person_id, fas_person_id)
// ****
function MessagesNewMessage()
{
window.open('<?php echo APP_ROOT ?>index.ci.php/system/Messages/write/'+MessageSenderPersonID+'/'+MessagePersonID,'Message','');
var tree = parent.document.getElementById('student-tree');
if (tree.currentIndex == -1)
{
alert("Bitte markieren Sie zuerst eine Person");
}
else
{
var prestudentIdArray = getMultipleTreeCellText(tree, 'student-treecol-prestudent_id');
var action = '<?php echo APP_ROOT ?>index.ci.php/system/Messages/write/' + MessageSenderPersonID;
openWindowPostArray(action, 'prestudent_id', prestudentIdArray);
}
}
/**