From eeffa31994c3121685a7598ccf2e41fc1dee176d Mon Sep 17 00:00:00 2001 From: delageniere Date: Thu, 20 Dec 2018 17:27:09 +0100 Subject: [PATCH] add new analysis reports --- .../grid/mxdatacollectiongrid.js | 30 ++++++++-- mx/dev.html | 2 + saxs/dev.html | 2 + test/dev.html | 57 ++++++++++++++++--- tracking/dev.html | 57 ++++++++++++++++--- 5 files changed, 130 insertions(+), 18 deletions(-) diff --git a/js/mx/view/datacollection/grid/mxdatacollectiongrid.js b/js/mx/view/datacollection/grid/mxdatacollectiongrid.js index 5e3c8921f..50b719e14 100644 --- a/js/mx/view/datacollection/grid/mxdatacollectiongrid.js +++ b/js/mx/view/datacollection/grid/mxdatacollectiongrid.js @@ -113,9 +113,9 @@ MXDataCollectionGrid.prototype.getToolBar = function() { xtype: 'tbseparator' }, { - text: " PDF", + text: " PDF summary", id : 'pdfBtn', - tooltip: 'Download Session Report', + tooltip: 'Download Session Summary Report', margin: '2 0 2 5', handler : function(){ if (_this.pdfUrl != null){ @@ -124,15 +124,37 @@ MXDataCollectionGrid.prototype.getToolBar = function() { } }, { - text: " RTF", + text: " RTF summary", id : 'rtfBtn', - tooltip: 'Download Session Report as RTF', + tooltip: 'Download Session Summary Report as RTF', margin: '2 0 2 5', handler : function(){ if (_this.rtfUrl != null){ location.href = _this.rtfUrl; } } + }, + { + text: " PDF analysis", + id : 'pdfBtn2', + tooltip: 'Download Session Analysis Report', + margin: '2 0 2 5', + handler : function(){ + if (_this.pdfAnalysisUrl != null){ + location.href = _this.pdfAnalysisUrl; + } + } + }, + { + text: " RTF analysis", + id : 'rtfBtn2', + tooltip: 'Download Session Analysis Report as RTF', + margin: '2 0 2 5', + handler : function(){ + if (_this.rtfAnalysisUrl != null){ + location.href = _this.rtfAnalysisUrl; + } + } }, '->', { diff --git a/mx/dev.html b/mx/dev.html index 59432b903..60079886a 100644 --- a/mx/dev.html +++ b/mx/dev.html @@ -33,6 +33,7 @@ + @@ -49,6 +50,7 @@ + diff --git a/saxs/dev.html b/saxs/dev.html index 90798544e..b09f490b6 100644 --- a/saxs/dev.html +++ b/saxs/dev.html @@ -35,6 +35,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/test/dev.html b/test/dev.html index f331e9362..3e27eee3c 100644 --- a/test/dev.html +++ b/test/dev.html @@ -35,6 +35,7 @@ + @@ -51,6 +52,7 @@ + @@ -60,16 +62,57 @@ - + + + + + + - - - - - view-source:http://lindemaria:8082/EXI/test/dev.html#/welcome - + + + + + + + + + + + + + + + + + + + + + + + + + + view-source:http://lindemaria:8082/EXI/test/dev.html#/welcome + + + + + + + + + + + + + + + + diff --git a/tracking/dev.html b/tracking/dev.html index 3c8b003bd..b28a1ab7c 100644 --- a/tracking/dev.html +++ b/tracking/dev.html @@ -32,6 +32,7 @@ + @@ -48,6 +49,7 @@ + @@ -57,16 +59,57 @@ - + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +