Change things discussed in meeting

ubccr · Jul 17, 2019 · d9861c5 · d9861c5
1 parent 9d672d0
commit d9861c5
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 18 deletions.
diff --git a/classes/Rest/Controllers/SummaryControllerProvider.php b/classes/Rest/Controllers/SummaryControllerProvider.php
@@ -28,7 +28,7 @@ public function setupRoutes(Application $app, ControllerCollection $controller)
         $controller->delete("$root/layout", "$class::resetLayout");
 
         $controller->get("$root/rolereport", "$class::getRoleReport");
-        $controller->get("$root/recentchartsreports", "$class::getRecentChartsReports");
+        $controller->get("$root/savedchartsreports", "$class::getSavedChartsReports");
 
         $controller->post("$root/viewedUserTour", "$class::setViewedUserTour");
         $controller->get("$root/viewedUserTour", "$class::getViewedUserTour");
@@ -299,9 +299,9 @@ public function getViewedUserTour(Request $request, Application $app)
         ));
     }
     /**
-     * Get recent charts and reports.
+     * Get saved charts and reports.
      **/
-    public function getRecentChartsReports(Request $request, Application $app)
+    public function getSavedChartsReports(Request $request, Application $app)
     {
         $user = $this->authorize($request);
         if (isset($user)) {

diff --git a/configuration/assets.json b/configuration/assets.json
@@ -4,7 +4,7 @@
             "js": [
                 "gui/js/modules/summary/ChartPortlet.js",
                 "gui/js/modules/summary/JobPortlet.js",
-                "gui/js/modules/summary/RecentChartsReportsPortlet.js",
+                "gui/js/modules/summary/SavedChartsReportsPortlet.js",
                 "gui/js/modules/summary/ReportThumbnailsPortlet.js"
             ],
             "css": [

diff --git a/html/gui/css/ReportThumbnailsPortlet.css b/html/gui/css/ReportThumbnailsPortlet.css
@@ -9,8 +9,8 @@
 }
 
 .images-view .thumb img {
-    height: 158px;
-    width: 270px;
+    height: 180px;
+    width: 278px;
 }
 
 .images-view .thumb-wrap {

diff --git a/html/gui/js/modules/summary/ReportThumbnailsPortlet.js b/html/gui/js/modules/summary/ReportThumbnailsPortlet.js
@@ -208,11 +208,54 @@ XDMoD.Modules.SummaryPortlets.ReportThumbnailsPortlet = Ext.extend(Ext.Panel, {
             }
         });
         this.items = [this.panel];
+        this.tools = [
+            {
+                id: 'help',
+                qtip: [
+                    '<ul>',
+                    '<li style="padding-top:6px;margin-bottom:6px;">',
+                    '<span style="width:20px;background:#ff0000;display:inline-block">&nbsp;</span>',
+                    '<span><b>Failed Runs</b></span>',
+                    '<ul>',
+                    '<li style="margin-left:6px;">A run in which the app kernel failed to complete successfully.</li>',
+                    '</ul>',
+                    '</li>',
+                    '<li style="margin-top:6px;margin-bottom:6px;">',
+                    '<span style="width: 20px;background:#ffb336;display:inline-block">&nbsp;</span>',
+                    '<span><b>Under Performing Runs</b></span>',
+                    '<ul>',
+                    '<li style="margin-left:6px;">A run in which the app kernel completed successfully but performed below the established control region.</li>',
+                    '</ul>',
+                    '</li>',
+                    '<li style="margin-top:6px;margin-bottom:6px;">',
+                    '<span style="width: 20px;background:#50b432;display:inline-block ">&nbsp;</span>',
+                    '<span><b>In Control Runs</b></span>',
+                    '<ul>',
+                    '<li style="margin-left:6px;">A run in which the app kernel completed successfully and performed within the established control region.</li>',
+                    '</ul>',
+                    '</li>',
+                    '<li style="margin-top:6px;padding-bottom:6px;">',
+                    '<span style="width: 20px;background:#3c86ff;display:inline-block">&nbsp;</span>',
+                    '<span><b>Over Performing Runs</b></span>',
+                    '<ul>',
+                    '<li style="margin-left:6px;">A run in which the app kernel completed successfully and performed better than the established control region.</li>',
+                    '</ul>',
+                    '</li>',
+                    '</ul>'
+                ].join(' '),
+                qwidth: 60
+            }
+        ];
         this.tbar = {
             items: [
+                {
+                    xtype: 'tbtext',
+                    text: 'Time Range'
+                },
                 {
                     xtype: 'button',
-                    text: 'Time Range',
+                    text: timeframe_label,
+                    iconCls: 'custom_date',
                     menu: [{
                         text: '30 day',
                         checked: timeframe_label === '30 day',
@@ -224,6 +267,8 @@ XDMoD.Modules.SummaryPortlets.ReportThumbnailsPortlet = Ext.extend(Ext.Panel, {
                                 var start = lastMonth;
                                 var end = today;
                                 this.ownerCt.ownerCt.ownerCt.ownerCt.fireEvent('timeframe_change', start, end);
+                                this.ownerCt.ownerCt.ownerCt.items.items[1].setText('30 day');
+                                this.ownerCt.ownerCt.ownerCt.items.items[2].setText('<b>Summary Report - ' + self.timeframe.start_date + ' - ' + self.timeframe.end_date + '</b>');
                             }
                         }
                     },
@@ -239,6 +284,8 @@ XDMoD.Modules.SummaryPortlets.ReportThumbnailsPortlet = Ext.extend(Ext.Panel, {
                                 var start = oneYearAgoStart;
                                 var end = oneYearAgoEnd;
                                 this.ownerCt.ownerCt.ownerCt.ownerCt.fireEvent('timeframe_change', start, end);
+                                this.ownerCt.ownerCt.ownerCt.items.items[1].setText('Previous year');
+                                this.ownerCt.ownerCt.ownerCt.items.items[2].setText('<b>Summary Report - ' + self.timeframe.start_date + ' - ' + self.timeframe.end_date + '</b>');
                             }
                         }
                     },
@@ -253,6 +300,8 @@ XDMoD.Modules.SummaryPortlets.ReportThumbnailsPortlet = Ext.extend(Ext.Panel, {
                                 var start = last5Year;
                                 var end = today;
                                 this.ownerCt.ownerCt.ownerCt.ownerCt.fireEvent('timeframe_change', start, end);
+                                this.ownerCt.ownerCt.ownerCt.items.items[1].setText('5 year');
+                                this.ownerCt.ownerCt.ownerCt.items.items[2].setText('<b>Summary Report - ' + self.timeframe.start_date + ' - ' + self.timeframe.end_date + '</b>');
                             }
                         }
                     },
@@ -263,13 +312,17 @@ XDMoD.Modules.SummaryPortlets.ReportThumbnailsPortlet = Ext.extend(Ext.Panel, {
                         listeners: {
                             click: function (comp) {
                                 this.ownerCt.ownerCt.ownerCt.ownerCt.fireEvent('timeframe_change');
+                                this.ownerCt.ownerCt.ownerCt.items.items[1].setText('Report default');
+                                this.ownerCt.ownerCt.ownerCt.items.items[2].setText('<b>Summary Report</b>');
                             }
                         }
                     }]
                 },
-                ' ',
-                '|',
-                ' ',
+                {
+                    xtype: 'tbtext',
+                    text: '<b>Summary Report - ' + self.timeframe.start_date + ' - ' + self.timeframe.end_date + '</b>'
+                },
+                '->',
                 {
                     text: 'Download Report',
                     icon: 'gui/images/report_generator/pdf_icon.png',
@@ -293,7 +346,6 @@ XDMoD.Modules.SummaryPortlets.ReportThumbnailsPortlet = Ext.extend(Ext.Panel, {
                             });
                             conn.request({
                                 url: 'controllers/report_builder.php',
-
                                 params: {
                                     operation: 'send_report',
                                     report_id: report_id,
@@ -302,9 +354,7 @@ XDMoD.Modules.SummaryPortlets.ReportThumbnailsPortlet = Ext.extend(Ext.Panel, {
                                     start_date: start_date,
                                     end_date: end_date
                                 },
-
                                 method: 'POST',
-
                                 callback: function (options, success, response) {
                                     if (success) {
                                         var responseData = CCR.safelyDecodeJSONResponse(response);

diff --git a/...les/summary/RecentChartsReportsPortlet.js → ...ules/summary/SavedChartsReportsPortlet.js b/...les/summary/RecentChartsReportsPortlet.js → ...ules/summary/SavedChartsReportsPortlet.js
@@ -1,10 +1,10 @@
 Ext.namespace('XDMoD.Modules.SummaryPortlets');
 
-XDMoD.Modules.SummaryPortlets.RecentChartsReportsPortlet = Ext.extend(Ext.ux.Portlet, {
+XDMoD.Modules.SummaryPortlets.SavedChartsReportsPortlet = Ext.extend(CCR.xdmod.ui.Portlet, {
 
     layout: 'fit',
     autoScroll: true,
-    title: 'Recent Charts and Reports',
+    title: 'Saved Charts and Reports',
     width: 1000,
 
     initComponent: function () {
@@ -13,7 +13,7 @@ XDMoD.Modules.SummaryPortlets.RecentChartsReportsPortlet = Ext.extend(Ext.ux.Por
         this.chartReportStore = new Ext.data.JsonStore({
             // store configs
             autoDestroy: true,
-            url: XDMoD.REST.url + '/summary/recentchartsreports',
+            url: XDMoD.REST.url + '/summary/savedchartsreports',
             // reader configs
             root: 'data',
             idProperty: 'name',
@@ -28,6 +28,9 @@ XDMoD.Modules.SummaryPortlets.RecentChartsReportsPortlet = Ext.extend(Ext.ux.Por
                 {
                     name: 'ts',
                     convert: function (v, rec) {
+                        if (rec.ts === '0') {
+                            return 'Unknown';
+                        }
                         return Ext.util.Format.date(new Date(rec.ts * 1000).toString(), 'Y-m-d h:i:s');
                     }
                 }
@@ -125,12 +128,19 @@ XDMoD.Modules.SummaryPortlets.RecentChartsReportsPortlet = Ext.extend(Ext.ux.Por
 
         this.height = this.width * aspectRatio;
         this.items = [this.chartReportGrid];
-        XDMoD.Modules.SummaryPortlets.RecentChartsReportsPortlet.superclass.initComponent.apply(this, arguments);
+        this.tools = [
+            {
+                id: 'help',
+                qtip: 'Porlet shows a list of saved charts and reports.',
+                qwidth: 60
+            }
+        ];
+        XDMoD.Modules.SummaryPortlets.SavedChartsReportsPortlet.superclass.initComponent.apply(this, arguments);
     }
 });
 
 /**
 * The Ext.reg call is used to register an xtype for this class so it
 * can be dynamically instantiated
 */
-Ext.reg('RecentChartsReportsPortlet', XDMoD.Modules.SummaryPortlets.RecentChartsReportsPortlet);
+Ext.reg('SavedChartsReportsPortlet', XDMoD.Modules.SummaryPortlets.SavedChartsReportsPortlet);