dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #10744
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2948: Merging changes from 2.0.6
------------------------------------------------------------
revno: 2948
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-03-01 15:12:21 +0530
message:
Merging changes from 2.0.6
modified:
local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dataanalyser/i18n_module.properties
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForDS.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForDSMobile.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGA.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGADataElement.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGAIndicator.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForNR.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForOrgUnitGroupWiseDS.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSA.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTA.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTTA.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTarget.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summarySatusResult.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.vm
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/targetAnalysisFront.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/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml 2011-01-20 14:53:49 +0000
+++ local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml 2011-03-01 09:42:21 +0000
@@ -737,28 +737,17 @@
<ref bean="org.hisp.dhis.user.UserStore"/>
</property>
<property name="jdbcTemplate" ref="jdbcTemplate"/>
-<!-- <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService"/> -->
</bean>
- <!-- DataStatus For Mobile end -->
<bean
id="org.hisp.dhis.dataanalyser.ds.action.GenerateSummaryDataStatusResultAction"
class="org.hisp.dhis.dataanalyser.ds.action.GenerateSummaryDataStatusResultAction"
scope="prototype">
- <property name="dashBoardService">
- <ref bean="org.hisp.dhis.dataanalyser.util.DashBoardService"/>
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="periodService">
- <ref bean="org.hisp.dhis.period.PeriodService"/>
- </property>
- <property name="organisationUnitService">
- <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
- </property>
- <property name="sessionFactory" ref="sessionFactory"/>
+ <property name="dashBoardService" ref="org.hisp.dhis.dataanalyser.util.DashBoardService" />
+ <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+ <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
<property name="jdbcTemplate" ref="jdbcTemplate"/>
</bean>
=== modified file 'local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dataanalyser/i18n_module.properties'
--- local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dataanalyser/i18n_module.properties 2011-01-13 09:39:35 +0000
+++ local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dataanalyser/i18n_module.properties 2011-03-01 09:42:21 +0000
@@ -30,14 +30,14 @@
dataanalyser = Data Analyser
graphical_analysis = Graphical Analysis
dataelements_wise = DataElement Wise
-dataelements_wise_graphical_analyser = Data Elements wise Graphical Analyser
+dataelements_wise_graphical_analyser = Data Elementwise Graphical Analyser
periodType = Period Type
year = Year
period = Period
ga_orgUnitGroups = OrgUnitGroups
ga_aggregated_data = Aggregated Data
indicator_wise = Indicator Wise
-indicator_wise_graphical_analyser = Indicator Wise Graphical Analyser
+indicator_wise_graphical_analyser = Indicatorwise Graphical Analyser
ga_available_indicatorList = Available Indicator List
ga_selected_IndicatorList = Selected Indicator List
#------Annual Analysis------------------------#
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.vm 2010-09-28 07:10:26 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.vm 2011-03-01 09:42:21 +0000
@@ -1,146 +1,136 @@
-
-<html>
- <head>
- <title>Graphical Analyser - Annual</title>
- <script>
- // Global Variables
- var selriRadioButton = "indicatorsRadio";
- var selCategory = "";
- var selFacility = "";
-
- // OrganisationUnit ids and its Names
- </script>
- </head>
- <body>
- <h1>$i18n.getString( "aa_annual_analyser" )</h1>
- <hr />
- <br />
- ##<form id="ChartGenerationForm" name="ChartGenerationForm" action="generateAnnualData.action" method="post" onsubmit="return formValidations()" target="chartWindow1">
- <form id="ChartGenerationForm" name="ChartGenerationForm" method="post" target="chartWindow1">
- <table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="730" border=0>
- <colgroup>
- <col width="325">
- <col width="80">
- <col width="325">
- </colgroup>
- <tr>
- <td class="NormalB">
- <input type="radio" id="riRadio" name="riRadio" value="dataElementsRadio" onclick="riradioSelection(event)"> $i18n.getString( "ga_data_elements" )
-
- <input type="radio" id="riRadio" name="riRadio" value="indicatorsRadio" onclick="riradioSelection(event)" checked> $i18n.getString( "ga_indicators" )
- </td>
- <td class="NormalB" width="80"> </td>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td class="NormalB">
- $i18n.getString( "ga_filter_by_degroup" )<br />
- <select id="dataElementGroupId" name="dataElementGroupId" style="width:325px" onchange="getDataElementsWithOutOptionCombo()" disabled>
- <option value="$ALL">[ Select DataElementGroup / All ]</option>
- #foreach ( $group in $dataElementGroups )
- <option value="$group.id" title="$group.name">$group.name</option>
- #end
- </select>
- </td>
- <td class="NormalB"> </td>
- <td class="NormalB">
- $i18n.getString( "ga_filter_by_indicatorgroup" )<br />
- <select id="indicatorGroupId" name="indicatorGroupId" style="width:325px" onchange="getIndicators()">
- <option value="$ALL">[ Select IndicatorGroup / All ]</option>
- #foreach ( $group in $indicatorGroups )
- <option value="$group.id" title="$group.name">$group.name</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td class="NormalB">$i18n.getString( "ga_available_delist" )<br>
- <select id="availableDataElements" name="availableDataElements" disabled style="width:325px;">
- #foreach ( $element in $dataElements )
- <option value="$element.id" title="$element.name">$element.name</option>
- #end
- </select>
- <br>
- <select multiple id="selectedDataElements" name="selectedDataElements" disabled style="width:325px; height:0px; display:none" ondblclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )">
- </select>
- </td>
- <td class="NormalB" align="center"> </td>
- <td class="NormalB">
- $i18n.getString( "ga_available_indicatorlist" )<br />
- <select id="availableIndicators" name="availableIndicators" style="width:325px;" ondblclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )">
- #foreach ( $indicator in $indicators )
- <option value="$indicator.id" title="$indicator.name">$indicator.name</option>
- #end
- </select>
- <br />
- <select multiple id="selectedIndicators" name="selectedIndicators" style="width:325px; height:0px; display:none" ondblclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )">
- </select>
- </td>
- </tr>
- <tr>
- <td class="NormalB"> <br/></td>
- <td class="NormalB"> <br/></td>
- <td class="NormalB"> <br/></td>
- </tr>
- <tr>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td class="NormalB">
- $i18n.getString( "aa_annual_periods" )<br />
- <select name="annualPeriodsListCB" id="annualPeriodsListCB" multiple style="width: 325px;height: 100px">
- #set( $count = 0 )
- #foreach($periodName in $periodNameList)
- ##<option value="$simpleDateFormat.format($period.startDate)">$simpleDateFormat.format($period.startDate)</option>
- #set( $period = $yearlyPeriods.get($count) )
- <option value="$simpleDateFormat.format($period.startDate)">$periodName</option>
- #set( $count = $count + 1 )
- #end
- </select>
- </td>
- <td class="NormalB" align="center"> </td>
- <td class="NormalB">
- $i18n.getString( "aa_months" )<br />
- <select name="monthlyPeriodsListCB" id="monthlyPeriodsListCB" multiple style="width: 325px;height: 100px">
- #set($count1 = 0)
- #foreach($month in $monthNames)
- <option value="$count1">$month</option>
- #set($count1 = $count1 + 1)
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td class="NormalB">
- $i18n.getString( "aa_orgunit" ) : <br />
- <input type="text" name="ouNameTB" id="ouNameTB" size="20" disabled />
- </td>
- <td class="NormalB"> </td>
- <td class="NormalB">
- <input type="button" name="AnnualAnalysis" value="AnnualAnalysis" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000" onclick="javascript:selButtonFunction('AnnualAnalysis')">
- <input type="button" name="SurveyAnalysis" value="SurveyAnalysis" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000; display:none" onclick="javascript:selButtonFunction('SurveyAnalysis')">
- <input type="hidden" name="ouIDTB" id="ouIDTB">
- </td>
- </tr>
- </table>
- </form>
- </body>
-</html>
\ No newline at end of file
+<script>
+
+ // Global Variables
+ var selriRadioButton = "indicatorsRadio";
+ var selCategory = "";
+ var selFacility = "";
+
+</script>
+
+<h3>$i18n.getString( "aa_annual_analyser" )</h3>
+<hr /><br />
+
+<form id="ChartGenerationForm" name="ChartGenerationForm" method="post" target="chartWindow1">
+ <table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="730" border=0>
+ <colgroup>
+ <col width="325">
+ <col width="40">
+ <col width="325">
+ </colgroup>
+ <tr>
+ <td class="NormalB">
+ <input type="radio" id="riRadio" name="riRadio" value="dataElementsRadio" onclick="riradioSelection(event)"> $i18n.getString( "ga_data_elements" )
+
+ <input type="radio" id="riRadio" name="riRadio" value="indicatorsRadio" onclick="riradioSelection(event)" checked> $i18n.getString( "ga_indicators" )
+ </td>
+ <td class="NormalB" width="40"> </td>
+ <td class="NormalB"> </td>
+ </tr>
+ <tr>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ </tr>
+ <tr>
+ <td class="NormalB">
+ $i18n.getString( "ga_filter_by_degroup" )<br />
+ <select id="dataElementGroupId" name="dataElementGroupId" style="width:325px" onchange="getDataElementsWithOutOptionCombo()" disabled>
+ <option value="$ALL">[ Select DataElementGroup / All ]</option>
+ #foreach ( $group in $dataElementGroups )
+ <option value="$group.id" title="$group.name">$group.name</option>
+ #end
+ </select>
+ </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB">
+ $i18n.getString( "ga_filter_by_indicatorgroup" )<br />
+ <select id="indicatorGroupId" name="indicatorGroupId" style="width:325px" onchange="getIndicators()">
+ <option value="$ALL">[ Select IndicatorGroup / All ]</option>
+ #foreach ( $group in $indicatorGroups )
+ <option value="$group.id" title="$group.name">$group.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ </tr>
+ <tr>
+ <td class="NormalB">$i18n.getString( "ga_available_delist" )<br>
+ <select id="availableDataElements" name="availableDataElements" disabled style="width:325px;">
+ #foreach ( $element in $dataElements )
+ <option value="$element.id" title="$element.name">$element.name</option>
+ #end
+ </select>
+ <br>
+ <select multiple id="selectedDataElements" name="selectedDataElements" disabled style="width:325px; height:0px; display:none" ondblclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )">
+ </select>
+ </td>
+ <td class="NormalB" align="center"> </td>
+ <td class="NormalB">
+ $i18n.getString( "ga_available_indicatorlist" )<br />
+ <select id="availableIndicators" name="availableIndicators" style="width:325px;" ondblclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )">
+ #foreach ( $indicator in $indicators )
+ <option value="$indicator.id" title="$indicator.name">$indicator.name</option>
+ #end
+ </select>
+ <br />
+ <select multiple id="selectedIndicators" name="selectedIndicators" style="width:325px; height:0px; display:none" ondblclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )">
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="NormalB"> <br/></td>
+ <td class="NormalB"> <br/></td>
+ <td class="NormalB"> <br/></td>
+ </tr>
+ <tr>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ </tr>
+ <tr>
+ <td class="NormalB">
+ $i18n.getString( "aa_annual_periods" )<br />
+ <select name="annualPeriodsListCB" id="annualPeriodsListCB" multiple style="width: 325px;height: 100px">
+ #set( $count = 0 )
+ #foreach($periodName in $periodNameList)
+ #set( $period = $yearlyPeriods.get($count) )
+ <option value="$simpleDateFormat.format($period.startDate)">$periodName</option>
+ #set( $count = $count + 1 )
+ #end
+ </select>
+ </td>
+ <td class="NormalB" align="center"> </td>
+ <td class="NormalB">
+ $i18n.getString( "aa_months" )<br />
+ <select name="monthlyPeriodsListCB" id="monthlyPeriodsListCB" multiple style="width: 325px;height: 100px">
+ #set($count1 = 0)
+ #foreach($month in $monthNames)
+ <option value="$count1">$month</option>
+ #set($count1 = $count1 + 1)
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ </tr>
+ <tr>
+ <td class="NormalB">
+ $i18n.getString( "aa_orgunit" ) : <br />
+ <input type="text" name="ouNameTB" id="ouNameTB" style="width:325px" disabled />
+ </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB">
+ <input type="button" name="AnnualAnalysis" value="Annual Analysis" style="width:325px; height:25px; font-family:Arial; font-weight:bold; color:#000000" onclick="javascript:selButtonFunction('AnnualAnalysis')">
+ <input type="hidden" name="ouIDTB" id="ouIDTB">
+ </td>
+ </tr>
+ </table>
+</form>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm 2010-09-20 12:49:15 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm 2011-03-01 09:42:21 +0000
@@ -6,117 +6,65 @@
// Global Variables
var selCategory = "";
var selFacility = "";
- var ouName="";
- var dsName="";
- var sDateIndex=0;
- var eDateIndex=0;
- var sDate="";
- var eDate="";
- var curPeriodType="";
+ var ouName = "";
+ var dsName = "";
+ var sDateIndex = 0;
+ var eDateIndex = 0;
+ var sDate = "";
+ var eDate = "";
+ var curPeriodType = "";
</script>
-<h1>DataStatus Form</h1>
+<h3>DataStatus Form</h3>
<hr />
+
<form id="ChartGenerationForm" name="ChartGenerationForm" method="get" target="chartWindow1">
- <table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="730" border=0>
- <colgroup>
- <col width="325">
- <col width="80">
- <col width="325">
- </colgroup>
-
- <tr>
- <td class="NormalB" align="center">
- <table>
- <tr>
- <td class="NormalB" colspan="2">
- $i18n.getString( "ds_dataset_list" ) : <br>
- <select id="selectedDataSets" name="selectedDataSets" onchange="getdSetPeriods()" >
- #foreach ( $dataSet in $dataSetList )
- <option value='$dataSet.id' title='$dataSet.name'>$dataSet.name</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td colspan="2" class="NormalB">
- $i18n.getString( "ga_facilityby" )<br>
- <select id="facilityLB" name="facilityLB" onchange="facilityChangeFunction(event)">
- <option value="random" >Selected</option>
- <option value="immChildren" selected>Immediate Children</option>
- <option value="children" >Child Tree</option>
- </select>
- </td>
- <td class="NormalB" display="none">
- <br>
- <select class='hidden' id="categoryLB" name="categoryLB" onchange="categoryChangeFunction(event)" disabled>
- <option value="period">Period</option>
- <option value="facility" selected>Facility</option>
- </select>
- </td>
- </tr>
- <tr>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td class="NormalB">
- $i18n.getString( "ga_from" )<br>
- <select id="sDateLB" name="sDateLB"></select>
- </td>
- <td class="NormalB">
- $i18n.getString( "ga_to" )<br>
- <select id="eDateLB" name="eDateLB"></select>
- </td>
- </tr>
- </table>
- </td>
- <td class="NormalB"> </td>
- <td class="NormalB">
- <table>
- <tr>
- <td class="NormalB">
- <input type="checkbox" name="includeZeros" id="includeZeros" checked> Include Zero
- </td>
- </tr>
- <tr>
- <td class="NormalB">
- $i18n.getString( "ga_orgunit" )<br>
- <select name="orgUnitListCB" id="orgUnitListCB" multiple style="width: 325px;height: 110px" ondblclick="remOUFunction()">
- </select>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td align="center" class="NormalB"> </td>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td>
-
- <input type="button" name="ViewSummary" value="View DataSummary" style="font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('SummaryStatus')"/>
- <input type="button" name="ViewStatus" value="View DataStatus" style="font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('DataStatus')"/>
- </td>
- <td class="NormalB">
- <br/><br/><br/><br/><br/>
- <input type="button" name="LastUpdatedStatus" value=" User Details " style="font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('LastUpdatedStatus')"/>
- </td>
- <td>
-
- <input type="button" name="ViewGroupWise" value="View By Data Element Group" style="font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('GroupWiseStatus')"/>
- <input type="button" name="ValidationStatus" value="Validation Status" style="font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('ValidationStatus')"/>
- </td>
- </tr>
+ <table align="center" style="border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="80%" border="0">
+ <tr>
+ <td class="NormalB">
+ $i18n.getString( "ds_dataset_list" ) : <br>
+ <select id="selectedDataSets" name="selectedDataSets" onchange="getdSetPeriods()" style="width:300px">
+ #foreach ( $dataSet in $dataSetList )
+ <option value='$dataSet.id' title='$dataSet.name'>$dataSet.name</option>
+ #end
+ </select>
+ <br/><br/>
+ $i18n.getString( "ga_facilityby" )<br/>
+ <select id="facilityLB" name="facilityLB" onchange="facilityChangeFunction(event)" style="width:300px">
+ <option value="random" >Selected</option>
+ <option value="immChildren" selected>Immediate Children</option>
+ <option value="children" >Child Tree</option>
+ </select>
+ <br/>
+ <select class='hidden' id="categoryLB" name="categoryLB" onchange="categoryChangeFunction(event)" disabled>
+ <option value="period">Period</option>
+ <option value="facility" selected>Facility</option>
+ </select>
+ <br/>
+ <input type="button" name="ViewStatus" value="View DataStatus" style="width:300px;height:25px;font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('DataStatus')"/><br/><br/>
+ <input type="button" name="ViewGroupWise" value="View By Data Element Group" style="width:300px;height:25px;font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('GroupWiseStatus')"/><br/><br/>
+ <input type="button" name="ViewSummary" value="View DataSummary" style="width:300px;height:25px;font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('SummaryStatus')"/><br/><br/>
+ <input type="button" name="LastUpdatedStatus" value="User Details" style="width:300px;height:25px;font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('LastUpdatedStatus')"/><br/><br/>
+ <input type="button" name="ValidationStatus" value="Validation Status" style="width:300px;height:25px;font-family: Arial; font-weight: bold; color: rgb(0, 0, 0);" onclick="textvalue('ValidationStatus')"/>
+ </td>
+ <td class="NormalB">
+ <input type="checkbox" name="includeZeros" id="includeZeros" checked> Include Zero
+ <br/><br/>
+ $i18n.getString( "ga_orgunit" )<br />
+ <select name="orgUnitListCB" id="orgUnitListCB" multiple style="width:250px;height:125px" ondblclick="remOUFunction()">
+ </select>
+ <br/><br/>
+ $i18n.getString( "ga_from" )<br />
+ <select id="sDateLB" name="sDateLB" style="width:250px"></select>
+ <br/><br/>
+ $i18n.getString( "ga_to" )<br />
+ <select id="eDateLB" name="eDateLB" style="width:250px"></select>
+ </td>
+ </tr>
</table>
<input type="hidden" name="selectedButton" id="selectedButton"/>
</form>
<script>
getdSetPeriods();
-</script>
\ No newline at end of file
+</script>
\ No newline at end of file
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm 2010-12-29 07:47:36 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm 2011-03-01 09:42:21 +0000
@@ -1,30 +1,22 @@
<script>
+
// Global Variables
var selriRadioButton = "indicatorsRadio";
var selCategory = "";
var selFacility = "";
-
-
-
- // Global Variables
var dailyPeriodTypeName = '$dailyPeriodTypeName';
var weeklyPeriodTypeName = '$weeklyPeriodTypeName';
var monthlyPeriodTypeName = '$monthlyPeriodTypeName';
var quarterlyPeriodTypeName = '$quarterlyPeriodTypeName';
var sixmonthPeriodTypeName = '$sixMonthPeriodTypeName';
var yearlyPeriodTypeName = '$yearlyPeriodTypeName';
-
- // var maxOrgUnitLevels = $maxOrgUnitLevels;
var orgUnitIds="NONE";
var currentOrgUnitId;
var currentOrgUnitName;
-
-
var monthDays = new Array(31,29,31,30,31,30,31,31,30,31,30,31); // for daily Period
var days = new Array();
- //var monthNames = new Array("Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec","Jan","Feb","Mar");
var monthNames = new Array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");
var quarterNames = new Array("Q1","Q2","Q3","Q4");
var halfYearNames = new Array("HY1","HY2");
@@ -39,13 +31,11 @@
{
if( (i+1) <= 9 )
{
- // i = "0"+(i+1);
days[k]= "0"+ (i+1);
-
}
else
{
- days[k]= i+1;
+ days[k]= i+1;
}
if( j <= 9 )
{
@@ -53,13 +43,11 @@
}
else
{
- days[k] += "-"+j;
+ days[k] += "-"+j;
}
- //days[k]= (i+1)+"-"+j;
- // days[k]= i+"-"+j;
k++;
- }
+ }
}
var orgUnitGroupIds = new Array();
@@ -72,151 +60,138 @@
#set( $count1 = $count1 + 1 );
#end
-
</script>
-<h1>$i18n.getString( "dataelements_wise_graphical_analyser" )</h1>
+<h3>$i18n.getString( "dataelements_wise_graphical_analyser" )</h3>
<hr />
+
<form id="ChartGenerationForm" name="ChartGenerationForm" action="generateChartDataElement.action" method="post" onSubmit="return formValidationsDataElement()" target="chartWindowDataElement">
- <table style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" border=0>
-
- <tr>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td class="NormalB">$i18n.getString( "ga_filter_by_degroup" )<br>
- <select id="dataElementGroupId" name="dataElementGroupId" style="width:325px" onChange="getDataElements()" >
- <option value="$ALL">[ Select DataElementGroup / All ]</option>
- #foreach ( $group in $dataElementGroups )
- <option value="$group.id" title="$group.name">$group.name</option>
- #end
- </select>
- </td>
- <td class="NormalB"> </td>
- <td class="NormalB">$i18n.getString( "compare_view" )<br>
- <select id="deSelection" name="deSelection" style="width:325px" onChange="deSelectionChangeFuntion(event)" >
- <option value="dataelement" selected>DataElements</option>
- <option value="optioncombo">Options in DataElements</option>
- </select>
- </td>
- </tr>
- <tr>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td class="NormalB">$i18n.getString( "ga_available_delist" )<br>
- <select multiple size="7" id="availableDataElements" name="availableDataElements" style="width:325px; height:100px" ondblclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )">
- #foreach ( $element in $dataElements )
- <option value="$element.id" title="$element.name">$element.name</option>
- #end
- </select>
- </td>
- <td class="NormalB" align="center"><br />
- <input type="button" value=">" style="width:40px" onClick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )">
- <br>
- <input type="button" value="<" style="width:40px" onClick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )">
- <br>
- <input type="button" value=">>" style="width:40px" onClick="moveAllById( 'availableDataElements', 'selectedDataElements' )">
- <br>
- <input type="button" value="<<" style="width:40px" onClick="moveAllById( 'selectedDataElements', 'availableDataElements' )">
- </td>
- <td class="NormalB"> $i18n.getString( "ga_selected_delist" )<br />
- <select multiple size="7" id="selectedDataElements" name="selectedDataElements" style="width:325px; height:100px" ondblclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )">
- </select>
- </td>
- </tr>
- <tr>
- <td class="NormalB"> <br/></td>
- <td class="NormalB"> <br/></td>
- <td class="NormalB"> <br/></td>
- </tr>
-
- <tr>
- <td class="NormalB"><br><input type="checkbox" id="aggDataCB" name="aggDataCB" checked="true" >$i18n.getString( "ga_aggregated_data" )</td>
- <td class="NormalB"> </td>
- <td class="NormalB"><br>
- <table>
- <tr>
- <td class="NormalB"> $i18n.getString( "ga_viewby" )<br>
- <select id="categoryLB" name="categoryLB" onChange="categoryChangeFunction1(event)" disabled="true">
- <option value="period">Period Wise</option>
- <option value="children">Children</option>
- <option value="random">Selected</option>
- </select>
- <br />
- <br />
- </td>
- <td> </td>
- <td align="left" class="NormalB"> $i18n.getString( "periodType" )<br>
- <select id="periodTypeLB" name="periodTypeLB" onchange="getPeriods()" style="width: 150px;" disabled="true">
- #foreach ( $periodType in $periodTypes )
- <option value="$periodType.name" #if($periodType.name==$monthlyPeriodTypeName) selected #end>$periodType.name</option>
- #end
- </select>
- <br />
- <br />
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td class="NormalB"><br>
- <table>
- <td class="NormalB">$i18n.getString( "ga_orgunit" )<br>
- <select name="orgUnitListCB" id="orgUnitListCB" multiple size="7" style="width: 150px;" ondblclick="remOUFunction()"> >
- </select>
- </td>
- <td class="NormalB"><input type="checkbox" id="ougGroupSetCB" name="ougGroupSetCB" onChange="getOrgUnitGroupsDataElements()" disabled="true">$i18n.getString( "ga_orgUnitGroups" )<br>
- <select name="orgUnitGroupList" id="orgUnitGroupList" multiple size="7" onChange="selectSingleOptionOrgUnitGroup()" style="width: 150px;" disabled="true">
- </select>
- </td>
- </tr>
- </table>
- </td>
- <td class="NormalB" align="center"></td>
- <td class="NormalB" align="center"><br>
- <table>
- <tr>
- <td class="NormalB"> $i18n.getString( "year" )<br>
- <select id="yearLB" name="yearLB" onchange="getWeeklyPeriod()" size="5" multiple style="width: 150px;" disabled="true">
- #foreach($periodName in $periodNameList)
- <option value="$periodName">$periodName</option>
- #end
- </select>
- <br />
- <br />
- </td>
- <td> </td>
- <td class="NormalB"> $i18n.getString( "period" )<br>
- <select id="periodLB" name="periodLB" size="5" multiple style="width: 175px;" disabled="true">
- </select>
- <br />
- <br />
- </td>
- </tr>
- <tr>
- <td><input type="submit" name="ViewChart" value="$i18n.getString( 'ga_viewchart' )" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction1('ViewChart')">
- </td>
- <td> </td>
- <td align="right"><input type="submit" name="ViewSummary" value="$i18n.getString( 'ga_viewsummary' )" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction1('ViewSummary')">
- </td>
- </tr>
- <input type="hidden" name="selectedButton" id="selectedButton">
- </table></td>
- </tr>
+ <table style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" border=0>
+ <tr>
+ <td class="NormalB">$i18n.getString( "ga_filter_by_degroup" )<br>
+ <select id="dataElementGroupId" name="dataElementGroupId" style="width:325px" onChange="getDataElements()" >
+ <option value="$ALL">[ Select DataElementGroup / All ]</option>
+ #foreach ( $group in $dataElementGroups )
+ <option value="$group.id" title="$group.name">$group.name</option>
+ #end
+ </select>
+ </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB">$i18n.getString( "compare_view" )<br>
+ <select id="deSelection" name="deSelection" style="width:350px" onChange="deSelectionChangeFuntion(event)" >
+ <option value="dataelement" selected>DataElements</option>
+ <option value="optioncombo">Options in DataElements</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ </tr>
+ <tr>
+ <td class="NormalB">$i18n.getString( "ga_available_delist" )<br>
+ <select multiple size="7" id="availableDataElements" name="availableDataElements" style="width:325px; height:100px" ondblclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )">
+ #foreach ( $element in $dataElements )
+ <option value="$element.id" title="$element.name">$element.name</option>
+ #end
+ </select>
+ </td>
+ <td class="NormalB" align="center"><br />
+ <input type="button" value=">" style="width:40px" onClick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )"> <br />
+ <input type="button" value="<" style="width:40px" onClick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )"> <br />
+ <input type="button" value=">>" style="width:40px" onClick="moveAllById( 'availableDataElements', 'selectedDataElements' )"> <br />
+ <input type="button" value="<<" style="width:40px" onClick="moveAllById( 'selectedDataElements', 'availableDataElements' )">
+ </td>
+ <td class="NormalB"> $i18n.getString( "ga_selected_delist" )<br />
+ <select multiple size="7" id="selectedDataElements" name="selectedDataElements" style="width:350px; height:100px" ondblclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )">
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ </tr>
+ <tr>
+ <td class="NormalB">
+ <input type="checkbox" id="aggDataCB" name="aggDataCB" checked="true" >$i18n.getString( "ga_aggregated_data" )
+ </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB">
+ <table>
+ <tr>
+ <td class="NormalB"> $i18n.getString( "ga_viewby" )<br>
+ <select id="categoryLB" name="categoryLB" onChange="categoryChangeFunction1(event)" disabled="true" style="width: 150px;">
+ <option value="period">Period Wise</option>
+ <option value="children">Children</option>
+ <option value="random">Selected</option>
+ </select>
+ </td>
+ <td> </td>
+ <td align="left" class="NormalB"> $i18n.getString( "periodType" )<br>
+ <select id="periodTypeLB" name="periodTypeLB" onchange="getPeriods()" style="width: 175px;" disabled="true">
+ #foreach ( $periodType in $periodTypes )
+ <option value="$periodType.name" #if($periodType.name==$monthlyPeriodTypeName) selected #end>$periodType.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="NormalB">
+ <table>
+ <tr>
+ <td class="NormalB">$i18n.getString( "ga_orgunit" )<br>
+ <select name="orgUnitListCB" id="orgUnitListCB" multiple size="7" style="width:150px;height:100px" ondblclick="remOUFunction()"> >
+ </select>
+ </td>
+ <td class="NormalB"><input type="checkbox" id="ougGroupSetCB" name="ougGroupSetCB" onChange="getOrgUnitGroupsDataElements()" disabled="true">$i18n.getString( "ga_orgUnitGroups" )<br>
+ <select name="orgUnitGroupList" id="orgUnitGroupList" multiple size="7" onChange="selectSingleOptionOrgUnitGroup()" style="width:150px;height:100px" disabled="true">
+ </select>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td class="NormalB" align="center"></td>
+ <td class="NormalB" align="center">
+ <table>
+ <tr>
+ <td class="NormalB">$i18n.getString( "year" )<br>
+ <select id="yearLB" name="yearLB" onchange="getWeeklyPeriod()" size="7" multiple style="width:150px;height:100px" disabled="true">
+ #foreach($periodName in $periodNameList)
+ <option value="$periodName">$periodName</option>
+ #end
+ </select>
+ </td>
+ <td> </td>
+ <td class="NormalB">$i18n.getString( "period" )<br>
+ <select id="periodLB" name="periodLB" size="7" multiple style="width:175px;height:100px" disabled="true">
+ </select>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="NormalB"> </td>
+ <td class="NormalB" align="center"> </td>
+ <td class="NormalB" align="center">
+ <table>
+ <tr>
+ <td><input type="submit" name="ViewChart" value="$i18n.getString( 'ga_viewchart' )" style="width:150px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction1('ViewChart')"></td>
+ <td> </td>
+ <td align="right"><input type="submit" name="ViewSummary" value="$i18n.getString( 'ga_viewsummary' )" style="width:175px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction1('ViewSummary')"></td>
+ <input type="hidden" name="selectedButton" id="selectedButton">
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
</form>
+
<script>
- getPeriods();
+ getPeriods();
</script>
\ No newline at end of file
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm 2010-12-29 07:47:36 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisIndicatorFront.vm 2011-03-01 09:42:21 +0000
@@ -1,28 +1,22 @@
<script>
- // Global Variables
- var selriRadioButton = "indicatorsRadio";
- var selCategory = "";
- var selFacility = "";
-
-
-
- // Global Variables
- var dailyPeriodTypeName = '$dailyPeriodTypeName';
- var weeklyPeriodTypeName = '$weeklyPeriodTypeName';
- var monthlyPeriodTypeName = '$monthlyPeriodTypeName';
- var quarterlyPeriodTypeName = '$quarterlyPeriodTypeName';
- var sixmonthPeriodTypeName = '$sixMonthPeriodTypeName';
- var yearlyPeriodTypeName = '$yearlyPeriodTypeName';
-
- // var maxOrgUnitLevels = $maxOrgUnitLevels;
+
+ // Global Variables
+ var selriRadioButton = "indicatorsRadio";
+ var selCategory = "";
+ var selFacility = "";
+ var dailyPeriodTypeName = '$dailyPeriodTypeName';
+ var weeklyPeriodTypeName = '$weeklyPeriodTypeName';
+ var monthlyPeriodTypeName = '$monthlyPeriodTypeName';
+ var quarterlyPeriodTypeName = '$quarterlyPeriodTypeName';
+ var sixmonthPeriodTypeName = '$sixMonthPeriodTypeName';
+ var yearlyPeriodTypeName = '$yearlyPeriodTypeName';
var orgUnitIds="NONE";
var currentOrgUnitId = "";
var currentOrgUnitName = "";
- var monthDays = new Array(31,29,31,30,31,30,31,31,30,31,30,31); // for daily Period
- var days = new Array();
+ var monthDays = new Array(31,29,31,30,31,30,31,31,30,31,30,31); // for daily Period
+ var days = new Array();
- //var monthNames = new Array("Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec","Jan","Feb","Mar");
var monthNames = new Array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");
var quarterNames = new Array("Q1","Q2","Q3","Q4");
var halfYearNames = new Array("HY1","HY2");
@@ -37,13 +31,11 @@
{
if( (i+1) <= 9 )
{
- // i = "0"+(i+1);
- days[k]= "0"+ (i+1);
-
+ days[k]= "0"+ (i+1);
}
else
{
- days[k]= i+1;
+ days[k]= i+1;
}
if( j <= 9 )
{
@@ -54,13 +46,10 @@
days[k] += "-"+j;
}
- //days[k]= (i+1)+"-"+j;
- // days[k]= i+"-"+j;
k++;
}
}
-
var orgUnitGroupIds = new Array();
var orgUnitGroupNames = new Array();
@@ -71,148 +60,132 @@
#set( $count1 = $count1 + 1 );
#end
-
</script>
-<h1>$i18n.getString( "indicator_wise_graphical_analyser" )</h1>
+<h3>$i18n.getString( "indicator_wise_graphical_analyser" )</h3>
<hr />
<form id="ChartGenerationForm" name="ChartGenerationForm" action="generateChartIndicator.action" method="post" onSubmit="return formValidationsIndicator()" target="chartWindowIndicator">
- <table style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" border=0>
-
- <tr>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td class="NormalB">$i18n.getString( "ga_filter_by_indicatorgroup" )<br>
- <select id="indicatorGroupId" name="indicatorGroupId" style="width:325px" onChange="getIndicators()" >
- <option value="$ALL">[ Select IndicatorGroup / All ]</option>
- #foreach ( $group in $indicatorGroups )
- <option value="$group.id" title="$group.name">$group.name</option>
- #end
- </select>
- </td>
- <td class="NormalB"> </td>
-
-
- </td>
- </tr>
- <tr>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- <td class="NormalB"> </td>
- </tr>
- <tr>
- <td class="NormalB">$i18n.getString( "ga_available_indicatorList" )<br>
- <select multiple size="7" id="availableIndicators" name="availableIndicators" style="width:325px; height:100px" ondblclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )">
- #foreach ( $element in $indicators )
- <option value="$element.id" title="$element.name">$element.name</option>
- #end
- </select>
- </td>
- <td class="NormalB" align="center"><br />
- <input type="button" value=">" style="width:40px" onClick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )">
- <br>
- <input type="button" value="<" style="width:40px" onClick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )">
- <br>
- <input type="button" value=">>" style="width:40px" onClick="moveAllById( 'availableIndicators', 'selectedIndicators' )">
- <br>
- <input type="button" value="<<" style="width:40px" onClick="moveAllById( 'selectedIndicators', 'availableIndicators' )">
- </td>
- <td class="NormalB"> $i18n.getString( "ga_selected_IndicatorList" )<br />
- <select multiple size="7" id="selectedIndicators" name="selectedIndicators" style="width:325px; height:100px" ondblclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )">
- </select>
- </td>
- </tr>
- <tr>
- <td class="NormalB"> <br/></td>
- <td class="NormalB"> <br/></td>
- <td class="NormalB"> <br/></td>
- </tr>
-
- <tr>
- <td class="NormalB"><br><input type="checkbox" id="aggDataCB" name="aggDataCB" checked="true" >$i18n.getString( "ga_aggregated_data" )</td>
- <td class="NormalB"> </td>
- <td class="NormalB"><br>
- <table>
- <tr>
- <td class="NormalB"> $i18n.getString( "ga_viewby" )<br>
- <select id="categoryLB" name="categoryLB" onChange="categoryChangeFunction1(event)" disabled="true">
- <option value="period">Period Wise</option>
- <option value="children">Children</option>
- <option value="random">Selected</option>
- </select>
- <br />
- <br />
- </td>
- <td> </td>
- <td align="left" class="NormalB"> $i18n.getString( "periodType" )<br>
- <select id="periodTypeLB" name="periodTypeLB" onchange="getPeriods()" style="width: 150px;" disabled="true">
- #foreach ( $periodType in $periodTypes )
- <option value="$periodType.name" #if($periodType.name==$monthlyPeriodTypeName) selected #end>$periodType.name</option>
- #end
- </select>
- <br />
- <br />
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td class="NormalB"><br>
- <table>
- <td class="NormalB">$i18n.getString( "ga_orgunit" )<br>
- <select name="orgUnitListCB" id="orgUnitListCB" multiple size="7" style="width: 150px;" ondblclick="remOUFunction()"> >
- </select>
- </td>
- <td class="NormalB"><input type="checkbox" id="ougGroupSetCB" name="ougGroupSetCB" onChange="getOrgUnitGroupsDataElements()" disabled="true">$i18n.getString( "ga_orgUnitGroups" )<br>
- <select name="orgUnitGroupList" id="orgUnitGroupList" multiple size="7" onChange="selectSingleOptionOrgUnitGroup()" style="width: 150px;" disabled="true">
- </select>
- </td>
- </tr>
- </table>
- </td>
- <td class="NormalB" align="center"></td>
- <td class="NormalB" align="center"><br>
- <table>
- <tr>
- <td class="NormalB"> $i18n.getString( "year" )<br>
- <select id="yearLB" name="yearLB" onchange="getWeeklyPeriod()" size="5" multiple style="width: 150px;" disabled="true">
- #foreach($periodName in $periodNameList)
- <option value="$periodName">$periodName</option>
- #end
- </select>
- <br />
- <br />
- </td>
- <td> </td>
- <td class="NormalB"> $i18n.getString( "period" )<br>
- <select id="periodLB" name="periodLB" size="5" multiple style="width: 175px;" disabled="true">
- </select>
- <br />
- <br />
- </td>
- </tr>
- <tr>
- <td><input type="submit" name="ViewChart" value="$i18n.getString( 'ga_viewchart' )" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction('ViewChart')">
- </td>
- <td> </td>
- <td align="right"><input type="submit" name="ViewSummary" value="$i18n.getString( 'ga_viewsummary' )" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction('ViewSummary')">
- </td>
- </tr>
- <input type="hidden" name="selectedButton" id="selectedButton">
- </table></td>
- </tr>
+ <table style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" border=0>
+ <tr>
+ <td class="NormalB">$i18n.getString( "ga_filter_by_indicatorgroup" )<br>
+ <select id="indicatorGroupId" name="indicatorGroupId" style="width:325px" onChange="getIndicators()" >
+ <option value="$ALL">[ Select IndicatorGroup / All ]</option>
+ #foreach ( $group in $indicatorGroups )
+ <option value="$group.id" title="$group.name">$group.name</option>
+ #end
+ </select>
+ </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ </tr>
+ <tr>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ </tr>
+ <tr>
+ <td class="NormalB">$i18n.getString( "ga_available_indicatorList" )<br>
+ <select multiple size="7" id="availableIndicators" name="availableIndicators" style="width:325px; height:100px" ondblclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )">
+ #foreach ( $element in $indicators )
+ <option value="$element.id" title="$element.name">$element.name</option>
+ #end
+ </select>
+ </td>
+ <td class="NormalB" align="center">
+ <input type="button" value=">" style="width:40px" onClick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )"> <br>
+ <input type="button" value="<" style="width:40px" onClick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )"> <br>
+ <input type="button" value=">>" style="width:40px" onClick="moveAllById( 'availableIndicators', 'selectedIndicators' )"> <br>
+ <input type="button" value="<<" style="width:40px" onClick="moveAllById( 'selectedIndicators', 'availableIndicators' )">
+ </td>
+ <td class="NormalB"> $i18n.getString( "ga_selected_IndicatorList" )<br />
+ <select multiple size="7" id="selectedIndicators" name="selectedIndicators" style="width:350px; height:100px" ondblclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )">
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="NormalB"> <br/></td>
+ <td class="NormalB"> <br/></td>
+ <td class="NormalB"> <br/></td>
+ </tr>
+ <tr>
+ <td class="NormalB">
+ <input type="checkbox" id="aggDataCB" name="aggDataCB" checked="true" >$i18n.getString( "ga_aggregated_data" )
+ </td>
+ <td class="NormalB"> </td>
+ <td class="NormalB">
+ <table>
+ <tr>
+ <td class="NormalB"> $i18n.getString( "ga_viewby" )<br>
+ <select id="categoryLB" name="categoryLB" onChange="categoryChangeFunction1(event)" disabled="true" style="width: 150px;">
+ <option value="period">Period Wise</option>
+ <option value="children">Children</option>
+ <option value="random">Selected</option>
+ </select>
+ </td>
+ <td> </td>
+ <td align="left" class="NormalB"> $i18n.getString( "periodType" )<br>
+ <select id="periodTypeLB" name="periodTypeLB" onchange="getPeriods()" style="width: 175px;" disabled="true">
+ #foreach ( $periodType in $periodTypes )
+ <option value="$periodType.name" #if($periodType.name==$monthlyPeriodTypeName) selected #end>$periodType.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="NormalB">
+ <table>
+ <tr>
+ <td class="NormalB">$i18n.getString( "ga_orgunit" )<br>
+ <select name="orgUnitListCB" id="orgUnitListCB" multiple size="7" style="width:150px;height:100px" ondblclick="remOUFunction()"> >
+ </select>
+ </td>
+ <td class="NormalB"><input type="checkbox" id="ougGroupSetCB" name="ougGroupSetCB" onChange="getOrgUnitGroupsDataElements()" disabled="true">$i18n.getString( "ga_orgUnitGroups" )<br>
+ <select name="orgUnitGroupList" id="orgUnitGroupList" multiple size="7" onChange="selectSingleOptionOrgUnitGroup()" style="width:150px;height:100px" disabled="true">
+ </select>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td class="NormalB" align="center"></td>
+ <td class="NormalB" align="center">
+ <table>
+ <tr>
+ <td class="NormalB">$i18n.getString( "year" )<br>
+ <select id="yearLB" name="yearLB" onchange="getWeeklyPeriod()" size="7" multiple style="width:150px;height:100px" disabled="true">
+ #foreach($periodName in $periodNameList)
+ <option value="$periodName">$periodName</option>
+ #end
+ </select>
+ </td>
+ <td> </td>
+ <td class="NormalB">$i18n.getString( "period" )<br>
+ <select id="periodLB" name="periodLB" size="7" multiple style="width:175px;height:100px" disabled="true">
+ </select>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="NormalB"> </td>
+ <td class="NormalB" align="center"> </td>
+ <td class="NormalB" align="center">
+ <table>
+ <tr>
+ <td><input type="submit" name="ViewChart" value="$i18n.getString( 'ga_viewchart' )" style="width:150px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction('ViewChart')"></td>
+ <td> </td>
+ <td align="right"><input type="submit" name="ViewSummary" value="$i18n.getString( 'ga_viewsummary' )" style="width:175px; height: 25; font-family:Arial; font-weight:bold; color:#000000" onClick="javascript:selButtonFunction('ViewSummary')" /></td>
+ <input type="hidden" name="selectedButton" id="selectedButton">
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
</form>
+
<script>
- getPeriods();
+ getPeriods();
</script>
\ No newline at end of file
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js 2010-12-29 07:47:36 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js 2011-03-01 09:42:21 +0000
@@ -1,36 +1,23 @@
+function getOUDeatilsForSurvey( orgUnitIds )
+{
+ jQuery.postJSON("getOrgUnitName.action",{
+ id : orgUnitIds[0]
+ }, function( json ){
+ setFieldValue( "ouNameTB",json.organisationUnit.name );
+ });
+}
+
+
function getOUDeatilsForAA(orgUnitIds)
{
var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds;
var request = new Request();
request.setResponseTypeXML( 'orgunit' );
request.setCallbackSuccess( getOUDetailsForAARecevied );
- request.send( url );
-
- /*
-
- $.post("getOrgUnitDetails.action",
- {
- orgUnitId:orgUnitIds
- },
- function (data)
- {
- getOUDetailsForAARecevied(data);
- },'xml');
- */
+ request.send( url );
}
-/*
-function getOUDetailsForNR(orgUnitIds)
-{
- var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds;
-
- var request = new Request();
- request.setResponseTypeXML( 'orgunit' );
- request.setCallbackSuccess( getOUDetailsForNRRecevied );
- request.send( url );
-}
-*/
function getOUDetailsForAARecevied(xmlObject)
{
var orgUnits = xmlObject.getElementsByTagName("orgunit");
@@ -43,50 +30,17 @@
document.ChartGenerationForm.ouNameTB.value = orgUnitName;
}
}
-/*
-function getOUDetailsForNRRecevied(xmlObject)
-{
- var orgUnits = xmlObject.getElementsByTagName("orgunit");
-
- for ( var i = 0; i < orgUnits.length; i++ )
- {
- var id = orgUnits[ i ].getElementsByTagName("id")[0].firstChild.nodeValue;
- var orgUnitName = orgUnits[ i ].getElementsByTagName("name")[0].firstChild.nodeValue;
-
- document.ChartGenerationForm.ouIDTB.value = id;
- document.ChartGenerationForm.ouNameTB.value = orgUnitName;
- }
-
-}
-*/
function getOUDeatilsForGA(orgUnitIds)
{
- //document.getElementById( "ougGroupSetCB" ).disabled = false;
- //document.getElementById( "orgUnitGroup" ).disabled = false;
-
-
var request = new Request();
request.setResponseTypeXML( 'orgunit' );
request.setCallbackSuccess( getOUDetailsForGARecevied );
- //request.send( url );
var requestString = "getOrgUnitDetails.action";
var params = "orgUnitId=" + orgUnitIds+"&type=ta";
request.sendAsPost( params );
- request.send( requestString );
-
-
- /*
- $.post("getOrgUnitDetails.action",
- {
- orgUnitId:orgUnitIds
- },
- function (data)
- {
- getOUDetailsForGARecevied(data);
- },'xml');
- */
+ request.send( requestString );
}
function getOUDetailsForGARecevied(xmlObject)
@@ -125,6 +79,39 @@
}
+function getOUDeatilsForDataStatus( orgUnitIds )
+{
+ jQuery.postJSON("getOrgUnitName.action",{
+ id : orgUnitIds[0]
+ }, function( json ){
+
+ var orgUnitId = json.organisationUnit.id;
+ var orgUnitName = json.organisationUnit.name;
+ var faciltyLB = document.getElementById("facilityLB");
+ var facilityIndex = faciltyLB.selectedIndex;
+ var orgUnitListCB = document.getElementById("orgUnitListCB");
+
+ if( faciltyLB.options[facilityIndex].value == "children" )
+ {
+ for( i = 0; i< orgUnitListCB.options.length; i++ )
+ {
+ orgUnitListCB.options[0] = null;
+ }
+ orgUnitListCB.options[0] = new Option( orgUnitName, orgUnitId, false, false );
+ }
+ else
+ {
+ for( i = 0; i < orgUnitListCB.options.length; i++ )
+ {
+ if( orgUnitId == orgUnitListCB.options[i].value) return;
+ }
+ orgUnitListCB.options[orgUnitListCB.options.length] = new Option( orgUnitName, orgUnitId, false, false );
+ }
+
+ });
+}
+
+
function getOUDetails(orgUnitIds)
{
var request = new Request();
@@ -135,17 +122,6 @@
var params = "orgUnitId=" + orgUnitIds;
request.sendAsPost( params );
request.send( requestString );
-
- /*
- $.post("getOrgUnitDetails.action",
- {
- orgUnitId:orgUnitIds
- },
- function (data)
- {
- getOUDetailsRecevied(data);
- },'xml');
- */
}
function getOUDetailsRecevied(xmlObject)
@@ -171,8 +147,6 @@
}
document.ChartGenerationForm.orgUnitListCB.options[0] = new Option(orgUnitName,id,false,false);
}
-
-
else
{
index = document.ChartGenerationForm.orgUnitListCB.options.length;
@@ -187,8 +161,6 @@
}
-//Depends on dhis-web-commons/lists/lists.js for List functionality
-
function getOrgUnitGroups()
{
var orgUnitGroupSetList = document.getElementById("orgUnitGroupSetListCB");
@@ -256,7 +228,6 @@
}
}// getDataElements end
-//Depends on dhis-web-commons/lists/lists.js for List functionality
function getDataElementsWithOutOptionCombo()
{
var dataElementGroupList = document.getElementById("dataElementGroupId");
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js 2010-12-29 07:47:36 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js 2011-03-01 09:42:21 +0000
@@ -1,88 +1,52 @@
function getOUDeatilsForGADataElements( orgUnitIds )
{
- //alert( orgUnitIds );
document.getElementById( "ougGroupSetCB" ).disabled = false;
document.getElementById( "orgUnitGroupList" ).disabled = false;
-
document.getElementById( "categoryLB" ).disabled = false;
document.getElementById( "periodTypeLB" ).disabled = false;
document.getElementById( "yearLB" ).disabled = false;
document.getElementById( "periodLB" ).disabled = false;
-
- var request = new Request();
- request.setResponseTypeXML( 'orgunit' );
- request.setCallbackSuccess( getOUDetailsForGARecevied );
- request.send( 'getOrgUnitDetails.action?orgUnitId=' + orgUnitIds );
-
-
- /*
- $.post("getOrgUnitDetails.action",
- {
- orgUnitId:orgUnitIds
- },
- function (data)
- {
- getOUDetailsForGARecevied(data);
- },'xml');*/
-}
-
-function getOUDetailsForGARecevied(xmlObject)
-{
- var ouListCDId = document.getElementById( "orgUnitListCB" );
- var categoryIndex = document.ChartGenerationForm.categoryLB.selectedIndex;
-
-
- var index = 0;
- var i=0;
-
- var orgUnits = xmlObject.getElementsByTagName("orgunit");
-
- for ( var i = 0; i < orgUnits.length; i++ )
- {
-
- //var currentOrgUnitName = "";
- //var currentOrgUnitId = "";
- var id = orgUnits[ i ].getElementsByTagName("id")[0].firstChild.nodeValue;
- var orgUnitName = orgUnits[ i ].getElementsByTagName("name")[0].firstChild.nodeValue;
-
-
- currentOrgUnitId = id;
+
+ jQuery.postJSON("getOrgUnitName.action",{
+ id : orgUnitIds[0]
+ }, function( json ){
+
+ var ouListCBId = document.getElementById( "orgUnitListCB" );
+ var categoryLB = document.getElementById( "categoryLB");
+ var categoryIndex = categoryLB.selectedIndex;
+ var index = 0;
+ var orgUnitId = json.organisationUnit.id;
+ var orgUnitName = json.organisationUnit.name;
+
+ currentOrgUnitId = orgUnitId;
currentOrgUnitName = orgUnitName;
- // alert("orgUnit Id is : " + id + ", name is :" + orgUnitName );
- if(document.ChartGenerationForm.categoryLB.options[categoryIndex].value == "period" || document.ChartGenerationForm.categoryLB.options[categoryIndex].value == "children" )
+
+ if( categoryLB.options[categoryIndex].value == "period" || categoryLB.options[categoryIndex].value == "children" )
{
- index = document.ChartGenerationForm.orgUnitListCB.options.length;
- for(i=0;i<index;i++)
+ for( i = 0; i < ouListCBId.options.length; i++ )
{
- document.ChartGenerationForm.orgUnitListCB.options[0] = null;
+ ouListCBId.options[0] = null;
}
- document.ChartGenerationForm.orgUnitListCB.options[0] = new Option( orgUnitName,id,false,false );
+ ouListCBId.options[0] = new Option( orgUnitName, orgUnitId, false, false );
}
- //22/10/2010
- else if( document.ChartGenerationForm.categoryLB.options[categoryIndex].value == "random" && document.getElementById( 'ougGroupSetCB' ).checked )
+ else if( categoryLB.options[categoryIndex].value == "random" && document.getElementById( 'ougGroupSetCB' ).checked )
{
- //ouListCDId.options[ouListCDId.options.length] = new Option(orgUnitName,id,false,false);
-
- index = document.ChartGenerationForm.orgUnitListCB.options.length;
- for(i=0;i<index;i++)
+ for( i = 0; i < ouListCBId.options.length; i++ )
{
- document.ChartGenerationForm.orgUnitListCB.options[0] = null;
+ ouListCBId.options[0] = null;
}
- document.ChartGenerationForm.orgUnitListCB.options[0] = new Option( orgUnitName,id,false,false );
-
+ ouListCBId.options[0] = new Option( orgUnitName, orgUnitId, false, false );
}
else
{
- index = document.ChartGenerationForm.orgUnitListCB.options.length;
- for(i=0;i<index;i++)
+ for( i = 0; i < ouListCBId.options.length; i++ )
{
- if(id == document.ChartGenerationForm.orgUnitListCB.options[i].value) return;
+ if( orgUnitId == ouListCBId.options[i].value ) return;
}
- document.ChartGenerationForm.orgUnitListCB.options[index] = new Option(orgUnitName,id,false,false);
+ ouListCBId.options[ ouListCBId.options.length ] = new Option( orgUnitName, orgUnitId, false, false );
}
- }
-
+ });
}
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js 2011-03-01 09:42:21 +0000
@@ -563,33 +563,19 @@
function getOUDeatilsForTA( orgUnitIds )
{
showOverlay();
- //var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds+"&type=ta";
var request = new Request();
request.setResponseTypeXML( 'orgunit' );
request.setCallbackSuccess( getOUDetailsForTARecevied );
- //request.send( url );
var requestString = "getOrgUnitDetails.action";
var params = "orgUnitId=" + orgUnitIds+"&type=ta";
request.sendAsPost( params );
request.send( requestString );
-
- /*
- $.post("getOrgUnitDetails.action",
- {
- orgUnitId:orgUnitIds,
- type:"ta"
- },
- function (data)
- {
- getOUDetailsForTARecevied(data);
- },'xml'); */
}
function getOUDetailsForTARecevied(xmlObject)
{
- // var ouSelCBId = document.getElementById( "ouSelCB" );
var ouListCDId = document.getElementById( "orgUnitListCB" );
var ouLevelId = document.getElementById( "orgUnitLevelCB" );
var ouRadioVal = $( "input[name='ouRadio']:checked" ).val();
@@ -603,7 +589,6 @@
var ouLevel = orgUnits[ i ].getElementsByTagName("level")[0].firstChild.nodeValue;
var maxOULevel = orgUnits[ i ].getElementsByTagName("maxoulevel")[0].firstChild.nodeValue;
-
if( ouRadioVal == "orgUnitSelectedRadio" )
{
ouListCDId.disabled = false;
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForDS.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForDS.vm 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForDS.vm 2011-03-01 09:42:21 +0000
@@ -1,34 +1,28 @@
-<h2>$i18n.getString( "dataanalyser" )</h2>
+<a href="index.action"><h2>$i18n.getString( "dataanalyser" )</h2></a>
+
+<ul>
+ <li>$i18n.getString( "ds_datastatus" )</li>
<ul>
- <li>$i18n.getString( "ds_datastatus" )</li>
- <ul>
- <li>$i18n.getString( "ds_datastatus" )</li>
- </ul>
- </ul>
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
-#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
-
-<!-- The script that registeres selctions in the orgunit tree -->
+ <li>$i18n.getString( "ds_regular" )</li>
+ </ul>
+</ul>
+
+#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
+
<script type="text/javascript">
-function orgUnitHasBeenSelected( orgUnitIds )
-{
- if(orgUnitIds == null || orgUnitIds == "" )
+ function orgUnitHasBeenSelected( orgUnitIds )
{
- return;
+ if( orgUnitIds == null || orgUnitIds == "" )
+ {
+ return;
+ }
+ if( orgUnitIds != null )
+ {
+ getOUDeatilsForDataStatus( orgUnitIds );
+ }
}
- if(orgUnitIds != null)
- getOUDetails(orgUnitIds);
-}
-
-selection.setListenerFunction( orgUnitHasBeenSelected );
+ selection.setListenerFunction( orgUnitHasBeenSelected );
</script>
-
-
-
-
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForDSMobile.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForDSMobile.vm 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForDSMobile.vm 2011-03-01 09:42:21 +0000
@@ -1,37 +1,27 @@
-<h2>$i18n.getString( "dataanalyser" )</h2>
- <ul>
- <li>Data Status</li>
- <ul>
- <li>Mobile Data Status</li>
- </ul>
- </ul>
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
+<a href="index.action"><h2>$i18n.getString( "dataanalyser" )</h2></a>
+<ul>
+ <li>Data Status</li>
+ <ul>
+ <li>Mobile Data Status</li>
+ </ul>
+</ul>
-##parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
-<!-- The script that registeres selctions in the orgunit tree -->
<script type="text/javascript">
-function orgUnitHasBeenSelected( orgUnitIds )
-{
- if(orgUnitIds == null || orgUnitIds == "" )
- {
- return;
- }
+ function orgUnitHasBeenSelected( orgUnitIds )
+ {
+ if(orgUnitIds == null || orgUnitIds == "" )
+ {
+ return;
+ }
+ if(orgUnitIds != null)
+ {
+ getOUDetails(orgUnitIds);
+ }
+ }
- if(orgUnitIds != null)
- getOUDetails(orgUnitIds);
-}
-
-//selection.setListenerFunction( orgUnitHasBeenSelected );
-selection.setListenerFunction( orgUnitHasBeenSelected );
+ selection.setListenerFunction( orgUnitHasBeenSelected );
</script>
-
-
-
-
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGA.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGA.vm 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGA.vm 2011-03-01 09:42:21 +0000
@@ -1,38 +1,33 @@
-<h2>$i18n.getString( "dataanalyser" )</h2>
+<a href="index.action"><h2>$i18n.getString( "dataanalyser" )</h2></a>
+<ul>
+ <li>$i18n.getString( "ga" )</li>
<ul>
- <li>$i18n.getString( "ga" )</li>
- <ul>
- <li>$i18n.getString( "regular" )</li>
- </ul>
- </ul>
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
-##parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
+ <li>$i18n.getString( "regular" )</li>
+ </ul>
+</ul>
+
#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
-<!-- The script that registeres selctions in the orgunit tree -->
<script type="text/javascript">
-selection.setListenerFunction( orgUnitHasBeenSelected );
-
-function orgUnitHasBeenSelected( orgUnitIds )
-{
- if(document.getElementById( 'ougSetCB' ).checked)
- {
- return;
- }
- if(orgUnitIds == null || orgUnitIds == "" )
- {
- return;
- }
- if(orgUnitIds != null)
- {
- getOUDeatilsForGA(orgUnitIds);
- }
-}
+ selection.setListenerFunction( orgUnitHasBeenSelected );
+
+ function orgUnitHasBeenSelected( orgUnitIds )
+ {
+ if( document.getElementById( 'ougSetCB' ).checked )
+ {
+ return;
+ }
+ if( orgUnitIds == null || orgUnitIds == "" )
+ {
+ return;
+ }
+ if( orgUnitIds != null )
+ {
+ getOUDeatilsForGA(orgUnitIds);
+ }
+ }
</script>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGADataElement.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGADataElement.vm 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGADataElement.vm 2011-03-01 09:42:21 +0000
@@ -1,42 +1,29 @@
-<h2>$i18n.getString( "dataanalyser" )</h2>
+<a href="index.action"><h2>$i18n.getString( "dataanalyser" )</h2></a>
+
+<ul>
+ <li>$i18n.getString( "graphical_analysis" )</li>
<ul>
- <li>$i18n.getString( "graphical_analysis" )</li>
- <ul>
- <li>$i18n.getString( "dataelements_wise" )</li>
- </ul>
+ <li>$i18n.getString( "dataelements_wise" )</li>
</ul>
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
-<!--#parse( "/dhis-web-commons/ouwt/orgunittree.vm" ) -->
+</ul>
+
#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
-<!-- The script that registeres selctions in the orgunit tree -->
+
<script type="text/javascript">
-selection.setListenerFunction( orgUnitHasBeenSelected );
-
-//selection.setListenerFunction( organisationUnitSelected );
-
-function orgUnitHasBeenSelected( orgUnitIds )
-{
- /*
- if(document.getElementById( 'ougSetCB' ).checked)
- {
- return;
- }
-*/
- // alert(orgUnitIds);
-
- if(orgUnitIds == null || orgUnitIds == "" )
- {
- return;
- }
- if( orgUnitIds != null )
- {
- getOUDeatilsForGADataElements( orgUnitIds );
- }
-}
+ selection.setListenerFunction( orgUnitHasBeenSelected );
+
+ function orgUnitHasBeenSelected( orgUnitIds )
+ {
+ if( orgUnitIds == null || orgUnitIds == "" )
+ {
+ return;
+ }
+ if( orgUnitIds != null )
+ {
+ getOUDeatilsForGADataElements( orgUnitIds );
+ }
+ }
</script>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGAIndicator.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGAIndicator.vm 2010-12-23 07:23:23 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGAIndicator.vm 2011-03-01 09:42:21 +0000
@@ -1,37 +1,29 @@
-<h2>$i18n.getString( "dataanalyser" )DashBoard</h2>
+
+<a href="index.action"><h2>$i18n.getString( "dataanalyser" )</h2></a>
+
+<ul>
+ <li>$i18n.getString( "graphical_analysis" )</li>
<ul>
- <li>$i18n.getString( "graphical_analysis" )</li>
- <ul>
- <li>$i18n.getString( "indicator_wise" )</li>
- </ul>
+ <li>$i18n.getString( "indicator_wise" )</li>
</ul>
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
-##parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
+</ul>
+
#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
-<!-- The script that registeres selctions in the orgunit tree -->
+
<script type="text/javascript">
-selection.setListenerFunction( orgUnitHasBeenSelected );
+ selection.setListenerFunction( orgUnitHasBeenSelected );
-function orgUnitHasBeenSelected( orgUnitIds )
-{
- /*
- if(document.getElementById( 'ougSetCB' ).checked)
- {
- return;
- }
-*/
- if(orgUnitIds == null || orgUnitIds == "" )
- {
- return;
- }
- if(orgUnitIds != null)
- {
- getOUDeatilsForGADataElements(orgUnitIds);
- }
-}
+ function orgUnitHasBeenSelected( orgUnitIds )
+ {
+ if( orgUnitIds == null || orgUnitIds == "" )
+ {
+ return;
+ }
+ if( orgUnitIds != null )
+ {
+ getOUDeatilsForGADataElements(orgUnitIds);
+ }
+ }
</script>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForNR.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForNR.vm 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForNR.vm 2011-03-01 09:42:21 +0000
@@ -1,32 +1,29 @@
-<h2>$i18n.getString( "dataanalyser" )</h2>
+
+<a href="index.action"><h2>$i18n.getString( "dataanalyser" )</h2></a>
+
+<ul>
+ <li>$i18n.getString( "ds_datastatus" )</li>
<ul>
- <li>$i18n.getString( "ds_datastatus" )</li>
- <ul>
- <li>$i18n.getString( "nr_null_reporter" )</li>
- </ul>
- </ul>
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
-##parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
+ <li>$i18n.getString( "nr_null_reporter" )</li>
+ </ul>
+</ul>
+
#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
-<!-- The script that registeres selctions in the orgunit tree -->
<script type="text/javascript">
-function orgUnitHasBeenSelected( orgUnitIds )
-{
- if(orgUnitIds == null || orgUnitIds == "" )
- {
- return;
+ function orgUnitHasBeenSelected( orgUnitIds )
+ {
+ if(orgUnitIds == null || orgUnitIds == "" )
+ {
+ return;
+ }
+ if(orgUnitIds != null)
+ {
+ getOUDeatilsForNR( orgUnitIds );
+ }
}
- if(orgUnitIds != null)
- {
- getOUDeatilsForNR(orgUnitIds);
- }
-}
-selection.setListenerFunction( orgUnitHasBeenSelected );
+ selection.setListenerFunction( orgUnitHasBeenSelected );
</script>
\ No newline at end of file
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForOrgUnitGroupWiseDS.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForOrgUnitGroupWiseDS.vm 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForOrgUnitGroupWiseDS.vm 2011-03-01 09:42:21 +0000
@@ -1,37 +1,34 @@
-<h2>$i18n.getString( "dataanalyser" )</h2>
+
+<a href="index.action"><h2>$i18n.getString( "dataanalyser" )</h2></a>
+
+<ul>
+ <li>Data Status</li>
<ul>
- <li>Data Status</li>
- <ul>
- <li>OrganisationUnit Group Wise DatStatus</li>
- </ul>
- </ul>
+ <li>OrganisationUnit Groupwise DatStatus</li>
+ </ul>
</ul>
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-15px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
-#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
-
-<!-- The script that registeres selctions in the orgunit tree -->
+
+#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
+
<script type="text/javascript">
-function orgUnitHasBeenSelected( orgUnitIds )
-{
- document.ChartGenerationForm.ouIDTB.value = orgUnitIds;
-
- if(orgUnitIds == null || orgUnitIds == "" )
- {
- return;
+ function orgUnitHasBeenSelected( orgUnitIds )
+ {
+ document.ChartGenerationForm.ouIDTB.value = orgUnitIds;
+
+ if( orgUnitIds == null || orgUnitIds == "" )
+ {
+ return;
+ }
+
+ if( orgUnitIds != null )
+ {
+ getOrgUDetails(orgUnitIds);
+ }
+
}
-
- if(orgUnitIds !=null)
- {
- getOrgUDetails(orgUnitIds);
- }
-
-}
-selection.setListenerFunction( orgUnitHasBeenSelected );
+ selection.setListenerFunction( orgUnitHasBeenSelected );
</script>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSA.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSA.vm 2011-01-20 14:53:49 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSA.vm 2011-03-01 09:42:21 +0000
@@ -1,36 +1,32 @@
-<h2>$i18n.getString( "dataanalyser" )</h2>
+
+<a href="index.action"><h2>$i18n.getString( "dataanalyser" )</h2></a>
+
+<ul>
+ <li>Graphical Analysis</li>
<ul>
- <li>Graphical Analysis</li>
- <ul>
- <li>Survey</li>
- </ul>
- </ul>
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
-##parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
+ <li>Survey</li>
+ </ul>
+</ul>
+
#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
-<!-- The script that registeres selctions in the orgunit tree -->
<script type="text/javascript">
-function orgUnitHasBeenSelected( orgUnitIds )
-{
- //document.getElementById("ouIDTB"). value = orgUnitIds;
- //alert( document.getElementById("ouIDTB"). value );
- if(orgUnitIds == null || orgUnitIds == "" )
- {
- return;
+ function orgUnitHasBeenSelected( orgUnitIds )
+ {
+ document.getElementById("ouIDTB"). value = orgUnitIds;
+ if(orgUnitIds == null || orgUnitIds == "" )
+ {
+ document.getElementById("ouNameTB"). value = "";
+ return;
+ }
+ if( orgUnitIds != null )
+ {
+ getOUDeatilsForSurvey( orgUnitIds );
+ }
}
-
- if( orgUnitIds != null )
- {
- getOUDeatilsForAA(orgUnitIds);
- }
-}
-
-selection.setListenerFunction( orgUnitHasBeenSelected );
+
+ selection.setListenerFunction( orgUnitHasBeenSelected );
</script>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTA.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTA.vm 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTA.vm 2011-03-01 09:42:21 +0000
@@ -1,35 +1,30 @@
-<h2>$i18n.getString( "dataanalyser" )</h2>
+
+<a href="index.action"><h2>$i18n.getString( "dataanalyser" )</h2></a>
+
+<ul>
+ <li>Data Analysis</li>
<ul>
- <li>Data Analysis</li>
- <ul>
- <li>Tabular Analysis</li>
- </ul>
- </ul>
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
-##parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
+ <li>Tabular Analysis</li>
+ </ul>
+</ul>
+
#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
-<!-- The script that registeres selctions in the orgunit tree -->
<script type="text/javascript">
-function orgUnitHasBeenSelected( orgUnitIds )
-{
-
- if(orgUnitIds == null || orgUnitIds == "" )
- {
- return;
+ function orgUnitHasBeenSelected( orgUnitIds )
+ {
+ if(orgUnitIds == null || orgUnitIds == "" )
+ {
+ return;
+ }
+ if(orgUnitIds != null)
+ {
+ selOrgUnitId = orgUnitIds;
+ getOUDeatilsForTA( orgUnitIds );
+ }
}
- if(orgUnitIds != null)
- {
- selOrgUnitId = orgUnitIds;
-
- getOUDeatilsForTA(orgUnitIds);
- }
-}
-selection.setListenerFunction( orgUnitHasBeenSelected );
+ selection.setListenerFunction( orgUnitHasBeenSelected );
</script>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTTA.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTTA.vm 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTTA.vm 2011-03-01 09:42:21 +0000
@@ -1,34 +1,31 @@
-<h2>$i18n.getString( "dataanalyser" )</h2>
+
+<a href="index.action"><h2>$i18n.getString( "dataanalyser" )</h2></a>
+
+<ul>
+ <li>$i18n.getString( "ga" )</li>
<ul>
- <li>$i18n.getString( "ga" )</li>
- <ul>
- <li>$i18n.getString( "ga_annual" )</li>
- </ul>
- </ul>
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
-##parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
+ <li>$i18n.getString( "ga_annual" )</li>
+ </ul>
+</ul>
+
#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
-<!-- The script that registeres selctions in the orgunit tree -->
<script type="text/javascript">
-function orgUnitHasBeenSelected( orgUnitIds )
-{
- if(orgUnitIds == null || orgUnitIds == "" )
- {
- return;
+ function orgUnitHasBeenSelected( orgUnitIds )
+ {
+ document.getElementById("ouIDTB"). value = orgUnitIds;
+ if(orgUnitIds == null || orgUnitIds == "" )
+ {
+ document.getElementById("ouNameTB"). value = "";
+ return;
+ }
+ if( orgUnitIds != null )
+ {
+ getOUDeatilsForSurvey( orgUnitIds );
+ }
}
-
- if(orgUnitIds != null)
- {
- getOUDeatilsForAA(orgUnitIds);
- }
-}
-
-selection.setListenerFunction( orgUnitHasBeenSelected );
+
+ selection.setListenerFunction( orgUnitHasBeenSelected );
</script>
-
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTarget.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTarget.vm 2011-01-17 06:56:53 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForTarget.vm 2011-03-01 09:42:21 +0000
@@ -1,37 +1,31 @@
-<h2>$i18n.getString( "dataanalyser" )</h2>
- <ul>
- <li>$i18n.getString( "graphical_analysis" )</li>
- <ul>
- <li>$i18n.getString( "target" )</li>
- </ul>
- </ul>
-<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
-</div>
-<!--#parse( "/dhis-web-commons/ouwt/orgunittree.vm" ) -->
+
+<a href="index.action"><h2>$i18n.getString( "dataanalyser" )</h2></a>
+
+<ul>
+ <li>$i18n.getString( "graphical_analysis" )</li>
+ <ul>
+ <li>$i18n.getString( "target" )</li>
+ </ul>
+</ul>
+
#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
-<!-- The script that registeres selctions in the orgunit tree -->
+
<script type="text/javascript">
-selection.setListenerFunction( orgUnitHasBeenSelected );
-
-function orgUnitHasBeenSelected( orgUnitIds )
-{
- document.getElementById("ouIDTB"). value = orgUnitIds;
- if(orgUnitIds == null || orgUnitIds == "" )
- {
- document.getElementById("ouNameTB"). value = "";
- return;
- }
- if( orgUnitIds != null )
- {
- getOUDeatilsForTaget( orgUnitIds );
- }
-}
+ selection.setListenerFunction( orgUnitHasBeenSelected );
+
+ function orgUnitHasBeenSelected( orgUnitIds )
+ {
+ document.getElementById("ouIDTB"). value = orgUnitIds;
+ if(orgUnitIds == null || orgUnitIds == "" )
+ {
+ document.getElementById("ouNameTB"). value = "";
+ return;
+ }
+ if( orgUnitIds != null )
+ {
+ getOUDeatilsForTaget( orgUnitIds );
+ }
+ }
</script>
-
-
-
-
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summarySatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summarySatusResult.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summarySatusResult.vm 2011-03-01 09:42:21 +0000
@@ -1,40 +1,36 @@
<html>
- <head>
- <title>SummaryStatus Result</title>
- <link type="text/css" rel="stylesheet" media="screen" href="css/StylesForTags.css">
- <script>
- var startDate = "$sDateLB";
- var endDate = "$eDateLB";
- var dsType = "$selectedButton";
+ <head>
+ <title>SummaryStatus Result</title>
+ <link type="text/css" rel="stylesheet" media="screen" href="css/StylesForTags.css">
+ <script>
+ var startDate = "$sDateLB";
+ var endDate = "$eDateLB";
+ var dsType = "$selectedButton";
- function getImmChildInfo(evt, dsId, selOrgUnit)
- {
- immChildOption = "yes";
-
- //var urlForImmChild = "dataStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit;
-
- //evt.target.href = "dataStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ function getImmChildInfo(evt, dsId, selOrgUnit)
+ {
+ immChildOption = "yes";
- if( document.getElementById('includeZeros').checked )
- {
- evt.target.href = "summaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
- }
- else
- {
- evt.target.href = "summaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
- }
- }
+ if( document.getElementById('includeZeros').checked )
+ {
+ evt.target.href = "summaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType+"&includeZeros="+includeZeros;
+ }
+ else
+ {
+ evt.target.href = "summaryStatusResult.action?immChildOption="+immChildOption+"&dsId="+dsId+"&sDateLB="+startDate+"&eDateLB="+endDate+"&ouId="+selOrgUnit+"&selectedButton="+dsType;
+ }
+ }
- function exportDataStatusResultToWorkBook()
- {
- document.getElementById('htmlCode').value = document.getElementById('formResult').innerHTML;
-
- return true;
- }
- </script>
- </head>
- <body>
+ function exportDataStatusResultToWorkBook()
+ {
+ document.getElementById('htmlCode').value = document.getElementById('formResult').innerHTML;
+
+ return true;
+ }
+ </script>
+ </head>
+ <body>
<form id="form1" name="form1" action="exportDataStatusToExcel.action" method="post" onsubmit="return exportDataStatusResultToWorkBook()" target="_newtab">
<input type="hidden" name="htmlCode" id="htmlCode" />
@@ -77,6 +73,7 @@
#foreach($chiildorgUnit in $orgUnitList)
#set($count1 = $minOULevel)
#set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit))
+ ##set( $curOrgUnitLevel = $chiildorgUnit.getLevel() )
<tr class="TableHeadingCellStyles">
#foreach($levelName in $levelNames)
#if($count1 == $curOrgUnitLevel)
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.vm 2011-01-20 14:53:49 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/surveyAnalysisFront.vm 2011-03-01 09:42:21 +0000
@@ -1,8 +1,8 @@
-<h1>Survey Analyser</h1>
+<h3>Survey Analyser</h3>
<hr /><br />
<form id="ChartGenerationForm" name="ChartGenerationForm" action="generateChartSurvey.action" method="post" onsubmit="return formValidationsForSurvey()" target="chartWindow1">
- <table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="730" border=0>
+ <table align="center" style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="100%" border=0>
<tr>
<td class="NormalB">
$i18n.getString( "ga_filter_by_indicatorgroup" )<br />
@@ -46,22 +46,19 @@
<table style=" border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" border=0>
<tr>
<td class="NormalB">
- $i18n.getString( "ga_from" )<br>
- <select id="sDateLB" name="sDateLB">
+ $i18n.getString( "ga_from" )<br/>
+ <select id="sDateLB" name="sDateLB" style="width:150px;">
#foreach($period in $monthlyPeriods)
<option value="$period.id">$simpleDateFormat.format($period.startDate)</option>
#end
</select>
</td>
- <td class="NormalB"> </td>
- <td class="NormalB">
- $i18n.getString( "ga_to" )<br>
- <select id="eDateLB" name="eDateLB">
- #foreach($period in $monthlyPeriods)
- <option value="$period.id">$simpleDateFormat.format($period.endDate)</option>
- #end
- </select>
- </td>
+ <td class="NormalB" style="width:25px;"> </td>
+ <td class="NormalB">
+ $i18n.getString( "aa_orgunit" ) : <br />
+ <input type="text" name="ouNameTB" id="ouNameTB" disabled style="width:150px;" />
+ </td>
+
</tr>
<tr>
@@ -77,19 +74,22 @@
</tr>
<tr>
- <td class="NormalB">
- $i18n.getString( "aa_orgunit" ) : <br />
- <input type="text" name="ouNameTB" id="ouNameTB" size="20" disabled>
- </td>
- <td class="NormalB"> </td>
+ <td class="NormalB">
+ $i18n.getString( "ga_to" )<br />
+ <select id="eDateLB" name="eDateLB" style="width:150px;">
+ #foreach($period in $monthlyPeriods)
+ <option value="$period.id">$simpleDateFormat.format($period.endDate)</option>
+ #end
+ </select>
+ </td>
+ <td class="NormalB" style="width:25px;"> </td>
<td class="NormalB">
- <br>
- <input type="submit" name="SurveyAnalysis" value="SurveyAnalysis" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000;" >
+ <br /><input type="submit" name="SurveyAnalysis" value="SurveyAnalysis" style="width:150px;height:25px; font-family:Arial; font-weight:bold; color:#000000;" >
</td>
</tr>
</table>
</td>
</tr>
- <input type="hidden" name="ouIDTB" id="ouIDTB">
+ <input type="hidden" name="ouIDTB" id="ouIDTB" />
</table>
</form>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/targetAnalysisFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/targetAnalysisFront.vm 2011-01-21 12:09:47 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/targetAnalysisFront.vm 2011-03-01 09:42:21 +0000
@@ -11,7 +11,7 @@
#end
</script>
-<h1>Target Analysis Form</h1>
+<h3>Target Analysis Form</h3>
<hr /><br/>
<form id="targetAnalysisForm" name="targetAnalysisForm" action="generateChartDeTarget.action" method="post" onsubmit="return formValidationsForDeTarget()" target="chartWindow1">
@@ -96,7 +96,7 @@
</td>
<td class="NormalB"> </td>
<td>
- <input type="submit" id="ViewCumulativeChart" name="ViewChart" value="$i18n.getString( 'view_cumulativechart' )" style="width: 120; height: 25; font-family:Arial; font-weight:bold; color:#000000" onclick="setButtonName('VIEWCCHART')">
+ <input type="submit" id="ViewCumulativeChart" name="ViewChart" value="$i18n.getString( 'view_cumulativechart' )" style="width:150px;height:25px; font-family:Arial; font-weight:bold; color:#000000" onclick="setButtonName('VIEWCCHART')">
</td>
</tr>
</table>
