Skip to content
Snippets Groups Projects
Commit a23aa337 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

use bootstrap-select on project overview

parent 9bde7d9c
No related branches found
No related tags found
1 merge request!72OP#7651 CI Server: beide AWX ansteuerbar machen https://projects.iml.unibe.ch/work_packages/7651
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
require_once 'base.class.php'; require_once 'base.class.php';
require_once 'project_gui.class.php'; require_once 'project_gui.class.php';
require_once("actionlog.class.php");
/** /**
* class for project overview * class for project overview
*/ */
...@@ -65,6 +67,9 @@ class projectlist extends base ...@@ -65,6 +67,9 @@ class projectlist extends base
$oPrj1 = new projectgui(); $oPrj1 = new projectgui();
$oHtml = new htmlguielements(); $oHtml = new htmlguielements();
// TODO :: TIMEFILTER
// $oLog = new actionlog();
$sPrjFilter = ''; $sPrjFilter = '';
$sPrjGroupFilter = ''; $sPrjGroupFilter = '';
$sPhaseFilter = ''; $sPhaseFilter = '';
...@@ -120,6 +125,23 @@ class projectlist extends base ...@@ -120,6 +125,23 @@ class projectlist extends base
. (!($aProgress['hasQueue'] || $aProgress['inprogress']) ? ' nochange' : '') . (!($aProgress['hasQueue'] || $aProgress['inprogress']) ? ' nochange' : '')
. ' group-' . $sPrjGroup; . ' group-' . $sPrjGroup;
/*
TODO :: TIMEFILTER
$aLastaction=$oLog->getLastProjectAction($sPrj);
$TimeLastAction=isset($aLastaction[0]['time']) ? date('U', strtotime((string)$aLastaction[0]['time'])) : false;
if($TimeLastAction){
$iAge = (time() - $TimeLastAction) / 60 / 60 / 24;
if($iAge < 7){
$sClasses .= ' time-week';
}
if($iAge < 1){
$sClasses .= ' time-today';
}
}
*/
if ($aProgress['inprogress']) { if ($aProgress['inprogress']) {
$iInprogress++; $iInprogress++;
...@@ -249,11 +271,25 @@ class projectlist extends base ...@@ -249,11 +271,25 @@ class projectlist extends base
<button id="btnProgressinprogress" class="btn btn-default prjprogress" onclick="$(\'#progressfilter\').val(\'inprogress\'); return setprogress();" >' . $sDivInprogress . '<span>' . $iInprogress . '</span></button> <button id="btnProgressinprogress" class="btn btn-default prjprogress" onclick="$(\'#progressfilter\').val(\'inprogress\'); return setprogress();" >' . $sDivInprogress . '<span>' . $iInprogress . '</span></button>
<button id="btnProgresshasqueue" class="btn btn-default prjprogress" onclick="$(\'#progressfilter\').val(\'hasqueue\'); return setprogress();" >' . $sDivHasqueue . '<span>' . $iHasqueue . '</span></button> <button id="btnProgresshasqueue" class="btn btn-default prjprogress" onclick="$(\'#progressfilter\').val(\'hasqueue\'); return setprogress();" >' . $sDivHasqueue . '<span>' . $iHasqueue . '</span></button>
</div> </div>
<!--
TODO :: TIMEFILTER
- set buttons
- extend js code for filtering public_html/deployment/js/functions_overview.js
- lang texts
<div class="btn-group">
<button id="btnTimeAll" class="btn btn-default prjtime" onclick="$(\'#progressfilter\').val(\'\'); return setprogress();" >' . t("overview-time-all") . '</button>
<button id="btnTimeAll" class="btn btn-default prjtime" onclick="$(\'#progressfilter\').val(\'\'); return setprogress();" >' . t("overview-time-week") . '</button>
<button id="btnTimeAll" class="btn btn-default prjtime" onclick="$(\'#progressfilter\').val(\'\'); return setprogress();" >' . t("overview-time-today") . '</button>
</div>
-->
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<label for="prjgroupfilter"> <label for="prjgroupfilter">
' . t("projectgroup") . ': ' . t("projectgroup") . ':
</label> </label>
<select id="prjgroupfilter" class="form-control" onchange="filterOverviewTable(); return false;"> <select id="prjgroupfilter" class="selectpicker" data-live-search="true" onchange="filterOverviewTable(); return false;">
' . $sPrjGroupFilter . ' ' . $sPrjGroupFilter . '
</select> </select>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment