Are we going to continue with the previous approach to linelisting??
Don’t we want to use the patient module for linelisting as well, with deaths being just attribute to a person and cause of death and associated program for enrollment?? Just thinking out loud??
···
Regards,
Saptarshi PURKAYASTHA
Director R & D, HISP India
Health Information Systems Programme
My Tech Blog: http://sunnytalkstech.blogspot.com
You Live by CHOICE, Not by CHANCE
On 11 March 2010 10:17, noreply@launchpad.net wrote:
revno: 850
committer: HISP HISP@HISP-PC
branch nick: dhis2-in
timestamp: Thu 2010-03-11 14:45:13 +0530
message:
bug fixed while adding linelisting group
added:
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/llgroup/ValidateLineListGroupAddAction.java
modified:
dhis-2/dhis-web/dhis-web-portal/pom.xml
local/in/dhis-web-linelisting-in/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-linelisting-in/src/main/resources/struts.xml
local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/css/dhis-web-dataentry-national.css
local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/lineListGroup.js
local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/linelistagg.js
local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/select.vm
–
lp:~dhis2-devs-india/dhis2/dhis2-in
https://code.launchpad.net/~dhis2-devs-india/dhis2/dhis2-in
You are subscribed to branch lp:~dhis2-devs-india/dhis2/dhis2-in.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-india/dhis2/dhis2-in/+edit-subscription.
=== modified file ‘dhis-2/dhis-web/dhis-web-portal/pom.xml’
— dhis-2/dhis-web/dhis-web-portal/pom.xml 2010-02-09 11:36:50 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2010-03-11 09:15:13 +0000
@@ -167,14 +167,14 @@
<type>war</type> </dependency> -->-<!–
<dependency> <groupId>org.hisp.dhis</groupId> <artifactId>dhis-web-linelisting-in</artifactId> <version>${version}</version> <type>war</type> </dependency>
-->
<action name="defineLLGroupAssociationsForm"@@ -305,7 +313,7 @@
<param name="page">/dhis-web-linelisting-in/select.vm</param> <param name="menu">/dhis-web-linelisting-in/menuForLLDataEntry.vm</param> <param name="javascripts">../dhis-web-commons/calendar/calendar.js,../dhis-web-commons/calendar/calendar-lang.js,../dhis-web-commons/calendar/calendar-setup.js,../dhis-web-commons/ouwt/ouwt.js,javascript/general.js,javascript/form.js</param>
<param name="stylesheets">style/dhis-web-dataentry-national.css</param>
<param name="stylesheets">css/dhis-web-dataentry-national.css</param> </action> <action name="nextPeriods" class="org.hisp.dhis.ll.action.lldataentry.NextPeriodsAction">@@ -322,7 +330,7 @@
<param name="page">/dhis-web-linelisting-in/form.vm</param> <param name="menu">/dhis-web-linelisting-in/menuForLLDataEntry.vm</param> <param name="javascripts">../dhis-web-commons/calendar/calendar.js,../dhis-web-commons/calendar/calendar-lang.js,../dhis-web-commons/calendar/calendar-setup.js,../dhis-web-commons/ouwt/ouwt.js,javascript/general.js,javascript/form.js</param>
<param name="stylesheets">style/dhis-web-dataentry-national.css</param>
<param name="stylesheets">css/dhis-web-dataentry-national.css</param> </action> <action name="saveValueAction" class="org.hisp.dhis.ll.action.lldataentry.SaveValueAction">@@ -357,7 +365,7 @@
<param name="page">/dhis-web-linelisting-in/addValidationRuleForm.vm</param> <param name="menu">/dhis-web-linelisting-in/menu.vm</param> <param name="javascripts">javascript/general.js,javascript/validationForm.js,javascript/expression.js</param>
<param name="stylesheets">style/validationStyle.css</param>
<param name="stylesheets">css/validationStyle.css</param> <param name="requiredAuthorities">F_VALIDATIONRULE_ADD</param> </action>=== modified file ‘local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/css/dhis-web-dataentry-national.css’
— local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/css/dhis-web-dataentry-national.css 2009-09-07 11:25:40 +0000
+++ local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/css/dhis-web-dataentry-national.css 2010-03-11 09:15:13 +0000
@@ -1,13 +1,20 @@
-#currentSelection {
+#currentSelection
+{
color: black;
padding: 5px;
background-color: #D5FFC5;
border: 1px solid black;
font-size: 14px;
text-align: right;
position: fixed;
top: 95px;
right: 0;
color: black;
background-color: yellow;
border: 1px solid black;
font-size: 1.3em;
font-weight: bold;
}
#selectForm {
padding-top: 32px;
}
=== modified file ‘local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/lineListGroup.js’
— local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/lineListGroup.js 2010-03-09 13:57:08 +0000
+++ local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/lineListGroup.js 2010-03-11 09:15:13 +0000
@@ -45,7 +45,7 @@
var request = new Request(); request.setResponseTypeXML( 'message' ); request.setCallbackSuccess( addValidationCompleted );
- request.send( ‘validateLineListGroup.action?name=’ + getFieldValue( ‘name’ ) +
request.send( ‘validateLineListGroupAdd.action?name=’ + getFieldValue( ‘name’ ) +
'&shortName=' + htmlEncode( getFieldValue( 'shortName' ) ) + '&periodTypeSelect=' + htmlEncode( getFieldValue( 'periodTypeSelect' ) ) );=== modified file ‘local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/linelistagg.js’
— local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/linelistagg.js 2010-03-08 13:38:35 +0000
+++ local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/javascript/linelistagg.js 2010-03-11 09:15:13 +0000
@@ -234,15 +234,9 @@
{
var linelistGroupDE = document.getElementById( 'linelistGroupDE' );
var holdFocusId = holdFocus.id;//var position = $("#holdFocusId").data("pos");//var data = jQuery.metadata.get(holdFocusId);var data = $(holdFocusId).metadata().pos;
var data = jQuery(holdFocus).metadata({type:"attr",name:"data"});
alert( holdFocusId + " : " + data );//if( data.pos == "left" )/*if( jQuery("input[id='left']") )
if( data.pos == "left" ) { holdFocus.value += linelistGroupDE.options[ linelistGroupDE.selectedIndex ].value; }@@ -250,7 +244,6 @@
{ holdFocus.value = "klkjk"; }
*/}
//-----------------------------------------------------------------
=== modified file ‘local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/select.vm’
— local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/select.vm 2009-09-07 11:25:40 +0000
+++ local/in/dhis-web-linelisting-in/src/main/webapp/dhis-web-linelisting-in/select.vm 2010-03-11 09:15:13 +0000
@@ -1,4 +1,4 @@
-
+
#if ( $organisationUnit ) $encoder.htmlEncode( $organisationUnit.name )#else $i18n.getString("no_organisationunit_selected") #end - #set( $period = $selectedStateManager.getSelectedPeriod() ) #if ( $period ) $format.formatPeriod( $period ) #else $i18n.getString("no_period_selected") #end <br>@@ -11,12 +11,13 @@
+<!–
$i18n.getString( “use_default_form” )
<input type="checkbox" id="useDefaultForm" name="useDefaultForm" #if( $useDefaultForm ) checked="checked" #end #if( !$customDataEntryFormExists ) disabled="disabled" #end onchange="document.getElementById( 'selectForm' ).submit();">
-
-<input type=“button” value=“SAVE” onclick=“saveLineListingAggData()” #if( $isLineListing.equals(“no”) ) disabled=“disabled” #end>
±->
+
+<input type=“button” value=“Save Aggregated Data” onclick=“saveLineListingAggData()” #if( $isLineListing.equals(“no”) ) disabled=“disabled” #end>