=== 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 2012-09-12 04:14:03 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-09-12 09:03:33 +0000 @@ -57,9 +57,7 @@ registering_unit=Registering unit select=Select program_summary_report=Program Summary Report -visit_plan=Visit Plans intro_program_summary=View the summary report to get an overview of the services provided for a program. -intro_visit_plan=View the visit plan to get an overview of outstanding, pending and completed visits. other_facility=Private facility error_required_field=Please enter value for all data element in red color complete_confirm_message=Are you sure this event is completed? @@ -444,4 +442,6 @@ unknown = Unknown health_worker = Health worker please_select_criteria = Please select criteria -sender = Sender \ No newline at end of file +sender = Sender +activity_plan = Activity plan +intro_activity_plan=View the activity plan to get an overview of outstanding, pending and completed visits. \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-09-11 13:35:26 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-09-12 09:03:33 +0000 @@ -985,6 +985,26 @@ /dhis-web-commons/ajax/jsonResponseSuccess.vm + + + + + + /main.vm + /dhis-web-caseentry/activityPlanSelect.vm + /dhis-web-caseentry/trackingMenu.vm + style/style.css + ../dhis-web-commons/ouwt/ouwt.js,javascript/commons.js,javascript/activityPlan.js + F_ACTIVITY_PLAN + + + + /content.vm + /dhis-web-caseentry/activityPlanRecords.vm + style/style.css + === added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm 2012-09-12 09:03:33 +0000 @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + +
$i18n.getString( "search_result_matching_the_search_criteria" ):   + #if($!listAll) + $i18n.getString( "list_all_patients" ) + #else + $i18n.getString( "advanced_search_patients" ) + #end +
$i18n.getString( "total_result" ):  $!total
+ +#if( $patients && $patients.size()>0 ) +

#parse( "/dhis-web-caseentry/colorHelp.vm" )

+ + + #set( $mark = false ) + #foreach( $patient in $patients ) + #set( $programInstance = '') + #set( $programInstance = $programInstanceMap.get( $patient ) ) + + + + #if($!programStageInstanceMap.get($programInstance)) + #set($programStageInstances = $programStageInstanceMap.get($programInstance) ) + + #end + + #if( $mark ) + #set( $mark = false ) + #else + #set( $mark = true ) + #end + #end +
+ #set( $value="") + #foreach( $identifierType in $programInstance.program.patientIdentifierTypes ) + #foreach( $pIdentifier in $patient.identifiers ) + #if($identifierType.personDisplayName=="true" && $identifierType.id==$pIdentifier.identifierType.id) + #set($value=$value + $pIdentifier.identifier + " " ) + #end + #end + #end + #if($value=="") + #set($value=$patient.getFullName()) + #end + + + » + + + + + + + + +
+
 
+
+
+ + #set( $flag = "false" ) + #foreach( $programStageInstance in $programStageInstances ) + + + #end + +
+ + + +
+ #set($title="") + #set($index = 0) + #foreach( $comment in $programStageInstance.patientComments) + #if( $index < 5) + #set( $title= $title + "$format.formatDate( $comment.createdDate ) - $comment.creator - $comment.commentText " ) + #set( $index = $index + 1 ) + #end + #end + #foreach( $sms in $programStageInstance.outboundSms) + #if( $index < 5) + #set( $title= $title + "$format.formatDate( $sms.date ) - $sms.message ") + #set( $index = $index + 1) + #end + #end + + + +
+
+
+
 
+
+
+ +
+ #parse( "/dhis-web-commons/paging/paging.vm" ) +
+ +
+#end + + \ No newline at end of file === added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm 2012-09-12 09:03:33 +0000 @@ -0,0 +1,62 @@ + + +

$i18n.getString( "activity_plan" )

