mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-23 09:52:22 +00:00
Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox
This commit is contained in:
Andreas Österreicher
+1
-1
@@ -95,7 +95,7 @@ foreach($addon_obj->result as $addon)
|
||||
<command id="menu-prefs-stpltable-stundenplan:command" oncommand="stpltableChange('stundenplan');"/>
|
||||
<command id="menu-prefs-stpltable-stundenplandev:command" oncommand="stpltableChange('stundenplandev');"/>
|
||||
<command id="menu-prefs-kontofilterstg:command" oncommand="EinstellungenKontoFilterStgChange();"/>
|
||||
<command id="menu-prefs-number_displayed_past_studiensemester:command" oncommand="variableChangeValue('number_displayed_past_studiensemester');"/>
|
||||
<command id="menu-prefs-number_displayed_past_studiensemester:command" oncommand="variableChangeValueIfNumber('number_displayed_past_studiensemester');"/>
|
||||
<command id="menu-statistic-lehrauftraege:command" oncommand="StatistikPrintLehrauftraege();"/>
|
||||
<command id="menu-statistic-lvplanung:command" oncommand="StatistikPrintLVPlanung();"/>
|
||||
<command id="menu-statistic-lvplanungexcel:command" oncommand="StatistikPrintLVPlanungExcel();"/>
|
||||
|
||||
@@ -2099,6 +2099,26 @@ function variableChangeValue(variable)
|
||||
}
|
||||
}
|
||||
|
||||
// ****
|
||||
// * Aendert eines Variablenwert nach Überprüfung der Eingabe auf gültigen Wert (kleiner 100)
|
||||
// ****
|
||||
function variableChangeValueIfNumber(variable)
|
||||
{
|
||||
var variablevalue = getvariable(variable);
|
||||
|
||||
if(variablevalue = prompt('Bitte geben Sie den neuen Wert fuer '+variable+' ein', variablevalue))
|
||||
{
|
||||
if ((typeof(parseInt(variablevalue)) === 'number' && variablevalue < 100 ))
|
||||
{
|
||||
variableChange(variable, '', variablevalue);
|
||||
}
|
||||
else
|
||||
{
|
||||
alert(variablevalue + ' ist keine gültige Eingabe! Bitte eine Zahl eingeben!');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ****
|
||||
// * Sendet einen Request zum Aendern einer Variable
|
||||
// ****
|
||||
|
||||
@@ -481,9 +481,9 @@ $p = new phrasen($sprache);
|
||||
<textbox id="lehrveranstaltung-lehreinheitmitarbeiter-textbox-anmerkung" disabled="true" maxlength="255" width="300" oninput="LeMitarbeiterValueChanged();"/>
|
||||
</row>
|
||||
<row>
|
||||
<label id="lehrveranstaltung-lehreinheitmitarbeiter-label-semesterstunden" control="lehrveranstaltung-lehreinheitmitarbeiter-textbox-semesterstunden" value="Semesterstunden: "/>
|
||||
<label id="lehrveranstaltung-lehreinheitmitarbeiter-label-semesterstunden" control="lehrveranstaltung-lehreinheitmitarbeiter-textbox-semesterstunden" value="Lehrauftragsstunden (LAS): "/>
|
||||
<textbox id="lehrveranstaltung-lehreinheitmitarbeiter-textbox-semesterstunden" disabled="true" maxlength="6" flex="1" oninput="LeMitarbeiterValueChanged();LeMitarbeiterGesamtkosten(); if(parseInt(this.value)) document.getElementById('lehrveranstaltung-lehreinheitmitarbeiter-textbox-planstunden').value= parseInt(this.value)"/>
|
||||
<label control="lehrveranstaltung-lehreinheitmitarbeiter-textbox-planstunden" value="Planstunden: "/>
|
||||
<label control="lehrveranstaltung-lehreinheitmitarbeiter-textbox-planstunden" tooltiptext="LVPLS" value="LV-Plan Stunden: "/>
|
||||
<textbox id="lehrveranstaltung-lehreinheitmitarbeiter-textbox-planstunden" disabled="true" maxlength="3" flex="1" oninput="LeMitarbeiterValueChanged();"/>
|
||||
</row>
|
||||
<row>
|
||||
|
||||
@@ -59,7 +59,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/lehrveranstaltungnotenov
|
||||
</popupset>
|
||||
<toolbox>
|
||||
<toolbar id="lehrveranstaltung-nav-toolbar">
|
||||
<toolbarbutton id="lehrveranstaltung-toolbar-neu" label="Neue Lehreinheit" oncommand="LeNeu();" disabled="true" image="../skin/images/NeuDokument.png" tooltiptext="Neue Lehreinheit anlegen" />
|
||||
<toolbarbutton id="lehrveranstaltung-toolbar-neu" label="Neuer LV-Teil" oncommand="LeNeu();" disabled="true" image="../skin/images/NeuDokument.png" tooltiptext="Neue Lehreinheit anlegen" />
|
||||
<toolbarbutton id="lehrveranstaltung-toolbar-del" label="Loeschen" oncommand="LeDelete();" disabled="true" image="../skin/images/DeleteIcon.png" tooltiptext="Lehreinheiten löschen"/>
|
||||
<toolbarbutton id="lehrveranstaltung-toolbar-refresh" label="Aktualisieren" oncommand="LvTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
|
||||
<toolbarbutton id="lehrveranstaltung-toolbar-lehrauftrag" label="Lehrauftrag" oncommand="LvCreateLehrauftrag()" disabled="false" image="../skin/images/person.gif" tooltiptext="Lehrauftrag ausdrucken" hidden="true"/>
|
||||
|
||||
@@ -252,7 +252,7 @@ else
|
||||
array('uid', 'stg_kz', 'person_id', 'id', 'prestudent_id', 'buchungsnummern', 'ss', 'abschlusspruefung_id',
|
||||
'typ', 'all', 'preoutgoing_id', 'lvid', 'projekt_kurzbz', 'von', 'bis', 'stundevon', 'stundebis',
|
||||
'sem', 'lehreinheit', 'mitarbeiter_uid', 'studienordnung_id', 'fixangestellt', 'standort',
|
||||
'abrechnungsmonat', 'form')
|
||||
'abrechnungsmonat', 'form', 'projektarbeit_id', 'betreuerart_kurzbz')
|
||||
)
|
||||
)
|
||||
{
|
||||
|
||||
@@ -107,9 +107,9 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/ressource.overlay.xul.php"
|
||||
<vbox id="vbox-main">
|
||||
<tabbox id="tabbox-main" flex="3" orient="vertical">
|
||||
<tabs id="tabs-planner-main" orient="horizontal">
|
||||
<tab id="tab-projekte" label="Projekte" />
|
||||
<tab id="tab-projekte" label="Projekte" selected="true" />
|
||||
<tab id="tab-projektphase" label="Phasen" />
|
||||
<tab id="tab-projekttask" label="Tasks" selected="true" />
|
||||
<tab id="tab-projekttask" label="Tasks"/>
|
||||
<tab id="tab-dokumente" label="Dokumente" />
|
||||
<tab id="tab-ressourceauslastung" label="Ressourcen" />
|
||||
<tab id="tab-bestellung" label="Bestellungen" />
|
||||
@@ -176,7 +176,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/ressource.overlay.xul.php"
|
||||
<treechildren>
|
||||
<treeitem uri="rdf:*">
|
||||
<treerow>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/ressource/rdf#bezeichnung"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/ressource/rdf#bezeichnung"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/ressource/rdf#rdf_description"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/ressource/rdf#typ"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/ressource/rdf#ressource_id"/>
|
||||
|
||||
@@ -6,76 +6,77 @@ require_once('../../include/functions.inc.php');
|
||||
|
||||
function updateProjektRessource()
|
||||
{
|
||||
if(projekt_ressource_id!='')
|
||||
if(projekt_ressource_id!='')
|
||||
{
|
||||
aufwand = document.getElementById("textbox-ressource-aufwand").value;
|
||||
if (document.getElementById("leitung").selected)
|
||||
funktion_kurzbz = 'Leitung';
|
||||
else
|
||||
funktion_kurzbz = 'Mitarbeiter';
|
||||
|
||||
try
|
||||
{
|
||||
var soapBody = new SOAPObject("saveProjektRessource");
|
||||
var projektRessource = new SOAPObject("projektRessource");
|
||||
|
||||
projektRessource.appendChild(new SOAPObject("projekt_ressource_id")).val(projekt_ressource_id);
|
||||
|
||||
if(projekt_kurzbz != '')
|
||||
{
|
||||
projektRessource.appendChild(new SOAPObject("projektphase_id")).val('');
|
||||
projektRessource.appendChild(new SOAPObject("projekt_kurzbz")).val(projekt_kurzbz);
|
||||
var res_binding = window.opener.document.getElementById('box-projekt-ressourcen');
|
||||
}
|
||||
else if(projektphase_id != '')
|
||||
{
|
||||
projektRessource.appendChild(new SOAPObject("projektphase_id")).val(projektphase_id);
|
||||
projektRessource.appendChild(new SOAPObject("projekt_kurzbz")).val('');
|
||||
var res_binding = window.opener.document.getElementById('box-projekt-ressource-phase');
|
||||
}
|
||||
|
||||
projektRessource.appendChild(new SOAPObject("ressource_id")).val(ressource_id);
|
||||
projektRessource.appendChild(new SOAPObject("funktion_kurzbz")).val(funktion_kurzbz);
|
||||
projektRessource.appendChild(new SOAPObject("beschreibung")).val(beschreibung);
|
||||
projektRessource.appendChild(new SOAPObject("aufwand")).val(aufwand);
|
||||
|
||||
soapBody.appendChild(projektRessource);
|
||||
|
||||
var sr = new SOAPRequest("saveProjektRessource",soapBody);
|
||||
SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/ressource_projekt.soap.php?"+gettimestamp();
|
||||
|
||||
function mycallb(obj, projekt_kurzbz, projektphase_id)
|
||||
{
|
||||
var ressourcebinding=obj;
|
||||
var projekt = projekt_kurzbz;
|
||||
var phase = projektphase_id;
|
||||
|
||||
this.invoke=function (respObj)
|
||||
{
|
||||
try
|
||||
{
|
||||
var id = respObj.Body[0].saveProjektRessourceResponse[0].message[0].Text;
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
var fehler = respObj.Body[0].Fault[0].faultstring[0].Text;
|
||||
alert('Fehler: '+fehler);
|
||||
return;
|
||||
}
|
||||
// Ressourcen Tree aktualisieren
|
||||
ressourcebinding.LoadRessourceTree(projekt, phase);
|
||||
|
||||
aufwand = document.getElementById("textbox-ressource-aufwand").value;
|
||||
if (document.getElementById("leitung").selected)
|
||||
funktion_kurzbz = 'Leitung';
|
||||
else
|
||||
funktion_kurzbz = 'Mitarbeiter';
|
||||
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
var soapBody = new SOAPObject("saveProjektRessource");
|
||||
var projektRessource = new SOAPObject("projektRessource");
|
||||
|
||||
projektRessource.appendChild(new SOAPObject("projekt_ressource_id")).val(projekt_ressource_id);
|
||||
|
||||
if(projekt_kurzbz != '')
|
||||
{
|
||||
projektRessource.appendChild(new SOAPObject("projektphase_id")).val('');
|
||||
projektRessource.appendChild(new SOAPObject("projekt_kurzbz")).val(projekt_kurzbz);
|
||||
}
|
||||
else if(projektphase_id != '')
|
||||
{
|
||||
projektRessource.appendChild(new SOAPObject("projektphase_id")).val(projektphase_id);
|
||||
projektRessource.appendChild(new SOAPObject("projekt_kurzbz")).val('');
|
||||
}
|
||||
|
||||
projektRessource.appendChild(new SOAPObject("ressource_id")).val(ressource_id);
|
||||
projektRessource.appendChild(new SOAPObject("funktion_kurzbz")).val(funktion_kurzbz);
|
||||
projektRessource.appendChild(new SOAPObject("beschreibung")).val(beschreibung);
|
||||
projektRessource.appendChild(new SOAPObject("aufwand")).val(aufwand);
|
||||
|
||||
soapBody.appendChild(projektRessource);
|
||||
|
||||
var sr = new SOAPRequest("saveProjektRessource",soapBody);
|
||||
SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/ressource_projekt.soap.php?"+gettimestamp();
|
||||
|
||||
function mycallb(obj)
|
||||
{
|
||||
var me=obj;
|
||||
this.invoke=function (respObj)
|
||||
{
|
||||
try
|
||||
{
|
||||
var id = respObj.Body[0].saveProjektRessourceResponse[0].message[0].Text;
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
var fehler = respObj.Body[0].Fault[0].faultstring[0].Text;
|
||||
alert('Fehler: '+fehler);
|
||||
return;
|
||||
}
|
||||
me.RefreshRessource();
|
||||
}
|
||||
}
|
||||
|
||||
var cb=new mycallb(this);
|
||||
|
||||
//SOAPClient.SendRequest(sr,cb.invoke);
|
||||
SOAPClient.SendRequest(sr);
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
debug("Ressource load failed with exception: "+e);
|
||||
}
|
||||
|
||||
// Popup schließen
|
||||
window.close();
|
||||
}
|
||||
//window.opener.location.reload(false);
|
||||
window.close();
|
||||
}
|
||||
|
||||
// Callback fuer aktualisierung des Trees nach dem Speichern
|
||||
var cb=new mycallb(res_binding, projekt_kurzbz, projektphase_id);
|
||||
SOAPClient.SendRequest(sr,cb.invoke);
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
debug("Ressource load failed with exception: "+e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ require_once('../../config/vilesci.config.inc.php');
|
||||
|
||||
var TaskSelectID=null; //ID des Task Eintrages der nach dem Refresh markiert werden soll
|
||||
var filterErledigt; //Tasks filtern
|
||||
var currentProjektPhaseID;
|
||||
var currentProjektPhaseID;
|
||||
// ********** Observer und Listener ************* //
|
||||
|
||||
// ****
|
||||
@@ -81,13 +81,13 @@ function LoadTasks(projekt_phase_id, filter)
|
||||
{
|
||||
// wenn phase übergeben wurde -> setzte globale variable
|
||||
if(projekt_phase_id != null && projekt_phase_id != '' && typeof optional && "undefined")
|
||||
currentProjektPhaseID = projekt_phase_id;
|
||||
|
||||
currentProjektPhaseID = projekt_phase_id;
|
||||
|
||||
// wenn filter übergeben wurde -> setze globale variable
|
||||
if(filter != null && filter != '' && typeof filter != "undefined")
|
||||
filterErledigt = filter;
|
||||
|
||||
url = "<?php echo APP_ROOT; ?>rdf/projekttask.rdf.php?projektphase_id="+currentProjektPhaseID+"&"+gettimestamp();
|
||||
|
||||
url = "<?php echo APP_ROOT; ?>rdf/projekttask.rdf.php?projektphase_id="+currentProjektPhaseID+"&"+gettimestamp();
|
||||
|
||||
// überprüfe ob filter gesetzt ist
|
||||
if(filterErledigt != null)
|
||||
@@ -100,7 +100,7 @@ function LoadTasks(projekt_phase_id, filter)
|
||||
{
|
||||
treeTask.database.RemoveDataSource(oldDatasources.getNext());
|
||||
}
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
datasourceTreeTask.removeXMLSinkObserver(TaskTreeSinkObserver);
|
||||
@@ -108,7 +108,7 @@ function LoadTasks(projekt_phase_id, filter)
|
||||
}
|
||||
catch(e)
|
||||
{}
|
||||
|
||||
|
||||
var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
|
||||
datasourceTreeTask = rdfService.GetDataSource(url);
|
||||
datasourceTreeTask.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
|
||||
@@ -116,7 +116,7 @@ function LoadTasks(projekt_phase_id, filter)
|
||||
treeTask.database.AddDataSource(datasourceTreeTask);
|
||||
datasourceTreeTask.addXMLSinkObserver(TaskTreeSinkObserver);
|
||||
treeTask.builder.addListener(TaskTreeListener);
|
||||
|
||||
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
@@ -153,7 +153,7 @@ function RessourceTaskLoad(menulist, id)
|
||||
datasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
|
||||
menulist.database.AddDataSource(datasource);
|
||||
menulist.builder.rebuild();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -167,7 +167,7 @@ function TaskTreeRefresh()
|
||||
//markierte Lehreinheit global speichern damit diese LE nach dem
|
||||
//refresh wieder markiert werden kann.
|
||||
var tree = document.getElementById('projekttask-tree');
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
TaskSelectID = getTreeCellText(tree, "projekttask-treecol-projekttask_id", tree.currentIndex);
|
||||
@@ -187,7 +187,7 @@ function TaskNeu()
|
||||
var tasktree=document.getElementById('projekttask-tree');
|
||||
tasktree.view.selection.clearSelection();
|
||||
tree = document.getElementById('tree-projektmenue');
|
||||
|
||||
|
||||
//Projektphase_id holen
|
||||
var projektphase_id = getTreeCellText(tree, "treecol-projektmenue-projekt_phase_id", tree.currentIndex);
|
||||
|
||||
@@ -199,12 +199,12 @@ function TaskNeu()
|
||||
//Details zuruecksetzen
|
||||
TaskDetailReset();
|
||||
TaskDisableFields(false);
|
||||
|
||||
|
||||
document.getElementById('textbox-projekttaskdetail-projektphase_id').value=projektphase_id;
|
||||
document.getElementById('caption-projekttask-detail').label='Neuer Task';
|
||||
|
||||
|
||||
//Detail Tab auswaehlen
|
||||
document.getElementById('projekttask-tabs').selectedItem=document.getElementById('projekttask-tab-detail');
|
||||
document.getElementById('projekttask-tabs').selectedItem=document.getElementById('projekttask-tab-detail');
|
||||
}
|
||||
// ****
|
||||
// * Selectiert die Lektorzuordnung nachdem der Tree
|
||||
@@ -222,7 +222,7 @@ function TaskTreeSelectTask()
|
||||
{
|
||||
//id der row holen
|
||||
id = getTreeCellText(tree, "projekttask-treecol-projekttask_id", i);
|
||||
|
||||
|
||||
//wenn dies die zu selektierende Zeile
|
||||
if(TaskSelectID==id)
|
||||
{
|
||||
@@ -264,7 +264,7 @@ function TaskDelete()
|
||||
var soapBody = new SOAPObject("deleteProjekttask");
|
||||
soapBody.appendChild(new SOAPObject("projekttask_id")).val(id);
|
||||
var sr = new SOAPRequest("deleteProjekttask",soapBody);
|
||||
|
||||
|
||||
SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekttask.soap.php?"+gettimestamp();
|
||||
SOAPClient.SendRequest(sr, clb_deleteProjekttask);
|
||||
}
|
||||
@@ -285,7 +285,7 @@ function clb_deleteProjekttask(respObj)
|
||||
return;
|
||||
}
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
|
||||
|
||||
TaskSelectID='';
|
||||
datasourceTreeTask.Refresh(false); //non blocking
|
||||
SetStatusBarText('Eintrag wurde entfernt');
|
||||
@@ -332,7 +332,7 @@ function showProjekttaskParsedown()
|
||||
|
||||
//Werte holen
|
||||
projekttask_id = document.getElementById('textbox-projekttaskdetail-projekttask_id').value;
|
||||
|
||||
|
||||
if(!isNaN(projekttask_id) && projekttask_id != '')
|
||||
{
|
||||
window.open("projekt/parsedown.php?projekttask_id="+projekttask_id,"Projekttask"+projekttask_id);
|
||||
@@ -355,15 +355,15 @@ function saveProjekttaskDetail()
|
||||
aufwand = document.getElementById('textbox-projekttask-detail-aufwand').value;
|
||||
mantis_id = document.getElementById('textbox-projekttask-detail-mantis_id').value;
|
||||
scrumsprint_id = document.getElementById('textbox-projekttask-detail-scrumsprint_id').value;
|
||||
ressource_id = MenulistGetSelectedValue('textbox-projekttask-detail-ressource');
|
||||
ressource_id = MenulistGetSelectedValue('textbox-projekttask-detail-ressource');
|
||||
ende = document.getElementById('textbox-projekttask-detail-ende').iso;
|
||||
|
||||
|
||||
if(!isNaN(projektphase_id) && projektphase_id != '')
|
||||
{
|
||||
var soapBody = new SOAPObject("saveProjekttask");
|
||||
//soapBody.appendChild(new SOAPObject("username")).val('joe');
|
||||
//soapBody.appendChild(new SOAPObject("passwort")).val('waschl');
|
||||
|
||||
|
||||
var task = new SOAPObject("task");
|
||||
task.appendChild(new SOAPObject("projekttask_id")).val(projekttask_id);
|
||||
task.appendChild(new SOAPObject("projektphase_id")).val(projektphase_id);
|
||||
@@ -376,9 +376,9 @@ function saveProjekttaskDetail()
|
||||
task.appendChild(new SOAPObject("ressource_id")).val(ressource_id);
|
||||
task.appendChild(new SOAPObject("ende")).val(ende);
|
||||
soapBody.appendChild(task);
|
||||
|
||||
|
||||
var sr = new SOAPRequest("saveProjekttask",soapBody);
|
||||
|
||||
|
||||
SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekttask.soap.php?"+gettimestamp();
|
||||
SOAPClient.SendRequest(sr, clb_saveProjekttask);
|
||||
}else
|
||||
@@ -402,7 +402,7 @@ function clb_saveProjekttask(respObj)
|
||||
}
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
document.getElementById('textbox-projekttaskdetail-projekttask_id').value=id;
|
||||
|
||||
|
||||
TaskSelectID=id;
|
||||
datasourceTreeTask.Refresh(false); //non blocking
|
||||
SetStatusBarText('Daten wurden gespeichert');
|
||||
@@ -415,7 +415,7 @@ function clb_saveProjekttask(respObj)
|
||||
// ****
|
||||
function onselectProjekttask()
|
||||
{
|
||||
|
||||
|
||||
// Trick 17 (sonst gibt's ein Permission denied)
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
var tree = document.getElementById('projekttask-tree');
|
||||
@@ -445,12 +445,12 @@ function onselectProjekttask()
|
||||
alert(e);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
var req = new phpRequest('../rdf/projekttask.rdf.php','','');
|
||||
req.add('projekttask_id',id);
|
||||
|
||||
var response = req.execute();
|
||||
|
||||
|
||||
// Datasource holen
|
||||
var dsource=parseRDFString(response, 'http://www.technikum-wien.at/projekttask/alle-projekttasks');
|
||||
|
||||
@@ -472,7 +472,7 @@ function onselectProjekttask()
|
||||
var scrumsprint_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#scrumsprint_id" ));
|
||||
var ressource_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ressource_id" ));
|
||||
var ende=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ende" ));
|
||||
|
||||
|
||||
//Daten den Feldern zuweisen
|
||||
var menulist = document.getElementById('textbox-projekttask-detail-ressource');
|
||||
RessourceTaskLoad(menulist, projektphase_id);
|
||||
@@ -486,17 +486,17 @@ function onselectProjekttask()
|
||||
document.getElementById('textbox-projekttask-detail-scrumsprint_id').value=scrumsprint_id;
|
||||
MenulistSelectItemOnValue('textbox-projekttask-detail-ressource', ressource_id);
|
||||
//document.getElementById('textbox-projekttask-detail-ressource').value=ressource_id;
|
||||
|
||||
|
||||
//Notizen zu eines Tasks Laden
|
||||
notiz = document.getElementById('box-projekttask-notizen');
|
||||
notiz.LoadNotizTree('','',projekttask_id,'','','','', '','');
|
||||
|
||||
|
||||
//Mantis Tab reset
|
||||
document.getElementById('textbox-projekttask-mantis-issue_summary').value=bezeichnung;
|
||||
document.getElementById('textbox-projekttask-mantis-issue_description').value=beschreibung;
|
||||
//document.getElementById('textbox-projekttask-mantis-issue_project_id').value='1';
|
||||
//document.getElementById('textbox-projekttask-mantis-issue_category').value='General';
|
||||
|
||||
|
||||
document.getElementById('textbox-projekttask-mantis-mantis_id').value='';
|
||||
document.getElementById('textbox-projekttask-mantis-issue_view_state_id').value='';
|
||||
document.getElementById('textbox-projekttask-mantis-issue_view_state_name').value='';
|
||||
@@ -525,9 +525,9 @@ function onselectProjekttask()
|
||||
document.getElementById('textbox-projekttask-mantis-issue_due_date').value='';
|
||||
document.getElementById('textbox-projekttask-mantis-issue_steps_to_reproduce').value='';
|
||||
document.getElementById('textbox-projekttask-mantis-issue_additional_information').value='';
|
||||
|
||||
|
||||
//Mantis
|
||||
if (mantis_id!='')
|
||||
if (false && mantis_id!='')
|
||||
{
|
||||
var req = new phpRequest('../rdf/mantis.rdf.php','','');
|
||||
req.add('issue_id',mantis_id);
|
||||
@@ -539,7 +539,7 @@ function onselectProjekttask()
|
||||
getService(Components.interfaces.nsIRDFService);
|
||||
subject = rdfService.GetResource("http://www.technikum-wien.at/mantis/" + mantis_id);
|
||||
predicateNS = "http://www.technikum-wien.at/mantis/rdf";
|
||||
|
||||
|
||||
//Daten holen
|
||||
var issue_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_id" ));
|
||||
var issue_summary=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_summary" ));
|
||||
@@ -571,12 +571,12 @@ function onselectProjekttask()
|
||||
var issue_tags_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_tags_name" ));
|
||||
var issue_resolution_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_resolution_id" ));
|
||||
var issue_resolution_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_resolution_name" ));
|
||||
var issue_due_date=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_due_date" ));
|
||||
var issue_due_date=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_due_date" ));
|
||||
var issue_steps_to_reproduce=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_steps_to_reproduce" ));
|
||||
var issue_additional_information=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_additional_information" ));
|
||||
|
||||
ProjekttaskLoadCategories(issue_project_id);
|
||||
|
||||
|
||||
//Daten den Feldern zuweisen
|
||||
document.getElementById('textbox-projekttask-mantis-mantis_id').value=mantis_id;
|
||||
document.getElementById('textbox-projekttask-mantis-issue_summary').value=issue_summary;
|
||||
@@ -610,18 +610,18 @@ function onselectProjekttask()
|
||||
document.getElementById('textbox-projekttask-mantis-issue_due_date').value=issue_due_date;
|
||||
document.getElementById('textbox-projekttask-mantis-issue_steps_to_reproduce').value=issue_steps_to_reproduce;
|
||||
document.getElementById('textbox-projekttask-mantis-issue_additional_information').value=issue_additional_information;
|
||||
document.getElementById('textbox-projekttask-mantis-issue_tags').value=issue_tags_name;
|
||||
document.getElementById('textbox-projekttask-mantis-issue_tags').value=issue_tags_name;
|
||||
}
|
||||
}
|
||||
|
||||
// ****
|
||||
// * Beim Aendern des Mantis Projekts werden die zugehoerigen
|
||||
// * Beim Aendern des Mantis Projekts werden die zugehoerigen
|
||||
// * Kategorien geladen
|
||||
// ****
|
||||
function ProjekttaskMantisProjektChange()
|
||||
{
|
||||
project_id=document.getElementById('menulist-projekttask-mantis-issue_project_id').value;
|
||||
|
||||
|
||||
if(project_id!='')
|
||||
ProjekttaskLoadCategories(project_id);
|
||||
}
|
||||
@@ -645,10 +645,10 @@ function ProjekttaskLoadCategories(project_id)
|
||||
}
|
||||
//Refresh damit die entfernten DS auch wirklich entfernt werden
|
||||
menulist.builder.rebuild();
|
||||
|
||||
var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
|
||||
|
||||
var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
|
||||
var datasource = rdfService.GetDataSourceBlocking(url);
|
||||
|
||||
|
||||
datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
|
||||
datasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
|
||||
menulist.database.AddDataSource(datasource);
|
||||
@@ -696,7 +696,7 @@ function saveProjekttaskMantis()
|
||||
var issue_steps_to_reproduce=document.getElementById('textbox-projekttask-mantis-issue_steps_to_reproduce').value;
|
||||
var issue_additional_information=document.getElementById('textbox-projekttask-mantis-issue_additional_information').value;
|
||||
var issue_tags = document.getElementById('textbox-projekttask-mantis-issue_tags').value;
|
||||
|
||||
|
||||
var soapBody = new SOAPObject("saveMantis");
|
||||
soapBody.appendChild(new SOAPObject("projekttask_id")).val(projekttask_id);
|
||||
soapBody.appendChild(new SOAPObject("mantis_id")).val(mantis_id);
|
||||
@@ -731,25 +731,25 @@ function saveProjekttaskMantis()
|
||||
soapBody.appendChild(new SOAPObject("issue_due_date")).val(issue_due_date);
|
||||
soapBody.appendChild(new SOAPObject("issue_steps_to_reproduce")).val(issue_steps_to_reproduce);
|
||||
soapBody.appendChild(new SOAPObject("issue_additional_information")).val(issue_additional_information);
|
||||
|
||||
|
||||
var sr = new SOAPRequest("saveMantis",soapBody);
|
||||
|
||||
SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekttask.soap.php?"+gettimestamp();
|
||||
SOAPClient.SendRequest(sr, clb_saveProjekttaskMantis);
|
||||
|
||||
|
||||
// Tags speichern
|
||||
if(mantis_id != '')
|
||||
{
|
||||
var soapBody = new SOAPObject("saveTagsForIssue");
|
||||
soapBody.appendChild(new SOAPObject("mantis_id")).val(mantis_id);
|
||||
soapBody.appendChild(new SOAPObject("issue_tags")).val(issue_tags);
|
||||
soapBody.appendChild(new SOAPObject("issue_tags")).val(issue_tags);
|
||||
|
||||
var sr = new SOAPRequest("saveTagsForIssue",soapBody);
|
||||
|
||||
SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekttask.soap.php?"+gettimestamp();
|
||||
SOAPClient.SendRequest(sr, clb_saveProjekttaskMantis);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
// ****
|
||||
@@ -779,7 +779,7 @@ function ProjekttaskUpdateErledigt(event)
|
||||
var col = new Object();
|
||||
var childElt = new Object();
|
||||
//Tree holen
|
||||
var tree = event.currentTarget;
|
||||
var tree = event.currentTarget;
|
||||
//Treecol ermitteln in die geklickt wurde
|
||||
tree.treeBoxObject.getCellAt(event.clientX, event.clientY, row, col, childElt);
|
||||
//abbrechen wenn auf Header oder Scrollbar geklickt wurde
|
||||
@@ -798,7 +798,7 @@ function ProjekttaskUpdateErledigt(event)
|
||||
newval='false';
|
||||
else
|
||||
newval='true';
|
||||
|
||||
|
||||
var soapBody = new SOAPObject("setErledigt");
|
||||
//soapBody.appendChild(new SOAPObject("username")).val('joe');
|
||||
//soapBody.appendChild(new SOAPObject("passwort")).val('waschl');
|
||||
@@ -807,8 +807,8 @@ function ProjekttaskUpdateErledigt(event)
|
||||
|
||||
var sr = new SOAPRequest("setErledigt",soapBody);
|
||||
SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekttask.soap.php?"+gettimestamp();
|
||||
|
||||
SOAPClient.SendRequest(sr,function (respObj)
|
||||
|
||||
SOAPClient.SendRequest(sr,function (respObj)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
@@ -29,7 +29,7 @@ require_once('../../config/vilesci.config.inc.php');
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
|
||||
echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/projekttaskdetail.overlay.xul.php"?>';
|
||||
echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/mantisdetail.overlay.xul.php"?>';
|
||||
|
||||
?>
|
||||
<overlay id="ProjekttaskOverlay"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
@@ -154,12 +154,12 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/mantisdetail.overlay.xul.p
|
||||
<tabbox id="projekttask-tabbox" flex="3" orient="vertical">
|
||||
<tabs orient="horizontal" id="projekttask-tabs">
|
||||
<tab id="projekttask-tab-detail" label="Details" />
|
||||
<tab id="projekttask-tab-mantis" label="Mantis" />
|
||||
|
||||
<tab id="projekttask-tab-notizen" label="Notizen" />
|
||||
</tabs>
|
||||
<tabpanels id="projekttask-tabpanels-main" flex="1">
|
||||
<vbox id="box-projekttask-detail" />
|
||||
<vbox id="box-projekttask-mantis" />
|
||||
|
||||
<box class="Notiz" id="box-projekttask-notizen"/>
|
||||
</tabpanels>
|
||||
</tabbox>
|
||||
|
||||
@@ -64,7 +64,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
<toolbarbutton id="toolbarbutton-ressource-projekt-drucken" label="Drucken" oncommand="foo = window.open('<?php echo APP_ROOT; ?>content/projekt/ressourcenauslastung.php?typ=projekt');foo.print();" image="../skin/images/drucken.png" tooltiptext="Drucken"/>
|
||||
</toolbar>
|
||||
</toolbox>
|
||||
<iframe id="iframe-ressource-projekt" flex="5" src="<?php echo APP_ROOT; ?>content/projekt/ressourcenauslastung.php?typ=projekt" />
|
||||
<iframe id="iframe-ressource-projekt" flex="5" src="<?php echo APP_ROOT; ?>content/projekt/ressourcenauslastung.php?empty" />
|
||||
</vbox>
|
||||
<vbox>
|
||||
<toolbox>
|
||||
@@ -89,4 +89,4 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
</tabpanels>
|
||||
</tabbox>
|
||||
</vbox>
|
||||
</overlay>
|
||||
</overlay>
|
||||
|
||||
@@ -259,16 +259,19 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
|
||||
]]>
|
||||
</body>
|
||||
</method>
|
||||
<method name="DeleteRessource">
|
||||
<method name="DeleteRessource">
|
||||
<parameter name="ressource_id"/>
|
||||
<body>
|
||||
<body>
|
||||
<![CDATA[
|
||||
//debug('Refresh Notiz');
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
try
|
||||
{
|
||||
var col = tree.columns.getColumnFor(document.getAnonymousElementByAttribute(this ,'anonid', 'treecol-ressource-projekt_ressource_id'));
|
||||
var projekt_ressource_id = tree.view.getCellText(tree.currentIndex, col);
|
||||
var projekt_kurzbz = this.getAttribute('projekt_kurzbz');
|
||||
var projektphase_id = this.getAttribute('projektphase_id');
|
||||
//var projekt_ressource_id = this.getAttribute('projekt_ressource_id');
|
||||
|
||||
var soapBody = new SOAPObject("deleteProjektRessource");
|
||||
//soapBody.appendChild(new SOAPObject("username")).val('joe');
|
||||
@@ -286,6 +289,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
|
||||
projektRessource.appendChild(new SOAPObject("projekt_kurzbz")).val('');
|
||||
}
|
||||
projektRessource.appendChild(new SOAPObject("ressource_id")).val(ressource_id);
|
||||
projektRessource.appendChild(new SOAPObject("projekt_ressource_id")).val(projekt_ressource_id);
|
||||
soapBody.appendChild(projektRessource);
|
||||
|
||||
var sr = new SOAPRequest("deleteProjektRessource",soapBody);
|
||||
|
||||
@@ -34,7 +34,12 @@ $datum = date('Y-m-d',$timestamp);
|
||||
$endetimestamp = jump_week($timestamp,$showweeks);
|
||||
$endedatum = date('Y-m-d',$endetimestamp);
|
||||
|
||||
if(isset($_GET['projekt_kurzbz']) && $_GET['projekt_kurzbz']!='')
|
||||
if(isset($_GET['empty']))
|
||||
{
|
||||
echo '<br><br><br>';
|
||||
exit;
|
||||
}
|
||||
elseif(isset($_GET['projekt_kurzbz']) && $_GET['projekt_kurzbz']!='')
|
||||
{
|
||||
$projekt_kurzbz=$_GET['projekt_kurzbz'];
|
||||
}
|
||||
@@ -60,9 +65,10 @@ else
|
||||
$anzahl_warnung = 6;
|
||||
}
|
||||
|
||||
|
||||
foreach($ressource->result as $row)
|
||||
{
|
||||
$ressource_arr[]=$row->bezeichnung;
|
||||
}
|
||||
|
||||
$ressource_arr = array_unique($ressource_arr);
|
||||
|
||||
@@ -117,7 +123,7 @@ foreach($ressource_arr as $bezeichnung)
|
||||
$beistrich=false;
|
||||
$start = $datum_obj->mktime_fromdate($row->start);
|
||||
$ende = $datum_obj->mktime_fromdate($row->ende);
|
||||
if($row->bezeichnung == $bezeichnung
|
||||
if($row->bezeichnung == $bezeichnung
|
||||
&& ($row->start=='' || $start<=$timestamp_kw)
|
||||
&& ($row->ende=='' || $ende>=$timestamp_kw)
|
||||
)
|
||||
@@ -156,10 +162,10 @@ foreach($ressource_arr as $bezeichnung)
|
||||
if($beistrich)
|
||||
$title.=', ';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
$title = mb_substr($title,0,-1);
|
||||
|
||||
|
||||
$htmlrow.='<td title="'.$title.'" align="center">';
|
||||
if($anzahl>=$anzahl_warnung)
|
||||
$htmlrow.='<span class="warning">'.$anzahl.($typ!='projekt'?'/'.$aufwandssumme:'').'</span>';
|
||||
@@ -173,6 +179,7 @@ foreach($ressource_arr as $bezeichnung)
|
||||
ob_flush();
|
||||
}
|
||||
|
||||
echo ' </table>';
|
||||
echo '
|
||||
</body>
|
||||
</html>';
|
||||
|
||||
@@ -1733,6 +1733,7 @@ else
|
||||
$content .= "</tr>";
|
||||
|
||||
$content .= '</tfoot></table>';
|
||||
$content .= "\n";
|
||||
}
|
||||
|
||||
//Aufsplittungen für Mischformen holen
|
||||
@@ -1744,28 +1745,32 @@ else
|
||||
{
|
||||
if ($db->db_num_rows($result) > 0)
|
||||
{
|
||||
$content .= "<br><br><h2>Aufsplittung Mischformen</h2><br>";
|
||||
$content .= "\n<table class='liste table-autosort:0 table-stripeclass:alternate table-autostripe'>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class='table-sortable:default'>Studiengang</th>";
|
||||
$content .= "<br><br>";
|
||||
$content .= "<h2>Aufsplittung Mischformen</h2><br>";
|
||||
$content .= "\n<table class='liste table-autosort:0 table-stripeclass:alternate table-autostripe'>";
|
||||
$content .= "\n<thead>";
|
||||
$content .= "\n<tr>";
|
||||
$content .= "\n<th class='table-sortable:default'>Studiengang</th>";
|
||||
foreach ($studenttypes as $heading)
|
||||
{
|
||||
$content .= "<th colspan=".$noOrgformen.">$heading</th>";
|
||||
$content .= "\n<th colspan=".$noOrgformen.">$heading</th>";
|
||||
}
|
||||
$content .= "</tr><tr><th> </th>";
|
||||
$content .= "\n</tr>";
|
||||
$content .= "\n<tr>\n<th></th>";
|
||||
|
||||
//orgformheadings (VZ, BB,...) ausgeben
|
||||
for ($i = 0; $i < $noStudenttypes; $i++)
|
||||
{
|
||||
foreach ($orgform_arr as $row_orgform)
|
||||
{
|
||||
$content .= "<th align='center' class='table-sortable:numeric'>";
|
||||
$content .= "\n<th align='center' class='table-sortable:numeric' nowrap>";
|
||||
$content .= $row_orgform;
|
||||
$content .= "</th>";
|
||||
}
|
||||
}
|
||||
$content .= "</tr></thead><tbody>";
|
||||
$content .= "\n</tr>";
|
||||
$content .= "\n</thead>";
|
||||
$content .= "\n<tbody>";
|
||||
|
||||
$sumarr = array();
|
||||
|
||||
@@ -1773,13 +1778,13 @@ else
|
||||
{
|
||||
$content .= "\n";
|
||||
$content .= '<tr>';
|
||||
$content .= "<td>".mb_strtoupper($row->typ.$row->kurzbz)." ($row->kurzbzlang)</td>";
|
||||
$content .= "\n<td>".mb_strtoupper($row->typ.$row->kurzbz)." ($row->kurzbzlang)</td>";
|
||||
foreach ($studenttypes as $key => $value)
|
||||
{
|
||||
foreach ($orgform_arr as $row_orgform)
|
||||
{
|
||||
$fullAlias = $key."_".mb_strtolower($row_orgform);
|
||||
$content .= "<td align='center'>";
|
||||
$content .= "\n<td align='center' nowrap>";
|
||||
$content .= $row->{$fullAlias};
|
||||
$content .= "</td>";
|
||||
//Summe berechnen
|
||||
@@ -1794,14 +1799,15 @@ else
|
||||
}
|
||||
}
|
||||
}
|
||||
$content .= "</tr>";
|
||||
$content .= "\n</tr>";
|
||||
|
||||
$content .= "\n";
|
||||
$content .= '</tbody><tfoot style="font-weight: bold;"><tr>';
|
||||
$content .= "<td>Summe</td>";
|
||||
$content .= "</tbody>";
|
||||
$content .= '<tfoot style="font-weight: bold;"><tr>';
|
||||
$content .= "\n<td>Summe</td>";
|
||||
foreach ($sumarr as $sum)
|
||||
{
|
||||
$content .= "<td align='center'>".$sum."</td>";
|
||||
$content .= "\n<td align='center'>".$sum."</td>";
|
||||
}
|
||||
$content .= "</tfoot></tr>";
|
||||
$content .= '</table>';
|
||||
|
||||
@@ -365,7 +365,6 @@ if(!$error)
|
||||
$error = true;
|
||||
$errormsg = 'Sie haben keine Schreibrechte fuer diesen Studiengang';
|
||||
}
|
||||
|
||||
//Studentendaten speichern
|
||||
if(!$error)
|
||||
{
|
||||
@@ -377,7 +376,15 @@ if(!$error)
|
||||
$errormsg = 'Fehler beim Laden:'.$student->errormsg;
|
||||
$error = true;
|
||||
}
|
||||
$datum = new datum();
|
||||
|
||||
$gebdatum = $_POST['geburtsdatum'];
|
||||
if($gebdatum!='' && !$datum->checkDatum($gebdatum))
|
||||
{
|
||||
$return = false;
|
||||
$errormsg = 'Geburtsdatum ist nicht korrekt.';
|
||||
$error = true;
|
||||
}
|
||||
if(!$error)
|
||||
{
|
||||
$student->uid = $_POST['uid'];
|
||||
@@ -2296,8 +2303,12 @@ if(!$error)
|
||||
{
|
||||
$dokumente = explode(';',$_POST['dokumente']);
|
||||
$errormsg = '';
|
||||
$sonst = 0;
|
||||
foreach ($dokumente as $dokument_kurzbz)
|
||||
{
|
||||
if ($dokument_kurzbz === 'Sonst' && $sonst !== 0)
|
||||
continue;
|
||||
|
||||
if($dokument_kurzbz!='')
|
||||
{
|
||||
$dok = new dokument();
|
||||
@@ -2308,6 +2319,8 @@ if(!$error)
|
||||
$dok->insertamum = date('Y-m-d H:i:s');
|
||||
$dok->insertvon = $user;
|
||||
$dok->new = true;
|
||||
if ($dokument_kurzbz === 'Sonst')
|
||||
$sonst++;
|
||||
|
||||
if(!$dok->save())
|
||||
{
|
||||
@@ -2501,8 +2514,13 @@ if(!$error)
|
||||
{
|
||||
$dokumente = explode(';',$_POST['dokumente']);
|
||||
$errormsg = '';
|
||||
$sonst = 0;
|
||||
|
||||
foreach ($dokumente as $dokument_kurzbz)
|
||||
{
|
||||
if ($dokument_kurzbz === 'Sonst' && $sonst !== 0)
|
||||
continue;
|
||||
|
||||
if($dokument_kurzbz!='')
|
||||
{
|
||||
$dok = new dokument();
|
||||
@@ -2514,6 +2532,11 @@ if(!$error)
|
||||
{
|
||||
$errormsg .= "Fehler bei $dokument_kurzbz: $dok->errormsg\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($dokument_kurzbz === 'Sonst')
|
||||
$sonst++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -151,7 +151,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/mobilitaetsprogramm/rdf#mobilitaetsprogramm_code"
|
||||
label="rdf:http://www.technikum-wien.at/mobilitaetsprogramm/rdf#kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/mobilitaetsprogramm/rdf#kurzbz - rdf:http://www.technikum-wien.at/mobilitaetsprogramm/rdf#beschreibung"
|
||||
uri="rdf:*"/>
|
||||
</menupopup>
|
||||
</template>
|
||||
|
||||
@@ -892,7 +892,13 @@ function StudentProjektbetreuerAuswahl()
|
||||
document.getElementById('student-projektbetreuer-checkbox-neu').checked=false;
|
||||
|
||||
var gesamtkosten = StudentProjektbetreuerGesamtkosten();
|
||||
|
||||
|
||||
|
||||
if (document.getElementById('student-projektbetreuer-button-beurteilung'))
|
||||
{
|
||||
checkBeurteilung();
|
||||
}
|
||||
|
||||
// Wenn Vertragsdetails angezeigt werden
|
||||
if (projektarbeit_vertragsdetails_anzeigen) {
|
||||
//Reset attributes
|
||||
@@ -1122,6 +1128,12 @@ function StudentProjektbetreuerDetailDisableFields(val)
|
||||
document.getElementById('student-projektbetreuer-button-speichern').disabled=val;
|
||||
document.getElementById('student-projektbetreuer-button-neueperson').disabled=val;
|
||||
document.getElementById('student-projektbetreuer-button-kontaktdaten').disabled=val;
|
||||
|
||||
if (document.getElementById('student-projektbetreuer-button-beurteilung') && val === true)
|
||||
{
|
||||
document.getElementById('student-projektbetreuer-button-beurteilung').disabled=val;
|
||||
document.getElementById('student-projektbetreuer-span-beurteilung').setAttribute("value", '');
|
||||
}
|
||||
}
|
||||
|
||||
// ****
|
||||
|
||||
@@ -520,7 +520,7 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
|
||||
</groupbox>
|
||||
|
||||
<!-- Vertragsdetails: Anzeige wird ueber config Eintrag bestimmt -->
|
||||
<vbox>
|
||||
<vbox id="student-projektbetreuer-vbox">
|
||||
<groupbox id="student-projektbetreuer-groupbox-vertragsdetails" hidden="<?php echo $is_hidden ?>">
|
||||
<caption label="Vertragsdetails" />
|
||||
<grid style="overflow:auto; padding:10px;" flex="1">
|
||||
@@ -529,7 +529,7 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
|
||||
<column flex="1"/>
|
||||
<column flex="1"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<rows >
|
||||
<label id="student-projektbetreuer-label-vertrag_id" hidden="true" value=""/>
|
||||
<row>
|
||||
<label value="Vertragsstatus:"/>
|
||||
|
||||
Reference in New Issue
Block a user