Merge branch 'master' into gdpr

Author: ar2rsawseen

plugins/reports/frontend/public/stylesheets/main.css

@@ -26,6 +26,61 @@
 #reports-widget-drawer.editing #create-widget { display: none; }
 #reports-widget-drawer.editing #save-widget { display: block; }
 
+ #reports-table .options-item  .edit { display: block; right: 10px; top: 0; font-size: 17px; cursor: pointer; color: #a7a7a7; padding: 7px 10px; line-height: 15px; background-color: rgba(255,255,255,0.03); transition: background-color 1s; }
+ #reports-table .options-item  .edit:before { font-size:20px; font-family: 'Ionicons';  content: "\f396"; }
+ #reports-table .options-item  .edit:hover { color: #6B6B6B;  background-color: rgba(255,255,255,0.06); transition: background-color 1s; }
+ #reports-table .options-item :hover .edit { display: block; }
+ #reports-table .options-item  .edit-menu { 
+    margin: -6px -80px;
+    display: none; 
+    float:left; 
+    z-index: 10;
+    position:absolute; 
+    font-size: 13px;
+    white-space: nowrap;
+    background-color: #fff; 
+    border-radius: 2px;  
+    width: 106px;  
+    padding:10px 0 10px 0;
+    border: 1px solid #d0d0d0;
+}
+ #reports-table .options-item  .edit-menu .item {  
+    cursor: pointer;
+    padding: 8px 20px; 
+    font-size: 24px;
+    white-space: nowrap; 
+    cursor:pointer; font-size: 13px; white-space: nowrap; color:#474747; }
+ #reports-table .options-item  .edit-menu .item:hover { background-color: #f3f3f3; }
+ 
+  #reports-table .options-item  .edit-menu:before {
+    border: 4px solid rgba(194, 225, 245, 0);
+    border-bottom-color: #FFF;
+    right: 7px;
+    top: -8px;
+    content: " ";
+    height: 0;
+    width: 0;
+    position: absolute;
+    pointer-events: none;
+    z-index: 2;
+}
+ 
+  #reports-table .options-item  .edit-menu:after {
+    border: 5px solid rgba(194, 225, 245, 0);
+    border-bottom-color: #d0d0d0;
+    right: 6px;
+    top: -10px;
+    content: " ";
+    height: 0;
+    width: 0;
+    position: absolute;
+    pointer-events: none;
+    z-index: 1;
+}
+
+
+ 
+
 #reports-table  th:nth-child(1)  {
     width:15%;
 } 

plugins/slipping-away-users/api/api.js

@@ -46,13 +46,14 @@ const plugin = {},
       BPromise.all(tasks).spread(function() {
         const result = [];
         periods.forEach((p,index) => {
-          const percentage = (arguments[index] / arguments[periods.length]) * 100;
-        result.push({
-          period: p,
-          count: arguments[index],
-          percentage: `${ percentage.toFixed(2) }`,
-          timeStamp: timeList[p],
-        })
+          let percentage = (arguments[index] / arguments[periods.length]) * 100;
+          percentage = isNaN(percentage) ? 0 : percentage;
+          result.push({
+            period: p,
+            count: arguments[index],
+            percentage: `${ percentage.toFixed(2) }`,
+            timeStamp: timeList[p],
+          })
       });
         common.returnOutput(params, result);
       });