[VID-12] Delivery of remaining features for v1.1

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

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm
index a78b95e..4d02ae8 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm
@@ -78,30 +78,31 @@
                    <thead  att-table-row type="header">\r
                                <tr>\r
                                        <th att-table-header key="action">Action</th>\r
-                                       <th att-table-header key="uuid">UUID</th>\r
-                                       <th att-table-header key="invariantUUID">Invariant UUID</th>\r
-                                       <th att-table-header default-sort="A" key="name">Name</th>\r
-                           <th att-table-header key="version">Version</th>\r
-                           <th att-table-header key="category">Category</th>\r
-                           <th att-table-header key="distributionStatus">Distribution Status</th>\r
-                           <th att-table-header key="lastUpdaterUserId">Last Updated By</th>\r
-                           <th att-table-header key="toscaModelUrl">Tosca Model</th>\r
+                                       <th att-table-header key="serviceInstanceName">Service Name</th>\r
+                                       <th att-table-header key="serviceDescription">Service Description</th>\r
+                                       <th att-table-header key="serviceType">Service Type</th>\r
+                           <th att-table-header key="serviceUuid">Service UUID</th>\r
+                           <th att-table-header key="serviceInvariantUuid">Service Invariant UUID</th>\r
+                           <th att-table-header key="serviceVersion">Service Version</th>\r
+                           <th att-table-header key="actions">Action</th>\r
                        </tr>\r
                    </thead>\r
                    <tbody att-table-row type="body" row-repeat="service in services">\r
-                       <tr>\r
-                               <td att-table-body ><button type=button ng-click="deployService(service)" att-button btn-type="primary" size="small">Deploy</button></td>\r
-                       <td att-table-body ng-bind="service['uuid']"></td>\r
-                       <td att-table-body ng-bind="service['invariantUUID']"></td>\r
-                       <td att-table-body ng-bind="service['name']"></td>\r
-                       <td att-table-body ng-bind="service['version']"></td>\r
-                       <td att-table-body ng-bind="service['category']"></td>\r
-                       <td att-table-body ng-bind="service['distributionStatus']"></td>\r
-                       <td att-table-body ng-bind="service['lastUpdaterUserId']"></td>\r
-                       <td att-table-body ng-bind="service['toscaModelUrl']"></td>\r
-                       </tr>     \r
+                      <tr>\r
+                               <td att-table-body ><button type=button ng-click="deployService(service,true)" att-button btn-type="primary" size="small">Deploy</button></td>\r
+                       <td att-table-body ng-bind="service['extra-properties']['extra-property'][2]['property-value']"></td>\r
+                       <td att-table-body ng-bind="service['extra-properties']['extra-property'][0]['property-value']"></td>\r
+                       <td att-table-body ng-bind="service['extra-properties']['extra-property'][3]['property-value']"></td>\r
+                       <td att-table-body ng-bind="service['extra-properties']['extra-property'][1]['property-value']"></td>\r
+                       <td att-table-body ng-bind="service['extra-properties']['extra-property'][4]['property-value']"></td>\r
+                       <td att-table-body ng-bind="service['extra-properties']['extra-property'][6]['property-value']"></td>\r
+                       <td att-table-body ><button type=button ng-click="deploService(service)" att-button btn-type="primary" size="small">Previous Versions</button></td>\r
+                       </tr>\r
                    </tbody>      \r
                </table>\r
+               <div >  \r
+                       <center><button type="submit" class="btn btn-primary" size="small" ng-click="cancelCreateSIType();">Cancel</button></center>\r
+               </div>\r
                <table width='100%'>\r
                        <tr>\r
                                        <td width='33%' valign='middle'>\r