Merge pull request #444 from maestrano/release/v1.6.6

Release - v1.6.6

Changelog.md

@@ -1,5 +1,15 @@
 # Impac! Frontend Changelog
 
+### v1.6.6 | 2017 - Week 46
+
+#### Adds
+- [IMPAC-616] Stack invoices and bills on the cash projection widget
+
+#### Dependencies
+- Finance Bolt v1.4.0 - This is a soft dependency: transactions won't be stacked if older versions are used, but the change is backward-compatible
+
+-------------------------------------------------------------
+
 ### v1.6.5 | 2017 - Week 45
 
 #### Adds

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "impac-angular",
   "description": "Impac! Front-End Library",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "license": "Copyright 2017 Maestrano Pty Ltd",
   "repository": {
     "type": "git",

dist/impac-angular.less

@@ -2644,17 +2644,6 @@ dashboard-templates-selector {
   .overlay, .title, .btn, .example { display: none; }
 }
 
-.analytics common-delete-widget {
-  .widget-popup();
-  .message {
-    .loader i.fa.fa-spinner {
-      font-size: 26px;
-    }
-    p { padding: 0px 10px; }
-    button.btn { margin-top: 20px; }
-  }
-}
-
 #transactions-add {
   .widget-popup();
   .message {
@@ -2745,13 +2734,27 @@ dashboard-templates-selector {
   }
 }
 
+.analytics common-delete-widget {
+  .widget-popup();
+  .message {
+    .loader i.fa.fa-spinner {
+      font-size: 26px;
+    }
+    p { padding: 0px 10px; }
+    button.btn { margin-top: 20px; }
+  }
+}
+
 .analytics .dashboard-settings.currency {
   text-align: right;
   select {
     margin-top: 4px;
   }
 }
 
+.analytics .dashboard-settings.pdf-mode {
+}
+
 .analytics .dashboard-settings.sync-apps {
   .show-status {
     margin-right: 5px;
@@ -2858,24 +2861,9 @@ dashboard-templates-selector {
   .fa.success { color: @flurogreen; }
 }
 
-.analytics .dashboard-settings.pdf-mode {
-}
-
 .analytics .widget-item .content.accounts-accounting-values {
   // Nothing particular yet for this template...
 }
-.analytics .widget-item .content.accounts-assets-summary {
-  .legend {
-    text-align: left;
-    max-height: 115px;
-
-    .title {
-      text-align: center;
-      border-bottom: dashed 1px @impac-widget-borders-color;
-    }
-  }
-}
-
 .analytics .widget-item .content.accounts-assets-liability-summary {
   .param-selector {
     text-align: center;
@@ -2897,6 +2885,18 @@ dashboard-templates-selector {
   }
 }
 
+.analytics .widget-item .content.accounts-assets-summary {
+  .legend {
+    text-align: left;
+    max-height: 115px;
+
+    .title {
+      text-align: center;
+      border-bottom: dashed 1px @impac-widget-borders-color;
+    }
+  }
+}
+
 .analytics .widget-item .content.accounts-balance {
   h3 {
     .left-thin(30px);
@@ -3047,6 +3047,35 @@ dashboard-templates-selector {
   }
 }
 
+.analytics .widget-item .content.accounts-custom-calculation {
+  h3 {
+    margin-top: 85px;
+    text-align: center;
+    font-weight: bold;
+  }
+
+  .price {
+    .center-bold(75px);
+  }
+
+  .legend {
+    max-height: 125px;
+  }
+}
+
+.analytics.modal-custom-calculation {
+  margin: 0px;
+  padding: 0px;
+}
+
+.analytics.modal-custom-calculation .modal-body {
+  .edit {
+    .edit-panel-style();
+    padding: 5px;
+    overflow: visible;
+  }
+}
+
 .analytics .widget-item .content.accounts-comparison {
   .tall-widget();
 
@@ -3112,35 +3141,6 @@ dashboard-templates-selector {
   }
 }
 
-.analytics .widget-item .content.accounts-custom-calculation {
-  h3 {
-    margin-top: 85px;
-    text-align: center;
-    font-weight: bold;
-  }
-
-  .price {
-    .center-bold(75px);
-  }
-
-  .legend {
-    max-height: 125px;
-  }
-}
-
-.analytics.modal-custom-calculation {
-  margin: 0px;
-  padding: 0px;
-}
-
-.analytics.modal-custom-calculation .modal-body {
-  .edit {
-    .edit-panel-style();
-    padding: 5px;
-    overflow: visible;
-  }
-}
-
 .analytics .widget-item .content.accounts-detailed-classifications {
   .tall-widget();
   .widget-lines-container {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "impac-angular",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "author": {
     "name": "Xaun Lopez",
     "email": "[email protected]"

src/components/widgets/accounts-cash-projection/accounts-cash-projection.directive.coffee

@@ -9,6 +9,8 @@ module.controller('WidgetAccountsCashProjectionCtrl', ($scope, $q, $filter, $tim
   # Used by onZoom callback
   updateLocked = false
   zoomMetadata = {}
+  # Stack the invoices and bills based on their age
+  w.metadata.ranges = ['-60d', '-30d']
 
   # Timestamps stored in the back-end are in UTC => the filter on the date must be UTC too
   dateFilter = (timestamp) ->
@@ -127,7 +129,7 @@ module.controller('WidgetAccountsCashProjectionCtrl', ($scope, $q, $filter, $tim
   # Sets the transactions list resources type and displays it
   onClickBar = (event) ->
     series = this
-    resources = switch(series.name)
+    resources = switch(series.userOptions.stack)
       when 'Payables'
         'bills'
       when 'Receivables'
@@ -159,6 +161,12 @@ module.controller('WidgetAccountsCashProjectionCtrl', ($scope, $q, $filter, $tim
         ImpacWidgetsSvc.update(w, { metadata: zoomMetadata }, false).finally(-> updateLocked = false)
       , 1000
 
+  onClickLegend = ->
+    series = this
+    for s in $scope.chart.hc.series
+      continue if s.userOptions.linkedTo != series.name
+      if series.visible then s.hide() else s.show()
+
   # == Widget =====================================================================================
   # Executed after the widget content is retrieved from the API
   w.initContext = ->
@@ -196,6 +204,7 @@ module.controller('WidgetAccountsCashProjectionCtrl', ($scope, $q, $filter, $tim
     # Add events callbacks to chart object
     $scope.chart.addCustomLegend(legendFormatter)
     $scope.chart.addSeriesEvent('click', onClickBar)
+    $scope.chart.addSeriesEvent('legendItemClick', onClickLegend)
 
     # Notifies parent element that the chart is ready to be displayed
     $scope.chartDeferred.notify($scope.chart)