fix(journal): ensure col aggregates are displayed

This commit ensures that the column aggregates for debits, credits,
descriptions, and dates are shown on the grid group headers.  Because of
careless cell template design, these values were not substituted into
the templates in a previous iteration.

Closes #626.

client/src/js/components/bhInfo.js

@@ -6,7 +6,7 @@ angular.module('bhima.components')
       '  uib-popover-template="$ctrl.template" ' +
       '  popover-placement="right" ' +
       '  popover-append-to-body="true" ' +
-      '  popover-trigger="mouseenter"> ' +
+      '  popover-trigger="\'mouseenter\'"> ' +
       '</span> ',
     bindings : {
       template: '@',

client/src/js/services/grid/GridGrouping.js

@@ -20,30 +20,45 @@ function GridGroupingService(uiGridGroupingConstants, $filter, Session, $timeout
   // cache the currency filter for later lookup
   var $currency = $filter('currency');
 
+  // alias copy
+  var copy = angular.copy;
+
   /** @const renders any currencied amount */
   var DEFAULT_COST_AGGREGATOR = {
 
     // used to render amounts in the aggregate columns
     // TODO - this should render the currency from the row set.
-    customTreeAggregationFinalizerFn : function amountRenderer(aggregation) {
+    customTreeAggregationFinalizerFn : function (aggregation) {
       aggregation.rendered = $currency(aggregation.value, currencyId);
     },
 
     treeAggregationType : uiGridGroupingConstants.aggregation.SUM,
   };
 
   /** @const aggregates quantities as needed */
-  var DEFAULT_QUANTITY_AGGREGATOR= {
+  var DEFAULT_QUANTITY_AGGREGATOR = {
     treeAggregationType : uiGridGroupingConstants.aggregation.SUM,
   };
 
+  /** @const aggregates by choosing a single item to display */
+  /** @todo - this currently defaults to MAX, should be implemented as its own custom aggregator */
+  var DEFAULT_SINGLE_AGGREGATOR = {
+    treeAggregationType: uiGridGroupingConstants.aggregation.MAX,
+    customTreeAggregationFinalizerFn: function (aggregation) {
+      aggregation.rendered = aggregation.value;
+    }
+  };
+
   /** @const aggregators assigned by column ids */
   var DEFAULT_AGGREGATORS = {
-    'debit_equiv' : DEFAULT_COST_AGGREGATOR,
-    'credit_equiv' : DEFAULT_COST_AGGREGATOR,
-    'cost' : DEFAULT_COST_AGGREGATOR,
-    'quantity' : DEFAULT_QUANTITY_AGGREGATOR,
-    'amount' : DEFAULT_QUANTITY_AGGREGATOR
+    'debit_equiv' : copy(DEFAULT_COST_AGGREGATOR),
+    'credit_equiv' : copy(DEFAULT_COST_AGGREGATOR),
+    'cost' : copy(DEFAULT_COST_AGGREGATOR),
+    'quantity' : copy(DEFAULT_QUANTITY_AGGREGATOR),
+    'amount' : copy(DEFAULT_QUANTITY_AGGREGATOR),
+    'description' : copy(DEFAULT_SINGLE_AGGREGATOR),
+    'date' : copy(DEFAULT_SINGLE_AGGREGATOR),
+    'trans_date' : copy(DEFAULT_SINGLE_AGGREGATOR), // TODO - eliminate this in favor of "date"
   };
 
   /**

client/src/partials/journal/templates/credit.cell.html

@@ -1,3 +1,7 @@
-<div class="ui-grid-cell-contents">
-  {{ row.entity.credit_equiv | currency:row.entity.currency_id }}
+<div class="ui-grid-cell-contents" title="TOOLTIP" ng-if="!row.groupHeader">
+  {{ row.entity.credit | currency:row.entity.currency_id }}
+</div>
+
+<div class="ui-grid-cell-contents" title="TOOLTIP" ng-if="row.groupHeader">
+  {{ COL_FIELD CUSTOM_FILTERS }}
 </div>

client/src/partials/journal/templates/credit_equiv.cell.html

@@ -1,3 +1,7 @@
-<div class="ui-grid-cell-contents">
+<div class="ui-grid-cell-contents" title="TOOLTIP" ng-if="!row.groupHeader">
   {{ row.entity.credit_equiv | currency:grid.appScope.enterprise.currency_id }}
 </div>
+
+<div class="ui-grid-cell-contents" title="TOOLTIP" ng-if="row.groupHeader">
+  {{ COL_FIELD CUSTOM_FILTERS }}
+</div>

client/src/partials/journal/templates/debit.cell.html

@@ -1,3 +1,9 @@
-<div class="ui-grid-cell-contents">
-  {{ row.entity.debit_equiv | currency:row.entity.currency_id }}
+<div class="ui-grid-cell-contents"  title="TOOLTIP" ng-if="!row.groupHeader">
+  {{ row.entity.debit | currency:row.entity.currency_id }}
 </div>
+
+<div class="ui-grid-cell-contents" title="TOOLTIP" ng-if="row.groupHeader">
+  {{COL_FIELD CUSTOM_FILTERS}}
+</div>
+
+

client/src/partials/journal/templates/debit_equiv.cell.html

@@ -1,3 +1,7 @@
-<div class="ui-grid-cell-contents">
+<div class="ui-grid-cell-contents" title="TOOLTIP" ng-if="!row.groupHeader">
   {{ row.entity.debit_equiv | currency:grid.appScope.enterprise.currency_id }}
 </div>
+
+<div class="ui-grid-cell-contents" title="TOOLTIP" ng-if="row.groupHeader">
+  {{ COL_FIELD CUSTOM_FILTERS }}
+</div>