x/bansho
Code Issues Proposed changes

Dynamic noRepeat filter

Browse Source
This commit is contained in:
Frédéric Vachon 2015-03-09 14:41:35 -04:00
parent ba3bfe3b3a
commit b2d47cdf19
3 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/table/cell_host/cell_host.html
View File

@ -1,3 +1,3 @@
<td class="data-table__host {{state}}" ng-controller="CellHostCtrl">
<td class="data-table__host {{entry[cell_name + '_additionnalClass']}} {{state}}" ng-controller="CellHostCtrl">
<a class="data-table__data" href="#">{{entry.host_name}}</a>
</td>

1
app/components/table/cell_host/cell_host.js
View File

@ -3,6 +3,7 @@
angular.module('adagios.table.cell_host', ['adagios.table'])
.controller('CellHostCtrl', ['$scope', function ($scope) {
$scope.cell_name = 'host';
if ($scope.entry.host_state === 0) {
$scope.state = 'state--ok';
} else if ($scope.entry.host_state === 1) {

64
app/components/table/table.js
View File

@ -40,13 +40,6 @@ angular.module('adagios.table', ['adagios.live',
getData = function (requestFields, filters, apiName) {
getServices(requestFields, filters, apiName)
.success(function (data) {
var fieldToWrap = tableConfig.cellWrappableField[conf.noRepeatCell],
cellFields = tableConfig.cellToFieldsMap[conf.noRepeatCell];
if (conf.noRepeatCell !== "") {
data = processColumnRepeat(data, fieldToWrap, cellFields, conf.isWrappable);
}
$scope.entries = data;
});
};
@ -141,35 +134,23 @@ angular.module('adagios.table', ['adagios.live',
this.NoRepeatCell = config.noRepeatCell;
})
.service('processColumnRepeat', function () {
function clearFields(entry, fields) {
angular.forEach(fields, function (value) {
entry[value] = '';
});
}
// Erase subsequently repeated data of a given cell only keeping the first occurrence
// fieldToProcess is the field to watch for subsequent repetition
// fields are all the fields of a given cell whose data will be erased
return function (data, fieldToProcess, fields, isWrappable) {
.filter('wrappableStyle', ['tableConfig', function (tableConfig) {
return function (data) {
var last = '',
actual = '',
entry = {},
first_child = false,
parent_found = false,
class_name = ['', ''],
i;
i,
fieldToWrap = tableConfig.cellWrappableField[tableConfig.noRepeatCell];
if (isWrappable === "true") {
if (tableConfig.isWrappable) {
class_name = ['state--hasChild', 'state--isChild'];
}
for (i = 0; i < data.length; i += 1) {
entry = data[i];
actual = entry[fieldToProcess];
if (entry[fieldToProcess] === last) {
if (entry[fieldToWrap] === last) {
if (!data[i - 1].has_child && !parent_found) {
data[i - 1].has_child = 1;
@ -181,16 +162,37 @@ angular.module('adagios.table', ['adagios.live',
entry.child_class = class_name[1];
}
clearFields(entry, fields);
} else {
first_child = false;
parent_found = false;
}
last = actual;
last = entry[fieldToWrap];
}
return data;
}
});
};
}])
.filter('noRepeat', ['tableConfig', function (tableConfig) {
return function (items) {
var newItems = [],
previous;
angular.forEach(items, function (item) {
var fieldToCompare = tableConfig.cellWrappableField[tableConfig.noRepeatCell],
new_attr = tableConfig.noRepeatCell + "_additionnalClass";
if (previous === item[fieldToCompare]) {
item[new_attr] = 'hide-childrens';
} else {
previous = item[fieldToCompare].slice(0);
if (!!item[new_attr]) {
item[new_attr] = item[new_attr].replace("hide-childrens", "");
}
}
newItems.push(item);
});
return newItems;
};
}]);