blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Planner enhancements

Browse Source 
- Removed Loading of Mantis Tasks
- Dont Load Ressource Overview on Startup
- Set Projects Tab as Default on Startup
This commit is contained in:
Andreas Österreicher
2021-06-14 16:40:27 +02:00
parent c71c5ae126
commit 2d440585f4
5 changed files with 71 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/planner.overlay.xul.php
+2 -2
View File
@@ -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" />
content/projekt/projekttask.overlay.js.php
+1 -1
View File
@@ -527,7 +527,7 @@ function onselectProjekttask()
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);
content/projekt/projekttask.overlay.xul.php
+3 -3
View File
@@ -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>
content/projekt/ressource.overlay.xul.php
+1 -1
View File
@@ -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>
content/projekt/ressourcenauslastung.php
+9 -2
View File
@@ -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);
@@ -173,6 +179,7 @@ foreach($ressource_arr as $bezeichnung)
ob_flush();
}
echo ' </table>';
echo '
</body>
</html>';