dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5163
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-11-15 14:35:27 +0530
message:
  Bug fixed in DataSet Wise dataStatus in Data Analyser
modified:
  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/dataStatusDataSetWiseFront.vm
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menu.vm
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSms.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/org/hisp/dhis/dataanalyser/i18n_module.properties'
--- local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dataanalyser/i18n_module.properties	2011-10-13 09:49:44 +0000
+++ local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dataanalyser/i18n_module.properties	2011-11-15 09:05:27 +0000
@@ -156,5 +156,7 @@
 period_not_selected = Select Available Period
 dataset_not_selected = Select Available data sets
 bulk_sms = Bulk SMS
+due_dates = Due Dates
+ds_sms = DS SMS
 
 

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseFront.vm	2011-11-03 06:07:39 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseFront.vm	2011-11-15 09:05:27 +0000
@@ -1,1 +1,62 @@
-<h3>vbskvfbskdfb</h3>
\ No newline at end of file
+<style type='text/css'>
+    .hidden{ display: none; }
+</style>
+
+<script>
+    // Global Variables
+    var selCategory = "";
+    var selFacility = "";
+    var ouName = "";
+    var dsName = "";
+    var sDateIndex = 0;
+    var eDateIndex = 0;
+    var sDate = "";
+    var eDate = "";
+    var curPeriodType = "";
+</script>
+
+<h3>$i18n.getString( "dsform_datasetwise" )</h3>
+<hr />
+
+<form id="ChartGenerationDataSetWiseForm" name="ChartGenerationDataSetWiseForm" action="dataStatusDataSetWiseResult.action"  onsubmit="return formValidationsDataStatusDataSetWise()" method="get" target="chartWindow1">
+    <table align="center" style="border-collapse: collapse; margin-top: 0;" cellpadding="0" cellspacing="0" width="80%" border="0">
+        <tr>
+            <td class="NormalB">
+				1. $i18n.getString( "ds_periodtype" ) : <br/>
+				<select id="periodTypeId" name="periodTypeId" onchange="getPeriodsForDataSetWise()" style="width:200px">
+					<option value="NA">[ $i18n.getString( "select_periodtype" ) ]</option>
+					#foreach ( $periodType in $periodTypes )
+						<option value='$periodType.name' title='$periodType.name'>$periodType.name</option>
+					#end
+				</select>
+				<br/><br/>
+				2. $i18n.getString( "ga_from" )<br />
+				<select id="sDateLB" name="sDateLB" style="width:200px"></select>
+				<br/><br/>
+				3. $i18n.getString( "ga_to" )<br />
+				<select id="eDateLB" name="eDateLB" style="width:200px"></select>
+				<br/><br/>
+				4. $i18n.getString( "ga_facilityby" )<br/>
+				<select id="facilityLB" name="facilityLB" onchange="facilityChangeDataSetWiseFunction(event)" style="width:200px">
+                    <option value="random" >Selected</option>
+                    <option value="immChildren" selected>Immediate Children</option>
+                    <option value="children" >Child Tree</option>
+                </select>				
+			</td>
+			<td class="NormalB">
+				<input type="checkbox" name="includeZeros" id="includeZeros" checked> Include Zero
+				<br/><br/>
+				5. $i18n.getString( "ga_orgunit" )<br />
+				<select name="orgUnitListCB" id="orgUnitListCB" multiple style="width:200px;height:100px" ondblclick="remOUDataSetWiseFunction()">
+                </select>
+                <br/><br/>
+                <input type="submit" name="ViewSummary" value="View DataSummary" style="width:200px" />			
+			</td>
+		</tr>
+    </table>
+    <input type="hidden" name="selectedButton" id="selectedButton"/>
+</form>
+
+<script>
+	//getdSetPeriods();
+</script>
\ No newline at end of file

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menu.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menu.vm	2011-11-03 06:07:39 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menu.vm	2011-11-15 09:05:27 +0000
@@ -27,7 +27,7 @@
 		<li>$i18n.getString( "bulk_sms" )</li>
 			<ul>
 
-				<li><a href="dueDates.action">$i18n.getString( "Due Dates" )</a></li>
+				<li><a href="dueDates.action">$i18n.getString( "due_dates" )</a></li>
 				<li><a href="prgwiseSummaryBulkSMSForm.action">$i18n.getString( "Programwise Summary" )</a></li>
 			</ul>
 	</ul>
\ No newline at end of file

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSms.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSms.vm	2011-11-03 06:07:39 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForSms.vm	2011-11-15 09:05:27 +0000
@@ -4,7 +4,7 @@
 <ul>
 	<li>$i18n.getString( "ds_sms" )</li>
 	<ul>
-		<li>$i18n.getString( "due dates" )</li>
+		<li>$i18n.getString( "due_dates" )</li>
 	 </ul>
 </ul>
 	
\ No newline at end of file