$i18n.getString('post_comment'): | |||||||||||||||
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-03-01 09:15:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-03-01 14:09:05 +0000
@@ -1913,4 +1913,19 @@
{
$tbody.find( 'tr:visible:even' ).removeClass( 'listRow' ).removeClass( 'listAlternateRow' ).addClass( 'listRow' );
$tbody.find( 'tr:visible:odd' ).removeClass( 'listRow' ).removeClass( 'listAlternateRow' ).addClass( 'listAlternateRow' );
+}
+
+function saveCoordinatesEvent(programStageInstanceId)
+{
+ jQuery.postJSON( "saveCoordinatesEvent.action",
+ {
+ programStageInstanceId:programStageInstanceId,
+ longitude: getFieldValue('longitude'),
+ latitude: getFieldValue('latitude')
+ },
+ function( json )
+ {
+ byId('longitude').style.backgroundColor = SUCCESS_COLOR;
+ byId('latitude').style.backgroundColor = SUCCESS_COLOR;
+ });
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm 2012-12-12 04:43:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm 2013-03-01 14:09:05 +0000
@@ -19,6 +19,7 @@
"autoGenerateEvent": "$!programStage.autoGenerateEvent",
"validCompleteOnly": "$!programStage.validCompleteOnly",
"displayGenerateEventBox": "$!programStage.displayGenerateEventBox",
+ "captureCoordinates": "$!programStage.captureCoordinates",
#set( $size = ${programStageDataElements.size()} )
"dataElement": [
#foreach($d in $programStageDataElements)
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java 2012-12-12 04:43:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java 2013-03-01 14:09:05 +0000
@@ -204,7 +204,14 @@
{
this.displayGenerateEventBox = displayGenerateEventBox;
}
-
+
+ private Boolean captureCoordinates;
+
+ public void setCaptureCoordinates( Boolean captureCoordinates )
+ {
+ this.captureCoordinates = captureCoordinates;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -217,7 +224,8 @@
autoGenerateEvent = (autoGenerateEvent == null) ? false : autoGenerateEvent;
validCompleteOnly = (validCompleteOnly == null) ? false : validCompleteOnly;
displayGenerateEventBox = (displayGenerateEventBox == null) ? false : displayGenerateEventBox;
-
+ captureCoordinates = (captureCoordinates == null) ? false : captureCoordinates;
+
ProgramStage programStage = new ProgramStage();
Program program = programService.getProgram( id );
@@ -229,9 +237,9 @@
programStage.setIrregular( irregular );
programStage.setMinDaysFromStart( minDaysFromStart );
programStage.setDisplayGenerateEventBox( displayGenerateEventBox );
-
programStage.setValidCompleteOnly( validCompleteOnly );
programStage.setAutoGenerateEvent( autoGenerateEvent );
+ programStage.setCaptureCoordinates( captureCoordinates );
Set$i18n.getString( "form_details" ) |
+ |
+ |
|
| $i18n.getString( "form_details" ) |
+ |
+ |
|
| |