dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12823
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4018: Included DHIS Calendar in linelisting birth form; Changed version in india pom files
------------------------------------------------------------
revno: 4018
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-06-24 12:57:57 +0530
message:
Included DHIS Calendar in linelisting birth form; Changed version in india pom files
modified:
local/in/dhis-in-api/pom.xml
local/in/dhis-in-services/dhis-in-service-configuration/pom.xml
local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml
local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml
local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml
local/in/dhis-in-services/dhis-in-service-reports/pom.xml
local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml
local/in/dhis-in-services/dhis-in-service-survey/pom.xml
local/in/dhis-in-services/pom.xml
local/in/dhis-mobile/dhis-service-mobile/pom.xml
local/in/dhis-mobile/dhis-web-mobile/pom.xml
local/in/dhis-mobile/pom.xml
local/in/dhis-web-dashboard/pom.xml
local/in/dhis-web-dataentry-linelisting/pom.xml
local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llbirthForm.vm
local/in/dhis-web-excelimport/pom.xml
local/in/dhis-web-leprosy/pom.xml
local/in/dhis-web-linelisting-in/pom.xml
local/in/dhis-web-maintenance-in/pom.xml
local/in/dhis-web-reports-in/pom.xml
local/in/dhis-web-reports-national/pom.xml
local/in/dhis-web-sandbox/pom.xml
local/in/dhis-web-sandboxbk/pom.xml
local/in/dhis-web-survey/pom.xml
local/in/dhis-web-validationrule-in/pom.xml
local/in/pom.xml
--
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-in-api/pom.xml'
--- local/in/dhis-in-api/pom.xml 2011-04-27 16:07:05 +0000
+++ local/in/dhis-in-api/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-api</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-configuration/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-configuration/pom.xml 2011-04-27 16:07:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-configuration/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-configuration</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml 2011-06-15 05:50:55 +0000
+++ local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-dataentrystatus</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml 2011-04-27 16:07:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-dbmanager</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml 2011-04-27 16:07:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-linelisting</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-reports/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-reports/pom.xml 2011-04-27 16:07:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-reports/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-reports</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-scheduler</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2011-04-27 16:07:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-survey</artifactId>
=== modified file 'local/in/dhis-in-services/pom.xml'
--- local/in/dhis-in-services/pom.xml 2011-06-15 05:50:55 +0000
+++ local/in/dhis-in-services/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-services</artifactId>
=== modified file 'local/in/dhis-mobile/dhis-service-mobile/pom.xml'
--- local/in/dhis-mobile/dhis-service-mobile/pom.xml 2011-06-17 10:06:08 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-services</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-service-mobile</artifactId>
=== modified file 'local/in/dhis-mobile/dhis-web-mobile/pom.xml'
--- local/in/dhis-mobile/dhis-web-mobile/pom.xml 2011-06-17 10:06:08 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-mobile</artifactId>
=== modified file 'local/in/dhis-mobile/pom.xml'
--- local/in/dhis-mobile/pom.xml 2011-06-17 10:06:08 +0000
+++ local/in/dhis-mobile/pom.xml 2011-06-24 07:27:57 +0000
@@ -5,7 +5,7 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-sms</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Mobile SMS Modules</name>
=== modified file 'local/in/dhis-web-dashboard/pom.xml'
--- local/in/dhis-web-dashboard/pom.xml 2011-06-15 06:01:50 +0000
+++ local/in/dhis-web-dashboard/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-dashboard</artifactId>
=== modified file 'local/in/dhis-web-dataentry-linelisting/pom.xml'
--- local/in/dhis-web-dataentry-linelisting/pom.xml 2011-04-27 16:07:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-dataentry-national</artifactId>
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llbirthForm.vm'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llbirthForm.vm 2011-01-25 09:06:55 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/llbirthForm.vm 2011-06-24 07:27:57 +0000
@@ -50,7 +50,7 @@
oCell.innerHTML = "<select name='entryfield' id='value[1022].value:value["+nextRecordNo+"].value' onchange='validateLLBSexField(1022,"+nextRecordNo+")' onkeypress='return keyPress(event, this)' style='width:100% text-align:center'><option value='NONE' selected>---</option><option value='M'>Male</option><option value='F'>Female</option></select>";
oCell = newRow.insertCell(4);
- oCell.innerHTML = "<input name='entryfield' id='value[1023].value:value["+nextRecordNo+"].value' type='text' value='' onchange='validateLLBDOBField(1023,"+nextRecordNo+")' onkeypress='return keyPress(event, this)' style='width:10em text-align:center'> <img src='../images/calendar_icon.gif' width='16' height='16' id='getvalue[1023].value:value["+nextRecordNo+"].value' cursor: pointer;' title='$i18n.getString( 'date_selector' )' onmouseover='this.style.background='orange';' onmouseout='this.style.background='';'>";
+ oCell.innerHTML = "<input name='entryfield' id='value[1023].value:value["+nextRecordNo+"].value' type='text' value='' onchange='validateLLBDOBField(1023,"+nextRecordNo+")' onkeypress='return keyPress(event, this)' style='width:10em text-align:center'>";
oCell = newRow.insertCell(5);
oCell.innerHTML = "<input name='entryfield' id='value[1024].value:value["+nextRecordNo+"].value' type='text' value='' onchange='validateLLBWeightField(1024,"+nextRecordNo+")' onkeypress='return keyPress(event, this)' style='width:100% text-align:center'>";
@@ -61,10 +61,9 @@
oCell = newRow.insertCell(7);
oCell.innerHTML = "<div id='"+nextRecordNo+"' style='display: none;'><a href='javascript:removeLLRecord( " + nextRecordNo + " )' title='remove'><img src='../images/delete.png' alt='remove'></a></div>";
- var inputFieldVal1 = "value[1023].value:value["+nextRecordNo+"].value";
- var butVal1 = "getvalue[1023].value:value["+nextRecordNo+"].value";
- Calendar.setup({inputField:inputFieldVal1,ifFormat:"$i18n.getString('format.date.label')",button:butVal1});
-
+ var inputFieldVal1 = "value\\[1023\\]\\.value\\:value\\["+nextRecordNo+"\\]\\.value";
+
+ datePicker( inputFieldVal1, false);
}
</script>
@@ -116,9 +115,10 @@
#elseif($count1 == 4)
<td>
<input name="entryfield" id="value[$llDataValue.getDataElement().getId()].value:value[$llDataValue.getRecordNo()].value" type="text" value="#if($llDataValue.getValue())$llDataValue.getValue()#end" onchange="validateLLBDOBField($llDataValue.getDataElement().getId(),$llDataValue.getRecordNo())" onkeypress="return keyPress(event, this)" style="width:10em text-align:center" #if( $locked ) disabled="disabled"#end>
- #if( !$locked ) <img src="../images/calendar_icon.gif" width="16" height="16" id="getvalue[$llDataValue.getDataElement().getId()].value:value[$llDataValue.getRecordNo()].value" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''"> #end
+ ##if( !$locked ) <img src="../images/calendar_icon.gif" width="16" height="16" id="getvalue[$llDataValue.getDataElement().getId()].value:value[$llDataValue.getRecordNo()].value" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''"> #end
+ #if( !$locked ) <script type="text/javascript"> datePicker('value\\[$llDataValue.getDataElement().getId()\\]\\.value\\:value\\[$llDataValue.getRecordNo()\\]\\.value', false); </script> #end
</td>
- #set($calInfo = $calInfo + "Calendar.setup({inputField:'value["+$llDataValue.getDataElement().getId()+"].value:value["+$llDataValue.getRecordNo()+"].value',ifFormat:'$i18n.getString('format.date.label')',button:'getvalue["+$llDataValue.getDataElement().getId()+"].value:value["+$llDataValue.getRecordNo()+"].value'});")
+ ##set($calInfo = $calInfo + "Calendar.setup({inputField:'value["+$llDataValue.getDataElement().getId()+"].value:value["+$llDataValue.getRecordNo()+"].value',ifFormat:'$i18n.getString('format.date.label')',button:'getvalue["+$llDataValue.getDataElement().getId()+"].value:value["+$llDataValue.getRecordNo()+"].value'});")
#elseif($count1 == 1)
<td align="center"><div id="value[$llDataValue.getDataElement().getId()].value:value[$llDataValue.getRecordNo()].slno" align='center'>$slno</div></td>
<td><input name="entryfield" id="value[$llDataValue.getDataElement().getId()].value:value[$llDataValue.getRecordNo()].value" type="text" value="#if($llDataValue.getValue())$llDataValue.getValue()#end" onchange="validateLLBNameField($llDataValue.getDataElement().getId(),$llDataValue.getRecordNo())" onkeypress="return keyPress(event, this)" style="width:100% text-align:center" #if( $locked ) disabled="disabled"#end></td>
@@ -146,9 +146,12 @@
</select>
</td>
<td>
- <input name="entryfield" id="value[1023].value:value[$recordNo].value" type="text" value="" onchange="validateLLBDOBField(1023,$recordNo)" onkeypress="return keyPress(event, this)" style="width:10em text-align:center">
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getvalue[1023].value:value[$recordNo].value" cursor: pointer;" title="$i18n.getString( "date_selector" )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''">
- #set($calInfo = $calInfo + "Calendar.setup({inputField:'value[1023].value:value["+$recordNo+"].value',ifFormat:'$i18n.getString('format.date.label')',button:'getvalue[1023].value:value["+$recordNo+"].value'});")
+ #set( $tempVar = "value[1023].value:value["+$recordNo+"].value" )
+ <input name="entryfield" id="$tempVar" type="text" value="" onchange="validateLLBDOBField(1023,$recordNo)" onkeypress="return keyPress(event, this)" style="width:10em text-align:center">
+ <script type="text/javascript">
+ var a = "value\\[1023\\]\\.value\\:value\\[$recordNo\\]\\.value";
+ datePicker( a, false);
+ </script>
</td>
<td><input name="entryfield" id="value[1024].value:value[$recordNo].value" type="text" value="" onchange="validateLLBWeightField(1024,$recordNo )" onkeypress="return keyPress(event, this)" style="width:100% text-align:center"></td>
<td>
=== modified file 'local/in/dhis-web-excelimport/pom.xml'
--- local/in/dhis-web-excelimport/pom.xml 2011-04-27 16:07:05 +0000
+++ local/in/dhis-web-excelimport/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-excelimport</artifactId>
=== modified file 'local/in/dhis-web-leprosy/pom.xml'
--- local/in/dhis-web-leprosy/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-leprosy/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-leprosy</artifactId>
=== modified file 'local/in/dhis-web-linelisting-in/pom.xml'
--- local/in/dhis-web-linelisting-in/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-linelisting-in/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-linelisting-in</artifactId>
=== modified file 'local/in/dhis-web-maintenance-in/pom.xml'
--- local/in/dhis-web-maintenance-in/pom.xml 2011-04-27 16:07:05 +0000
+++ local/in/dhis-web-maintenance-in/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-maintenance-in</artifactId>
=== modified file 'local/in/dhis-web-reports-in/pom.xml'
--- local/in/dhis-web-reports-in/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-reports-in/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-reports-in</artifactId>
=== modified file 'local/in/dhis-web-reports-national/pom.xml'
--- local/in/dhis-web-reports-national/pom.xml 2011-04-27 16:07:05 +0000
+++ local/in/dhis-web-reports-national/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-reports-national</artifactId>
=== modified file 'local/in/dhis-web-sandbox/pom.xml'
--- local/in/dhis-web-sandbox/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-sandbox/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-linelisting-in</artifactId>
=== modified file 'local/in/dhis-web-sandboxbk/pom.xml'
--- local/in/dhis-web-sandboxbk/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-sandboxbk/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-sandbox-bk</artifactId>
=== modified file 'local/in/dhis-web-survey/pom.xml'
--- local/in/dhis-web-survey/pom.xml 2011-04-27 16:07:05 +0000
+++ local/in/dhis-web-survey/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-survey</artifactId>
=== modified file 'local/in/dhis-web-validationrule-in/pom.xml'
--- local/in/dhis-web-validationrule-in/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-validationrule-in/pom.xml 2011-06-24 07:27:57 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-validationrule-in</artifactId>
=== modified file 'local/in/pom.xml'
--- local/in/pom.xml 2011-04-27 16:07:05 +0000
+++ local/in/pom.xml 2011-06-24 07:27:57 +0000
@@ -5,7 +5,7 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-local</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Local India Modules</name>
