From: lizi <li.zi30@zte.com.cn>
Date: Wed, 25 Oct 2017 09:44:00 +0000 (+0800)
Subject: Fix the vendor and version input issue of ems.
X-Git-Tag: v1.0.0^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=383c9a08b5a659a836e3ad6c32114e5afcddb487;p=aai%2Fesr-gui.git

Fix the vendor and version input issue of ems.

Change-Id: I2c4daf468a55b1c16cb016551e8abdd523d83e04
Issue-ID: AAI-441
Signed-off-by: lizi <li.zi30@zte.com.cn>
---

diff --git a/portal/src/main/webapp/extsys/ems/emsView.html b/portal/src/main/webapp/extsys/ems/emsView.html
index 368f643..7e3eaf6 100644
--- a/portal/src/main/webapp/extsys/ems/emsView.html
+++ b/portal/src/main/webapp/extsys/ems/emsView.html
@@ -41,23 +41,30 @@
                     <div class="modal-body">
                         <div class="px-ui-steps">
                             <ul class="px-ui-horizon-ul-horizon" role="tablist">
-                                <li class="px-ui-steps-li step-active" id="step-resourceAddr">
+                                <li class="px-ui-steps-li step-active" id="step-commonInfo">
                                     <div  class="px-ui-menuitem-div-passive">
                                         <span class="px-ui-steps-number-passive">1</span>
+                                        <span class="px-ui-steps-title-passive">Common</span>
+                                    </div>
+                                    <div class="px-ui-underline-passive"></div>
+                                </li>
+                                <li class="px-ui-steps-li" id="step-resourceAddr">
+                                    <div  class="px-ui-menuitem-div-passive">
+                                        <span class="px-ui-steps-number-passive">2</span>
                                         <span class="px-ui-steps-title-passive">Resource</span>
                                     </div>
                                     <div class="px-ui-underline-passive"></div>
                                 </li>
                                 <li class="px-ui-steps-li" id="step-performanceAddr">
                                     <div class="px-ui-menuitem-div-passive">
-                                        <span class="px-ui-steps-number-passive">2</span>
+                                        <span class="px-ui-steps-number-passive">3</span>
                                         <span class="px-ui-steps-title-passive">Performance</span>
                                     </div>
                                     <div class="px-ui-underline-passive"></div>
                                 </li>
                                 <li class="px-ui-steps-li" id="step-alarmAddr">
                                     <div class="px-ui-menuitem-div-passive">
-                                        <span class="px-ui-steps-number-passive">3</span>
+                                        <span class="px-ui-steps-number-passive">4</span>
                                         <span class="px-ui-steps-title-passive">Alarm</span>
                                     </div>
                                     <div class="px-ui-underline-passive"></div>
@@ -65,7 +72,7 @@
                             </ul>
                         </div>
                         <div class="step-content">
-                            <form class="form-horizontal" id="form_resourceAddr" role="form">
+                            <form class="form-horizontal" id="form_commonInfo" role="form">
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">
                                         <span>Name</span>
@@ -76,6 +83,26 @@
                                         <span class="help-block"></span>
                                     </div>
                                 </div>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">
+                                        <span>Vendor</span>
+                                    </label>
+                                    <div class="col-sm-7">
+                                        <input type="text" ms-duplex="currentElement.vendor" name="vendor" class="form-control"/>
+                                        <span class="help-block"></span>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">
+                                        <span>Version</span>
+                                    </label>
+                                    <div class="col-sm-7">
+                                        <input type="text" ms-duplex="currentElement.version" name="version" class="form-control"/>
+                                        <span class="help-block"></span>
+                                    </div>
+                                </div>
+                            </form>
+                            <form class="form-horizontal" id="form_resourceAddr" role="form"> 
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">
                                         <span>Ftp Type</span>
diff --git a/portal/src/main/webapp/extsys/ems/js/emsController.js b/portal/src/main/webapp/extsys/ems/js/emsController.js
index fea1820..84d92f8 100644
--- a/portal/src/main/webapp/extsys/ems/js/emsController.js
+++ b/portal/src/main/webapp/extsys/ems/js/emsController.js
@@ -22,8 +22,8 @@ var vm = avalon.define({
         $newElement: {
             "emsId": "",
             "name": "",
-            "version": "v1.0",
-            "vendor": "ZTE",
+            "version": "",
+            "vendor": "",
             "resourceAddr": {
                 "ftptype": "ftp",
                 "ip": "",
@@ -104,20 +104,10 @@ var vm = avalon.define({
             });
         },
         $nextStep: function () {
-            if(vm.currentStep == 1 && !vm.validate("resourceAddr")){
-                 return false;
-            } else if(vm.currentStep == 2 && !vm.validate("performanceAddr")){
-                return false;
-            }
             vm.currentStep ++;
             vm.showStep();
         },
         $preStep: function () {
-            if(vm.currentStep == 2 && !vm.validate("resourceAddr")){
-                return false;
-            } else if(vm.currentStep == 3 && !vm.validate("alarmAddr")){
-                return false;
-            }
             vm.currentStep --;
             vm.showStep();
         },
@@ -130,16 +120,21 @@ var vm = avalon.define({
             };
             switch (vm.currentStep){
                 case 1:
-                    show("resourceAddr");
+                    show("commonInfo");
                     $("#btnSave, #btnPreStep").hide();
                     $("#btnNextStep").show();
                     break;
                 case 2:
-                    show("performanceAddr");
+                    show("resourceAddr");
                     $("#btnSave").hide();
                     $("#btnNextStep, #btnPreStep").show();
                     break;
                 case 3:
+                    show("performanceAddr");
+                    $("#btnSave").hide();
+                    $("#btnNextStep, #btnPreStep").show();
+                    break;
+                case 4:
                     show("alarmAddr");
                     $("#btnNextStep").hide();
                     $("#btnSave, #btnPreStep").show();
@@ -162,6 +157,8 @@ var vm = avalon.define({
         dismiss: function () {
             if(vm.currentIndex !== -1){
                 vm.currentElement.name = vm.$emsList[vm.currentIndex].name;
+                vm.currentElement.vendor = vm.$emsList[vm.currentIndex].vendor;
+                vm.currentElement.version = vm.$emsList[vm.currentIndex].version;
             }
             $("#addEmsDlg").modal("hide");
         },