feat: Optimize slice business management

Change-Id: I95a55038c22cb3d54d3217fb3b0031adafc3a56a
Issue-ID: USECASEUI-369
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>

4 files changed, 45 insertions, 27 deletions

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html
index 606d9e15..d4914dd1 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html
@@ -1,3 +1,3 @@
-<p>
-  business-order works!
-</p>
+<nz-modal [(nzVisible)]="showModel" nzTitle="Create Slicing Business Order" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()"
+          nzWidth="900px">
+</nz-modal>
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 bf95a83c..0647b76d 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
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
 import {COMMUNICATION_FORM_ITEMS} from "../../../../../../constants/constants";
 @Component({
   selector: 'app-business-order',
@@ -11,5 +11,14 @@ export class BusinessOrderComponent implements OnInit {
 
   ngOnInit() {
   }
+    @Input() showModel: boolean;
+    @Output() cancel = new EventEmitter<boolean>();
 
+    handleCancel() {
+        this.showModel = false;
+        this.cancel.emit(this.showModel)
+    }
+    handleOk() {
+        console.log(1)
+    }
 }
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html
index c260de77..818fc136 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.html
@@ -7,7 +7,7 @@
         <nz-option *ngFor="let item of statusOptions" [nzLabel]="item" [nzValue]="item"></nz-option>
       </nz-select>
     </div>
-    <button nz-button nzType="primary" class="buy-button">Purchase</button>
+    <button nz-button nzType="primary" class="buy-button" (click)="OrderModelShow()">Purchase</button>
   </div>
   <div class="slicing-resource-table-list">
     <nz-table #basicTable [nzData]="listOfData" [nzFrontPagination]="false" nzShowSizeChanger
@@ -18,6 +18,7 @@
         <th width=100>No</th>
         <th width=280>Service Instance Id</th>
         <th width=200>Service Instance Name</th>
+        <th width=200>Creation Time</th>
         <th width=110>Service Type</th>
         <th width=110>S-NSSAI</th>
         <th width=110>Status</th>
@@ -28,8 +29,9 @@
       <ng-template ngFor let-data [ngForOf]="basicTable.data" let-i="index">
         <tr>
           <td>{{i+1}}</td>
-          <td>{{ data.service_instance_id }}</td>
-          <td>{{ data.service_instance_name }}</td>
+          <td>{{ data.order_id }}</td>
+          <td>{{ data.order_name }}</td>
+          <td>{{ data.order_creation_time }}</td>
           <td>{{ data.service_type?data.service_type:'--' }}</td>
           <td>{{ data.service_snssai }}</td>
           <td>
@@ -38,13 +40,13 @@
                                     {{data.last_operation_progress+'%'}}
                                 </span>
                                 <br>
-                                {{data.orchestration_status}}
+                                {{data.order_status}}
                             </span>
             <br>
           </td>
           <td>
             <div class="action-icon">
-              <nz-switch [ngModel]="data.orchestration_status==='activated'?true:false"
+              <nz-switch [ngModel]="data.order_status==='activated'?true:false"
                          [nzDisabled]="data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100'"
                          (ngModelChange)="switchChange(data,i)"></nz-switch>
               <nz-progress
@@ -53,7 +55,7 @@
               </nz-progress>
             </div>
             <div class="action-icon">
-              <i [ngClass]="{'cannotclick': data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100' && (data.last_operation_type !== 'DELETE' || data.orchestration_status==='activated')}"
+              <i [ngClass]="{'cannotclick': data.last_operation_type && data.last_operation_progress && data.last_operation_progress !== '100' && (data.last_operation_type !== 'DELETE' || data.order_status==='activated')}"
                  nz-icon nzType="poweroff" nzTheme="outline" class="anticon anticon-poweroff"
                  (click)="terminate(data)"></i>
               <nz-progress
@@ -67,4 +69,5 @@
       </tbody>
     </nz-table>
   </div>
+  <app-business-order [showModel]="businessOrderShow" (cancel)="businessOrderShow=$event"></app-business-order>
 </div>
\ No newline at end of file
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts
index fac4e0cf..76f0bcdf 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.ts
@@ -2,6 +2,7 @@ import {Component, OnInit} from '@angular/core';
 import {BUSINESS_STATUS} from "../../../../../constants/constants";
 import {SlicingTaskServices} from '.././../../../core/services/slicingTaskServices';
 import { NzModalService, NzMessageService } from 'ng-zorro-antd';
+import *as moment from 'moment';
 @Component({
     selector: 'app-csmf-slicing-business-management',
     templateUrl: './csmf-slicing-business-management.component.html',
@@ -33,36 +34,37 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit {
     total: number = 0;
     loading = false;
     statusOptions: any[] = BUSINESS_STATUS;
-    isSelect: boolean = false;
+    // isSelect: boolean = false;
     progressingTimer: any[] = [];
     terminateStart: boolean = false;
-
+    businessOrderShow: boolean = false;
     getCSMFBusinessList() {
         this.loading = true;
-        this.isSelect = false;
+        // this.isSelect = false;
         this.listOfData = [];
         let paramsObj = {
             status: this.selectedValue,
             pageNo: this.pageIndex,
             pageSize: this.pageSize
         };
-        if (this.selectedValue !== BUSINESS_STATUS[0]) {
-            paramsObj["businessStatus"] = this.selectedValue;
-            this.isSelect = true;
-        }
-        this.myhttp.getSlicingBusinessList(paramsObj, this.isSelect).subscribe(res => {
-            const {result_header: {result_code}, result_body: {slicing_business_list, record_number}} = res;
+        // if (this.selectedValue !== BUSINESS_STATUS[0]) {
+        //     paramsObj["businessStatus"] = this.selectedValue;
+        //     this.isSelect = true;
+        // }
+        this.myhttp.getCSMFSlicingBusinessList(paramsObj).subscribe(res => {
+            const {result_header: {result_code}, result_body: {slicing_order_list, record_number}} = res;
             this.loading = false;
             if (+result_code === 200) {
                 this.total = record_number;
-                if (slicing_business_list !== null && slicing_business_list.length > 0) {
-                    this.listOfData = slicing_business_list.map((item, index) => {
+                if (slicing_order_list !== null && slicing_order_list.length > 0) {
+                    this.listOfData = slicing_order_list.map((item, index) => {
+                        item.order_creation_time =  moment(Number(item.order_creation_time)).format('YYYY-MM-DD');
                         if (item.last_operation_progress && item.last_operation_type && Number(item.last_operation_progress) < 100) {
                             let updata = (prodata: { operation_progress: string }) => {
                                 item.last_operation_progress = prodata.operation_progress || item.last_operation_progress;
                             };
                             let obj = {
-                                serviceId: item.service_instance_id
+                                serviceId: item.order_id
                             };
                             if (item.last_operation_type === 'DELETE') this.terminateStart = true;
                             this.queryProgress(obj, index, updata).then((res) => {
@@ -99,12 +101,12 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit {
         console.log(slicing, i, "slicing");
         this.modalService.confirm({
             nzTitle: '<i>Are you sure you want to perform this task?</i>',
-            nzContent: '<b>Name:' + slicing.service_instance_name + '</b>',
+            nzContent: '<b>Name:' + slicing.order_name + '</b>',
             nzOnOk: () => {
                 let paramsObj = {
-                    serviceId: slicing.service_instance_id
+                    serviceId: slicing.order_id
                 };
-                if (slicing.orchestration_status === 'activated') {
+                if (slicing.order_status === 'activated') {
                     this.changeActivate(paramsObj, false, slicing, "deactivate", "deactivated", i)
                 } else {
                     this.changeActivate(paramsObj, true, slicing, "activate", "activated", i);
@@ -145,9 +147,9 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit {
         console.log(slicing, "slicing");
         this.modalService.confirm({
             nzTitle: 'Are you sure you want to terminate this task?',
-            nzContent: '<b>Name:&nbsp;</b>' + slicing.service_instance_name,
+            nzContent: '<b>Name:&nbsp;</b>' + slicing.order_name,
             nzOnOk: () => {
-                let paramsObj = { serviceId: slicing.service_instance_id };
+                let paramsObj = { serviceId: slicing.order_id };
                 this.terminateStart = true;
                 this.loading = true;
                 this.myhttp.terminateSlicingService(paramsObj).subscribe(res => {
@@ -215,4 +217,8 @@ export class CsmfSlicingBusinessManagementComponent implements OnInit {
             requery();
         })
     }
+
+    OrderModelShow(){
+        this.businessOrderShow = true;
+    }
 }