* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-(function() {\r
+(function () {\r
'use strict';\r
\r
/**\r
* Controller of the app\r
*/\r
\r
- angular\r
- .module('vnfmarket')\r
- .controller('functionalTestOnboardingCtrl', functionalTest);\r
+ angular.module('vnfmarket').controller('functionalTestOnboardingCtrl', functionalTest);\r
\r
- functionalTest.$inject = [ 'vnfConfig', 'baseUrlConfig', '$mdDialog', 'functionalTestService', '$stateParams'];\r
+ functionalTest.$inject = ['vnfConfig', 'baseUrlConfig', '$mdDialog', 'functionalTestService', '$stateParams'];\r
\r
/*\r
* recommend\r
* and bindable members up top.\r
*/\r
\r
- function functionalTest(vnfConfig, baseUrlConfig, $mdDialog, functionalTestService,$stateParams) {\r
+ function functionalTest(vnfConfig, baseUrlConfig, $mdDialog, functionalTestService, $stateParams) {\r
var vm = this;\r
- vm.csarId = $stateParams.csarId;\r
+ vm.csarId = $stateParams.csarId;\r
console.log("functionalTest")\r
vm.filter = {\r
"search": '',\r
\r
vm.pagination = [5, 10, 15, {\r
label: 'All',\r
- value: function() {\r
+ value: function () {\r
return vm.validations.length ? vm.validations.length : 0;\r
}\r
}];\r
limitSelect: true,\r
pageSelect: true\r
};\r
- vm.getvalidations = function(){\r
+ vm.getvalidations = function () {\r
console.log(vm.functionalTests)\r
}\r
- \r
- \r
- vm.hide = function(answer) {\r
+\r
+\r
+ vm.hide = function (answer) {\r
$mdDialog.hide(answer);\r
};\r
\r
- \r
-\r
- vm.getFunctionTestDetails = function() {\r
- functionalTestService.getFunctionTestDetails(vm.csarId).then(function(response){\r
- vm.validations = response.data;\r
- })\r
- }\r
- \r
- vm.getFunctionTestDetails();\r
- \r
- vm.cancel = function() {\r
+\r
+\r
+ vm.getFunctionTestDetails = function () {\r
+ functionalTestService.getFunctionTestDetails(vm.csarId).then(function (response) {\r
+ vm.validations = response.data;\r
+ })\r
+ }\r
+\r
+ vm.getFunctionTestDetails();\r
+\r
+ vm.cancel = function () {\r
$mdDialog.cancel();\r
};\r
}\r
<h2>{{'common.tabs.functionTest.title' | translate}}</h2>\r
<span flex></span>\r
<button class="btnTransparency" ng-click="vm.cancel()">\r
- <i class="fa fa-close fa-sm" aria-hidden="true"></i>\r
+ <i class="fa fa-close fa-sm" aria-hidden="true"></i>\r
</button>\r
</div>\r
</md-toolbar>\r
\r
<br>\r
<div>\r
- <!-- <img src="../../../../../common/images/floating-layer-function.png">-->\r
+
<!-- <img src="../../../../../common/images/floating-layer-function.png">-->
\r <img src="/onapui/vnfmarket/common/images/floating_layer_function.png" width="100%" height="40%">\r
\r
</div>\r
<br>\r
-<md-card flex="100" class="nomargin md-padding">\r
+ <md-card flex="100" class="nomargin md-padding">\r
<md-table-container>\r
<table md-table>\r
<thead md-head md-order="vm.filter.name" md-on-reorder="vm.getValidations">\r
<tr md-row>\r
- <th md-column class="fontSize" md-order-by="testCase">\r
+ <th md-column class="fontSize" md-order-by="testCase">\r
<md-tooltip md-direction="top">{{'common.tabs.functionTest.testTHead' | translate}} </md-tooltip>\r
{{'common.tabs.functionTest.testTHead' | translate}}\r
</th>\r
<md-tooltip md-direction="top">{{'common.tabs.functionTest.descTHead' | translate}} </md-tooltip>\r
{{'common.tabs.functionTest.descTHead' | translate}}\r
</th>\r
- <th md-column class="fontSize" md-order-by="testResult">\r
+ <th md-column class="fontSize" md-order-by="testResult">\r
<md-tooltip md-direction="top">{{'common.tabs.functionTest.resultTHead' | translate}} </md-tooltip>\r
{{'common.tabs.functionTest.resultTHead' | translate}}\r
</th>\r
- \r
+\r
</tr>\r
</thead>\r
<tbody md-body>\r
- <tr md-row ng-repeat="validation in vm.validations | orderBy: vm.filter.name |\r
+ <tr md-row ng-repeat="validation in vm.validations | orderBy: vm.filter.name |\r
limitTo: vm.paginationQuery.limit: (vm.paginationQuery.page - 1) * vm.paginationQuery.limit track by $index">\r
<td md-cell class="">\r
<md-tooltip md-direction="top">{{validation.name}}</md-tooltip>{{validation.name}}\r
<td md-cell class="">\r
<md-tooltip md-direction="top">{{validation.status}}</md-tooltip>{{validation.status}}\r
</td>\r
- \r
+\r
</tr>\r
</tbody>\r
</table>\r
</md-table-container>\r
- <md-table-pagination class="pagination-class" md-limit="vm.paginationQuery.limit" md-limit-options="vm.pagination" md-page="vm.paginationQuery.page" md-total="{{vm.validations.length}}" md-page-select="vm.paginationOptions.pageSelect" md-boundary-links="vm.paginationOptions.boundaryLink" md-label="{ page : 'Page', RowPerPage:'row per page', of:'of'}"></md-table-pagination>\r
-</md-card>\r
+ <md-table-pagination class="pagination-class" md-limit="vm.paginationQuery.limit" md-limit-options="vm.pagination" md-page="vm.paginationQuery.page"\r
+ md-total="{{vm.validations.length}}" md-page-select="vm.paginationOptions.pageSelect" md-boundary-links="vm.paginationOptions.boundaryLink"\r
+ md-label="{ page : 'Page', RowPerPage:'row per page', of:'of'}"></md-table-pagination>\r
+ </md-card>\r
</md-dialog>
\ No newline at end of file
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-(function() {\r
+(function () {\r
'use strict';\r
\r
/**\r
.module('vnfmarket')\r
.controller('lifeCycleOnboardingCtrl', lifeCycle);\r
\r
- lifeCycle.$inject = [ 'vnfConfig', 'baseUrlConfig', '$mdDialog'];\r
+ lifeCycle.$inject = ['vnfConfig', 'baseUrlConfig', '$mdDialog'];\r
\r
/*\r
* recommend\r
* and bindable members up top.\r
*/\r
\r
- function lifeCycle(vnfConfig, baseUrlConfig,$mdDialog) {\r
+ function lifeCycle(vnfConfig, baseUrlConfig, $mdDialog) {\r
var vm = this;\r
console.log("functionalTest")\r
vm.filter = {\r
\r
vm.pagination = [5, 10, 15, {\r
label: 'All',\r
- value: function() {\r
+ value: function () {\r
return vm.lifeCycleTests.length ? vm.lifeCycleTests.length : 0;\r
}\r
}];\r
limitSelect: true,\r
pageSelect: true\r
};\r
- vm.getTests = function(){\r
+ vm.getTests = function () {\r
console.log(vm.lifeCycleTests)\r
}\r
- \r
- \r
- vm.hide = function(answer) {\r
+\r
+\r
+ vm.hide = function (answer) {\r
$mdDialog.hide(answer);\r
};\r
\r
- vm.cancel = function() {\r
+ vm.cancel = function () {\r
$mdDialog.cancel();\r
};\r
\r
- vm.lifeCycleTests = [{\r
- "step" : "Lifecycle step-1",\r
- "parameter" : "Lifecycle Parameter1",\r
- "result" : "pass"\r
- },\r
- {\r
- "step" : "Lifecycle step-2",\r
- "parameter" : "Lifecycle Parameter2",\r
- "result" : "pass"\r
- },{\r
- "step" : "Lifecycle step-3",\r
- "parameter" : "Parameter3",\r
- "result" : "pass"\r
- }]\r
+ vm.lifeCycleTests = [{\r
+ "step": "Lifecycle step-1",\r
+ "parameter": "Lifecycle Parameter1",\r
+ "result": "pass"\r
+ },\r
+ {\r
+ "step": "Lifecycle step-2",\r
+ "parameter": "Lifecycle Parameter2",\r
+ "result": "pass"\r
+ }, {\r
+ "step": "Lifecycle step-3",\r
+ "parameter": "Parameter3",\r
+ "result": "pass"\r
+ }]\r
}\r
})();
\ No newline at end of file
<h2>{{'common.tabs.lifeCycle.title' | translate}}</h2>\r
<span flex></span>\r
<button class="btnTransparency" ng-click="vm.cancel()">\r
- <i class="fa fa-close fa-sm" aria-hidden="true"></i>\r
+ <i class="fa fa-close fa-sm" aria-hidden="true"></i>\r
</button>\r
</div>\r
</md-toolbar>\r
- \r
-<md-card flex="100" class="nomargin md-padding">\r
+\r
+ <md-card flex="100" class="nomargin md-padding">\r
<md-table-container>\r
<table md-table>\r
<thead md-head md-order="vm.filter.name" md-on-reorder="vm.getTests">\r
<tr md-row>\r
- <th md-column class="fontSize" md-order-by="step">\r
- <md-tooltip md-direction="top">{{'common.tabs.lifeCycle.stepTHead' | translate}}</md-tooltip>\r
+ <th md-column class="fontSize" md-order-by="step">\r
+ <md-tooltip md-direction="top">{{'common.tabs.lifeCycle.stepTHead' | translate}}</md-tooltip>\r
{{'common.tabs.lifeCycle.stepTHead' | translate}}\r
</th>\r
- <th md-column class="fontSize" md-order-by="parameter">\r
- <md-tooltip md-direction="top">{{'common.tabs.lifeCycle.ParamTHead' | translate}}</md-tooltip>\r
+ <th md-column class="fontSize" md-order-by="parameter">\r
+ <md-tooltip md-direction="top">{{'common.tabs.lifeCycle.ParamTHead' | translate}}</md-tooltip>\r
{{'common.tabs.lifeCycle.ParamTHead' | translate}}\r
</th>\r
- <th md-column class="fontSize" md-order-by="result">\r
- <md-tooltip md-direction="top">{{'common.tabs.lifeCycle.ResultTHead' | translate}}</md-tooltip>\r
+ <th md-column class="fontSize" md-order-by="result">\r
+ <md-tooltip md-direction="top">{{'common.tabs.lifeCycle.ResultTHead' | translate}}</md-tooltip>\r
{{'common.tabs.lifeCycle.ResultTHead' | translate}}\r
</th>\r
- \r
+\r
</tr>\r
</thead>\r
<tbody md-body>\r
<tr md-row md-select="dessert" md-select-id="name" md-auto-select ng-repeat="test in vm.lifeCycleTests | orderBy: vm.filter.name |\r
limitTo: vm.paginationQuery.limit: (vm.paginationQuery.page - 1) * vm.paginationQuery.limit track by $index">\r
<td md-cell>\r
- <md-tooltip md-direction="top">{{test.step}}</md-tooltip>{{test.step}}\r
+ <md-tooltip md-direction="top">{{test.step}}</md-tooltip>{{test.step}}\r
</td>\r
<td md-cell>\r
- <md-tooltip md-direction="top">{{test.parameter}}</md-tooltip>{{test.parameter}}\r
+ <md-tooltip md-direction="top">{{test.parameter}}</md-tooltip>{{test.parameter}}\r
</td>\r
<td md-cell>\r
- <md-tooltip md-direction="top">{{test.result}}</md-tooltip>{{test.result}}\r
+ <md-tooltip md-direction="top">{{test.result}}</md-tooltip>{{test.result}}\r
</td>\r
- \r
+\r
</tr>\r
</tbody>\r
</table>\r
</md-table-container>\r
- <md-table-pagination class="pagination-class" md-limit="vm.paginationQuery.limit" md-limit-options="vm.pagination" md-page="vm.paginationQuery.page" md-total="{{vm.lifeCycleTests.length}}" md-page-select="vm.paginationOptions.pageSelect" md-boundary-links="vm.paginationOptions.boundaryLink" md-label="{ page : 'Page', RowPerPage:'row per page', of:'of'}"></md-table-pagination>\r
-</md-card>\r
+ <md-table-pagination class="pagination-class" md-limit="vm.paginationQuery.limit" md-limit-options="vm.pagination" md-page="vm.paginationQuery.page"\r
+ md-total="{{vm.lifeCycleTests.length}}" md-page-select="vm.paginationOptions.pageSelect" md-boundary-links="vm.paginationOptions.boundaryLink"\r
+ md-label="{ page : 'Page', RowPerPage:'row per page', of:'of'}"></md-table-pagination>\r
+ </md-card>\r
</md-dialog>
\ No newline at end of file
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-(function() {
+(function () {
'use strict';
/**
method = vnfConfig.api.home.getFunctionalList.method;
url = url.replace(":csarId", csarId);
- url += "?operTypeId="+operTypeId;
- url += "&operId="+operId;
+ url += "?operTypeId=" + operTypeId;
+ url += "&operId=" + operId;
/*var response =
//defer.resolve(response);
httpService.apiRequest(url, method)
- .then(function(response) {
+ .then(function (response) {
defer.resolve(response);
- }, function(error) {
+ }, function (error) {
defer.reject(error);
});
return defer.promise;
httpService.apiRequest(url, method)
- .then(function(response) {
+ .then(function (response) {
defer.resolve(response);
- }, function(error) {
+ }, function (error) {
defer.reject(error);
});
return defer.promise;
<div class="layout-row onboardProgress">\r
<div class="flex-100 progress1">\r
<div class="progressDiv"></div>\r
- <div class="roundProg"><span>1</span></div>\r
+ <div class="roundProg">\r
+ <span>1</span>\r
+ </div>\r
</div>\r
<!-- <div class="flex-33 progress2">\r
<div class="progressDiv"></div>\r
<div class="onbdContent">\r
<div class="onboarddiv">\r
<div class="btnOuter">\r
- <div class="onboardBtn btnImage1" type="button" aria-label="Eat cake" ng-click="vm.displayValidationDialog()">\r
+ <div class="onboardBtn btnImage1" type="button" aria-label="Eat cake" ng-click="vm.displayValidationDialog()">\r
\r
</div>\r
</div>\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-(function() {\r
+(function () {\r
'use strict';\r
\r
/**\r
.module('vnfmarket')\r
.controller('onBoardingCtrl', onBoarding);\r
\r
- onBoarding.$inject = [ 'vnfConfig', 'baseUrlConfig', '$interval', '$timeout', '$state', '$mdDialog', '$stateParams', 'onBoardingService'];\r
+ onBoarding.$inject = ['vnfConfig', 'baseUrlConfig', '$interval', '$timeout', '$state', '$mdDialog', '$stateParams', 'onBoardingService'];\r
\r
/*\r
* recommend\r
\r
$(".onboardProgress .progress3 .progressDiv").removeClass("progressed");\r
$(".onboardProgress .progress3 .roundProg").removeClass("progressed");\r
- var fileName = $stateParams.csarName\r
- \r
- vm.mainTitle = fileName.slice(0, fileName.lastIndexOf("."));\r
+ var fileName = $stateParams.csarName\r
+\r
+ vm.mainTitle = fileName.slice(0, fileName.lastIndexOf("."));\r
\r
//vm.mainTitle = $stateParams.csarName;//"clearwater_ns";\r
var csarId = $stateParams.csarId;\r
- if(!csarId) {\r
+ if (!csarId) {\r
$state.go("home.marketplace", {});\r
- return;\r
+ return;\r
}\r
\r
/*onBoardingService.getFunctionalList(csarId).then(function(response) {\r
vm.functionalDataList = response.data;\r
});*/\r
\r
- vm.getIconClass = function(status) {\r
+ vm.getIconClass = function (status) {\r
var classIcon = "";\r
- if(status == undefined || status == 1) {\r
+ if (status == undefined || status == 1) {\r
//classIcon = "fa fa-clock-o";\r
classIcon = "clock-icon";\r
}\r
- else if(status == 2) {\r
+ else if (status == 2) {\r
//classIcon = "fa fa-spinner fa-spin";\r
classIcon = "progress-icon fa-spin";\r
}\r
- else if(status == 0) {\r
+ else if (status == 0) {\r
//classIcon = "fa fa-check-circle";\r
classIcon = "success-icon";\r
}\r
- else if(status == -1) {\r
+ else if (status == -1) {\r
classIcon = "failed-icon fa fa-exclamation";\r
}\r
return classIcon;\r
vm.functional = [];\r
var currentIteration = {};\r
\r
- onBoardingService.getOnBoardingSteps().then(function(response) {\r
+ onBoardingService.getOnBoardingSteps().then(function (response) {\r
\r
var operTypeList = response.data.operTypeList;\r
- for(var i = 0; i < operTypeList.length; i++) {\r
- \r
+ for (var i = 0; i < operTypeList.length; i++) {\r
+\r
switch (operTypeList[i].operTypeId) {\r
case "validation":\r
vm.validation = operTypeList[i];\r
break;\r
}\r
}\r
- currentIteration = {"list":vm.validation, "item":0};\r
+ currentIteration = { "list": vm.validation, "item": 0 };\r
\r
updateStepStatus();\r
});\r
\r
function addDefaultStatus(listArr) {\r
- for(var index = 0; index < listArr.oper.length; index++) {\r
+ for (var index = 0; index < listArr.oper.length; index++) {\r
listArr.oper[index].status = 1;\r
}\r
}\r
var operTypeId = currentIteration.list["operTypeId"];\r
var operId = currentIteration.list.oper[currentIteration.item].operId;\r
\r
- if(operTypeId == "validation" || operTypeId == "lifecycletest") {\r
+ if (operTypeId == "validation" || operTypeId == "lifecycletest") {\r
updateView(0);\r
}\r
else {\r
\r
function updateView(stepStatus) {\r
var listIterFinished = false;\r
- if(stepStatus == 0) {\r
+ if (stepStatus == 0) {\r
currentIteration.list.oper[currentIteration.item].status = stepStatus;\r
//Success, go to next step\r
- if(currentIteration.list.oper.length - 1 > currentIteration.item) {\r
+ if (currentIteration.list.oper.length - 1 > currentIteration.item) {\r
currentIteration.item++;\r
}\r
else {\r
//Choose next list\r
- if(currentIteration.list == vm.validation){\r
+ if (currentIteration.list == vm.validation) {\r
//First list is completed\r
$(".onboardProgress .progress1 .progressDiv").addClass("progressed");\r
$(".onboardProgress .progress1 .roundProg").addClass("progressed");\r
currentIteration.item = 0*/\r
\r
listIterFinished = true;\r
- $state.go('home.onboardingSuccess', {"csarId": csarId});\r
+ $state.go('home.onboardingSuccess', { "csarId": csarId });\r
}\r
/*else if(currentIteration.list == vm.lifeCycle){\r
//Second list is completed\r
}*/\r
}\r
}\r
- else if(stepStatus == -1) {\r
+ else if (stepStatus == -1) {\r
//Failed case\r
currentIteration.list.oper[currentIteration.item].status = stepStatus;\r
listIterFinished = true;\r
}\r
\r
- if(!listIterFinished) {\r
+ if (!listIterFinished) {\r
updateStepStatus();\r
}\r
}\r
\r
- vm.displayValidationDialog = function(){\r
- $mdDialog.show({\r
- controller: 'validationOnboardingCtrl',\r
- templateUrl: vnfConfig.modulePath.home + '/serviceUpload/onboarding/validation/view.html',\r
- controllerAs: 'vm'\r
- })\r
- .then(function(answer) {\r
- vm.getFeatureList();\r
- // vm.status = 'You said the information was "' + answer + '".';\r
- }, function() {\r
- // vm.status = 'You cancelled the dialog.';\r
- });\r
- }\r
- vm.displayLifecycleDialog = function(){\r
- $mdDialog.show({\r
- controller: 'lifeCycleOnboardingCtrl',\r
- templateUrl: vnfConfig.modulePath.home + '/serviceUpload/onboarding/lifeCycle/view.html',\r
- controllerAs: 'vm'\r
- })\r
- .then(function(answer) {\r
- vm.getFeatureList();\r
- // vm.status = 'You said the information was "' + answer + '".';\r
- }, function() {\r
- // vm.status = 'You cancelled the dialog.';\r
- });\r
- }\r
- vm.displayFunctionalTestDialog = function(){\r
- $mdDialog.show({\r
- controller: 'functionalTestOnboardingCtrl',\r
- templateUrl: vnfConfig.modulePath.home + '/serviceUpload/onboarding/functionalTest/view.html',\r
- controllerAs: 'vm'\r
- })\r
- .then(function(answer) {\r
- vm.getFeatureList();\r
- // vm.status = 'You said the information was "' + answer + '".';\r
- }, function() {\r
- // vm.status = 'You cancelled the dialog.';\r
- });\r
- }\r
+ vm.displayValidationDialog = function () {\r
+ $mdDialog.show({\r
+ controller: 'validationOnboardingCtrl',\r
+ templateUrl: vnfConfig.modulePath.home + '/serviceUpload/onboarding/validation/view.html',\r
+ controllerAs: 'vm'\r
+ })\r
+ .then(function (answer) {\r
+ vm.getFeatureList();\r
+ // vm.status = 'You said the information was "' + answer + '".';\r
+ }, function () {\r
+ // vm.status = 'You cancelled the dialog.';\r
+ });\r
+ }\r
+ vm.displayLifecycleDialog = function () {\r
+ $mdDialog.show({\r
+ controller: 'lifeCycleOnboardingCtrl',\r
+ templateUrl: vnfConfig.modulePath.home + '/serviceUpload/onboarding/lifeCycle/view.html',\r
+ controllerAs: 'vm'\r
+ })\r
+ .then(function (answer) {\r
+ vm.getFeatureList();\r
+ // vm.status = 'You said the information was "' + answer + '".';\r
+ }, function () {\r
+ // vm.status = 'You cancelled the dialog.';\r
+ });\r
+ }\r
+ vm.displayFunctionalTestDialog = function () {\r
+ $mdDialog.show({\r
+ controller: 'functionalTestOnboardingCtrl',\r
+ templateUrl: vnfConfig.modulePath.home + '/serviceUpload/onboarding/functionalTest/view.html',\r
+ controllerAs: 'vm'\r
+ })\r
+ .then(function (answer) {\r
+ vm.getFeatureList();\r
+ // vm.status = 'You said the information was "' + answer + '".';\r
+ }, function () {\r
+ // vm.status = 'You cancelled the dialog.';\r
+ });\r
+ }\r
}\r
})();
\ No newline at end of file
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-(function() {\r
+(function () {\r
'use strict';\r
\r
/**\r
.module('vnfmarket')\r
.controller('onBoardingSuccessCtrl', onBoardingSuccess);\r
\r
- onBoardingSuccess.$inject = [ 'vnfConfig', 'baseUrlConfig', 'homeService', '$state', '$stateParams'];\r
+ onBoardingSuccess.$inject = ['vnfConfig', 'baseUrlConfig', 'homeService', '$state', '$stateParams'];\r
\r
/*\r
* recommend\r
function onBoardingSuccess(vnfConfig, baseUrlConfig, homeService, $state, $stateParams) {\r
var vm = this;\r
console.log("onBoardingSuccess");\r
- vm.services= [], vm.serviceDetails;\r
+ vm.services = [], vm.serviceDetails;\r
\r
var csarId = $stateParams.csarId;\r
- if(!csarId) {\r
+ if (!csarId) {\r
$state.go("home.marketplace", {});\r
- return;\r
+ return;\r
}\r
\r
- vm.return = function() {\r
+ vm.return = function () {\r
$state.go('home.marketplace', {}, {\r
reload: true\r
});\r
}\r
- vm.showDetailPage = function() {\r
- homeService.getFeaturesList().then(function(response) {\r
+ vm.showDetailPage = function () {\r
+ homeService.getFeaturesList().then(function (response) {\r
for (var i = 0; i < response.data.length; i++) {\r
response.data[i].createTime = new Date(response.data[i].createTime);\r
response.data[i].modifyTime = new Date(response.data[i].modifyTime);\r
}\r
vm.services = response.data;\r
\r
- for(var j = 0; j < response.data.length; j++) {\r
- if(response.data[j].csarId == csarId) {\r
+ for (var j = 0; j < response.data.length; j++) {\r
+ if (response.data[j].csarId == csarId) {\r
vm.serviceDetails = response.data[j];\r
break;\r
}\r
}\r
\r
$state.go("home.serviceDetails.validation", {\r
- serviceDetails : vm.serviceDetails\r
+ serviceDetails: vm.serviceDetails\r
});\r
});\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-(function() {\r
+(function () {\r
'use strict';\r
\r
/**\r
.module('vnfmarket')\r
.controller('validationOnboardingCtrl', validation);\r
\r
- validation.$inject = [ 'vnfConfig', 'baseUrlConfig', '$mdDialog'];\r
+ validation.$inject = ['vnfConfig', 'baseUrlConfig', '$mdDialog'];\r
\r
/*\r
* recommend\r
\r
vm.pagination = [5, 10, 15, {\r
label: 'All',\r
- value: function() {\r
+ value: function () {\r
return vm.validations.length ? vm.validations.length : 0;\r
}\r
}];\r
limitSelect: true,\r
pageSelect: true\r
};\r
- vm.getValidations = function(){\r
+ vm.getValidations = function () {\r
console.log(vm.validations)\r
}\r
- \r
- \r
- vm.hide = function(answer) {\r
+\r
+\r
+ vm.hide = function (answer) {\r
$mdDialog.hide(answer);\r
};\r
\r
- vm.cancel = function() {\r
+ vm.cancel = function () {\r
$mdDialog.cancel();\r
};\r
\r
- vm.validations = [{\r
- "step" : "Validation step-1",\r
- "parameter" : "Validation Parameter1",\r
- "result" : "pass"\r
- },\r
- {\r
- "step" : "Validation step-2",\r
- "parameter" : "Validation Parameter2",\r
- "result" : "pass"\r
- },{\r
- "step" : "Validation step-3",\r
- "parameter" : "Validation Parameter3",\r
- "result" : "pass"\r
- }];\r
+ vm.validations = [{\r
+ "step": "Validation step-1",\r
+ "parameter": "Validation Parameter1",\r
+ "result": "pass"\r
+ },\r
+ {\r
+ "step": "Validation step-2",\r
+ "parameter": "Validation Parameter2",\r
+ "result": "pass"\r
+ }, {\r
+ "step": "Validation step-3",\r
+ "parameter": "Validation Parameter3",\r
+ "result": "pass"\r
+ }];\r
}\r
})();
\ No newline at end of file
<md-dialog aria-label="Upload Service dialog" flex="80" id="uploadDialog" ng-cloak>\r
- <md-toolbar class="md-hue-3 dialogHeader">\r
- <div class="md-toolbar-tools">\r
- <h2>{{'common.tabs.validation.title' | translate}}</h2>\r
- <span flex></span>\r
- <button class="btnTransparency" ng-click="vm.cancel()">\r
- <i class="fa fa-close fa-sm" aria-hidden="true"></i>\r
- </button>\r
- </div>\r
- </md-toolbar>\r
+ <md-toolbar class="md-hue-3 dialogHeader">\r
+
<div class="md-toolbar-tools">
\r+ <h2>{{'common.tabs.validation.title' | translate}}</h2>\r
+ <span flex></span>\r
+ <button class="btnTransparency" ng-click="vm.cancel()">\r
+ <i class="fa fa-close fa-sm" aria-hidden="true"></i>\r
+ </button>\r
+ </div>\r
+ </md-toolbar>\r
\r
<md-card flex="100" class="nomargin md-padding">\r
- <md-table-container>\r
- <thead md-head md-order="vm.filter.name" md-on-reorder="vm.getValidations">\r
- <tr md-row>\r
- <th md-column class="fontSize" md-order-by="step">\r
- <md-tooltip md-direction="top">{{'common.tabs.validation.stepTHead' | translate}}</md-tooltip>\r
- {{'common.tabs.validation.stepTHead' | translate}}\r
- </th>\r
- <th md-column class="fontSize" md-order-by="parameter">\r
- <md-tooltip md-direction="top">{{'common.tabs.validation.ParamTHead' | translate}}</md-tooltip>\r
- {{'common.tabs.validation.ParamTHead' | translate}}\r
- </th>\r
- <th md-column class="fontSize" md-order-by="result">\r
- <md-tooltip md-direction="top">{{'common.tabs.validation.ResultTHead' | translate}}</md-tooltip>\r
- {{'common.tabs.validation.ResultTHead' | translate}}\r
- </th>\r
- \r
- </tr>\r
- </thead>\r
- <tbody md-body>\r
- <tr md-row md-select="dessert" md-select-id="name" md-auto-select ng-repeat="validation in vm.validations | orderBy: vm.filter.name |\r
+ <md-table-container>\r
+ <table md-table>\r
+ <thead md-head md-order="vm.filter.name" md-on-reorder="vm.getValidations">\r
+ <tr md-row>\r
+ <th md-column class="fontSize" md-order-by="step">\r
+ <md-tooltip md-direction="top">{{'common.tabs.validation.stepTHead' | translate}}</md-tooltip>\r
+ {{'common.tabs.validation.stepTHead' | translate}}\r
+ </th>\r
+ <th md-column class="fontSize" md-order-by="parameter">\r
+ <md-tooltip md-direction="top">{{'common.tabs.validation.ParamTHead' | translate}}</md-tooltip>\r
+ {{'common.tabs.validation.ParamTHead' | translate}}\r
+ </th>\r
+ <th md-column class="fontSize" md-order-by="result">\r
+ <md-tooltip md-direction="top">{{'common.tabs.validation.ResultTHead' | translate}}</md-tooltip>\r
+ {{'common.tabs.validation.ResultTHead' | translate}}\r
+ </th>\r
+\r
+ </tr>\r
+ </thead>\r
+ <tbody md-body>\r
+ <tr md-row md-select="dessert" md-select-id="name" md-auto-select ng-repeat="validation in vm.validations | orderBy: vm.filter.name |\r
limitTo: vm.paginationQuery.limit: (vm.paginationQuery.page - 1) * vm.paginationQuery.limit track by $index">\r
- <td md-cell>\r
- <md-tooltip md-direction="top">{{validation.step}}</md-tooltip>{{validation.step}}\r
- </td>\r
- <td md-cell>\r
- <md-tooltip md-direction="top">{{validation.parameter}}</md-tooltip>{{validation.parameter}}\r
- </td>\r
- <td md-cell>\r
- <md-tooltip md-direction="top">{{validation.result}}</md-tooltip>{{validation.result}}\r
- </td>\r
- \r
- </tr>\r
- </tbody>\r
- </table>\r
- </md-table-container>\r
- <md-table-pagination class="pagination-class" md-limit="vm.paginationQuery.limit" md-limit-options="vm.pagination" md-page="vm.paginationQuery.page" md-total="{{vm.validations.length}}" md-page-select="vm.paginationOptions.pageSelect" md-boundary-links="vm.paginationOptions.boundaryLink" md-label="{ page : 'Page', RowPerPage:'row per page', of:'of'}"></md-table-pagination>\r
+ <td md-cell>\r
+ <md-tooltip md-direction="top">{{validation.step}}</md-tooltip>{{validation.step}}\r
+ </td>\r
+ <td md-cell>\r
+ <md-tooltip md-direction="top">{{validation.parameter}}</md-tooltip>{{validation.parameter}}\r
+ </td>\r
+ <td md-cell>\r
+ <md-tooltip md-direction="top">{{validation.result}}</md-tooltip>{{validation.result}}\r
+ </td>\r
+\r
+ </tr>\r
+ </tbody>\r
+ </table>\r
+ </md-table-container>\r
+ <md-table-pagination class="pagination-class" md-limit="vm.paginationQuery.limit" md-limit-options="vm.pagination" md-page="vm.paginationQuery.page"\r
+ md-total="{{vm.validations.length}}" md-page-select="vm.paginationOptions.pageSelect" md-boundary-links="vm.paginationOptions.boundaryLink"\r
+ md-label="{ page : 'Page', RowPerPage:'row per page', of:'of'}"></md-table-pagination>\r
</md-card>\r
</md-dialog>
\ No newline at end of file
\r
<md-toolbar class="md-hue-3 dialogHeader">\r
<div class="md-toolbar-tools" id="uploadStyle">\r
- <h2 ng-if="vm.isUpload" >{{'module.marketplace.serviceUpload.title' | translate}}</h2>\r
- <h2 ng-if="!vm.isUpload" >{{'module.marketplace.serviceUpload.updateTitle' | translate}}</h2>\r
+ <h2 ng-if="vm.isUpload">{{'module.marketplace.serviceUpload.title' | translate}}</h2>\r
+ <h2 ng-if="!vm.isUpload">{{'module.marketplace.serviceUpload.updateTitle' | translate}}</h2>\r
<span flex></span>\r
<button class="btnTransparency" ng-click="vm.cancel()" ng-hide="vm.status == 'progress'">\r
- <i class="fa fa-close fa-sm" aria-hidden="true"></i>\r
+ <i class="fa fa-close fa-sm" aria-hidden="true"></i>\r
</button>\r
</div>\r
</md-toolbar>\r
<label for="file" class="btn btnDefault"> {{'common.actions.add' | translate}} </label>\r
<label>\r
<span ng-if="!vm.service.file"> {{'module.marketplace.serviceUpload.fields.fileUpload.noFileSelected' | translate}}</span>\r
- <span ng-if="vm.service.file"> {{ vm.service.file.name}}</span>\r
+ <span ng-if="vm.service.file"> {{ vm.service.file.name}}</span>\r
</label>\r
</div>\r
<input class="hidden" id="file" type="file" file-upload="vm.service.file" md-asterisk accept=".csar">\r
</div>\r
\r
<div>\r
- <label for="shortDesc" class="labels">{{'module.marketplace.serviceUpload.fields.shortDescription.placeholder' | translate}}</label>\r
- <input ng-model="vm.service.shortDesc" type="text" id="shortDesc" name="shortDesc">\r
+ <label for="shortDesc" class="labels">{{'module.marketplace.serviceUpload.fields.shortDescription.placeholder' | translate}}</label>\r
+ <input ng-model="vm.service.shortDesc" type="text" id="shortDesc" name="shortDesc">\r
</div>\r
<div>\r
- \r
- <label class="labels">{{'module.marketplace.serviceUpload.fields.details.placeholder' | translate}}</label>\r
- <textarea name="details" ng-model="vm.service.details" maxlength="150" rows="3" md-select-on-focus></textarea>\r
+\r
+ <label class="labels">{{'module.marketplace.serviceUpload.fields.details.placeholder' | translate}}</label>\r
+ <textarea name="details" ng-model="vm.service.details" maxlength="150" rows="3" md-select-on-focus></textarea>\r
</div>\r
<div>\r
- \r
- <label for="remarks" class="labels">{{'module.marketplace.serviceUpload.fields.remarks.placeholder' | translate}}</label>\r
- <input ng-model="vm.service.remarks" type="text" id="remarks" name="remarks">\r
+\r
+ <label for="remarks" class="labels">{{'module.marketplace.serviceUpload.fields.remarks.placeholder' | translate}}</label>\r
+ <input ng-model="vm.service.remarks" type="text" id="remarks" name="remarks">\r
</div>\r
</div>\r
</md-dialog-content>\r
</div>\r
<md-progress-linear md-mode="determinate" value="{{vm.apiInfo}}"></md-progress-linear>\r
<h4 class="text-center"> {{vm.apiInfo}} % </h4>\r
- <span class="text-center" ng-if="vm.status == 'success'">{{'module.marketplace.serviceUpload.fields.funcTestReport.label' | translate}} <a href="{{vm.funcTestReportUrl}}" target="_blank">{{'common.actions.clickHere' | translate}}</a></span>\r
+ <span class="text-center" ng-if="vm.status == 'success'">{{'module.marketplace.serviceUpload.fields.funcTestReport.label' | translate}}\r
+ <a href="{{vm.funcTestReportUrl}}"\r
+ target="_blank">{{'common.actions.clickHere' | translate}}</a>\r
+ </span>\r
</div>\r
<div flex="25" layout="column">\r
</div>\r
\r
<md-dialog-actions layout="row" ng-show="vm.status == 'Idle'" class="marginAuto">\r
<!-- <span flex></span> -->\r
- \r
- <button ng-if="!vm.isUpload" class="md-raised btn btnPrimary btnPrimaryPadding btnSpacing" ng-click="vm.answer('Uploaded')" ng-disabled="!vm.service.file">\r
+\r
+ <button ng-if="!vm.isUpload" class="md-raised btn btnPrimary btnPrimaryPadding btnSpacing" ng-click="vm.answer('Uploaded')"\r
+ ng-disabled="!vm.service.file">\r
{{'common.actions.update' | translate}}\r
</button>\r
- \r
- <button ng-if="vm.isUpload" class="md-raised btn btnPrimary btnPrimaryPadding btnSpacing" ng-click="vm.answer('Uploaded')" ng-disabled="!vm.service.file">\r
+\r
+ <button ng-if="vm.isUpload" class="md-raised btn btnPrimary btnPrimaryPadding btnSpacing" ng-click="vm.answer('Uploaded')"\r
+ ng-disabled="!vm.service.file">\r
{{'common.actions.upload' | translate}}\r
</button>\r
\r
<button class="md-raised btn btnDefault btnPrimaryPadding btnSpacing" ng-click="vm.cancel()">\r
{{'common.actions.close' | translate}}\r
</button>\r
- \r
+\r
\r
</md-dialog-actions>\r
<md-dialog-actions class="marginAuto" layout="row" ng-show="vm.status == 'success'">\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-(function() {\r
+(function () {\r
'use strict';\r
\r
/**\r
* and bindable members up top.\r
*/\r
\r
- function ServiceUpload(serviceUploadService, $scope, vnfConfig, $mdDialog, $mdToast, $rootScope, $interval, baseUrlConfig,$state, isUpload, csarId) {\r
+ function ServiceUpload(serviceUploadService, $scope, vnfConfig, $mdDialog, $mdToast, $rootScope, $interval, baseUrlConfig, $state, isUpload, csarId) {\r
var vm = this;\r
- vm.isUpload = isUpload;\r
- vm.csarId = csarId\r
+ vm.isUpload = isUpload;\r
+ vm.csarId = csarId\r
vm.apiInfo = 0;\r
vm.status = "Idle";\r
vm.promise = null;\r
vm.service = {};\r
\r
- vm.hide = function(answer) {\r
+ vm.hide = function (answer) {\r
$mdDialog.hide(answer);\r
};\r
\r
- vm.cancel = function() {\r
+ vm.cancel = function () {\r
$mdDialog.cancel();\r
};\r
\r
- vm.answer = function(answer) {\r
+ vm.answer = function (answer) {\r
vm.status = "progress";\r
var dataObj = vm.service,\r
file = vm.service.file,\r
"Content-Type": undefined\r
}\r
\r
- vm.promise = $interval(function() {\r
+ vm.promise = $interval(function () {\r
if ($rootScope.progressBar >= 80 && vm.status !== "success") {\r
vm.apiInfo = 80;\r
} else {\r
vm.apiInfo = parseInt($rootScope.progressBar, 10);\r
}\r
}, 500);\r
- \r
- if(vm.isUpload){\r
- var filename = vm.service.file.name;\r
- serviceUploadService.postServiceUpload(fd, headers)\r
- .then(function(response) {\r
- vm.hide("Uploading")\r
- $state.go('home.onboarding', {"csarId": response.data.csarId, "csarName": filename});\r
- });\r
- } else {\r
- serviceUploadService.repostServiceUpload(fd, headers, vm.csarId)\r
- .then(function(response) {\r
- vm.hide("Uploading")\r
- $state.go('home.onboarding', {"csarId": response.data.csarId, "csarName": filename});\r
- });\r
- }\r
+\r
+ if (vm.isUpload) {\r
+ var filename = vm.service.file.name;\r
+ serviceUploadService.postServiceUpload(fd, headers)\r
+ .then(function (response) {\r
+ vm.hide("Uploading")\r
+ $state.go('home.onboarding', { "csarId": response.data.csarId, "csarName": filename });\r
+ });\r
+ } else {\r
+ serviceUploadService.repostServiceUpload(fd, headers, vm.csarId)\r
+ .then(function (response) {\r
+ vm.hide("Uploading")\r
+ $state.go('home.onboarding', { "csarId": response.data.csarId, "csarName": filename });\r
+ });\r
+ }\r
};\r
\r
- $scope.$on("$destroy", function() {\r
+ $scope.$on("$destroy", function () {\r
if (vm.promise) {\r
$interval.cancel(vm.promise);\r
}\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-(function() {
+(function () {
'use strict';
/**
function serviceUpload($q, vnfConfig, httpService) {
return {
postServiceUpload: postServiceUpload,
- repostServiceUpload: repostServiceUpload
+ repostServiceUpload: repostServiceUpload
};
function postServiceUpload(data, headers) {
var defer = $q.defer()
httpService.apiRequestWithProgress(url, method, apiData, headers)
- .then(function(response) {
+ .then(function (response) {
defer.resolve(response);
- }, function(error) {
+ }, function (error) {
defer.reject(error);
});
return defer.promise;
}
-
- function repostServiceUpload(data, headers, csarId) {
+
+ function repostServiceUpload(data, headers, csarId) {
var url = vnfConfig.api.home.repostServiceUpload.url,
method = vnfConfig.api.home.repostServiceUpload.method,
apiData = data;
- url = url.replace(":csarId", csarId)
+ url = url.replace(":csarId", csarId)
var defer = $q.defer()
httpService.apiRequestWithProgress(url, method, apiData, headers)
- .then(function(response) {
+ .then(function (response) {
defer.resolve(response);
- }, function(error) {
+ }, function (error) {
defer.reject(error);
});
return defer.promise;
Code Review / vnfsdk / refrepo.git / commitdiff