dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18923
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8048: Add activity plan functionality (WIP)
------------------------------------------------------------
revno: 8048
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-09-12 16:03:33 +0700
message:
Add activity plan functionality (WIP)
added:
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/activityPlanSelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js
modified:
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/struts.xml
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/javascript/commons.js
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/menu.vm
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/searchPatientCriteria.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingMenu.vm
--
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 '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 @@
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
</action>
+
+ <!-- Activity plan -->
+
+ <action name="activityPlanSelect"
+ class="org.hisp.dhis.caseentry.action.caseentry.MultiDataEntrySelectAction">
+ <interceptor-ref name="organisationUnitTreeStack" />
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-caseentry/activityPlanSelect.vm</param>
+ <param name="menu">/dhis-web-caseentry/trackingMenu.vm</param>
+ <param name="stylesheets">style/style.css</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/commons.js,javascript/activityPlan.js</param>
+ <param name="requiredAuthorities">F_ACTIVITY_PLAN</param>
+ </action>
+
+ <action name="getActivityPlanRecords"
+ class="org.hisp.dhis.caseentry.action.caseentry.GetDataRecordsAction">
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-caseentry/activityPlanRecords.vm</param>
+ <param name="stylesheets">style/style.css</param>
+ </action>
</package>
</struts>
=== 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 @@
+<script src="javascript/tooltip.js" type="text/javascript"></script>
+<table>
+ <tr>
+ <td class='text-column' >$i18n.getString( "search_result_matching_the_search_criteria" ):</td>
+ <td> </td>
+ <td> </td>
+ <td>
+ #if($!listAll)
+ $i18n.getString( "list_all_patients" )
+ #else
+ $i18n.getString( "advanced_search_patients" )
+ #end
+ </td>
+ </tr>
+
+ <tr>
+ <td class='text-column' >$i18n.getString( "total_result" ):</td>
+ <td> </td>
+ <td> </td>
+ <td>$!total</td>
+ </tr>
+</table>
+
+#if( $patients && $patients.size()>0 )
+ <p>#parse( "/dhis-web-caseentry/colorHelp.vm" )</p>
+
+ <table class="listTable mainPageTable" id="patientList">
+ #set( $mark = false )
+ #foreach( $patient in $patients )
+ #set( $programInstance = '')
+ #set( $programInstance = $programInstanceMap.get( $patient ) )
+ <tr #alternate( $mark )>
+ <td>
+ #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
+ <input type='button' class='patient-object' value='$value' onclick='javascript:showPatientHistory( "$programInstance.id" );' title='$i18n.getString( "patient_dashboard" )'>
+ </td>
+ <td class='bold' style='cursor:pointer;font-size:25px' onclick="eventFlowToggle($programInstance.id)">
+ <a>»</a>
+ </td>
+ #if($!programStageInstanceMap.get($programInstance))
+ #set($programStageInstances = $programStageInstanceMap.get($programInstance) )
+ <td>
+ <table class="stage-container" id='tb_$programInstance.id'>
+ <tr>
+ <td>
+ <div class="arrow-left" onclick="moveLeft('flow_$programInstance.id')"> </div>
+ </td>
+ <td class='stage-flow'>
+ <div id='flow_$programInstance.id' class='stage-flow'><table class="stage-flow">
+ <tr>
+ #set( $flag = "false" )
+ #foreach( $programStageInstance in $programStageInstances )
+ <td id="arrow_$programStageInstance.id" width="5px" style='font-size:25px;'>→</td>
+ <td id="td_$programStageInstance.id">
+ <table class='stage-object'>
+ <tr>
+ <td>
+ #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
+
+ <input type="button" name="programStageBtn"
+ id="ps_$!programStageInstance.id"
+ psid="$programStageInstance.programStage.id"
+ psname="$programStageInstance.programStage.name"
+ orgunit="$!programStageInstance.organisationUnit.name"
+ programType='$programInstance.program.type'
+ reportDate="$!format.formatDate( $!programStageInstance.executionDate )"
+ reportDateDes="$programStageInstance.programStage.reportDateDescription"
+ dueDate="$format.formatDate( $programStageInstance.dueDate )"
+ class="stage-object"
+ title="$title"
+ value="$programStageInstance.programStage.name $format.formatDate( $programStageInstance.dueDate )"
+ onclick="javascript:loadDataEntry( $programStageInstance.id );">
+ <script>
+ var status = $statusMap.get( $programStageInstance.id );
+ setEventColorStatus( 'ps_' + $programStageInstance.id ,status);
+ </script>
+ </tr>
+ </table>
+ </td>
+ #end
+ </tr>
+ </table></div>
+ </td>
+
+ <td>
+ <div class="arrow-right" onclick="moveRight('flow_$programInstance.id')"> </div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ #end
+ </tr>
+ #if( $mark )
+ #set( $mark = false )
+ #else
+ #set( $mark = true )
+ #end
+ #end
+ </table>
+
+ <div class="paging-container">
+ #parse( "/dhis-web-commons/paging/paging.vm" )
+ </div>
+
+ <div id="detailsInfo"></div>
+#end
+
+<script>
+ #if( $programStageInstanceIds && $programStageInstanceIds.size() > 0 )
+ jQuery("#patientList .stage-object").each( function(){
+ var programStageInstance = this.id.split('_')[1];
+ hideById('arrow_' + programStageInstance );
+ hideById('td_' + programStageInstance );
+ });
+
+ jQuery(".arrow-left").css("display", "none");
+ jQuery(".arrow-right").css("display", "none");
+ #foreach( $id in $programStageInstanceIds )
+ showById('arrow_$id');
+ showById('td_$id');
+ jQuery("#box_$id").addClass("stage-object-selected searched");
+ #end
+ #end
+</script>
\ 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 @@
+<script>
+ jQuery(document).ready( function(){
+ showById('programAddPatientTR');
+ showById('programStageAddPatientTR');
+ showById('sendSmsToListBtn');
+ jQuery("#programIdAddPatient option").each(function(){
+ var item = jQuery(this);
+ if( item.attr('type')!=1 && item.val()!='' ){
+ item.remove();
+ }
+ });
+
+ jQuery('#statusEvent').val('3');
+ jQuery("#searchObjectId [value=prg]").remove();
+ jQuery("#searchObjectId").prepend('<option value="-100">' + i18n_please_select_criteria + '</option>');
+ jQuery("#searchObjectId [value=]").attr("selected","selected");
+ hideById('addPatientBtn');
+ disable('advancedSearchBtn');
+ setFieldValue('searchByProgramStage', 'true');
+ setFieldValue('hideLink', 'true');
+ showById('dueDateTR');
+ });
+</script>
+
+<h3>$i18n.getString( "activity_plan" )</h3>
+<form>
+ <input type='hidden' id='isRegistration' name= 'isRegistration' value='false'>
+ <input type='hidden' id='listAll' name='listAll'>
+ <input type='hidden' id='sendToList' name='sendToList'>
+ <input type='hidden' id='programStageInstanceId' name='programStageInstanceId' value='$programStageInstance.id'>
+ <input type='hidden' id='programStageName' name='programStageName'>
+ <div id='searchDiv'>
+ #parse( "dhis-web-caseentry/searchPatientCriteria.vm" )
+ </div>
+</form>
+
+<div id='listPatientDiv'></div>
+<div id='contentDataRecord'></div>
+#parse( "dhis-web-commons/loader/loader.vm" )
+
+<div class='hidden'>
+ <input type='textbox' id='currentDate' name='currentDate'>
+ <script>
+ datePickerValid( 'currentDate', true );
+ </script>
+</div>
+
+<script>
+ unSave = false;
+ var i18n_sms_message_management = '$encoder.jsEscape( $i18n.getString( "sms_message_management" ) , "'")';
+ var i18n_send_sms = '$encoder.jsEscape( $i18n.getString( "send_sms" ) , "'")';
+ var i18n_please_select = '[' + '$encoder.jsEscape( $i18n.getString( "please_select" ) , "'")' + ']';
+ var i18n_specify_search_criteria = '$encoder.jsEscape( $i18n.getString( "specify_search_criteria" ) , "'")';
+ var i18n_color_quick_help = '$encoder.jsEscape( $i18n.getString( "color_quick_help" ) , "'")';
+ var i18n_patient_details_and_history = '$encoder.jsEscape( $i18n.getString( "patient_details_and_history" ) , "'")';
+ var i18n_please_select_program_stage = '[' + '$encoder.jsEscape( $i18n.getString( "please_select_program_stage" ) , "'")' + ']';
+ var i18n_comment_added = '$encoder.jsEscape( $i18n.getString( "comment_added" ) , "'")';
+ var i18n_update = '$encoder.jsEscape( $i18n.getString( "update" ) , "'")';
+ var i18n_comfirm_delete_event = '$encoder.jsEscape( $i18n.getString( "comfirm_delete_event" ) , "'")';
+ var i18n_please_select_criteria = '[' + '$encoder.jsEscape( $i18n.getString( "please_select_criteria" ) , "'")' + ']';
+ var i18n_program_stage = '$encoder.jsEscape( $i18n.getString( "program_stage" ) , "'")';
+</script>
=== 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( "visitplan.action" "visit_plan" "visitplan" ) -->
#introListImgItem( "caseAggregationForm.action" "case_aggregation" "caseaggregation" )
+ #introListImgItem( "activityPlanSelect.action" "activity_plan" "attribute" )
#introListImgItem( "smsReminderSelect.action" "program_tracking" "attribute" )
</ul>
\ 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( '<option value="">' + i18n_please_select + '</option>' );
+ for ( i in json.programs ) {
+ if(json.programs[i].type==1){
+ jQuery( '#programIdAddPatient').append( '<option value="' + json.programs[i].id +'" type="' + json.programs[i].type + '">' + json.programs[i].name + '</option>' );
+ }
+ }
+ 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 @@
<h2>$i18n.getString( "tracking" ) </h2>
<ul>
+ <li><a href="activityPlanSelect.action">$i18n.getString( "activity_plan" )</a></li>
+</ul>
+<ul>
<li><a href="smsReminderSelect.action">$i18n.getString( "program_tracking" )</a></li>
</ul>
=== 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 = '<input type="text" id="searchText" name="searchText" onkeyup="searchPatientsOnKeyUp( event );">';
- 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 );
</script>
\ 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 @@
<a href="index.action"><h2>$i18n.getString( "tracking" ) </h2></a>
<ul>
- <li><a href="smsReminderSelect.action">$i18n.getString( "program_tracking" )</a></li>
+ <li><a href="activityPlanSelect.action">$i18n.getString( "activity_plan" )</a></li>
+ <li><a href="smsReminderSelect.action">$i18n.getString( "program_tracking" )</a></li>
</ul>
#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
