feat:add csmf slicing purchase components of communication service page

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

diff --git a/usecaseui-portal/src/app/app.module.ts b/usecaseui-portal/src/app/app.module.ts
index 48b125d..d46f9f5 100644 (file)
--- a/usecaseui-portal/src/app/app.module.ts
+++ b/usecaseui-portal/src/app/app.module.ts
@@ -97,6 +97,7 @@ import { SlicingBusinessModelComponent } from './views/services/slicing-manageme
 import { NsiModelComponent } from './views/services/slicing-management/slicing-resource-management/nsi-management/nsi-model/nsi-model.component';
 import { NssiModelComponent } from './views/services/slicing-management/slicing-resource-management/nssi-management/nssi-model/nssi-model.component';
 import { CsmfSlicingBusinessManagementComponent } from './views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component';
+import { BusinessOrderComponent } from './views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component';
 
 @NgModule({
   providers: [
@@ -158,7 +159,8 @@ import { CsmfSlicingBusinessManagementComponent } from './views/services/slicing
       SlicingBusinessModelComponent,
       NsiModelComponent,
       NssiModelComponent,
-      CsmfSlicingBusinessManagementComponent
+      CsmfSlicingBusinessManagementComponent,
+      BusinessOrderComponent
   ],
   imports: [
     BrowserModule,

diff --git a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
index 1c348a7..05cf188 100644 (file)
--- a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
+++ b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
@@ -53,6 +53,7 @@ export class SlicingTaskServices {
         csmfDeactivate:"/api/usecaseui/csmf/5gSlicing/service/{serviceId}/deactivate",\r
         csmfTerminate:"/api/usecaseui/csmf/5gSlicing/service/{serviceId}",\r
         csmfGetProgress:"/api/usecaseui/csmf/5gSlicing/service/{serviceId}/progress",\r
+        csmfPurchase:"/uui-slicing/csmf/5gSlicing ",\r
         //monitor 5G\r
         fetchTraffic: this.baseUrl + "/monitoring/queryTimestamp/{queryTimestamp}/trafficData",\r
         fetchOnlineusers: this.baseUrl + "/monitoring/queryTimestamp/{queryTimestamp}/onlineUsers",\r

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
new file mode 100644 (file)
index 0000000..606d9e1
--- /dev/null
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.html
@@ -0,0 +1,3 @@
+<p>
+  business-order works!
+</p>

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.spec.ts b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.spec.ts
new file mode 100644 (file)
index 0000000..1d7a756
--- /dev/null
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BusinessOrderComponent } from './business-order.component';
+
+describe('BusinessOrderComponent', () => {
+  let component: BusinessOrderComponent;
+  let fixture: ComponentFixture<BusinessOrderComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BusinessOrderComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BusinessOrderComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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
new file mode 100644 (file)
index 0000000..bf95a83
--- /dev/null
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+import {COMMUNICATION_FORM_ITEMS} from "../../../../../../constants/constants";
+@Component({
+  selector: 'app-business-order',
+  templateUrl: './business-order.component.html',
+  styleUrls: ['./business-order.component.less']
+})
+export class BusinessOrderComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

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 2da0554..c260de7 100644 (file)
--- 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,6 +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>
   </div>
   <div class="slicing-resource-table-list">
     <nz-table #basicTable [nzData]="listOfData" [nzFrontPagination]="false" nzShowSizeChanger
@@ -43,7 +44,7 @@
           </td>
           <td>
             <div class="action-icon">
-              <nz-switch [ngModel]="data.service_status==='activated'?true:false"
+              <nz-switch [ngModel]="data.orchestration_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
@@ -52,7 +53,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.service_status==='activated')}"
+              <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')}"
                  nz-icon nzType="poweroff" nzTheme="outline" class="anticon anticon-poweroff"
                  (click)="terminate(data)"></i>
               <nz-progress

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.less b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.less
index e71024f..f52f4ad 100644 (file)
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.less
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/csmf-slicing-business-management.component.less
@@ -24,4 +24,8 @@ i.anticon {
   pointer-events: none;
   color: #aaa;
   opacity: 0.6;
+}
+.buy-button{
+  float: right;
+  margin-right: 2%;
 }
\ No newline at end of file

diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts
index 68c5c2e..d5f6183 100644 (file)
--- a/usecaseui-portal/src/constants/constants.ts
+++ b/usecaseui-portal/src/constants/constants.ts
@@ -244,4 +244,196 @@ export const ADDRESS = [
 ]\r
 export const BUSINESS_STATUS = [\r
        "All", "activated", "deactivated"\r
-]
\ No newline at end of file
+]\r
+\r
+export const COMMUNICATION_FORM_ITEMS = [\r
+    {\r
+        title: 'Slicing Business Name',\r
+        key: 'name'\r
+    },\r
+    {\r
+        title: 'Max Number of UEs',\r
+        key: 'maxNumberofUEs'\r
+    },\r
+    {\r
+        title: 'Data Rate Downlink (Mbps)',\r
+        key: 'expDataRateDL'\r
+    },\r
+    {\r
+        title: 'Latency',\r
+        key: 'latency'\r
+    },\r
+    {\r
+        title: 'Data Rate Uplink (Mbps)',\r
+        key: 'expDataRateUL'\r
+    },\r
+    {\r
+        title: 'Resource Sharing Level',\r
+        key: 'resourceSharingLevel',\r
+        options: [\r
+            {\r
+                title: 'Shared',\r
+                key: 'shared'\r
+            },\r
+            {\r
+                title: 'Non-shared',\r
+                key: 'no-shared'\r
+            }\r
+        ]\r
+    },\r
+    {\r
+        title: 'Mobility',\r
+        key: 'uEMobilityLevel',\r
+    },\r
+    {\r
+        title: 'Use Interval (Month)',\r
+        key: 'useInterval'\r
+    },\r
+    {\r
+        title: 'Max Number of UEs',\r
+        key: 'coverageArea'\r
+    }\r
+]\r
+\r
+export const COMMUNICATION_FORM_ADDRESS = {\r
+    "result_header": {\r
+        "result_code": 200,\r
+        "result_message": "Successfully"\r
+    },\r
+\r
+    "result_body": {\r
+        "province": [\r
+            {\r
+                "id": "1",\r
+                "name": "北京",\r
+                "city": [\r
+                    {\r
+                        "id": "101",\r
+                        "name": "北京市",\r
+                        "county": [\r
+                            {\r
+                                "id": "1001",\r
+                                "name": "海淀区",\r
+                                "street": [\r
+                                    {\r
+                                        "id": "100101",\r
+                                        "name": "万寿路街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100102",\r
+                                        "name": "中关村街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100103",\r
+                                        "name": "海淀街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100104",\r
+                                        "name": "西三旗街道"\r
+                                    }\r
+                                ]\r
+                            },\r
+                            {\r
+                                "id": "1002",\r
+                                "name": "西城区",\r
+                                "street": [\r
+                                    {\r
+                                        "id": "100201",\r
+                                        "name": "广安门内街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100202",\r
+                                        "name": "广安门外街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100203",\r
+                                        "name": "西长安街街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100204",\r
+                                        "name": "金融街街道"\r
+                                    }\r
+                                ]\r
+                            },\r
+                            {\r
+                                "id": "1003",\r
+                                "name": "昌平区",\r
+                                "street": [\r
+                                    {\r
+                                        "id": "100301",\r
+                                        "name": "城北街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100302",\r
+                                        "name": "城南街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100303",\r
+                                        "name": "天通苑北街道"\r
+                                    },\r
+                                    {\r
+                                        "id": "100304",\r
+                                        "name": "天通苑南街道"\r
+                                    }\r
+                                ]\r
+                            }\r
+                        ]\r
+                    }\r
+                ]\r
+            },\r
+            {\r
+                "id": "2",\r
+                "name": "上海",\r
+                "city": [{\r
+                    "id": "201",\r
+                    "name": "上海市",\r
+                    "county": [{\r
+                        "id": "2001",\r
+                        "name": "浦东新区",\r
+                        "street": [\r
+                            {\r
+                                "id": "200101",\r
+                                "name": "陆家嘴街道"\r
+                            },\r
+                            {\r
+                                "id": "200102",\r
+                                "name": "周家渡街道"\r
+                            },\r
+                            {\r
+                                "id": "200103",\r
+                                "name": "塘桥街道"\r
+                            },\r
+                            {\r
+                                "id": "200104",\r
+                                "name": "南码头路街道"\r
+                            }\r
+                        ]\r
+                    },\r
+                        {\r
+                            "id": "2002",\r
+                            "name": "静安区",\r
+                            "street": [\r
+                                {\r
+                                    "id": "200201",\r
+                                    "name": "江宁路街道"\r
+                                },\r
+                                {\r
+                                    "id": "200202",\r
+                                    "name": "静安寺街道"\r
+                                },\r
+                                {\r
+                                    "id": "200203",\r
+                                    "name": "南京西路街道"\r
+                                },\r
+                                {\r
+                                    "id": "200204",\r
+                                    "name": "曹家渡街道"\r
+                                }\r
+                            ]\r
+                        }\r
+                    ]\r
+                }]\r
+            }\r
+        ]\r
+    }\r
+}
\ No newline at end of file