dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18066
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7460: local/in merge linelisting dataentry from 2.7 to trunk
------------------------------------------------------------
revno: 7460
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-06-30 13:35:32 +0530
message:
local/in merge linelisting dataentry from 2.7 to trunk
modified:
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/api/LLDataSets.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/autoagg/action/AutoLLDataAggregationAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java
local/in/dhis-web-dataentry-linelisting/src/main/resources/org/hisp/dhis/den/i18n_module.properties
local/in/dhis-web-dataentry-linelisting/src/main/resources/struts.xml
local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/autoLLDataAggForm.vm
local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/autoLLDataAggResult.vm
local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/javascript/autolldataagg.js
local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llmdeathForm.vm
local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/menu.vm
local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/menuAutoLLData.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-dataentry-linelisting/src/main/java/org/hisp/dhis/den/api/LLDataSets.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/api/LLDataSets.java 2012-05-10 11:40:01 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/api/LLDataSets.java 2012-06-30 08:05:32 +0000
@@ -361,6 +361,7 @@
public static final int LLMD_AT_PHC = 535;
public static final int LLMD_AT_CHC = 536;
public static final int LLMD_AT_MC = 537;
+ public static final int LLMD_AT_PVTINST = 5726; // This data element should be created for state specific for line listing maternal death delivery at PVT INST
public static final int LLMD_BY_UNTRAINED = 538;
public static final int LLMD_BY_TRAINED = 539;
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/autoagg/action/AutoLLDataAggregationAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/autoagg/action/AutoLLDataAggregationAction.java 2012-02-02 09:56:51 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/autoagg/action/AutoLLDataAggregationAction.java 2012-06-30 08:05:32 +0000
@@ -171,6 +171,8 @@
llDataSets.add( dataSetService.getDataSetByName( LLDataSets.LL_DEATHS ) );
llDataSets.add( dataSetService.getDataSetByName( LLDataSets.LL_MATERNAL_DEATHS ) );
+ System.out.println( "Aggregation Start Time is : \t" + new Date() );
+
// Calculation
List<String> aggDeList;
for( OrganisationUnit orgUnit : orgUnitList )
@@ -183,6 +185,7 @@
// LLB
if( orgUnitDataSets.contains( llDataSets.get( 0 ) ) )
{
+ System.out.println( "inside ----- " + LLDataSets.LL_BIRTHS );
lldeValueMap = new HashMap<String, String>( lldataValueService.processLineListBirths( orgUnit, period ) );
aggDeList = new ArrayList<String>( lldeValueMap.keySet() );
@@ -201,6 +204,8 @@
if( orgUnitDataSets.contains( llDataSets.get( 1 ) ) )
{
+ System.out.println( "inside ----- " + LLDataSets.LL_DEATHS );
+
lldeValueMap = new HashMap<String, String>( lldataValueService.processLineListDeaths( orgUnit, period ) );
aggDeList = new ArrayList<String>( lldeValueMap.keySet() );
for ( String aggde : aggDeList )
@@ -215,8 +220,9 @@
}
//LLMD
- if( orgUnitDataSets.contains( llDataSets.get( 0 ) ) )
+ if( orgUnitDataSets.contains( llDataSets.get( 2 ) ) )
{
+ System.out.println( "inside ----- " + LLDataSets.LL_MATERNAL_DEATHS );
lldeValueMap = new HashMap<String, String>( lldataValueService.processLineListMaternalDeaths( orgUnit, period ) );
aggDeList = new ArrayList<String>( lldeValueMap.keySet() );
@@ -233,12 +239,16 @@
if(flag != 1)
{
- resultStatus += orgUnit.getName() + " : " + period.getStartDate() + " Imported.<br>";
+ //resultStatus += orgUnit.getName() + " : " + period.getStartDate() + " Imported.<br>";
+
+ resultStatus += "<font color=red><strong>"+ orgUnit.getName()+ " : From : " + period.getStartDate() + " To : " + period.getEndDate() + " Imported.<br></font></strong>";
}
}
}
+ System.out.println( "Aggregation End Time is : \t" + new Date() );
+
return SUCCESS;
}
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java 2012-05-10 11:40:01 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java 2012-06-30 08:05:32 +0000
@@ -2213,7 +2213,7 @@
LLDataSets.LLMD_DURING_SECOND_TRIM, LLDataSets.LLMD_DURING_THIRD_TRIM, LLDataSets.LLMD_DURING_DELIVERY,
LLDataSets.LLMD_AFTER_DEL_WITHIN_42DAYS, LLDataSets.LLMD_AGE_BELOW16, LLDataSets.LLMD_AGE_16TO19,
LLDataSets.LLMD_AGE_19TO35, LLDataSets.LLMD_AGE_ABOVE35, LLDataSets.LLMD_AT_HOME, LLDataSets.LLMD_AT_SC,
- LLDataSets.LLMD_AT_PHC, LLDataSets.LLMD_AT_CHC, LLDataSets.LLMD_AT_MC, LLDataSets.LLMD_BY_UNTRAINED,
+ LLDataSets.LLMD_AT_PHC, LLDataSets.LLMD_AT_CHC, LLDataSets.LLMD_AT_MC, LLDataSets.LLMD_AT_PVTINST, LLDataSets.LLMD_BY_UNTRAINED,
LLDataSets.LLMD_BY_TRAINED, LLDataSets.LLMD_BY_ANM, LLDataSets.LLMD_BY_NURSE, LLDataSets.LLMD_BY_DOCTOR,
LLDataSets.LLMD_CAUSE_ABORTION, LLDataSets.LLMD_CAUSE_OPL, LLDataSets.LLMD_CAUSE_FITS,
LLDataSets.LLMD_CAUSE_SH, LLDataSets.LLMD_CAUSE_BBCD, LLDataSets.LLMD_CAUSE_BACD,
@@ -2269,52 +2269,56 @@
// Metarnal Death At Medical College
queries[14] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_DELIVERY_AT + " AND value = 'MC'";
-
+
+ // Metarnal Death At PVT INST
+ queries[15] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ + " AND dataelementid = " + LLDataSets.LLMD_DELIVERY_AT + " AND value = 'PVTINST'";
+
// Metarnal Death Assisted by Untrained
- queries[15] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[16] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_NATURE_OF_ASSISTANCE + " AND value = 'UNTRAINED'";
// Metarnal Death Assisted by Trained
- queries[16] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[17] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_NATURE_OF_ASSISTANCE + " AND value = 'TRAINED'";
// Metarnal Death Assisted by ANM
- queries[17] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[18] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_NATURE_OF_ASSISTANCE + " AND value = 'ANM'";
// Metarnal Death Assisted by Nurse
- queries[18] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[19] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_NATURE_OF_ASSISTANCE + " AND value = 'NURSE'";
// Metarnal Death Assisted by Doctor
- queries[19] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[20] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_NATURE_OF_ASSISTANCE + " AND value = 'DOCTOR'";
// Metarnal Death Cause Abortion
- queries[20] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[21] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_DEATH_CAUSE + " AND value = 'ABORTION'";
// Metarnal Death Cause Obsturcted
- queries[21] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[22] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_DEATH_CAUSE + " AND value = 'OPL'";
// Metarnal Death Cause Fits
- queries[22] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[23] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_DEATH_CAUSE + " AND value = 'FITS'";
// Metarnal Death Cause Severe Hypertension
- queries[23] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[24] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_DEATH_CAUSE + " AND value = 'SH'";
// Metarnal Death Cause Bleeding before Child Delivery
- queries[24] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[25] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_DEATH_CAUSE + " AND value = 'BBCD'";
// Metarnal Death Cause Bleeding after Child Delivery
- queries[25] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[26] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_DEATH_CAUSE + " AND value = 'BACD'";
// Metarnal Death Cause High fever before Delivery
- queries[26] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[27] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_DEATH_CAUSE + " AND value = 'HFBD'";
// Metarnal Death Cause High fever after Delivery
- queries[27] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[28] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_DEATH_CAUSE + " AND value = 'HFAD'";
// Metarnal Death Cause not known
- queries[28] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[29] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_DEATH_CAUSE + " AND value = 'NK'";
// Metarnal Death Other Causes (including cause not known)
- queries[29] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ queries[30] = "SELECT COUNT(*) FROM lldatavalue WHERE sourceid = " + ouId + " AND periodid = " + pId
+ " AND dataelementid = " + LLDataSets.LLMD_DEATH_CAUSE + " AND value = 'MDNK'";
try
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/resources/org/hisp/dhis/den/i18n_module.properties'
--- local/in/dhis-web-dataentry-linelisting/src/main/resources/org/hisp/dhis/den/i18n_module.properties 2011-10-07 12:25:01 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/resources/org/hisp/dhis/den/i18n_module.properties 2012-06-30 08:05:32 +0000
@@ -80,3 +80,11 @@
no_dataelement_selected = No Data Element Selected
use_default_form = Use Default Form
select_DOB_for_selected_month = You can select DOB only for the selected period
+from_date = From date
+to_date = To date
+ll_data_aggregation_form = Linelisting Data Aggregation Form
+ll_data_aggregation = Linelisting Data Aggregation
+linelisting = Linelisting
+linelisting_dataentry = Linelisting dataentry
+aggregate = Aggregate
+orgUnit = OrgUnit
\ No newline at end of file
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/resources/struts.xml'
--- local/in/dhis-web-dataentry-linelisting/src/main/resources/struts.xml 2011-10-07 12:25:01 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/resources/struts.xml 2012-06-30 08:05:32 +0000
@@ -123,13 +123,14 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dataentry-national/autoLLDataAggForm.vm</param>
<param name="menu">/dhis-web-dataentry-national/menuAutoLLData.vm</param>
- <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/autolldataagg.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/autolldataagg.js</param>
+ <param name="requiredAuthorities">LINELISTING_AGGREGATION</param>
</action>
<action name="autoLLAgg" class="org.hisp.dhis.den.autoagg.action.AutoLLDataAggregationAction">
- <result name="success" type="velocity">/main.vm</result>
+ <result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-dataentry-national/autoLLDataAggResult.vm</param>
- <param name="menu">/dhis-web-dataentry-national/menuAutoLLData.vm</param>
+ <param name="requiredAuthorities">LINELISTING_AGGREGATION</param>
</action>
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/autoLLDataAggForm.vm'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/autoLLDataAggForm.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/autoLLDataAggForm.vm 2012-06-30 08:05:32 +0000
@@ -1,8 +1,51 @@
-<h1>Linelisting Data Auto AggregationForm</h1>
-
-
-<form id="llAggForm" name="autoLLAggForm" action="autoLLAgg.action" method="post">
+<h1>$i18n.getString( "ll_data_aggregation_form" )</h1>
+
+<hr /><br />
+<!--<form id="autoLLAggForm" name="autoLLAggForm" action="autoLLAgg.action" method="post" onsubmit="return formValidationsLLAggregation()">-->
+<form id="autoLLAggForm" name="autoLLAggForm">
+<table>
+ <tr>
+ <td><label>$i18n.getString( "from_date" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td>
+ <select id="sDateLB" name="sDateLB" style="width:200px">
+ #foreach ( $monthlyPeriod in $monthlyPeriods )
+ <option value='$monthlyPeriod.id'>$simpleDateFormat.format( $monthlyPeriod.startDate )</option>
+ #end
+ </select>
+ </td>
+ <td> </td>
+
+ <td><label>$i18n.getString( "to_date" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td>
+ <select id="eDateLB" name="eDateLB" style="width:200px">
+ #foreach ( $monthlyPeriod in $monthlyPeriods )
+ <option value='$monthlyPeriod.id'>$simpleDateFormat.format( $monthlyPeriod.startDate )</option>
+ #end
+ </select>
+ </td>
+ </tr>
+
+ <tr><td> </td><td> </td><td> </td><td> </td><td> </td></tr>
+ <tr><td> </td><td> </td><td> </td><td> </td><td> </td></tr>
+
+ <tr>
+ <td><label>$i18n.getString( "orgUnit" )</label></td>
+ <td><input type="text" id="selOrgUnitName" name="selOrgUnitName" style="width:200px" disabled ></td>
+ <td> </td><td> </td>
+ <td class="NormalB"><input type="button" id="aggregate" name="aggregate" value="$i18n.getString( 'aggregate' )" style="width:200px" onclick="llAggregate()" /></td>
+ </tr>
+<input type="hidden" id="selOrgUnitId" name="selOrgUnitId">
+</table>
+
+#parse( "/dhis-web-commons/loader/loader.vm" )
+<div id='llAggregateDiv'></div>
+<div id='loaderDiv'></div>
+
+
+</form>
+
+<!--
<table>
@@ -44,4 +87,5 @@
</td>
</tr>
-</table>
\ No newline at end of file
+</table>
+-->
\ No newline at end of file
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/autoLLDataAggResult.vm'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/autoLLDataAggResult.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/autoLLDataAggResult.vm 2012-06-30 08:05:32 +0000
@@ -1,3 +1,7 @@
-<div align="center">$resultStatus</div>
\ No newline at end of file
+<!--<div align="left">$resultStatus</div>-->
+
+
+<br/><br/>
+<span id="message" style="display:block">$resultStatus</span>
\ No newline at end of file
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/javascript/autolldataagg.js'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/javascript/autolldataagg.js 2012-02-17 07:15:15 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/javascript/autolldataagg.js 2012-06-30 08:05:32 +0000
@@ -37,4 +37,52 @@
document.getElementById("selOrgUnitName").value = orgUnitName;
}
}
+//form Validation
+
+function formValidationsLLAggregation()
+{
+ var startPeriodObj = document.getElementById('sDateLB');
+ var endPeriodObj = document.getElementById('eDateLB');
+
+ sDateTxt = startPeriodObj.options[startPeriodObj.selectedIndex].text;
+ sDate = formatDate(new Date(getDateFromFormat(sDateTxt,"MMM-y")),"yyyy-MM-dd");
+
+ eDateTxt = endPeriodObj.options[endPeriodObj.selectedIndex].text;
+ eDate = formatDate(new Date(getDateFromFormat(eDateTxt,"MMM-y")),"yyyy-MM-dd");
+
+ if(sDate > eDate)
+ {
+ alert( "Starting Date is Greater" );
+ return false;
+ }
+
+ return true;
+}
+
+function llAggregate()
+{
+ if( formValidationsLLAggregation() )
+ {
+ $( '#llAggregateDiv' ).html( ' ' );
+
+ var selOrgUnitId = $( '#selOrgUnitId' ).val();
+ var sDateLB = $( '#sDateLB' ).val();
+ var eDateLB = $( '#eDateLB' ).val();
+
+ jQuery('#loaderDiv').show();
+ document.getElementById( "aggregate" ).disabled = true;
+
+ jQuery('#llAggregateDiv').load('autoLLAgg.action',
+ {
+ selOrgUnitId:selOrgUnitId,
+ sDateLB:sDateLB,
+ eDateLB:eDateLB
+ }, function()
+ {
+ showById('llAggregateDiv');
+ document.getElementById( "aggregate" ).disabled = false;
+ jQuery('#loaderDiv').hide();
+ });
+ }
+}
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llmdeathForm.vm'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llmdeathForm.vm 2012-05-10 11:40:01 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llmdeathForm.vm 2012-06-30 08:05:32 +0000
@@ -52,7 +52,7 @@
oCell.innerHTML = "<select name='entryfield' id='value[1035].value:value["+nextRecordNo+"].value' onchange='validateLLMDDuringField(1035,"+nextRecordNo+")' onkeypress='return keyPress(event, his)' style='width:100% text-align:center'><option value='NONE' selected>---</option><option value='FTP'>FIRST TRIMESTER PREGNANCY</option><option value='STP'>SECOND TRIMESTER PREGNANCY</option> <option value='TTP'>THIRD TRIMESTER PREGNANCY</option><option value='DELIVERY'>DELIVERY</option><option value='ADW42D'>AFTER DELIVERY WITHIN 42 DAYS</option></select>";
oCell = newRow.insertCell(5);
- oCell.innerHTML = "<select name='entryfield' id='value[1036].value:value["+nextRecordNo+"].value' onchange='validateLLMDDeliveryAtField(1036,"+nextRecordNo+")' onkeypress='return keyPress(event, this)' style='width:100% text-align:center'><option value='NONE'>---</option><option value='HOME'>HOME</option><option value='SC'>SUBCENTER</option><option value='PHC'>PHC</option><option value='CHC'>CHC</option><option value='MC'>MEDICAL COLLEGE</option></select>";
+ oCell.innerHTML = "<select name='entryfield' id='value[1036].value:value["+nextRecordNo+"].value' onchange='validateLLMDDeliveryAtField(1036,"+nextRecordNo+")' onkeypress='return keyPress(event, this)' style='width:100% text-align:center'><option value='NONE'>---</option><option value='HOME'>HOME</option><option value='SC'>SUBCENTER</option><option value='PHC'>PHC</option><option value='CHC'>CHC</option><option value='MC'>DH/SDH/MEDICAL COLLEGE</option><option value='PVTINST'>PVT INST</option></select>";
oCell = newRow.insertCell(6);
oCell.innerHTML = "<select name='entryfield' id='value[1037].value:value["+nextRecordNo+"].value' onchange='validateLLMDDeliveryByField(1037,"+nextRecordNo+")' onkeypress='return keyPress(event, this)' style='width:100% text-align:center'><option value='NONE' SELECTED>---</option><option value='UNTRAINED'>UNTRAINED</option><option value='TRAINED'>TRAINED</option><option value='ANM'>ANM</option><option value='NURSE'>NURSE</option><option value='DOCTOR'>DOCTOR</option><option value='OTHERS'>OTHERS</option></select>";
@@ -127,7 +127,8 @@
<option value="SC" #if($llDataValue.getValue() && $llDataValue.getValue()=="SC") selected #end>SUBCENTER</option>
<option value="PHC" #if($llDataValue.getValue() && $llDataValue.getValue()=="PHC") selected #end>PHC</option>
<option value="CHC" #if($llDataValue.getValue() && $llDataValue.getValue()=="CHC") selected #end>CHC</option>
- <option value="MC" #if($llDataValue.getValue() && $llDataValue.getValue()=="MC") selected #end>MEDICAL COLLEGE</option>
+ <option value="MC" #if($llDataValue.getValue() && $llDataValue.getValue()=="MC") selected #end>DH/SDH/MEDICAL COLLEGE</option>
+ <option value="PVTINST" #if($llDataValue.getValue() && $llDataValue.getValue()=="PVTINST") selected #end>PVT INST</option>
</select>
</td>
#elseif($count1 == 6)
@@ -195,7 +196,8 @@
<option value="SC">SUBCENTER</option>
<option value="PHC">PHC</option>
<option value="CHC">CHC</option>
- <option value="MC">MEDICAL COLLEGE</option>
+ <option value="MC">DH/SDH/MEDICAL COLLEGE</option>
+ <option value="PVTINST">PVT INST</option>
</select>
</td>
<td>
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/menu.vm'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/menu.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/menu.vm 2012-06-30 08:05:32 +0000
@@ -2,11 +2,11 @@
<h2>Linelisting</h2>
<ul>
- <li><a href="index.action">Data Entry</a></li>
- <!-- <br>
- <li><a href="autoLLdataAggForm.action">Auto Linelisting Data Aggregation</a></li>-->
+ <li><a href="index.action">$i18n.getString( "linelisting_dataentry" )</a></li>
+ <br>
+ <li><a href="autoLLdataAggForm.action">$i18n.getString( "ll_data_aggregation" )</a></li>
<!--
- <li>Data Import</li>
+ <li>Data Import</li>
<ul>
<li><a href="lldataImport.action?llImportFlag=1">Overwrite Existing Data</a></li>
<li><a href="lldataImport.action?llImportFlag=2">Append to Existing Data</a></li>
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/menuAutoLLData.vm'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/menuAutoLLData.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/menuAutoLLData.vm 2012-06-30 08:05:32 +0000
@@ -1,10 +1,10 @@
-<h2>Linelisting</h2>
+<h2>$i18n.getString( "linelisting" )</h2>
<ul>
- <li><a href="index.action">Data Entry</a></li>
+ <li><a href="index.action">$i18n.getString( "linelisting_dataentry" )</a></li>
<br>
- <li><a href="autoLLdataAggForm.action">Auto Linelisting Data Aggregation</a></li>
+ <li><a href="autoLLdataAggForm.action">$i18n.getString( "ll_data_aggregation" )</a></li>
<!--
<li>Data Import</li>
<ul>
