- Datepicker für Datumsfelder hinzugefügt
- Menüeinträge entfernt
- Unfertige Tabs auskommentiert
This commit is contained in:
Andreas Österreicher
2011-10-05 15:18:40 +00:00
parent cb7cf9d18d
commit 3b76c78cab
11 changed files with 117 additions and 230 deletions
+1 -10
View File
@@ -53,16 +53,7 @@ var globalProgressmeter=new Progressmeter('statusbar-progressmeter');
//globalProgressmeter.StartPM();
function closeWindow()
{
//Warnung wenn Daten veraendert aber noch nicht gespeichert wurden
if(MitarbeiterDetailValueChanged)
{
if(!confirm('Achtung! Mitarbeiterdaten wurden veraendert aber noch nicht gespeichert. Programm wirklich beenden? \n(Die geaenderten Daten gehen dabei verloren)'))
return false;
}
MitarbeiterDetailValueChanged=false;
{
window.close();
}
+5 -1
View File
@@ -78,7 +78,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/bestellung.overlay.xul.php
<treechildren>
<treeitem uri="rdf:*">
<treerow>
<treecell label="rdf:http://www.technikum-wien.at/projektphase/rdf#bezeichnung"/>
<treecell src="../skin/images/rdf:http://www.technikum-wien.at/projektphase/rdf#typ^.png" label="rdf:http://www.technikum-wien.at/projektphase/rdf#bezeichnung"/>
<treecell label="rdf:http://www.technikum-wien.at/projektphase/rdf#oe_kurzbz"/>
<treecell label="rdf:http://www.technikum-wien.at/projektphase/rdf#projekt_kurzbz"/>
<treecell label="rdf:http://www.technikum-wien.at/projektphase/rdf#projekt_phase"/>
@@ -109,9 +109,11 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/bestellung.overlay.xul.php
<tab id="tab-projektphase" label="Phasen" />
<tab id="tab-projekttask" label="Tasks" selected="true" />
<tab id="tab-dokumente" label="Dokumente" />
<!--
<tab id="tab-bestellung" label="Bestellungen" />
<tab id="tab-ressource" label="Ressourcen" />
<tab id="tab-gantt" label="Gantt" />
-->
<tab id="tab-notiz" label="Eigene Notizen" />
</tabs>
<tabpanels id="tabpanels-main" flex="1">
@@ -119,9 +121,11 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/bestellung.overlay.xul.php
<vbox id="box-projektphase" />
<vbox id="box-projekttask" />
<vbox id="box-dokumente" />
<!--
<vbox id="box-bestellung" />
<vbox id="box-ressource" />
<vbox id="box-gantt" />
-->
<vbox id="box-notiz" />
</tabpanels>
</tabbox>
-183
View File
@@ -47,29 +47,8 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
<commandset id="maincommands">
<command id="menu-file-close:command" oncommand="closeWindow();"/>
<command id="menu-properties-studiensemester:command" oncommand="studiensemesterChange();"/>
<command id="menu-prefs-stpltable-stundenplan:command" oncommand="stpltableChange('stundenplan');"/>
<command id="menu-prefs-stpltable-stundenplandev:command" oncommand="stpltableChange('stundenplandev');"/>
<command id="menu-prefs-ignore_kollision:command" oncommand="variableChange('ignore_kollision','menu-prefs-ignore_kollision');"/>
<command id="menu-prefs-ignore_zeitsperre:command" oncommand="variableChange('ignore_zeitsperre','menu-prefs-ignore_zeitsperre');"/>
<command id="menu-prefs-ignore_reservierung:command" oncommand="variableChange('ignore_reservierung','menu-prefs-ignore_reservierung');"/>
<command id="menu-prefs-kollision_student:command" oncommand="variableChange('kollision_student','menu-prefs-kollision_student');"/>
<command id="menu-prefs-max_kollision:command" oncommand="variableChangeValue('max_kollision');"/>
<command id="menu-extras-kollisionstudent:command" oncommand="KollisionStudentShow();"/>
<command id="menu-extras-lvplanwartung:command" oncommand="LVPlanWartungShow();"/>
<command id="menu-extras-rescheck:command" oncommand="ResCheckShow();"/>
<command id="menu-help-about:command" oncommand="OpenAboutDialog()"/>
<command id="menu-help-todo:command" oncommand="HelpOpenToDo();"/>
<command id="menu-help-manual:command" oncommand="OpenManualPlanner();"/>
</commandset>
<keyset id="mainkeys">
<key
id = "menu-file-close:key"
key = "&menu-file-close.key;"
observes = "menu-file-close:command"
modifiers = "accel" />
<key id="keycode_ignore_kollision" keycode="VK_F9" oncommand="toggleIgnoreKollision()"/>
</keyset>
<toolbox id="main-toolbox">
<menubar id="menu" >
@@ -83,168 +62,6 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
accesskey = "&menu-file-close.accesskey;"/>
</menupopup>
</menu>
<menu id="menu-edit" label="&menu-edit.label;" accesskey="&menu-edit.accesskey;" onclick="">
<menupopup id="menu-edit-popup" onpopupshowing="loadUndoList();">
<menu id="menu-edit-undo" label="&menu-edit-undo.label;"
datasources="rdf:null"
ref="http://www.technikum-wien.at/undo/liste"
>
<template>
<rule>
<menupopup id="menu-edit-undo-popup">
<menuitem uri="rdf:*" label="rdf:http://www.technikum-wien.at/undo/rdf#beschreibung"
value="rdf:http://www.technikum-wien.at/undo/rdf#log_id"
onclick="UnDo(this.value, this.label);"/>
</menupopup>
</rule>
</template>
</menu>
</menupopup>
</menu>
<menu id="menu-prefs" label="&menu-prefs.label;" accesskey="&menu-prefs.accesskey;">
<menupopup id="menu-prefs-popup">
<menu
id = "menu-properies-studiensemester"
label = "Studiensemester">
<menupopup id="menu-properties-popup">
<?php
$stsemobj = new studiensemester();
$stsemobj->getAll();
foreach ($stsemobj->studiensemester as $stsem)
{
echo "
<menuitem
id = 'menu-properies-studiensemester-name'
label = '$stsem->studiensemester_kurzbz'
type = 'radio'
command = 'menu-properties-studiensemester:command'
checked = ".($semester_aktuell==$stsem->studiensemester_kurzbz?"'true' ":"'false'")." />";
}
?>
</menupopup>
</menu>
<?php
if($rechte->isBerechtigt('lv-plan'))
{
?>
<menu id="menu-prefs-stpltable" label="&menu-prefs-stpltable.label;" accesskey="&menu-prefs-stpltable.accesskey;">
<menupopup id="menu-prefs-stpltable-popup">
<menuitem
id ="menu-prefs-stpltable-stundenplan"
type ="radio"
key ="menu-prefs-stpltable-stundenplan:key"
label ="&menu-prefs-stpltable-stundenplan.label;"
command ="menu-prefs-stpltable-stundenplan:command"
accesskey ="&menu-prefs-stpltable-stundenplan.accesskey;"
checked ="<?php echo ($db_stpl_table=='stundenplan'?'true':'false');?>" />
<menuitem
id ="menu-prefs-stpltable-stundenplandev"
type ="radio"
key ="menu-prefs-stpltable-stundenplandev:key"
label ="&menu-prefs-stpltable-stundenplandev.label;"
command ="menu-prefs-stpltable-stundenplandev:command"
accesskey ="&menu-prefs-stpltable-stundenplandev.accesskey;"
checked ="<?php echo ($db_stpl_table=='stundenplandev'?'true':'false');?>" />
</menupopup>
</menu>
<menuitem
id ="menu-prefs-ignore_kollision"
type ="checkbox"
key ="menu-prefs-ignore_kollision:key"
label ="&menu-prefs-ignore_kollision.label;"
command ="menu-prefs-ignore_kollision:command"
accesskey ="&menu-prefs-ignore_kollision.accesskey;"
checkbox ="true"
checked ="<?php echo $ignore_kollision;?>"
/>
<menuitem
id ="menu-prefs-ignore_zeitsperre"
type ="checkbox"
key ="menu-prefs-ignore_zeitsperre:key"
label ="&menu-prefs-ignore_zeitsperre.label;"
command ="menu-prefs-ignore_zeitsperre:command"
accesskey ="&menu-prefs-ignore_zeitsperre.accesskey;"
checkbox ="true"
checked ="<?php echo $ignore_zeitsperre;?>"
/>
<menuitem
id ="menu-prefs-ignore_reservierung"
type ="checkbox"
key ="menu-prefs-ignore_reservierung:key"
label ="&menu-prefs-ignore_reservierung.label;"
command ="menu-prefs-ignore_reservierung:command"
accesskey ="&menu-prefs-ignore_reservierung.accesskey;"
checkbox ="true"
checked ="<?php echo $ignore_reservierung;?>"
/>
<menuitem
id ="menu-prefs-kollision_student"
type ="checkbox"
key ="menu-prefs-kollision_student:key"
label ="&menu-prefs-kollision_student.label;"
command ="menu-prefs-kollision_student:command"
accesskey ="&menu-prefs-kollision_student.accesskey;"
checkbox ="true"
checked ="<?php echo $kollision_student;?>"
/>
<menuitem
id ="menu-prefs-max_kollision"
key ="menu-prefs-max_kollision:key"
label ="&menu-prefs-max_kollision.label;"
command ="menu-prefs-max_kollision:command"
accesskey ="&menu-prefs-max_kollision.accesskey;"
value ="<?php echo $max_kollision;?>"
/>
<?php
}
?>
</menupopup>
</menu>
<menu id="menu-extras" label="&menu-extras.label;" accesskey="&menu-extras.accesskey;">
<menupopup id="menu-extras-popup">
<menuitem
id = "menu-extras-kollisionstudent"
key = "menu-extras-kollisionstudent:key"
label = "&menu-extras-kollisionstudent.label;"
command = "menu-extras-kollisionstudent:command"
accesskey = "&menu-extras-kollisionstudent.accesskey;"/>
<menuitem
id = "menu-extras-lvplanwartung"
key = "menu-extras-lvplanwartung:key"
label = "&menu-extras-lvplanwartung.label;"
command = "menu-extras-lvplanwartung:command"
accesskey = "&menu-extras-lvplanwartung.accesskey;"/>
<menuitem
id = "menu-extras-rescheck"
key = "menu-extras-rescheck:key"
label = "&menu-extras-rescheck.label;"
command = "menu-extras-rescheck:command"
accesskey = "&menu-extras-rescheck.accesskey;"/>
</menupopup>
</menu>
<menu id="menu-help" label="&menu-help.label;" accesskey="&menu-help.accesskey;">
<menupopup id="menu-about-popup">
<menuitem
id = "menu-help-about"
key = "menu-help-about:key"
label = "&menu-help-about.label;"
command = "menu-help-about:command"
accesskey = "&menu-help-about.accesskey;"/>
<menuitem
id = "menu-help-manual"
key = "menu-help-manual:key"
label = "&menu-help-manual.label;"
command = "menu-help-manual:command"
accesskey = "&menu-help-manual.accesskey;"/>
<menuitem
id = "menu-help-todo"
key = "&menu-help-todo.key;"
label = "&menu-help-todo.label;"
command = "menu-help-todo:command"
accesskey = "&menu-help-todo.accesskey;"/>
</menupopup>
</menu>
</menubar>
</toolbox>
<hbox flex="1">
+4 -4
View File
@@ -148,7 +148,7 @@ function onselectProjekt()
//Daten den Feldern zuweisen
document.getElementById('textbox-projekt-detail-projekt_kurzbz').value=projekt_kurzbz;
document.getElementById('textbox-projekt-detail-oe_kurzbz').value=oe_kurzbz;
document.getElementById('menulist-projekt-detail-oe_kurzbz').value=oe_kurzbz;
document.getElementById('textbox-projekt-detail-titel').value=titel;
document.getElementById('textbox-projekt-detail-beschreibung').value=beschreibung;
document.getElementById('textbox-projekt-detail-nummer').value=nummer;
@@ -175,12 +175,12 @@ function saveProjektDetail()
//Werte holen
projekt_kurzbz = document.getElementById('textbox-projekt-detail-projekt_kurzbz').value;
oe_kurzbz = document.getElementById('textbox-projekt-detail-oe_kurzbz').value;
oe_kurzbz = document.getElementById('menulist-projekt-detail-oe_kurzbz').value;
titel = document.getElementById('textbox-projekt-detail-titel').value;
beschreibung = document.getElementById('textbox-projekt-detail-beschreibung').value;
nummer = document.getElementById('textbox-projekt-detail-nummer').value;
beginn = document.getElementById('textbox-projekt-detail-beginn').value;
ende = document.getElementById('textbox-projekt-detail-ende').value;
beginn = document.getElementById('textbox-projekt-detail-beginn').iso;
ende = document.getElementById('textbox-projekt-detail-ende').iso;
budget = document.getElementById('textbox-projekt-detail-budget').value;
neu = document.getElementById('checkbox-projekt-detail-neu').checked;
+11 -2
View File
@@ -91,15 +91,22 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/projektdetail.overlay.xul.
<splitter class="tree-splitter"/>
<treecol id="treecol-projekt-beginn" label="Start" flex="2" hidden="false" persist="hidden, width, ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/projekt/rdf#beginn" />
sort="rdf:http://www.technikum-wien.at/projekt/rdf#beginn_iso" />
<splitter class="tree-splitter"/>
<treecol id="treecol-projekt-ende" label="Ende" flex="2" hidden="false" persist="hidden, width, ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/projekt/rdf#ende" />
sort="rdf:http://www.technikum-wien.at/projekt/rdf#ende_iso" />
<splitter class="tree-splitter"/>
<treecol id="treecol-projekt-budget" label="Budget" flex="2" hidden="false" persist="hidden, width, ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/projekt/rdf#budget" />
<treecol id="treecol-projekt-beginniso" label="StartISO" flex="2" hidden="true" persist="hidden, width, ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/projekt/rdf#beginn_iso" />
<splitter class="tree-splitter"/>
<treecol id="treecol-projekt-endeiso" label="EndeISO" flex="2" hidden="true" persist="hidden, width, ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/projekt/rdf#ende_iso" />
</treecols>
<template>
@@ -115,6 +122,8 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/projektdetail.overlay.xul.
<treecell label="rdf:http://www.technikum-wien.at/projekt/rdf#beginn"/>
<treecell label="rdf:http://www.technikum-wien.at/projekt/rdf#ende"/>
<treecell label="rdf:http://www.technikum-wien.at/projekt/rdf#budget"/>
<treecell label="rdf:http://www.technikum-wien.at/projekt/rdf#beginn_iso"/>
<treecell label="rdf:http://www.technikum-wien.at/projekt/rdf#ende_iso"/>
</treerow>
</treeitem>
</treechildren>
+39 -7
View File
@@ -51,19 +51,48 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<rows>
<row>
<label value="Projekt (KurzBz)" control="textbox-projekt-detail-projekt_kurzbz "/>
<textbox id="textbox-projekt-detail-projekt_kurzbz"/>
<hbox>
<textbox id="textbox-projekt-detail-projekt_kurzbz" size="16" maxlength="16" readonly="true"/>
<spacer />
</hbox>
</row>
<row>
<label value="OE (Organisationseinheit)" control="textbox-projekt-detail-oe_kurzbz"/>
<textbox id="textbox-projekt-detail-oe_kurzbz"/>
<hbox>
<menulist id="menulist-projekt-detail-oe_kurzbz"
xmlns:ORGANISATIONSEINHEIT="http://www.technikum-wien.at/organisationseinheit/rdf#"
datasources="<?php echo APP_ROOT;?>rdf/organisationseinheit.rdf.php"
ref="http://www.technikum-wien.at/organisationseinheit/liste" >
<template>
<rule ORGANISATIONSEINHEIT:aktiv='false'>
<menupopup>
<menuitem value="rdf:http://www.technikum-wien.at/organisationseinheit/rdf#oe_kurzbz"
label="rdf:http://www.technikum-wien.at/organisationseinheit/rdf#organisationseinheittyp_kurzbz rdf:http://www.technikum-wien.at/organisationseinheit/rdf#bezeichnung"
uri="rdf:*" style="text-decoration:line-through;"/>
</menupopup>
</rule>
<rule>
<menupopup>
<menuitem value="rdf:http://www.technikum-wien.at/organisationseinheit/rdf#oe_kurzbz"
label="rdf:http://www.technikum-wien.at/organisationseinheit/rdf#organisationseinheittyp_kurzbz rdf:http://www.technikum-wien.at/organisationseinheit/rdf#bezeichnung"
uri="rdf:*"/>
</menupopup>
</rule>
</template>
</menulist>
<spacer />
</hbox>
</row>
<row>
<label value="Titel" control="textbox-projekt-detail-titel"/>
<textbox id="textbox-projekt-detail-titel"/>
<textbox id="textbox-projekt-detail-titel" maxlength="256"/>
</row>
<row>
<label value="Nummer" control="textbox-projekt-detail-nummer"/>
<textbox id="textbox-projekt-detail-nummer"/>
<hbox>
<textbox id="textbox-projekt-detail-nummer" maxlength="8"/>
<spacer />
</hbox>
</row>
<row>
<label value="Beschreibung" control="textbox-projekt-detail-beschreibung"/>
@@ -71,15 +100,18 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</row>
<row>
<label value="Beginn" control="textbox-projekt-detail-beginn"/>
<textbox id="textbox-projekt-detail-beginn"/>
<box class="Datum" id="textbox-projekt-detail-beginn"/>
</row>
<row>
<label value="Ende" control="textbox-projekt-detail-ende"/>
<textbox id="textbox-projekt-detail-ende"/>
<box class="Datum" id="textbox-projekt-detail-ende"/>
</row>
<row>
<label value="Budget" control="textbox-projekt-detail-budget"/>
<textbox id="textbox-projekt-detail-budget"/>
<hbox>
<textbox id="textbox-projekt-detail-budget" size="12" maxlength="13"/>
<spacer />
</hbox>
</row>
</rows>
</grid>
+3 -3
View File
@@ -176,8 +176,8 @@ function saveProjektphaseDetail()
projekt_kurzbz = document.getElementById('textbox-projektphase-detail-projekt_kurzbz').value;
bezeichnung = document.getElementById('textbox-projektphase-detail-bezeichnung').value;
beschreibung = document.getElementById('textbox-projektphase-detail-beschreibung').value;
start = document.getElementById('textbox-projektphase-detail-start').value;
ende = document.getElementById('textbox-projektphase-detail-ende').value;
start = document.getElementById('textbox-projektphase-detail-start').iso;
ende = document.getElementById('textbox-projektphase-detail-ende').iso;
budget = document.getElementById('textbox-projektphase-detail-budget').value;
personentage = document.getElementById('textbox-projektphase-detail-personentage').value;
neu = document.getElementById('checkbox-projektphase-detail-neu').checked;
@@ -211,7 +211,7 @@ function clb_saveProjektphase(respObj)
{
try
{
var id = respObj.Body[0].SaveProjektphaseResponse[0].message[0].Text;
var id = respObj.Body[0].saveProjektphaseResponse[0].message[0].Text;
}
catch(e)
{
+12 -3
View File
@@ -83,11 +83,11 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/projektphasedetail.overlay
<splitter class="tree-splitter"/>
<treecol id="treecol-projektphase-beginn" label="Beginn" flex="2" hidden="false" persist="hidden width ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/projektphase/rdf#beginn" />
sort="rdf:http://www.technikum-wien.at/projektphase/rdf#beginn_iso" />
<splitter class="tree-splitter"/>
<treecol id="treecol-projektphase-ende" label="Ende" flex="2" hidden="false" persist="hidden width ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/projektphase/rdf#ende" />
sort="rdf:http://www.technikum-wien.at/projektphase/rdf#ende_iso" />
<splitter class="tree-splitter"/>
<treecol id="treecol-projektphase-budget" label="Budget" flex="2" hidden="false" persist="hidden width ordinal"
class="sortDirectionIndicator"
@@ -102,7 +102,14 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/projektphasedetail.overlay
<treecol id="treecol-projektphase-fortschritt" label="Fortschritt[%]" flex="2" hidden="true" persist="hidden width ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/projektphase/rdf#fortschritt"/>
<splitter class="tree-splitter"/>
<splitter class="tree-splitter"/>
<treecol id="treecol-projektphase-beginniso" label="BeginnISO" flex="2" hidden="true" persist="hidden width ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/projektphase/rdf#beginn_iso" />
<splitter class="tree-splitter"/>
<treecol id="treecol-projektphase-endeiso" label="EndeISO" flex="2" hidden="true" persist="hidden width ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/projektphase/rdf#ende_iso" />
</treecols>
@@ -120,6 +127,8 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/projektphasedetail.overlay
<treecell label="rdf:http://www.technikum-wien.at/projektphase/rdf#oe_kurzbz"/>
<treecell label="rdf:http://www.technikum-wien.at/projektphase/rdf#projekt_kurzbz"/>
<treecell label="rdf:http://www.technikum-wien.at/projektphase/rdf#fortschritt"/>
<treecell label="rdf:http://www.technikum-wien.at/projektphase/rdf#beginn_iso"/>
<treecell label="rdf:http://www.technikum-wien.at/projektphase/rdf#ende_iso"/>
</treerow>
</treeitem>
</treechildren>
@@ -62,7 +62,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</row>
<row>
<label value="Bezeichnung" control="textbox-projektphase-detail-bezeichnung"/>
<textbox id="textbox-projektphase-detail-bezeichnung"/>
<hbox>
<textbox id="textbox-projektphase-detail-bezeichnung" maxlength="32" size="32"/>
<spacer />
</hbox>
</row>
<row>
<label value="Beschreibung" control="textbox-projektphase-detail-beschreibung"/>
@@ -70,19 +73,25 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</row>
<row>
<label value="Start" control="textbox-projektphase-detail-start"/>
<textbox id="textbox-projektphase-detail-start"/>
<box class="Datum" id="textbox-projektphase-detail-start"/>
</row>
<row>
<label value="Ende" control="textbox-projektphase-detail-ende"/>
<textbox id="textbox-projektphase-detail-ende"/>
<box class="Datum" id="textbox-projektphase-detail-ende"/>
</row>
<row>
<label value="Budget" control="textbox-projektphase-detail-budget"/>
<textbox id="textbox-projektphase-detail-budget"/>
<hbox>
<textbox id="textbox-projektphase-detail-budget" size="12" maxlength="13"/>
<spacer />
</hbox>
</row>
<row>
<label value="Personentage" control="textbox-projektphase-detail-personentage"/>
<textbox id="textbox-projektphase-detail-personentage"/>
<hbox>
<textbox id="textbox-projektphase-detail-personentage" size="4" maxlenght="5"/>
<spacer />
</hbox>
</row>
</rows>
</grid>