Added Junits & AAF attributes Support

Issue-ID: PORTAL-136

Includes JUNITS, AAF attributes support


Change-Id: Id4cc9f64268017665d7245d0a10369c9b498ba2f
Signed-off-by: Kotta, Shireesha (sk434m) <sk434m@att.com>

5 files changed, 48 insertions, 32 deletions

diff --git a/ecomp-sdk/epsdk-app-overlay/pom.xml b/ecomp-sdk/epsdk-app-overlay/pom.xml
index b78973df..53147a81 100644
--- a/ecomp-sdk/epsdk-app-overlay/pom.xml
+++ b/ecomp-sdk/epsdk-app-overlay/pom.xml
@@ -43,9 +43,29 @@
 			<version>3.1.0</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>1.2</version>
+    		<groupId>org.apache.taglibs</groupId>
+    		<artifactId>taglibs-standard-spec</artifactId>
+    		<version>1.2.5</version>
+		</dependency>
+		<dependency>
+    		<groupId>org.apache.taglibs</groupId>
+    		<artifactId>taglibs-standard-impl</artifactId>
+    		<version>1.2.5</version>
+		</dependency>
+		<dependency>
+    		<groupId>org.apache.taglibs</groupId>
+    		<artifactId>taglibs-standard-spec</artifactId>
+    		<version>1.2.5</version>
+		</dependency>
+		<dependency>
+    		<groupId>org.apache.taglibs</groupId>
+    		<artifactId>taglibs-standard-impl</artifactId>
+    		<version>1.2.5</version>
+		</dependency>
+		<dependency>
+    		<groupId>org.apache.taglibs</groupId>
+   			<artifactId>taglibs-standard-jstlel</artifactId>
+    		<version>1.2.5</version>
 		</dependency>
 	</dependencies>
 
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml
index b2fa88f8..1df65560 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml
@@ -211,6 +211,8 @@
     <class name="RoleFunction" table="FN_FUNCTION">
         <id        name="code"  column="function_cd"   />
         <property  name="name"  column="function_name" />
+        <property  name="type"  column="type" />
+        <property  name="action"  column="action" />
     </class>
     
     <!-- Menu class mapping details -->
@@ -284,16 +286,6 @@
         <property name="siteCd"      column="broadcast_site_cd"    />
     </class>
     
-    <class name="org.onap.portalsdk.analytics.model.base.ReportUserRole" table="cr_report_access">
-		<composite-id>
-			<key-property name="repId" column="rep_id" />
-			<key-property name="orderNo" column="order_no" />
-		</composite-id>
-
-        <property name="roleId" column="role_id"/>
-        <property name="userId"  column="user_id"/>
-        <property name="readOnlyYn"  column="read_only_yn"/>
-    </class>    
     
     <!-- State Lookup class mapping details -->
     <class name="LuState" table="FN_LU_STATE">
@@ -378,23 +370,7 @@
     <query name="getAllRoles">
       select id, name from Role order by name
     </query>	
-    
-    <query name="getReportSecurityUsers">
-      select repId, orderNo, roleId, userId, readOnlyYn from ReportUserRole where repId = :report_id and userId is not null
-    </query>
-        
-    <query name="getReportSecurityRoles">
-      select repId, orderNo, roleId, userId, readOnlyYn from ReportUserRole where repId = :report_id and roleId is not null
-    </query>    
-
-    <query name="deleteReportSecurityUsers">
-      delete from ReportUserRole where repId = :report_id and userId =:user_id
-    </query>
-
-    <query name="deleteReportSecurityRoles">
-      delete from ReportUserRole where repId = :report_id and roleId =:role_id
-    </query>
-    
+      
      <query name="getUserByProfileId">
       select orgUserId from User where id = :user_id
      </query>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-add.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-add.html
index 531c55e5..5752a278 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-add.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-add.html
@@ -9,7 +9,7 @@
 	
 	<div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0"
 		role="region" aria-label="Modal header text content"
-		style="height: 145px;">
+		style="height: 280px;">
 
 		<div class="field-group">
 			<span ID="required" style="color: Red;" visible="false"> *</span>Name <input id="textinputID-2a" ddh-reset ng-model="roleFun['name']"
@@ -29,6 +29,16 @@
 			ng-show="!roleFun['code']||roleFun['code']==0">
 			<small id="code-required" class="err-message">Code is Required</small>
 		</div>
+			<br>
+		<div class="field-group">
+			Type <input id="textinputID-2b" ddh-reset ng-model="roleFun['type']"
+				placeholder="Type" class="span12" type="text">
+		</div>
+		<br>
+		<div class="field-group">
+			Action <input id="textinputID-2c" ddh-reset ng-model="roleFun['action']"
+				placeholder="Action" class="span12" type="text">
+		</div>
 		
 	</div>
 	<br>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-edit.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-edit.html
index ecf69b5a..9c1d55aa 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-edit.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-edit.html
@@ -5,13 +5,19 @@
 			<button type="button" class="close" aria-label="Close"	ng-click="$dismiss('cancel')"></button>
 		</div>
 	</div>
-	<div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content" style="height: 145px;">
+	<div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content" style="height: 240px;">
 		<div class="field-group">
 			Name <input id="textinputID-2a" ng-model="roleFun['name']" placeholder="Name" class="span12" type="text">
 		</div>
 		<div class="field-group">
 			Code <input id="textinputID-2a" ng-model="roleFun['code']" disabled placeholder="Code" class="span12" type="text">
 		</div>
+		<div class="field-group">
+			Type <input id="textinputID-2b" ng-model="roleFun['type']" disabled placeholder="Type" class="span12" type="text">
+		</div>
+		<div class="field-group">
+			Action <input id="textinputID-2c" ng-model="roleFun['action']" disabled placeholder="Action" class="span12" type="text">
+		</div>
 	</div>
 	<div class="b2b-modal-footer">
 		<div class="cta-button-group"> 
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role-function.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role-function.html
index 55f2980b..4114a468 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role-function.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role-function.html
@@ -39,6 +39,8 @@
 					<tr>
 						<th b2b-table-header key="name">Name</th>
 						<th b2b-table-header key="code">Code</th>
+						<th b2b-table-header key="type">Type</th>
+						<th b2b-table-header key="action">Action</th>
 						<th b2b-table-header sortable="false" ng-if="isAppCentralized=='false'">Edit</th>
 						<th b2b-table-header sortable="false" ng-if="isAppCentralized=='false'">Delete</th>
 					</tr>
@@ -47,6 +49,8 @@
 					<tr>
 						<td b2b-table-body ng-bind="rowData['name']"></td>
 						<td b2b-table-body ng-bind="rowData['code']"></td>
+						<td b2b-table-body ng-bind="rowData['type']"></td>
+						<td b2b-table-body ng-bind="rowData['action']"></td>
 						<td b2b-table-body ng-if="isAppCentralized=='false'">
 							<div style="font-size: 20px;">
 								<a ng-click="saveRoleFuncPopUp(rowData);" class="icon-misc-pen"></a>