dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #13004
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4085: In datastatus result color coding changed both datastatus and drilldown
------------------------------------------------------------
revno: 4085
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-07-07 12:32:33 +0530
message:
In datastatus result color coding changed both datastatus and drilldown
modified:
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntryStatusResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/nullReportDataEntryStatusResult.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntryStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntryStatusResult.vm 2011-06-15 06:01:50 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntryStatusResult.vm 2011-07-07 07:02:33 +0000
@@ -65,17 +65,17 @@
<div id="formResult">
<div align="center" class="NormalB">Data Entry Status</div>
<div align="right">
- <table width="30%">
+ <table width="30%" border="1">
<tr class="TableDataCellStyles" >
- <td bgcolor="#a0c0a0"> </td>
+ <td bgcolor="#9ACD32"> </td>
<td align="left"> Completed (75+) %</td>
</tr>
<tr class="TableDataCellStyles">
- <td bgcolor="#a0a0ff"> </td>
+ <td bgcolor="#FF66FF"> </td>
<td align="left"> Partially Completed (41 - 75) %</td>
</tr>
<tr class="TableDataCellStyles">
- <td bgcolor="#905090"> </td>
+ <td bgcolor="#FFFF00"> </td>
<td align="left"> Not Completed (1 - 40) %</td>
</tr>
<tr class="TableDataCellStyles">
@@ -83,11 +83,11 @@
<td align="left"> Not Entered ( 0 ) %</td>
</tr>
<tr class="TableDataCellStyles">
- <td bgcolor="blue"> </td>
+ <td bgcolor="white"> </td>
<td align="left"> Not Assigned</td>
</tr>
<tr class="TableDataCellStyles">
- <td bgcolor="white"> </td>
+ <td bgcolor="green"> </td>
<td align="left"> Data Not Mart</td>
</tr>
</table>
@@ -135,17 +135,17 @@
##set( $deCount = $dataElementCounts.get( $count2 ) )
##set( $periodCount = $periodCounts.get( $count2 ) )
#if( !$dataSetSources.contains( $chiildorgUnit ) )
- <td bgcolor="blue"> </td>
+ <td bgcolor="white"> </td>
#elseif( $result < 0 )
- <td bgcolor="white"> </td>
+ <td bgcolor="green"> </td>
#elseif( $result == 0 )
- <td align="center" bgcolor="#ff0000"><font color="#ffffff"><a href="javascript:getNullReportInfo('$selDataSet.id','$period.id','$chiildorgUnit.id')">$result% ( $deCount ) </a></font></td>
+ <td align="center" bgcolor="#ff0000"><font color="#000000"><a href="javascript:getNullReportInfo('$selDataSet.id','$period.id','$chiildorgUnit.id')">$result% ( $deCount ) </a></font></td>
#elseif( $result > 75 )
- <td align="center" bgcolor="#a0c0a0"><font color="#ffffff"><a href="javascript:getNullReportInfo('$selDataSet.id','$period.id','$chiildorgUnit.id')">$result% ( $deCount ) </a></font></td>
+ <td align="center" bgcolor="#9ACD32"><font color="#000000"><a href="javascript:getNullReportInfo('$selDataSet.id','$period.id','$chiildorgUnit.id')">$result% ( $deCount ) </a></font></td>
#elseif( $result > 40 && $result <= 75 )
- <td align="center" bgcolor="#a0a0ff"><font color="#ffffff"><a href="javascript:getNullReportInfo('$selDataSet.id','$period.id','$chiildorgUnit.id')">$result% ( $deCount ) </a></font></td>
+ <td align="center" bgcolor="#FF66FF"><font color="#000000"><a href="javascript:getNullReportInfo('$selDataSet.id','$period.id','$chiildorgUnit.id')">$result% ( $deCount ) </a></font></td>
#else
- <td align="center" bgcolor="#905090"><font color="#ffffff"><a href="javascript:getNullReportInfo('$selDataSet.id','$period.id','$chiildorgUnit.id')">$result% ( $deCount ) </a></font></td>
+ <td align="center" bgcolor="#FFFF00"><font color="#000000"><a href="javascript:getNullReportInfo('$selDataSet.id','$period.id','$chiildorgUnit.id')">$result% ( $deCount ) </a></font></td>
#end
#set( $count2 = $count2 + 1 )
#end
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult.vm 2011-06-15 06:01:50 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult.vm 2011-07-07 07:02:33 +0000
@@ -66,17 +66,17 @@
<div id="formResult">
<div align="center" class="NormalB">Data Entry Status</div>
<div align="right">
- <table width="30%">
+ <table width="30%" border="1">
<tr class="TableDataCellStyles" >
- <td bgcolor="#a0c0a0"> </td>
+ <td bgcolor="#9ACD32"> </td>
<td align="left"> Completed (75+) %</td>
</tr>
<tr class="TableDataCellStyles">
- <td bgcolor="#a0a0ff"> </td>
+ <td bgcolor="#FF66FF"> </td>
<td align="left"> Partially Completed (41 - 75) %</td>
</tr>
<tr class="TableDataCellStyles">
- <td bgcolor="#905090"> </td>
+ <td bgcolor="#FFFF00"> </td>
<td align="left"> Not Completed (1 - 40) %</td>
</tr>
<tr class="TableDataCellStyles">
@@ -126,13 +126,13 @@
#if( $result < 0 )
<td bgcolor="white"> </td>
#elseif( $result == 0 )
- <td align="center" bgcolor="#ff0000"><font color="#ffffff"><a href="javascript:getNullReportInfo('$selDataSet.id','$periodCount.id','$chiildorgUnit.id')">$result% #if( $deCount != -1 ) ( $deCount ) #end</a></font></td>
+ <td align="center" bgcolor="#ff0000"><font color="#000000"><a href="javascript:getNullReportInfo('$selDataSet.id','$periodCount.id','$chiildorgUnit.id')">$result% #if( $deCount != -1 ) ( $deCount ) #end</a></font></td>
#elseif( $result > 75 )
- <td align="center" bgcolor="#a0c0a0"><font color="#ffffff"><a href="javascript:getNullReportInfo('$selDataSet.id','$periodCount.id','$chiildorgUnit.id')">$result% #if( $deCount != -1 ) ( $deCount ) #end</a></font></td>
+ <td align="center" bgcolor="#9ACD32"><font color="#000000"><a href="javascript:getNullReportInfo('$selDataSet.id','$periodCount.id','$chiildorgUnit.id')">$result% #if( $deCount != -1 ) ( $deCount ) #end</a></font></td>
#elseif( $result > 40 && $result <= 75 )
- <td align="center" bgcolor="#a0a0ff"><font color="#ffffff"><a href="javascript:getNullReportInfo('$selDataSet.id','$periodCount.id','$chiildorgUnit.id')">$result% #if( $deCount != -1 ) ( $deCount ) #end</a></font></td>
+ <td align="center" bgcolor="#FF66FF"><font color="#000000"><a href="javascript:getNullReportInfo('$selDataSet.id','$periodCount.id','$chiildorgUnit.id')">$result% #if( $deCount != -1 ) ( $deCount ) #end</a></font></td>
#else
- <td align="center" bgcolor="#905090"><font color="#ffffff"><a href="javascript:getNullReportInfo('$selDataSet.id','$periodCount.id','$chiildorgUnit.id')">$result% #if( $deCount != -1 ) ( $deCount ) #end</a></font></td>
+ <td align="center" bgcolor="#FFFF00"><font color="#000000"><a href="javascript:getNullReportInfo('$selDataSet.id','$periodCount.id','$chiildorgUnit.id')">$result% #if( $deCount != -1 ) ( $deCount ) #end</a></font></td>
#end
#set( $count2 = $count2 + 1 )
#end
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/nullReportDataEntryStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/nullReportDataEntryStatusResult.vm 2011-05-24 08:25:51 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/nullReportDataEntryStatusResult.vm 2011-07-07 07:02:33 +0000
@@ -54,11 +54,11 @@
<td align="center">$count1</td>
<td align="left">$dataElementName</td>
#if( !$dataElementValue )
- <td align="center" bgcolor="#ff0000"><font color="#ffffff"> </font></td>
+ <td align="center" bgcolor="#ff0000"><font color="#000000"> </font></td>
#elseif( $dataElementValue == "0" )
- <td align="center" bgcolor="#a0c0a0"><font color="#ffffff">$dataElementValue</font></td>
+ <td align="center" bgcolor="#a0c0a0"><font color="#000000">$dataElementValue</font></td>
#else
- <td align="center" bgcolor="a0a0ff"><font color="#ffffff">$dataElementValue</font></td>
+ <td align="center" bgcolor="a0a0ff"><font color="#000000">$dataElementValue</font></td>
#end
#set( $count1 = $count1 + 1 )
</tr>
