Skip to content
Snippets Groups Projects
Commit e0cfce58 authored by hahn's avatar hahn
Browse files

- add deploy button in simple view

- set role to enable/ disable buttons in the overview
parent aa34de4e
No related branches found
No related tags found
No related merge requests found
...@@ -1365,7 +1365,7 @@ class project { ...@@ -1365,7 +1365,7 @@ class project {
'default' => array('icon' => 'icon-forward', 'class' => ''), 'default' => array('icon' => 'icon-forward', 'class' => ''),
'accept' => array('icon' => 'icon-forward', 'class' => $sNext, 'accept' => array('icon' => 'icon-forward', 'class' => $sNext,
'hint' => 'Accept [' . $sPhase . '] und in die Queue von [' . $sNext . '] stellen.', 'hint' => 'Accept [' . $sPhase . '] und in die Queue von [' . $sNext . '] stellen.',
'label' => 'Accept' 'label' => 'Accept',
), ),
'build' => array('icon' => 'icon-forward', 'class' => $sFirst, 'build' => array('icon' => 'icon-forward', 'class' => $sFirst,
'hint' => 'neues Paket erstellen und in [' . $sFirst . '] stellen.', 'hint' => 'neues Paket erstellen und in [' . $sFirst . '] stellen.',
...@@ -1385,6 +1385,14 @@ class project { ...@@ -1385,6 +1385,14 @@ class project {
'label' => 'Details' 'label' => 'Details'
), ),
); );
// fuer wen ist der Link:
$sRole='';
if ($sFunction=="build") {$sRole = 'developer'; }
if ($sFunction=="accept"){
$sRole = 'developer';
if ($sPhase=="stage")$sRole = 'pl';
}
$sClass = $sPhase; $sClass = $sPhase;
$sIconClass = (array_key_exists($sFunction, $aLinkdata)) ? $aLinkdata[$sFunction]['icon'] : $aLinkdata['default']['icon']; $sIconClass = (array_key_exists($sFunction, $aLinkdata)) ? $aLinkdata[$sFunction]['icon'] : $aLinkdata['default']['icon'];
$sHint = ( $sHint = (
...@@ -1396,6 +1404,9 @@ class project { ...@@ -1396,6 +1404,9 @@ class project {
$sClass = ( $sClass = (
array_key_exists($sFunction, $aLinkdata) && array_key_exists("class", $aLinkdata[$sFunction]) array_key_exists($sFunction, $aLinkdata) && array_key_exists("class", $aLinkdata[$sFunction])
) ? $aLinkdata[$sFunction]['class'] : ''; ) ? $aLinkdata[$sFunction]['class'] : '';
if($sRole){
$sClass .= " role role".$sRole;
}
$sLink = "/deployment/" . $this->_aConfig["id"] . "/"; $sLink = "/deployment/" . $this->_aConfig["id"] . "/";
if ($sFunction != "overview") { if ($sFunction != "overview") {
......
...@@ -79,7 +79,8 @@ class projectlist { ...@@ -79,7 +79,8 @@ class projectlist {
foreach (array_keys($oPrj->getPhases()) as $sPhase) { foreach (array_keys($oPrj->getPhases()) as $sPhase) {
$sOutPhases.=$oPrj->renderAllPhaseDetails($sPhase,true,false); $sOutPhases.=$oPrj->renderAllPhaseDetails($sPhase,true,false);
if ($oPrj->canAcceptPhase($sPhase)){ if ($oPrj->canAcceptPhase($sPhase)){
$sOutPhases2.=" ".$oPrj->renderLink("accept", $sPhase); // $sOutPhases2.=' <span class="'.$sPhase.'" style="padding: 1em 0.5em 0.5em;">'.$oPrj->renderLink("accept", $sPhase).'</span>';
$sOutPhases2.=' '.$oPrj->renderLink("accept", $sPhase);
} }
} }
...@@ -166,6 +167,18 @@ class projectlist { ...@@ -166,6 +167,18 @@ class projectlist {
return false; return false;
} }
/**
* switch view between tiles and table
*/
function setrole(){
var sRole=$("#rolefilter").val();
$(\'.role\').hide();
$(\'.role\'+sRole).show();
localStorage.setItem("role", sRole);
showResetbtn();
return false;
}
/** /**
* set default view; it gets the last values for filter text, * set default view; it gets the last values for filter text,
* and selected values in dropdowns and restores the * and selected values in dropdowns and restores the
...@@ -183,6 +196,10 @@ class projectlist { ...@@ -183,6 +196,10 @@ class projectlist {
$("#efilter").val(localStorage.getItem("efilter")); $("#efilter").val(localStorage.getItem("efilter"));
window.setTimeout("filterTable();", 10); window.setTimeout("filterTable();", 10);
} }
if (localStorage.getItem("role")) {
$("#rolefilter").val(localStorage.getItem("role"));
window.setTimeout("setrole();", 20);
}
var sMode=localStorage.getItem("mode"); var sMode=localStorage.getItem("mode");
if (sMode)setview(sMode); if (sMode)setview(sMode);
...@@ -196,6 +213,7 @@ class projectlist { ...@@ -196,6 +213,7 @@ class projectlist {
sVisible=($("#efilter").val())?"visible":"hidden"; sVisible=($("#efilter").val())?"visible":"hidden";
if ($("#prjfilter").val()!="'.$sTrClass.'")sVisible="visible"; if ($("#prjfilter").val()!="'.$sTrClass.'")sVisible="visible";
if ($("#phasefilter").val()!="'.$sColClass.'")sVisible="visible"; if ($("#phasefilter").val()!="'.$sColClass.'")sVisible="visible";
if ($("#rolefilter").val())sVisible="visible";
$("#btnresetfilter").css("visibility", sVisible); $("#btnresetfilter").css("visibility", sVisible);
return false; return false;
} }
...@@ -209,6 +227,8 @@ class projectlist { ...@@ -209,6 +227,8 @@ class projectlist {
filterOverviewTable(); filterOverviewTable();
$("#efilter").val(""); $("#efilter").val("");
window.setTimeout("filterTable();", 10); window.setTimeout("filterTable();", 10);
$("#rolefilter").val("");
window.setTimeout("setrole();", 20);
showResetbtn(); showResetbtn();
return false; return false;
} }
...@@ -233,13 +253,23 @@ class projectlist { ...@@ -233,13 +253,23 @@ class projectlist {
<select id="prjfilter" onchange="filterOverviewTable(); return false;"> <select id="prjfilter" onchange="filterOverviewTable(); return false;">
'.$sPrjFilter.' '.$sPrjFilter.'
</select> </select>
<span style="display: none;">
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
Phasen: Phasen:
<select id="phasefilter" onchange="filterOverviewTable(); return false;"> <select id="phasefilter" onchange="filterOverviewTable(); return false;">
'.$sPhaseFilter.' '.$sPhaseFilter.'
</select> </select>
</span>
</span> </span>
&nbsp;&nbsp;&nbsp;
Rolle:
<select id="rolefilter" onchange="setrole(); return false;">
<option value="">Alle</option>
<option value="developer">Entwickler</option>
<option value="pl">Projekleiter</option>
</select>
<a href="#" class="btn" id="btnresetfilter" <a href="#" class="btn" id="btnresetfilter"
title="Filter zurücksetzen" title="Filter zurücksetzen"
style="background:#fcc;" style="background:#fcc;"
......
...@@ -78,7 +78,7 @@ ul li { ...@@ -78,7 +78,7 @@ ul li {
} }
.prjbox{ .prjbox{
float: left; width: 17%; margin: 0 1em 1em 0; height: 12em; float: left; width: 350px; margin: 0 1em 1em 0; height: 12em;
background:#f8f8f8; background:#f8f8f8;
border: 1px solid #eee; border: 1px solid #eee;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment