Commit 208ca733 authored by Jerome Mariette's avatar Jerome Mariette
Browse files

add monitoring from administration view

parent 33c89240
......@@ -21,14 +21,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<input type="hidden" id="user_id" value="{$user_id}" />
<input type="hidden" id="data_folder" value="{$data_folder}" />
<input type="hidden" id="usergroup" value="{$group_info.uid}" />
<input type="hidden" id="server_url" value="{$server_url}" />
<div class="sub-content sc-top">
<div class="ng6-content-header-left administration">
<h2>Administration <small> center </small> </h2>
Select a graph to display.
</div>
<div class="ng6-content-header-right">
&nbsp;
Monitor running workflows and disk space usage. Select a tab to display what you want.
</div>
<div style="clear:both"></div>
</div>
......@@ -36,12 +36,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<div class="sub-content sc-bottom">
<ul id="myTab" class="nav nav-tabs">
<li class="active"><a href="#runs_size" data-toggle="tab">Runs size</a></li>
<li class="active"><a href="#wf_monitoring" data-toggle="tab">Workflows monitoring</a></li>
<li><a href="#runs_size" data-toggle="tab">Runs size</a></li>
</ul>
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade in active" id="runs_size">
<div class="tab-pane fade in active" id="wf_monitoring"></div>
<div class="tab-pane fade" id="runs_size">
<div id="size_chart"></div>
<div id="chart_options">
Select a user group:
......@@ -62,3 +65,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</div>
</div>
<!-- statusModal -->
<div id="statusModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="statusModalLabel" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="statusModalLabel"></h3>
</div>
<div id="statusModalBody" class="modal-body"></div>
<div class="modal-footer">
<button id="refresh_workflow" class="btn"><i class="icon-refresh"></i> Refresh</button>
<button id="rerun_workflow" class="btn btn-primary"><i class="icon-cog icon-white"></i> ReRun</button>
</div>
</div>
\ No newline at end of file
......@@ -63,6 +63,12 @@ class tx_nG6_pi6 extends tslib_pibase {
<script type="text/javascript" src="'.t3lib_extMgm::siteRelPath($this->extKey).'res/js/bootstrap.min.js"></script>
<script type="text/javascript" src="'.t3lib_extMgm::siteRelPath($this->extKey).'res/js/tx_nG6_pi6.js"></script>
<script type="text/javascript" src="'.t3lib_extMgm::siteRelPath($this->extKey).'res/js/highstock.js"></script>
<script type="text/javascript" src="'.t3lib_extMgm::siteRelPath($this->extKey).'res/js/jquery.validate.js"></script>
<script type="text/javascript" src="'.t3lib_extMgm::siteRelPath($this->extKey).'res/js/jquery.tmpl.min.js"></script>
<script type="text/javascript" src="'.t3lib_extMgm::siteRelPath($this->extKey).'res/js/jflow-activewf.js"></script>
<script type="text/javascript" src="'.t3lib_extMgm::siteRelPath($this->extKey).'res/js/jflow-availablewf.js"></script>
<script type="text/javascript" src="'.t3lib_extMgm::siteRelPath($this->extKey).'res/js/jflow-wfform.js"></script>
<script type="text/javascript" src="'.t3lib_extMgm::siteRelPath($this->extKey).'res/js/jflow-wfstatus.js"></script>
<link type="text/css" rel="stylesheet" media="screen" href="'.t3lib_extMgm::siteRelPath($this->extKey).'res/css/bootstrap.min.css"/>
<link type="text/css" rel="stylesheet" media="screen" href="'.t3lib_extMgm::siteRelPath($this->extKey).'res/css/tx_nG6.css"/>';
......@@ -79,6 +85,7 @@ class tx_nG6_pi6 extends tslib_pibase {
$smarty->assign('user_id', $GLOBALS['TSFE']->fe_user->user['uid']);
$smarty->assign('group_list', $group_list);
$smarty->assign('data_folder', $this->conf["data"]);
$smarty->assign('server_url', $this->conf['server_url']);
return $smarty->fetch('administration_view.tpl');
}
......
......@@ -147,4 +147,15 @@ $(function () {
});
}
$("#wf_monitoring").activewf({
serverURL: $("#server_url").val()
});
$("#wf_monitoring").on("select", function(event, workflow) {
$('#statusModalLabel').html(workflow["name"] + " <small>" + workflow["id"] + "</small>");
$('#statusModalBody').wfstatus({
workflowID: workflow["id"]
});
$('#statusModal').modal();
});
});
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment