From 2bbb62fcc0506a6aec706749af3fc0153c01ec7d Mon Sep 17 00:00:00 2001 From: cyuamber Date: Tue, 18 Feb 2020 11:33:34 +0800 Subject: feat:Remove parameters not needed when order is created of csmf slicing Change-Id: I7880d9473f5f8359032920fed464889f6335471e Issue-ID: USECASEUI-369 Signed-off-by: cyuamber --- .../business-order/business-order.component.ts | 140 ++++++++++----------- 1 file changed, 67 insertions(+), 73 deletions(-) (limited to 'usecaseui-portal/src/app/views') diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts index 47578b52..7db003ff 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts @@ -2,24 +2,27 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {COMMUNICATION_FORM_ITEMS, COMMUNICATION_FORM_ADDRESS} from "../../../../../../constants/constants"; import {SlicingTaskServices} from "../../../../../core/services/slicingTaskServices"; import {NzMessageService} from "ng-zorro-antd"; + @Component({ - selector: 'app-business-order', - templateUrl: './business-order.component.html', - styleUrls: ['./business-order.component.less'] + selector: 'app-business-order', + templateUrl: './business-order.component.html', + styleUrls: ['./business-order.component.less'] }) export class BusinessOrderComponent implements OnInit { constructor( private myhttp: SlicingTaskServices, private message: NzMessageService - ) { + ) { } ngOnInit() { } + ngOnChanges() { this.AreaFormatting(); } + @Input() showModel: boolean; @Output() cancel = new EventEmitter(); comunicationFormItems = COMMUNICATION_FORM_ITEMS; @@ -31,7 +34,6 @@ export class BusinessOrderComponent implements OnInit { expDataRateUL: null, resourceSharingLevel: "shared", uEMobilityLevel: "stationary", - useInterval: null, coverageArea: '' }; areaList: any[] = []; @@ -39,6 +41,7 @@ export class BusinessOrderComponent implements OnInit { validateRules: any[] = []; rulesText: any[] = []; tooltipText: string = 'Scope: 1-100000'; + AreaFormatting() { let areaList = ['Beijing;Beijing;Haidian District;Wanshoulu Street']; this.areaList = areaList.map((item: any) => { @@ -56,7 +59,7 @@ export class BusinessOrderComponent implements OnInit { } const obj: any = {}; obj.key = key; - obj.selected = ite + obj.selected = ite; obj.options = [{name: ite, id: ite}] return obj }) @@ -64,7 +67,7 @@ export class BusinessOrderComponent implements OnInit { }) } - creatAreaList (): void { + creatAreaList(): void { let arr = [ { key: 'province', @@ -90,29 +93,29 @@ export class BusinessOrderComponent implements OnInit { this.areaList.push(arr) } - deleteAreaList (index: number): void { - this.areaList.splice(index,1); + deleteAreaList(index: number): void { + this.areaList.splice(index, 1); } - handleChange(area: any[], areaItem: any): void{ + handleChange(area: any[], areaItem: any): void { if (areaItem.key === 'province' && areaItem.options.length <= 1) { areaItem.options = COMMUNICATION_FORM_ADDRESS; } else if (areaItem.key === 'city' && areaItem.options.length <= 1) { - COMMUNICATION_FORM_ADDRESS.forEach( item => { - if(item.name === area[0].selected) { + COMMUNICATION_FORM_ADDRESS.forEach(item => { + if (item.name === area[0].selected) { areaItem.options = item.city; } }) - }else if (areaItem.key === 'district' && areaItem.options.length <= 1) { - COMMUNICATION_FORM_ADDRESS.forEach( (item: any) => { + } else if (areaItem.key === 'district' && areaItem.options.length <= 1) { + COMMUNICATION_FORM_ADDRESS.forEach((item: any) => { item.city.forEach(city => { if (city.name === area[1].selected) { areaItem.options = city.county; } }) }) - }else if (areaItem.key === 'street' && areaItem.options.length <= 1) { - COMMUNICATION_FORM_ADDRESS.forEach( (item: any) => { + } else if (areaItem.key === 'street' && areaItem.options.length <= 1) { + COMMUNICATION_FORM_ADDRESS.forEach((item: any) => { item.city.forEach(city => { if (city.name === area[1].selected) { city.county.forEach(county => { @@ -139,7 +142,7 @@ export class BusinessOrderComponent implements OnInit { area[2].options = []; area[3].selected = ''; area[3].options = []; - }else if (areaItem.key === 'district') { + } else if (areaItem.key === 'district') { area[3].selected = ''; area[3].options = []; } @@ -156,108 +159,99 @@ export class BusinessOrderComponent implements OnInit { expDataRateUL: null, resourceSharingLevel: "shared", uEMobilityLevel: "stationary", - useInterval: null, coverageArea: '' }; } - changeTooltipText(title){ - if(title === 'Max Number of UEs'){ + changeTooltipText(title) { + if (title === 'Max Number of UEs') { this.tooltipText = 'Scope: 1-100000' - }else if(title === 'Data Rate Downlink (Mbps)' || title === 'Data Rate Uplink (Mbps)'){ + } else if (title === 'Data Rate Downlink (Mbps)' || title === 'Data Rate Uplink (Mbps)') { this.tooltipText = 'Scope: 100-3000' - }else if(title === 'Latency'){ + } else if (title === 'Latency') { this.tooltipText = 'Scope: 10-200' - }else if(title === 'Use Interval (Month)'){ + } else if (title === 'Use Interval (Month)') { this.tooltipText = 'Scope: ≥1' } } - getRulesText = (words,title,val,index) => { + getRulesText = (words, title, val, index) => { return this.rulesText[index] = words + title }; - validator(key,val,i){ - if(val === null || val.replace(/\s*/g,'').length<=0){ + validator(key, val, i) { + if (val === null || val.replace(/\s*/g, '').length <= 0) { this.validateRules[i] = true; - this.getRulesText('Please enter',key,val,i,); + this.getRulesText('Please enter', key, val, i,); return false - }else { + } else { this.validateRules[i] = false; } - if(key === 'maxNumberofUEs' && !/^([1-9]\d{0,4}|100000)$/.test(val) && isNaN(val)){ + if (key === 'maxNumberofUEs' && !/^([1-9]\d{0,4}|100000)$/.test(val) && isNaN(val)) { this.validateRules[i] = true; - this.getRulesText('Only numbers can be entered','','',i); + this.getRulesText('Only numbers can be entered', '', '', i); return false - }else if(key === 'maxNumberofUEs' && !/^([1-9]\d{0,4}|100000)$/.test(val) && !isNaN(val)){ + } else if (key === 'maxNumberofUEs' && !/^([1-9]\d{0,4}|100000)$/.test(val) && !isNaN(val)) { console.log("-----maxNumberofUEs") this.validateRules[i] = true; - this.getRulesText('Scope: 1-100000','','',i); - return false - }else { - this.validateRules[i] = false; - }if((key === 'expDataRateDL' || key === 'expDataRateUL') && !/^([1-9]\d{2}|[1-3]\d{3}|3000)$/.test(val) && isNaN(val)){ - this.validateRules[i] = true; - this.getRulesText('Only numbers can be entered','','',i); - return false - }else if((key === 'expDataRateDL' || key === 'expDataRateUL') && !/^([1-9]\d{2}|[1-3]\d{3}|3000)$/.test(val) && !isNaN(val)){ - this.validateRules[i] = true; - this.getRulesText('Scope: 100-3000','','',i); + this.getRulesText('Scope: 1-100000', '', '', i); return false - }else { + } else { this.validateRules[i] = false; - }if(key === 'latency' && !/^1[0-9]$|^[2-9]\d$|^1\d{2}$|^200$/.test(val) && isNaN(val)){ + } + if ((key === 'expDataRateDL' || key === 'expDataRateUL') && !/^([1-9]\d{2}|[1-3]\d{3}|3000)$/.test(val) && isNaN(val)) { this.validateRules[i] = true; - this.getRulesText('Only numbers can be entered','','',i); + this.getRulesText('Only numbers can be entered', '', '', i); return false - }else if(key === 'latency' && !/^1[0-9]$|^[2-9]\d$|^1\d{2}$|^200$/.test(val) && !isNaN(val)){ + } else if ((key === 'expDataRateDL' || key === 'expDataRateUL') && !/^([1-9]\d{2}|[1-3]\d{3}|3000)$/.test(val) && !isNaN(val)) { this.validateRules[i] = true; - this.getRulesText('Scope: 10-200','','',i); + this.getRulesText('Scope: 100-3000', '', '', i); return false - }else { + } else { this.validateRules[i] = false; - }if(key === 'useInterval' && !/^[1-9]\d*$/.test(val) && isNaN(val)){ + } + if (key === 'latency' && !/^1[0-9]$|^[2-9]\d$|^1\d{2}$|^200$/.test(val) && isNaN(val)) { this.validateRules[i] = true; - this.getRulesText('Only numbers can be entered','','',i); + this.getRulesText('Only numbers can be entered', '', '', i); return false - }else if(key === 'useInterval' && !/^[1-9]\d*$/.test(val) && !isNaN(val)){ + } else if (key === 'latency' && !/^1[0-9]$|^[2-9]\d$|^1\d{2}$|^200$/.test(val) && !isNaN(val)) { this.validateRules[i] = true; - this.getRulesText('Scope: ≥1','','',i); + this.getRulesText('Scope: 10-200', '', '', i); return false - }else { + } else { this.validateRules[i] = false; } } handleOk(): void { - Object.keys(this.slicing_order_info).forEach((item,index)=>{ - if(item !== 'resourceSharingLevel' && item !== 'uEMobilityLevel' && item !== 'coverageArea'){ - this.validator(item,this.slicing_order_info[item],index) + Object.keys(this.slicing_order_info).forEach((item, index) => { + if (item !== 'resourceSharingLevel' && item !== 'uEMobilityLevel' && item !== 'coverageArea') { + this.validator(item, this.slicing_order_info[item], index) } }); - if(this.validateRules.indexOf(true)>-1){ + if (this.validateRules.indexOf(true) > -1) { return - }; - const coverage_list: string[] = []; - this.areaList.forEach( item => { - let str: string = ''; - item.forEach( area => { - str += area.selected + ';'; - }); - coverage_list.push(str.substring(0, str.length-1)); + } + const coverage_list: string[] = []; + this.areaList.forEach(item => { + let str: string = ''; + item.forEach(area => { + str += area.selected + ';'; }); - if(coverage_list.length>1){ - this.slicing_order_info.coverageArea = coverage_list.join('|') - }else { - this.slicing_order_info.coverageArea = coverage_list.toString(); - } + coverage_list.push(str.substring(0, str.length - 1)); + }); + if (coverage_list.length > 1) { + this.slicing_order_info.coverageArea = coverage_list.join('|') + } else { + this.slicing_order_info.coverageArea = coverage_list.toString(); + } let paramsObj = { - slicing_order_info:this.slicing_order_info + slicing_order_info: this.slicing_order_info }; - console.log(paramsObj,"-----paramsObj"); + console.log(paramsObj, "-----paramsObj"); this.isSpinning = true; this.myhttp.csmfSlicingPurchase(paramsObj).subscribe(res => { - const { result_header: { result_code, result_message }, result_body: { service_id,operation_id } } = res; + const {result_header: {result_code, result_message}, result_body: {service_id, operation_id}} = res; if (+result_code === 200) { this.isSpinning = false; this.handleCancel(); -- cgit 1.2.3-korg