=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java 2013-05-22 14:56:12 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java 2013-05-29 08:36:29 +0000 @@ -367,7 +367,7 @@ sql += "GROUP BY ou.organisationunitid, ou.name"; } - System.out.println( "\n\n === \n " + sql ); + sql = sql.replaceAll( "COMBINE", "" ); return sql; === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java 2013-05-27 04:33:25 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java 2013-05-29 08:36:29 +0000 @@ -207,7 +207,7 @@ } patientDataValue = getValue( patientDataValues, dataElementUid ); -System.out.println( "\n\n === \n patientDataValue : " + patientDataValue ); + dataElementValue = patientDataValue != null ? patientDataValue.getValue() : dataElementValue; } else === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-05-29 07:33:41 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-05-29 08:36:29 +0000 @@ -623,8 +623,8 @@ display_totals = Display totals cancelled_programs = Cancelled programs quit = Quit -unmark_followup = Un-mark followup -mark_followup = Mark followup +unmark_risk = Un-mark risk +mark_risk = Mark risk save_comment = Save comment program_enrollment = Program enrollment stored_by = Stored by @@ -635,7 +635,6 @@ intro_program_stage_completeness = Monitor the completeness of events and produce completeness reports for each program. program_stage_completeness_form = Program stage completeness number_of_events = Number of events -followup = Follow-up filter_on_section = Filter on section dataelementname = Data element categoryoptioncomboname = Category option combo @@ -652,4 +651,6 @@ access_log = View access Log risk = Risk show_only_risk_cases = Show only Risk cases -toggle_risk_status = Toggle risk status \ No newline at end of file +toggle_risk_status = Toggle risk status +with = with +status_events = events \ No newline at end of file === added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/risk_small.png' Binary files dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/risk_small.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/risk_small.png 2013-05-29 08:36:29 +0000 differ === 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-05-28 07:09:29 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-05-29 08:36:29 +0000 @@ -2073,11 +2073,13 @@ { showById('imgMarkFollowup'); hideById('imgUnmarkFollowup'); + showById("followup_" + programInstanceId); } else { hideById('imgMarkFollowup'); showById('imgUnmarkFollowup'); + hideById("followup_" + programInstanceId); } }); } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js 2013-05-29 06:09:10 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js 2013-05-29 08:36:29 +0000 @@ -90,7 +90,6 @@ }, function() { - setInnerHTML('searchInforLbl',i18n_list_all_patients); showById('colorHelpLink'); showById('listEventDiv'); hideLoader(); === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm 2013-05-29 06:09:10 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm 2013-05-29 08:36:29 +0000 @@ -1,4 +1,4 @@ - +
#if($programInstance.program.type==1 && $programStageInstance) === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2013-05-28 05:49:19 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2013-05-29 08:36:29 +0000 @@ -50,8 +50,9 @@ #end - #if( ($identifierTypes && $identifierTypes.size() > 0) - || ($patientAttributes && $patientAttributes.size() > 0) ) + #if($auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) && + ( ($identifierTypes && $identifierTypes.size() > 0) + || ($patientAttributes && $patientAttributes.size() > 0) ) )
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm 2013-05-29 07:33:41 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm 2013-05-29 08:36:29 +0000 @@ -1,23 +1,8 @@

$i18n.getString( 'patient_management' ) @@ -132,6 +132,7 @@ onclick='javascript:loadActiveProgramStageRecords("$programInstance.id", "$programStageInstance.id")' >

$programInstance.program.displayName ($format.formatDate($programInstance.enrollmentDate)) +
- - - - - - - - - - - + +
$i18n.getString( "search_result_matching_the_search_criteria" ):   - #if($!listAll) - $i18n.getString( "list_events" ) - #else - $i18n.getString( "search_patients" ) - #end -
$i18n.getString( "total_result" ):  $!total$i18n.getString('total_result'):
@@ -37,6 +22,7 @@ + #set($noPatient=0) #set($patientId='') #set($count=1) #set($class='listRow') @@ -45,6 +31,7 @@ #set($patient = $programStageInstance.programInstance.patient) #if( $patientId != $patient.id ) + #set($noPatient=$noPatient + 1) #set( $comment = $!programStageInstance.programInstance.patientComment.commentText ) #if( $$!programStageInstance.programInstance.followup == 'true') @@ -121,3 +108,11 @@
#end + + === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2013-05-29 07:33:41 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2013-05-29 08:36:29 +0000 @@ -16,8 +16,8 @@ $i18n.getString('program'): $program.displayName - - + + === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm 2013-05-28 09:04:10 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm 2013-05-29 08:36:29 +0000 @@ -86,14 +86,20 @@ * === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2013-05-29 07:33:41 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2013-05-29 08:36:29 +0000 @@ -32,8 +32,8 @@ #else #set($followup='false') #end - - + +