From 7c46f62e309d5b688ea3640ca8f43aff5c62ef8f Mon Sep 17 00:00:00 2001 From: Elisha Oren Date: Thu, 22 Dec 2016 17:29:40 +0200 Subject: [PATCH] Edit Profile, default burst time,draggable dialogs Change-Id: Iecf7544cb341a39df9e2bf0dd181d47e7468c9b5 Signed-off-by: Elisha Oren --- .../main/resources/cpeui/admin.controller.js | 20 ++++++++++++++++--- .../src/main/resources/cpeui/admin.tpl.html | 6 +++++- .../cpeui/dialogs/AddProfile.tpl.html | 15 ++++++++------ .../resources/cpeui/services/cpeui.dialogs.js | 2 +- .../cpeui/services/cpeui.services.js | 16 +++++++++++++++ 5 files changed, 48 insertions(+), 11 deletions(-) diff --git a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.controller.js b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.controller.js index 4d142635..2dcd3bbe 100644 --- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.controller.js +++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.controller.js @@ -48,11 +48,25 @@ define([ 'app/cpeui/cpeui.module' ], function(cpeui) { }; $scope.addProfile = new CpeuiDialogs.Dialog('AddProfile', {}, function(obj) { - CpeuiSvc.addProfile(obj['bw-profile'], obj.cir, obj.cbs, function() { - $scope.updateProfilesView(); - }); + if (obj.default_cbs) { + obj.cbs = Math.floor(obj.cir/10); + } + CpeuiSvc.addProfile(obj['bw-profile'], obj.cir, obj.cbs, function() { + $scope.updateProfilesView(); + }); }); + $scope.editProfile = function(profileName, cbs, cir) { + new CpeuiDialogs.Dialog('AddProfile', {}, function(obj) { + if (obj.default_cbs) { + obj.cbs = Math.floor(obj.cir/10); + } + CpeuiSvc.editProfile(obj['bw-profile'], obj.cir, obj.cbs, function() { + $scope.updateProfilesView(); + }); + }).show(null,{edit:true, profileName:profileName, cbs:cbs, cir:cir}); + }; + $scope.deleteProfile = function(profileName) { CpeuiDialogs.confirm(function() { CpeuiSvc.deleteProfile(profileName, function() { diff --git a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.tpl.html b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.tpl.html index c53b818a..8827a486 100644 --- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.tpl.html +++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.tpl.html @@ -124,7 +124,7 @@ Profile Name - Committed Information Rate (Kb/s) + Committed Information Rate (KB/s) Committed Burst Size (bytes) @@ -135,6 +135,10 @@ {{ profile.cir }} {{ profile.cbs }} +