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

Change-Id: I50305ba25aaa34ee1ca7640237f31ab824655a34
Signed-off-by: jimmydot <jf2512@att.com>

3 files changed, 85 insertions, 82 deletions

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 a78b95ee..4d02ae80 100755
--- 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">

 				<tr>

 					<th att-table-header key="action">Action</th>

-					<th att-table-header key="uuid">UUID</th>

-					<th att-table-header key="invariantUUID">Invariant UUID</th>

-					<th att-table-header default-sort="A" key="name">Name</th>

-		            <th att-table-header key="version">Version</th>

-		            <th att-table-header key="category">Category</th>

-		            <th att-table-header key="distributionStatus">Distribution Status</th>

-		            <th att-table-header key="lastUpdaterUserId">Last Updated By</th>

-		            <th att-table-header key="toscaModelUrl">Tosca Model</th>

+					<th att-table-header key="serviceInstanceName">Service Name</th>

+					<th att-table-header key="serviceDescription">Service Description</th>

+					<th att-table-header key="serviceType">Service Type</th>

+		            <th att-table-header key="serviceUuid">Service UUID</th>

+		            <th att-table-header key="serviceInvariantUuid">Service Invariant UUID</th>

+		            <th att-table-header key="serviceVersion">Service Version</th>

+		            <th att-table-header key="actions">Action</th>

 		        </tr>

 		    </thead>

 		    <tbody att-table-row type="body" row-repeat="service in services">

-		        <tr>

-		        	<td att-table-body ><button type=button ng-click="deployService(service)" att-button btn-type="primary" size="small">Deploy</button></td>

-	            	<td att-table-body ng-bind="service['uuid']"></td>

-	            	<td att-table-body ng-bind="service['invariantUUID']"></td>

-	            	<td att-table-body ng-bind="service['name']"></td>

-	            	<td att-table-body ng-bind="service['version']"></td>

-	            	<td att-table-body ng-bind="service['category']"></td>

-	            	<td att-table-body ng-bind="service['distributionStatus']"></td>

-	            	<td att-table-body ng-bind="service['lastUpdaterUserId']"></td>

-	            	<td att-table-body ng-bind="service['toscaModelUrl']"></td>

-		        </tr>     

+		       <tr>

+		        	<td att-table-body ><button type=button ng-click="deployService(service,true)" att-button btn-type="primary" size="small">Deploy</button></td>

+	            	<td att-table-body ng-bind="service['extra-properties']['extra-property'][2]['property-value']"></td>

+	            	<td att-table-body ng-bind="service['extra-properties']['extra-property'][0]['property-value']"></td>

+	            	<td att-table-body ng-bind="service['extra-properties']['extra-property'][3]['property-value']"></td>

+	            	<td att-table-body ng-bind="service['extra-properties']['extra-property'][1]['property-value']"></td>

+	            	<td att-table-body ng-bind="service['extra-properties']['extra-property'][4]['property-value']"></td>

+	            	<td att-table-body ng-bind="service['extra-properties']['extra-property'][6]['property-value']"></td>

+	            	<td att-table-body ><button type=button ng-click="deploService(service)" att-button btn-type="primary" size="small">Previous Versions</button></td>

+		        </tr>

 		    </tbody>	  

 		</table>

+		<div >	

+			<center><button type="submit" class="btn btn-primary" size="small" ng-click="cancelCreateSIType();">Cancel</button></center>

+		</div>

 		<table width='100%'>

 			<tr>

 					<td width='33%' valign='middle'>

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
index 0ac74a9a..11dc1c39 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
@@ -1,64 +1,64 @@
-<!--

-  ============LICENSE_START=======================================================

-  VID

-  ================================================================================

-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

-  ================================================================================

-  Licensed under the Apache License, Version 2.0 (the "License");

-  you may not use this file except in compliance with the License.

-  You may obtain a copy of the License at

-  

-       http://www.apache.org/licenses/LICENSE-2.0

-  

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

-  ============LICENSE_END=========================================================

-  -->