+
+ + + + + +
+ #parse( "dhis-web-caseentry/searchPatientCriteria.vm" ) +
+
+ +
+
+#parse( "dhis-web-commons/loader/loader.vm" ) + + + + === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm 2012-09-06 09:44:43 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm 2012-09-12 09:03:33 +0000 @@ -9,7 +9,7 @@ #introListImgItem( "anonymousRegistration.action" "anonymous_events" "dataentry" ) #introListImgItem( "reportSelect.action" "program_summary" "summaryreport" ) #introListImgItem( "app/index.html" "tabular_report" "summaryreport" ) - #introListImgItem( "caseAggregationForm.action" "case_aggregation" "caseaggregation" ) + #introListImgItem( "activityPlanSelect.action" "activity_plan" "attribute" ) #introListImgItem( "smsReminderSelect.action" "program_tracking" "attribute" ) \ No newline at end of file === added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2012-09-12 09:03:33 +0000 @@ -0,0 +1,120 @@ + +function orgunitSelected( orgUnits, orgUnitNames ) +{ + hideById("listPatientDiv"); + clearListById('programIdAddPatient'); + $('#contentDataRecord').html(''); + setFieldValue('orgunitName', orgUnitNames[0]); + setFieldValue('orgunitId', orgUnits[0]); + jQuery.get("getPrograms.action",{}, + function(json) + { + jQuery( '#programIdAddPatient').append( '' ); + for ( i in json.programs ) { + if(json.programs[i].type==1){ + jQuery( '#programIdAddPatient').append( '' ); + } + } + enableBtn(); + }); +} + +selection.setListenerFunction( orgunitSelected ); + +function listAllPatient() +{ + setFieldValue('listAll', "true"); + hideById('listPatientDiv'); + contentDiv = 'listPatientDiv'; + $('#contentDataRecord').html(''); + + var date = new Date(); + var d = date.getDate() + 7; + var m = date.getMonth(); + var y= date.getFullYear(); + var startDate = jQuery( '#currentDate' ).val(); + var endDate = jQuery.datepicker.formatDate( dateFormat, new Date(y, m, d) ) ; + + var programId = getFieldValue('programIdAddPatient'); + var searchTexts = "stat_" + programId + "_3_" + startDate + "_" + endDate + + "_" + getFieldValue('orgunitId'); + + showLoader(); + jQuery('#listPatientDiv').load('getActivityPlanRecords.action', + { + programId:programId, + listAll:false, + searchBySelectedOrgunit: false, + searchTexts: searchTexts + }, + function() + { + showById('colorHelpLink'); + showById('listPatientDiv'); + hideLoader(); + }); +} + +function advancedSearch( params ) +{ + setFieldValue('listAll', "false"); + $('#contentDataRecord').html(''); + params += "&programId=" + getFieldValue('programIdAddPatient'); + $.ajax({ + url: 'getActivityPlanRecords.action', + type:"POST", + data: params, + success: function( html ){ + jQuery('#listPatientDiv').html(html); + showById('colorHelpLink'); + showById('listPatientDiv'); + hideLoader(); + } + }); +} + +function eventFlowToggle( programInstanceId ) +{ + jQuery("#tb_" + programInstanceId + " .stage-object").each( function(){ + var programStageInstance = this.id.split('_')[1]; + jQuery('#arrow_' + programStageInstance ).toggle(); + jQuery('#td_' + programStageInstance ).toggle(); + jQuery(this).removeClass("stage-object-selected"); + }); + + jQuery("#tb_" + programInstanceId + " .arrow-left").toggle(); + jQuery("#tb_" + programInstanceId + " .arrow-right").toggle(); + if( jQuery("#tb_" + programInstanceId + " .searched").length>0) + { + var id = jQuery("#tb_" + programInstanceId + " .searched").attr('id').split('_')[1]; + showById("arrow_" + id); + showById("td_" + id ); + } +} + +// -------------------------------------------------------------------- +// Patient program tracking +// -------------------------------------------------------------------- + +function loadDataEntry( programStageInstanceId ) +{ + jQuery("#patientList input[name='programStageBtn']").each(function(i,item){ + jQuery(item).removeClass('stage-object-selected'); + }); + jQuery( '#' + prefixId + programStageInstanceId ).addClass('stage-object-selected'); + setFieldValue('programStageInstanceId', programStageInstanceId); + + $('#contentDataRecord' ).load("viewProgramStageRecords.action", + { + programStageInstanceId: programStageInstanceId + }).dialog( + { + title:i18n_program_stage, + maximize:true, + closable:true, + modal:false, + overlay:{background:'#000000', opacity:0.1}, + width:1000, + height:500 + }); +} === 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 2012-09-12 02:49:08 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-09-12 09:03:33 +0000 @@ -274,11 +274,22 @@ } } }) + + if( getFieldValue('searchByProgramStage') == "true" + && byId('searchBySelectedOrgunit').checked){ + p += "_" + getFieldValue('orgunitId'); + } params += p; }); params += '&listAll=false'; - params += '&searchBySelectedOrgunit=' + byId('searchBySelectedOrgunit').checked; + if( getFieldValue('searchByProgramStage') == "false"){ + params += '&searchBySelectedOrgunit=' + byId('searchBySelectedOrgunit').checked; + } + else + { + params += '&searchBySelectedOrgunit=false'; + } params += programIds; return params; === 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 2012-09-12 07:31:21 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js 2012-09-12 09:03:33 +0000 @@ -33,11 +33,8 @@ var m = date.getMonth(); var y1 = date.getFullYear() - 100; var y2 = date.getFullYear(); - jQuery( '#currentDate' ).datepicker( "setDate" , new Date(y1, m, d) ); - var startDate = jQuery( '#currentDate' ).val(); - jQuery( '#currentDate' ).datepicker( "setDate" , new Date(y2, m, d) ).val(); - var endDate = jQuery( '#currentDate' ).val(); - jQuery( '#currentDate' ).val(getCurrentDate()); + var startDate = jQuery.datepicker.formatDate( dateFormat, new Date(y1, m, d) ); + var endDate = jQuery.datepicker.formatDate( dateFormat, new Date(y2, m, d) ); var programId = getFieldValue('programIdAddPatient'); var searchTexts = "stat_" + programId + "_4_" + startDate + "_" + endDate === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm 2012-09-06 09:44:43 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm 2012-09-12 09:03:33 +0000 @@ -31,5 +31,8 @@

$i18n.getString( "tracking" ) 

+ === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm 2012-09-12 04:14:03 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm 2012-09-12 09:03:33 +0000 @@ -15,7 +15,6 @@ jQuery("#searchObjectId [value=]").attr("selected","selected"); hideById('addPatientBtn'); disable('advancedSearchBtn'); - hideById('searchBySelectedUnitTD'); setFieldValue('searchByProgramStage', 'true'); setFieldValue('hideLink', 'true'); showById('dueDateTR'); === 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 2012-09-12 02:49:08 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm 2012-09-12 09:03:33 +0000 @@ -95,14 +95,6 @@ var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")'; var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")'; var searchTextBox = ''; - datePicker( 'startDueDate' ); + datePicker( 'startDueDate', true ); datePicker( 'endDueDate', true ); - - var standardInterval = -1; - var date = new Date(); - var d = date.getDate() + eval(standardInterval); - var m = date.getMonth(); - var y = date.getFullYear(); - var edate= new Date(y, m, d); - jQuery( '#startDueDate' ).datepicker( "setDate" , edate ); \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingMenu.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingMenu.vm 2012-09-06 09:44:43 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingMenu.vm 2012-09-12 09:03:33 +0000 @@ -1,7 +1,8 @@

$i18n.getString( "tracking" ) 

#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )