add new analysis reports

ispyb · Dec 20, 2018 · eeffa31 · eeffa31
1 parent 1370642
commit eeffa31
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 18 deletions.
diff --git 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: "<span class='glyphicon glyphicon-download-alt'> PDF</span>",
+                        text: "<span class='glyphicon glyphicon-download-alt'> PDF summary</span>",
                         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: "<span class='glyphicon glyphicon-download-alt'> RTF</span>",
+                        text: "<span class='glyphicon glyphicon-download-alt'> RTF summary</span>",
                         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: "<span class='glyphicon glyphicon-download-alt'> PDF analysis</span>",
+                        id : 'pdfBtn2',
+                        tooltip: 'Download Session Analysis Report',                                              
+                        margin: '2 0 2 5',
+                        handler : function(){
+                            if (_this.pdfAnalysisUrl != null){
+                                location.href = _this.pdfAnalysisUrl;                             
+                            }
+                        }
+                    },
+             {                     
+                        text: "<span class='glyphicon glyphicon-download-alt'> RTF analysis</span>",
+                        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
@@ -33,6 +33,7 @@
 
         <!-- bower:js -->
         <script src="../bower_components/jquery/dist/jquery.js"></script>
+        <script src="../bower_components/zeroclipboard/dist/ZeroClipboard.js"></script>
         <script src="../bower_components/moment/moment.js"></script>
         <script src="../bower_components/pikaday/pikaday.js"></script>
         <script src="../bower_components/handsontable/dist/handsontable.js"></script>
@@ -49,6 +50,7 @@
         <script src="../bower_components/notifyjs/dist/notify.js"></script>
         <script src="../bower_components/bootstrap-multiselect/dist/js/bootstrap-multiselect.js"></script>
         <script src="../bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
+        <script src="../bower_components/file-saver/FileSaver.js"></script>
         <script src="../bower_components/html-docx-js/dist/html-docx.js"></script>
         <!-- endbower -->
 

diff --git a/saxs/dev.html b/saxs/dev.html
@@ -35,6 +35,7 @@
 
         <!-- bower:js -->
         <script src="../bower_components/jquery/dist/jquery.js"></script>
+        <script src="../bower_components/zeroclipboard/dist/ZeroClipboard.js"></script>
         <script src="../bower_components/moment/moment.js"></script>
         <script src="../bower_components/pikaday/pikaday.js"></script>
         <script src="../bower_components/handsontable/dist/handsontable.js"></script>
@@ -51,6 +52,7 @@
         <script src="../bower_components/notifyjs/dist/notify.js"></script>
         <script src="../bower_components/bootstrap-multiselect/dist/js/bootstrap-multiselect.js"></script>
         <script src="../bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
+        <script src="../bower_components/file-saver/FileSaver.js"></script>
         <script src="../bower_components/html-docx-js/dist/html-docx.js"></script>
         <!-- endbower -->
 

diff --git a/test/dev.html b/test/dev.html
@@ -35,6 +35,7 @@
 
         <!-- bower:js -->
         <script src="../bower_components/jquery/dist/jquery.js"></script>
+        <script src="../bower_components/zeroclipboard/dist/ZeroClipboard.js"></script>
         <script src="../bower_components/moment/moment.js"></script>
         <script src="../bower_components/pikaday/pikaday.js"></script>
         <script src="../bower_components/handsontable/dist/handsontable.js"></script>
@@ -51,6 +52,7 @@
         <script src="../bower_components/notifyjs/dist/notify.js"></script>
         <script src="../bower_components/bootstrap-multiselect/dist/js/bootstrap-multiselect.js"></script>
         <script src="../bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
+        <script src="../bower_components/file-saver/FileSaver.js"></script>
         <script src="../bower_components/html-docx-js/dist/html-docx.js"></script>
         <!-- endbower -->
 
@@ -60,16 +62,57 @@
 
 
         <!-- EXI-UI-UTILS -->
-
+        <script src="../bower_components/exi-ui-utils/js/bui.js"></script>
+        <script src="../bower_components/exi-ui-utils/js/dygraphwidget.js"></script>
+        <script src="../bower_components/exi-ui-utils/js/event.js"></script>
+        <script src="../bower_components/exi-ui-utils/js/imageutils.js"></script>
+        <script src="../bower_components/exi-ui-utils/js/progressbar.js"></script>
+        <script src="../bower_components/exi-ui-utils/js/string.js"></script>
 
 
         <!-- ISPYB-JS-API -->	
-
-
-
-
-        view-source:http://lindemaria:8082/EXI/test/dev.html#/welcome
-
+        <script src="../bower_components/ispyb-js-api/js/dataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/event.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/exi/exidataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/exi/exidataadaptergroup.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/security/authenticationdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/dataadapterfactory.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/dewardataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/labcontactdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/proposaldataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/proposaldataadaptergroup.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/sessiondataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/shippingdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/autoprocintegrationdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/crystaldataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/datacollectiondataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/datacollectiongroupdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/energyscandataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/mxdataadapterfactory.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/mxdataadaptergroup.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/phasingdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/proteindataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/sampledataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/statisticsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/workflowdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/workflowstepdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/xfescandataadapter.js"></script>view-source:http://lindemaria:8082/EXI/test/dev.html#/welcome
+        <script src="../bower_components/ispyb-js-api/js/saxs/buffersaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/datacollectionsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/experiment.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/experimentlist.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/experimentsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/framesaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/hplcsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/macromoleculesaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/measurementsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/modelsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/saxsdataadapterfactory.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/saxsdataadaptergroup.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/specimensaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/stocksolutionsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/subtractionsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/templatesaxsdataadapter.js"></script>
 
         <!-- DUST -->  
 		<script src="../js/dust/helpers.js"></script>

diff --git a/tracking/dev.html b/tracking/dev.html
@@ -32,6 +32,7 @@
 
         <!-- bower:js -->
         <script src="../bower_components/jquery/dist/jquery.js"></script>
+        <script src="../bower_components/zeroclipboard/dist/ZeroClipboard.js"></script>
         <script src="../bower_components/moment/moment.js"></script>
         <script src="../bower_components/pikaday/pikaday.js"></script>
         <script src="../bower_components/handsontable/dist/handsontable.js"></script>
@@ -48,6 +49,7 @@
         <script src="../bower_components/notifyjs/dist/notify.js"></script>
         <script src="../bower_components/bootstrap-multiselect/dist/js/bootstrap-multiselect.js"></script>
         <script src="../bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
+        <script src="../bower_components/file-saver/FileSaver.js"></script>
         <script src="../bower_components/html-docx-js/dist/html-docx.js"></script>
         <!-- endbower -->
 
@@ -57,16 +59,57 @@
 
 
         <!-- EXI-UI-UTILS -->
-
+        <script src="../bower_components/exi-ui-utils/js/bui.js"></script>
+        <script src="../bower_components/exi-ui-utils/js/dygraphwidget.js"></script>
+        <script src="../bower_components/exi-ui-utils/js/event.js"></script>
+        <script src="../bower_components/exi-ui-utils/js/imageutils.js"></script>
+        <script src="../bower_components/exi-ui-utils/js/progressbar.js"></script>
+        <script src="../bower_components/exi-ui-utils/js/string.js"></script>
 
 
         <!-- ISPYB-JS-API -->	
-
-
-
-
-
-
+        <script src="../bower_components/ispyb-js-api/js/dataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/event.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/exi/exidataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/exi/exidataadaptergroup.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/security/authenticationdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/dataadapterfactory.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/dewardataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/labcontactdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/proposaldataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/proposaldataadaptergroup.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/sessiondataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/proposal/shippingdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/autoprocintegrationdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/crystaldataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/datacollectiondataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/datacollectiongroupdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/energyscandataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/mxdataadapterfactory.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/mxdataadaptergroup.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/phasingdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/proteindataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/sampledataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/statisticsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/workflowdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/workflowstepdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/mx/xfescandataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/buffersaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/datacollectionsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/experiment.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/experimentlist.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/experimentsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/framesaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/hplcsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/macromoleculesaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/measurementsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/modelsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/saxsdataadapterfactory.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/saxsdataadaptergroup.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/specimensaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/stocksolutionsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/subtractionsaxsdataadapter.js"></script>
+        <script src="../bower_components/ispyb-js-api/js/saxs/templatesaxsdataadapter.js"></script>
 
 
         <!-- DUST -->