+<!--
+  ============LICENSE_START=======================================================
+  VID
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<div ng-controller="creationDialogController">
+
+	<div ng-show="isDialogVisible">
+		<div class="titleLine">
+			<img src="app/vid/images/spinner.gif"
+				ngx-visible="{{isSpinnerVisible}}"></img>
+			<h3>Create {{componentName}} -- {{createType}}</h3>
+		</div>
+
+		<div class="error" ng-show="isErrorVisible">
+			<img src="app/vid/images/error.png"></img>{{error}}
+		</div>
+
+		<div ngx-visible="{{isDataVisible}}">
+			<parameter-block control="summaryControl"></parameter-block>
+			<h4>
+				User Provided Data (<img class="requiredIndicator"
+					src="app/vid/images/asterisk.png" height='10' width='10'></img> indicates required field)
+			</h4>
+			<parameter-block control="userProvidedControl"
+				callback="userParameterChanged(id);" editable></parameter-block>
 

-<div ng-controller="creationDialogController">

-

-	<div ng-show="isDialogVisible">

-		<div class="titleLine">

-			<img src="app/vid/images/spinner.gif"

-				ngx-visible="{{isSpinnerVisible}}"></img>

-			<h3>Create {{componentName}} -- {{createType}}</h3>

-		</div>

-

-		<div class="error" ng-show="isErrorVisible">

-			<img src="app/vid/images/error.png"></img>{{error}}

-		</div>

-

-		<div ngx-visible="{{isDataVisible}}">

-			<parameter-block control="summaryControl"></parameter-block>

-			<h4>

-				User Provided Data (<img class="requiredIndicator"

-					src="app/vid/images/asterisk.png" height='10' width='10'></img> indicates required field)

-			</h4>

-			<parameter-block control="userProvidedControl"

-				callback="userParameterChanged(id);" editable></parameter-block>

-

-			<div class="prompt">

-				<p>

-					Enter Data and <span>Confirm</span> to<br />Create <span>{{componentName}}</span>

-				</p>

-				<p>

-					<span>Cancel</span> to Return to Previous Page.<br />Data entered

-					will be lost

-				</p>

-			</div>

-

-		</div>

-		<div class="buttonRow">

-			<button ngx-enabled="{{isConfirmEnabled}}" att-button size="small"

-				ng-click="confirm();">Confirm</button>

-			<button type="button" ng-click="cancel();" att-button

-				btn-type="primary" size="small">Cancel</button>

-		</div>

-	</div>

-

-	<div ng-include="'app/vid/scripts/view-models/msoCommit.htm'"></div>

-

-</div>

+			<div class="prompt">
+				<p>
+					Enter Data and <span>Confirm</span> to<br />Create <span>{{componentName}}</span>
+				</p>
+				<p>
+					<span>Cancel</span> to Return to Previous Page.<br />Data entered
+					will be lost
+				</p>
+			</div>
+
+		</div>
+		<div class="buttonRow">
+			<button ngx-enabled="{{isConfirmEnabled}}" att-button size="small"
+				ng-click="confirm();">Confirm</button>
+			<button type="button" ng-click="cancel();" att-button
+				btn-type="primary" size="small">Cancel</button>
+		</div>
+	</div>
+
+	<div ng-include="'app/vid/scripts/view-models/msoCommit.htm'"></div>
+
+</div>
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
index c0a8ee54..00b8972f 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
@@ -52,6 +52,7 @@
 		            <th att-table-header key="distributionStatus">Distribution Status</th>

 		            <th att-table-header key="lastUpdaterUserId">Last Updated By</th>

 		            <th att-table-header key="toscaModelUrl">Tosca Model</th>

+					<th att-table-header key="actions">Action</th>

 		        </tr>

 		    </thead>

 		    <tbody att-table-row type="body" row-repeat="service in services">

@@ -65,6 +66,7 @@
 	            	<td att-table-body ng-bind="service['distributionStatus']"></td>

 	            	<td att-table-body ng-bind="service['lastUpdaterUserId']"></td>

 	            	<td att-table-body ng-bind="service['toscaModelUrl']"></td>

+					<td att-table-body ><button type=button ng-click="deloyService(service)" att-button btn-type="primary" size="small">Previous Versions</button></td>

 		        </tr>     

 		    </tbody>	  

 		</table>