From e7deae813ed28aab1440fc165855d86b90d9a48b Mon Sep 17 00:00:00 2001
From: geek <geek@loafle.com>
Date: Wed, 23 May 2018 12:34:16 +0900
Subject: [PATCH] ing

---
 .../discovery/discovery.component.html        |  2 +-
 .../discovery/discovery.component.ts          |  8 ++----
 .../search-config.component.html              | 25 +++++++++++++++++--
 .../search-config/search-config.component.ts  | 16 +++++++++++-
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/packages/discovery/component/discovery/discovery.component.html b/src/packages/discovery/component/discovery/discovery.component.html
index 3d3d979..19fd2f0 100644
--- a/src/packages/discovery/component/discovery/discovery.component.html
+++ b/src/packages/discovery/component/discovery/discovery.component.html
@@ -6,7 +6,7 @@
   <div class="ui-g-12 ui-md-3">
     <p-accordion (onClose)="onTabClose($event)" (onOpen)="OnTabOpen($event)">
       <p-accordionTab header="Discovery Search Config Area" [selected]="true">
-        <of-discovery-search-config (discoverySearchStartClick)="onDiscoveryStart()"></of-discovery-search-config>
+        <of-discovery-search-config (discoverySearchStartClick)="onDiscoveryStart()" [isiii]="tabIdx"></of-discovery-search-config>
       </p-accordionTab>
       <p-accordionTab header="Result Filter Area">
         <of-discovery-search-filter></of-discovery-search-filter>
diff --git a/src/packages/discovery/component/discovery/discovery.component.ts b/src/packages/discovery/component/discovery/discovery.component.ts
index 8acc249..410f270 100644
--- a/src/packages/discovery/component/discovery/discovery.component.ts
+++ b/src/packages/discovery/component/discovery/discovery.component.ts
@@ -9,7 +9,7 @@ import {
 })
 export class DiscoveryComponent implements OnInit, AfterContentInit {
 
-  private isSelectResult = true;
+  private tabIdx: number;
 
   constructor(
   ) {
@@ -26,11 +26,7 @@ export class DiscoveryComponent implements OnInit, AfterContentInit {
   }
 
   OnTabOpen(event) {
-    if (event.index === 0) {
-      this.isSelectResult = true;
-    } else {
-      this.isSelectResult = false;
-    }
+    this.tabIdx = event.index;
   }
 
   onFilterResultOpen() {
diff --git a/src/packages/discovery/component/discovery/search-config/search-config.component.html b/src/packages/discovery/component/discovery/search-config/search-config.component.html
index cb25cc3..4ef7368 100644
--- a/src/packages/discovery/component/discovery/search-config/search-config.component.html
+++ b/src/packages/discovery/component/discovery/search-config/search-config.component.html
@@ -1,8 +1,29 @@
 <div class="ui-g-nopad">
+  <of-probe-selector [hidden]="requestStart" [preProbe]="probe" (probeSelected)="onProbeSelect($event)"></of-probe-selector>
+
+  <div class="ui-g ui-fluid" style="width:250px;margin-bottom:10px">
+    <div class="ui-g-12"><p-radioButton name="group1" value="0" label="IPv4" [(ngModel)]="ipVesion" inputId="opt1"></p-radioButton></div>
+    <div class="ui-g-12"><p-radioButton name="group1" value="1" label="IPv6" [(ngModel)]="ipVesion" inputId="opt2"></p-radioButton></div>
+  </div>
 
   <div class="ui-g ui-fluid">
-    <span>Basic</span>
-    <p-inputMask mask="9?9?9.9?9?9.9?9?9.9?9?9" [(ngModel)]="val1" placeholder="254.254.254.254"></p-inputMask>
+    <span>Start IP Address : </span>
+    <p-inputMask slotChar=" " mask="9?9?9.9?9?9.9?9?9.9?9?9" [(ngModel)]="startIP" placeholder="254.254.254.254" [autoClear]="false"></p-inputMask> -
+    <span>End IP Address : </span>
+    <p-inputMask mask="9?9?9.9?9?9.9?9?9.9?9?9" [(ngModel)]="endIP" placeholder="254.254.254.254" [autoClear]="false"></p-inputMask>
+    <span>Exclude IP Address : </span>
+    <p-inputMask mask="9?9?9.9?9?9.9?9?9.9?9?9" [(ngModel)]="excludeIP" placeholder="254.254.254.254" [autoClear]="false"></p-inputMask>
   </div>
+
+  <div class="ui-g ui-fluid">
+    <span>Start Port : </span>
+    <p-inputMask slotChar=" " mask="9999" [(ngModel)]="startPort" placeholder="1024" [autoClear]="false"></p-inputMask> -
+    <span>End Port : </span>
+    <p-inputMask mask="9999" [(ngModel)]="endPort" placeholder="1024" [autoClear]="false"></p-inputMask>
+    <span>Exclude Port : </span>
+    <p-inputMask mask="9999" [(ngModel)]="excludePort" placeholder="1024" [autoClear]="false"></p-inputMask>
+  </div>
+  <of-service-selector [disabled]="!serviceChecked" [(includeServices)]="includeServices"></of-service-selector>
+
   <button type="button" label="Discovery Start" pButton class="ui-button-width-fit" (click)="discoveryStartClick($event)"></button>
 </div>
diff --git a/src/packages/discovery/component/discovery/search-config/search-config.component.ts b/src/packages/discovery/component/discovery/search-config/search-config.component.ts
index d1adac6..6f6e011 100644
--- a/src/packages/discovery/component/discovery/search-config/search-config.component.ts
+++ b/src/packages/discovery/component/discovery/search-config/search-config.component.ts
@@ -1,5 +1,5 @@
 import {
-  AfterContentInit, Component, EventEmitter,
+  AfterContentInit, Component, EventEmitter, Input,
   OnInit, Output
 } from '@angular/core';
 
@@ -10,12 +10,22 @@ import {
 export class SearchConfigComponent implements OnInit, AfterContentInit {
 
   @Output() discoverySearchStartClick = new EventEmitter();
+  @Input() isiii;
+
+  private ipVesion: string;
+  private startIP: string;
+  private endIP: string;
+  private excludeIP: string;
+  private startPort: string;
+  private endPort: string;
+  private excludePort: string;
 
   constructor(
   ) {
   }
 
   ngOnInit() {
+    this.ipVesion = '0';
   }
 
   ngAfterContentInit() {
@@ -24,4 +34,8 @@ export class SearchConfigComponent implements OnInit, AfterContentInit {
   discoveryStartClick() {
     this.discoverySearchStartClick.emit();
   }
+
+  onProbeSelect(event) {
+
+  }
 }