Index: main/plugin-admin/resources/js/Ametys/plugins/admin/jvmstatus/MonitoringTool.js =================================================================== --- main/plugin-admin/resources/js/Ametys/plugins/admin/jvmstatus/MonitoringTool.js (revision 41221) +++ main/plugin-admin/resources/js/Ametys/plugins/admin/jvmstatus/MonitoringTool.js (working copy) @@ -265,22 +265,103 @@ createPanel: function () { - this._monitoringPanel = Ext.create('Ext.tab.Panel', { - tabPosition: 'left', - tabRotation: 0, - listeners: { - 'tabchange': Ext.bind(function(tabPanel, newChart, oldChart, eOpts) { - if (oldChart != null) - { - newChart.getAxis(0).setVisibleRange(oldChart.getAxis(0).getVisibleRange()); +// this._monitoringPanel = Ext.create('Ext.tab.Panel', { +// tabPosition: 'left', +// tabRotation: 0, +// listeners: { +// 'tabchange': Ext.bind(function(tabPanel, newChart, oldChart, eOpts) { +// if (oldChart != null) +// { +// newChart.getAxis(0).setVisibleRange(oldChart.getAxis(0).getVisibleRange()); +// } +// this.setDrawMode(this.getDrawMode()); +// this.reloadActiveGraph(); +// }, this) +// } +// }); +// +// return this._monitoringPanel; + + var foo = Ext.create({ + xtype: 'cartesian', + renderTo: document.body, + width: 600, + height: 400, + insetPadding: 40, + store: { + fields: ['data1', 'time'], + data: [{ + 'time': new Date('Jan 1 2010 00:00').getTime(), + 'data1': 10 + }, { + 'time': new Date('Jan 1 2010 01:00').getTime(), + 'data1': 7 + }, { + 'time': new Date('Jan 1 2010 02:00').getTime(), + 'data1': 5 + }, { + 'time': new Date('Jan 1 2010 03:00').getTime(), + 'data1': 2 + }, { + 'time': new Date('Jan 1 2010 04:00').getTime(), + 'data1': 27 + }] + }, + + legend: { + docked: 'right' + }, + + axes: [{ + type: 'numeric', + position: 'left', + fields: ['data1'], + title: { + text: 'Sample Values', + fontSize: 15 + }, + grid: true, + minimum: 0 + }, { + type: 'time', + position: 'bottom', + grid: true, + fields: ['time'], + title: { + text: 'Sample Values', + fontSize: 15 + }, + dateFormat: "d/m/Y àH:i", + label: { + rotate: { + degrees: -75 } - this.setDrawMode(this.getDrawMode()); - this.reloadActiveGraph(); - }, this) - } + }, + fromDate: new Date('Jan 1 2010 00:00'), + toDate: new Date('Jan 1 2010 04:00') + }], + series: [{ + type: 'line', + xField: 'time', + yField: 'data1', + marker: { + type: 'path', + path: ['M', - 4, 0, 0, 4, 4, 0, 0, - 4, 'Z'], + lineWidth: 2, + fill: 'white' + }, + tooltip: { + trackMouse: true, + dismissDelay: 0, + renderer: Ext.bind(function (tooltip, record, item) { + var date = Ext.Date.format(new Date(record.get('time')), "d/m/Y àH:i"); + var value = record.get('data1'); + tooltip.setHtml(date + ': ' + value); + }, this) + } + }] }); - - return this._monitoringPanel; + return foo; }, setParams: function (params) @@ -294,21 +375,22 @@ */ refresh: function () { - this.showRefreshing(); - - Ametys.data.ServerComm.callMethod({ - role: "org.ametys.runtime.plugins.admin.jvmstatus.JVMStatusHelper", - methodName: "getMonitoringData", - parameters: [], - callback: { - scope: this, - handler: this._refreshCb - }, - errorMessage: { - category: this.self.getName(), - msg: "{{i18n PLUGINS_ADMIN_TOOL_MONITORING_SERVER_ERROR}}" - } - }); +// this.showRefreshing(); +// +// Ametys.data.ServerComm.callMethod({ +// role: "org.ametys.runtime.plugins.admin.jvmstatus.JVMStatusHelper", +// methodName: "getMonitoringData", +// parameters: [], +// callback: { +// scope: this, +// handler: this._refreshCb +// }, +// errorMessage: { +// category: this.self.getName(), +// msg: "{{i18n PLUGINS_ADMIN_TOOL_MONITORING_SERVER_ERROR}}" +// } +// }); + this.showUpToDate(); }, /** @@ -466,14 +548,22 @@ fromDate: fromDate, toDate: toDate, maxZoom: 500000, + title: { + text: 'Time', + fontSize: 15 + }, label: { rotate: { - degrees: -45 + degrees: -75 } } }, { type: 'numeric', position: 'left', + title: { + text: 'Sample Values', + fontSize: 15 + }, grid: true, minimum: 0, limits: this._getLimitLineCfg(thresholds),