Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#286: added sorting by build list status on monitoring page

This commit is contained in:
Vokhmin Alexey V 2013-08-28 23:04:41 +04:00
parent d8408d22c9
commit bfa07b577e
2 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/assets/javascripts/angularjs/controllers/build_lists_controller.js → app/assets/javascripts/angularjs/controllers/build_lists_controller.js.erb
View File

@ -8,6 +8,21 @@ RosaABF.controller('BuildListsController', ['$scope', '$http', '$location', '$ti
$scope.pages = []; $scope.pages = [];
$scope.opened = {}; $scope.opened = {};
$scope.map_priorities = {
<%=BuildList::WAITING_FOR_RESPONSE%>: 11,
<%=BuildList::BUILD_PENDING%>: 10,
<%=BuildList::BUILD_STARTED%>: 9,
<%=BuildList::SUCCESS%>: 8,
<%=BuildList::BUILD_PUBLISH%>: 7,
<%=BuildList::BUILD_PUBLISHED%>: 6,
<%=BuildList::TESTS_FAILED%>: 5,
<%=BuildList::BUILD_CANCELING%>: 4,
<%=BuildList::BUILD_CANCELED%>: 3,
<%=BuildList::BUILD_ERROR%>: 2,
<%=BuildList::FAILED_PUBLISH%>: 1,
<%=BuildList::REJECTED_PUBLISH%>: 0
};
// Fixes: redirect to page after form submit // Fixes: redirect to page after form submit
$("#monitoring_filter").on('submit', function(){ return false; }); $("#monitoring_filter").on('submit', function(){ return false; });
@ -44,7 +59,17 @@ RosaABF.controller('BuildListsController', ['$scope', '$http', '$location', '$ti
$scope.build_lists = []; $scope.build_lists = [];
$scope.opened = {}; $scope.opened = {};
_.each(build_lists, function(bl){ _.each(build_lists, function(bl){
_.each(bl.related, function(b){ $scope.build_lists.push(b); }); if (bl.related.length > 1) {
var sorted_build_lists = _.sortBy(bl.related, function(b) { return $scope.map_priorities[b.status]; });
bl.clearRelated();
var first_in_group = sorted_build_lists[0];
_.each(sorted_build_lists, function(b){
if (b != first_in_group) { first_in_group.addRelated(b); }
$scope.build_lists.push(b);
});
} else {
$scope.build_lists.push(bl);
}
}); });
// Shows groups which have been opened before // Shows groups which have been opened before
_.each(to_open, function(bl){ $scope.showRelated(bl, true); }); _.each(to_open, function(bl){ $scope.showRelated(bl, true); });

8
app/assets/javascripts/angularjs/models/build_list.js.erb
View File

@ -59,13 +59,15 @@ var BuildList = function(atts, dictionary) {
// private fields // private fields
self.lastRelated = false; self.lastRelated = false;
// public fields // public methods
self.clearRelated = function() {
self.related = [self]; self.related = [self];
self.show = true; self.show = true;
self.relatedHidden = true; self.relatedHidden = true;
self.hasRelated = false; self.hasRelated = false;
}
// public methods self.clearRelated();
self.addRelated = function(bl) { self.addRelated = function(bl) {
bl.show = false; bl.show = false;