W15ESUN005, Changed by Sneha. Updated the Warehouse User Activity dashboard.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98455 ce508802-f39f-4f6c-b175-0d175dae99d5

W15ESUN005, Changed by Sneha. Updated the Warehouse User Activity dashboard.
git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98455 ce508802-f39f-4f6c-b175-0d175dae99d5
94866589 · smestry · 541389b5 · 94866589
Commit 94866589 authored Aug 11, 2015 by smestry
Show whitespace changes
Inline Side-by-side

Showing with 435 additions and 413 deletions

webitm-wms/module-resource/web/dashboard/metadataxml/taskactivity.xml ...odule-resource/web/dashboard/metadataxml/taskactivity.xml +435 -413

No files found.
--- a/webitm-wms/module-resource/web/dashboard/metadataxml/taskactivity.xml
+++ b/webitm-wms/module-resource/web/dashboard/metadataxml/taskactivity.xml
@@ -274,16 +274,38 @@
 		<height><![CDATA[150]]></height>
 		<width><![CDATA[100%]]></width>			   
 		<layout> 
-			<html><![CDATA[<table border='0' width='100%'> 
+			<html><![CDATA[		
+			<table border='0' width='100%'>
+			<tr> 
+				<td width='60%' class='topAlign'>
+					<a href = '/ibase/dashboard/wms/jsp/LocationStockOccupancy.jsp?area={link}' target = '_blank'>
+						<span style='color: #000;font-size:15px;'>{descr}</span>
+					</a>
+						<table width='100%' {tbldisplay} class='marginTop'> 
 							<tr>
-				<td width='40%' style='text-align:center'>
-				<a href = '/ibase/dashboard/wms/jsp/LocationStockOccupancy.jsp?area={link}' target='_blank'>
-				<span style='color: #000'>{descr}</span></a> </td> 	
-				               		
-				<td width='40%' style='text-align:center'> 
-				<div class='c100 p{value} green'> <span class='internalSpan'>{value}%</span> <div class='slice'> <div class='bar'></div> 
-				<div class='fill'></div> </div> </div> </td> </tr> </table>]]>
-			</html>
+								<td class='cardViewTable'>Occupied</td>
+								<td class='cardViewTable'>Total</td>
+							</tr>
+							<tr>
+								<td class='cardViewTable'>{occupied}</td>
+								<td class='cardViewTable'>{total}</td>
+							</tr>
+						</table> 
+				</td>
+					    
+				<td>
+					<a href = '/ibase/dashboard/wms/jsp/LocationStockOccupancy.jsp?area={link}' target = '_blank'>
+						<div class='c100  p{value} green'> 
+						<span class='internalSpan'>  {value} % </span>
+							<div class='slice'> <div class='bar'></div> 
+							<div class='fill'></div> 
+						</div> 
+						</div> 
+					</a>
+				</td>
+			</tr>
+			</table>
+			]]></html>
 		</layout>             
 	</component>
 	 	    	    
@@ -314,7 +336,7 @@
 		</column_group>
 	
 		<column_group id='y_axis'>
-		<col_group_title><![CDATA[Assign Task Value]]></col_group_title>
+		<col_group_title><![CDATA[Value]]></col_group_title>
 		<columns>
 			<column id='created' render='bar'  linktype=''  linkedmetadata='' color='' showvalue='1' linevisibility='1' dotthickness='0'><![CDATA[Created]]></column>
 			<column id='pending' render='bar' linktype=''  linkedmetadata=''  color='' showvalue='1' linevisibility='1' dotthickness='0'><![CDATA[Held]]></column>