loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add option

Browse source
This commit is contained in:
Loic GUEGAN 2016-05-04 22:54:14 +02:00
parent a9e8c8e664
commit 4daec471a3
2 changed files with 180 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
client/js/controllers/home/home.js
View file

@ -3,15 +3,15 @@
*
* @param {$scope} $scope The $scope service from angular
*/
mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', 'Image', function ($scope, Compute, $rootScope, Loading, Identity, Image)
{
mainApp.controller('homeCtrl', ['$scope', 'Compute', '$rootScope', 'Loading', 'Identity', 'Image', function ($scope, Compute, $rootScope, Loading, Identity, Image)
{
$scope.raiseShowMachineCreationEvent = function () {
$rootScope.$broadcast("showMachineCreationEvent", Compute.getData().axioms);
};
var displayMachine = function(){
var displayMachine = function () {
var machineNames = [];
var i = 0;
$.each(Compute.getData().machines, function(){
$.each(Compute.getData().machines, function () {
machineNames[i] = [this.name, this.id];
i++;
})
@ -38,7 +38,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
defaults: joint.util.deepSupplement({
type: 'html.Element',
attrs: {
rect: { stroke: 'none', 'fill-opacity': 0 }
rect: {stroke: 'none', 'fill-opacity': 0}
}
}, joint.shapes.basic.Rect.prototype.defaults)
});
@ -67,13 +67,13 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
paper.setDimensions(test.width, test.height);
$(".Member").bind('click', function() {
$(".Member").bind('click', function () {
$scope.raiseShowMachineDetailsEvent($(this).attr('model-id'));
});
}
// Function to call after pull all data about machines
var callMeAfterPullData=function(data){
var callMeAfterPullData = function (data) {
//$scope.machines=Compute.getData().machines;
Loading.stop();
displayMachine();
@ -124,11 +124,11 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
var elements = [];
var links = [];
_.each(adjacencyList['vms'], function(vm) {
_.each(adjacencyList['vms'], function (vm) {
elements.push(makeElement(vm));
});
_.each(adjacencyList['links'], function(link) {
links.push(makeLink(link[0], link[1] , link[2], link[3]));
_.each(adjacencyList['links'], function (link) {
links.push(makeLink(link[0], link[1], link[2], link[3]));
});
// Links must be added after all the elements. This is because when the links
// are added to the graph, link source/target
@ -136,15 +136,19 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
return elements.concat(links);
}
// On user login
$scope.$on('updateGraphEvent', function () {
// call update graph
});
//Return a new link linking the parent and child elements with the interfaces names given in parameters
function makeLink(parentElementLabel, childElementLabel, Iparent, Ichild) {
return new joint.dia.Link({
source: { id: parentElementLabel },
target: { id: childElementLabel },
source: {id: parentElementLabel},
target: {id: childElementLabel},
labels: [
{ position: 20, attrs: { text: { text: Iparent } }},
{ position: -20, attrs: { text: { text: Ichild } }}
{position: 20, attrs: {text: {text: Iparent}}},
{position: -20, attrs: {text: {text: Ichild}}}
]
});
}
@ -153,7 +157,9 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
function makeElement(vm) {
var label = vm[0];
var maxLineLength = _.max(label.split('\n'), function(l) { return l.length; }).length;
var maxLineLength = _.max(label.split('\n'), function (l) {
return l.length;
}).length;
// Compute width/height of the rectangle based on the number
// of lines in the label and the letter size. 0.6 * letterSize is
@ -162,28 +168,28 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
var height = 80;
var data = Compute.getData();
if(data.machines[vm[1]].status == "ACTIVE"){
if (data.machines[vm[1]].status == "ACTIVE") {
return new joint.shapes.org.Member({
id: vm[1],
position: { x: 0, y: 0 },
position: {x: 0, y: 0},
attrs: {
'.card': { fill: 'blue', stroke: 'none'},
image: { 'xlink:href': './images/ON.png', opacity: 0.7 },
'.card': {fill: 'blue', stroke: 'none'},
image: {'xlink:href': './images/ON.png', opacity: 0.7},
//'.rank': { text: rank, fill: textColor, 'word-spacing': '-5px', 'letter-spacing': 0},
'.name': { text: label, fill: 'white', 'font-size': 13, 'font-family': 'Arial', 'letter-spacing': 0 }
'.name': {text: label, fill: 'white', 'font-size': 13, 'font-family': 'Arial', 'letter-spacing': 0}
}
});
}else{
} else {
return new joint.shapes.org.Member({
id: vm[1],
position: { x: 0, y: 0 },
position: {x: 0, y: 0},
attrs: {
'.card': { fill: 'blue', stroke: 'none'},
image: { 'xlink:href': './images/OFF.png', opacity: 0.7 },
'.card': {fill: 'blue', stroke: 'none'},
image: {'xlink:href': './images/OFF.png', opacity: 0.7},
//'.rank': { text: rank, fill: textColor, 'word-spacing': '-5px', 'letter-spacing': 0},
'.name': { text: label, fill: 'white', 'font-size': 13, 'font-family': 'Arial', 'letter-spacing': 0 }
'.name': {text: label, fill: 'white', 'font-size': 13, 'font-family': 'Arial', 'letter-spacing': 0}
}
});
}
}
}]);
}]);

2
client/js/controllers/home/machineDetails.js
View file

@ -42,7 +42,7 @@ mainApp.controller('machineDetailsCtrl', ['$scope', 'Compute', '$rootScope', '$t
};
$scope.deleteMachine=function(){
Compute.deleteMachine(function(){Compute.pullData(function(){});},$scope.machine.id);
Compute.deleteMachine(function(){Compute.pullData(function(){$rootScope.$broadcast("updateGraphEvent")});},$scope.machine.id);
}
}]);