org.onap migration

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / view-models / aaiGetSubs.htm

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubs.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubs.htm
index c5c5cca..233bab1 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubs.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubs.htm
@@ -39,7 +39,8 @@
         <br>\r
         Please search by the Subscriber name or enter Service Instance Id or Service Instance Name below:&nbsp;<br><br>\r
 \r
-        <table>\r
+        <table ng-init="loadOwningEntity()">\r
+\r
             <tr>\r
                 <td style="width:30%">\r
                     <div class="fn-ebz-container">\r
@@ -51,7 +52,7 @@
                         <!--<select name="selectedCustomer" ng-model="selectedCustomer">-->\r
                         <!--<option ng-repeat="item in customerList" value="{{item.globalCustomerId}}" ng-disabled="getPermitted(item)">{{item.subscriberName}}</option>-->\r
                         <!--</select>-->\r
-                        <select ng-model="selectedCustomer"\r
+                        <select ng-model="selectedCustomer" id="selectSubscriber"\r
                                 ng-options="item.globalCustomerId as item.subscriberName for item in customerList | orderBy:'subscriberName'">\r
                             <option value="">Select a subscriber</option>\r
                         </select>\r
@@ -60,8 +61,9 @@
                             class="glyphicon glyphicon-refresh"></span></a>\r
                     </div>\r
                 </td>\r
-\r
             </tr>\r
+\r
+\r
             <tr>\r
                 <td style="width:30%">\r
                     <div class="fn-ebz-container">\r
@@ -72,8 +74,8 @@
                     </div>\r
                 </td>\r
                 <td style="width:60%">\r
-                    <div class="fn-ebz-container">\r
-                        <input type="text" style="width: 350px;" name="selectedServiceInstance"\r
+                    <div class="fn-ebz-container" style="width: 100%;">\r
+                        <input type="text" name="selectedServiceInstance"\r
                                ng-model="selectedServiceInstance"\r
                                data-tests-id="searchForExistingInstancesText"\r
                                restrict-input="{type : selectedserviceinstancetype}"/>\r
@@ -81,12 +83,51 @@
                 </td>\r
 \r
             </tr>\r
+\r
+            <tr>\r
+                <td style="width:30%">\r
+                    <div class="fn-ebz-container">\r
+                        <label class="fn-ebz-text-label">Owning entity Name:</label>\r
+                    </div>\r
+                </td>\r
+                <td style="width:30%" nowrap>\r
+                    <div class="fn-ebz-container" style="width: 100%;">\r
+                        <!--<select name="selectedCustomer" ng-model="selectedCustomer">-->\r
+                        <!--<option ng-repeat="item in customerList" value="{{item.globalCustomerId}}" ng-disabled="getPermitted(item)">{{item.subscriberName}}</option>-->\r
+                        <!--</select>-->\r
+                        <multiselect id="selectOwningEntity" ng-model="selectedEntity"\r
+                                     options="owningEntities"\r
+                                     display-prop="name" id-prop="id">\r
+                        </multiselect>\r
+                    </div>\r
+                </td>\r
+            </tr>\r
+\r
+            <tr>\r
+                <td style="width:30%">\r
+                    <div class="fn-ebz-container">\r
+                        <label class="fn-ebz-text-label">Project Name:</label>\r
+                    </div>\r
+                </td>\r
+                <td style="width:30%" nowrap>\r
+                    <div class="fn-ebz-container" style="width: 100%;">\r
+                        <!--<select name="selectedCustomer" ng-model="selectedCustomer">-->\r
+                        <!--<option ng-repeat="item in customerList" value="{{item.globalCustomerId}}" ng-disabled="getPermitted(item)">{{item.subscriberName}}</option>-->\r
+                        <!--</select>-->\r
+                        <multiselect id="selectProject" ng-model="selectedProject"\r
+                                     options="projects"\r
+                                     display-prop="name" id-prop="id">\r
+                        </multiselect>\r
+                    </div>\r
+                </td>\r
+            </tr>\r
+\r
             <tr>\r
                 <td>\r
                 <td style="width:30%">\r
                     <div>\r
                         <button type="submit" class="btn btn-primary" size="small"\r
-                                ng-click="getSubscriberDet(selectedCustomer,selectedserviceinstancetype,selectedServiceInstance);">\r
+                                ng-click="getServiceInstancesSearchResults(selectedCustomer,selectedserviceinstancetype,selectedServiceInstance, selectedProject, selectedEntity);">\r
                             Submit\r
                         </button>\r
                         </a>\r