dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #21202
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9964: Small changes UI visit-plans.
------------------------------------------------------------
revno: 9964
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-03-04 21:05:33 +0700
message:
Small changes UI visit-plans.
modified:
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetActivityPlansAction.java
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/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/anonymousRegistration.vm
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/searchPatientCriteria.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css
--
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-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2013-03-04 10:00:47 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2013-03-04 14:05:33 +0000
@@ -42,6 +42,8 @@
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.patient.Patient;
+import org.hisp.dhis.patient.PatientIdentifier;
+import org.hisp.dhis.patient.PatientIdentifierType;
import org.hisp.dhis.patientdatavalue.PatientDataValue;
import org.hisp.dhis.patientdatavalue.PatientDataValueService;
import org.hisp.dhis.patientreport.TabularReportColumn;
@@ -373,37 +375,35 @@
Grid grid = new ListGrid();
grid.setTitle( program.getDisplayName() );
+ List<PatientIdentifierType> identifierTypes = program.getPatientIdentifierTypes();
+
// Header
+ grid.addHeader( new GridHeader( i18n.getString( "date_scheduled" ), false, false ) );
grid.addHeader( new GridHeader( i18n.getString( "full_name" ), false, false ) );
- grid.addHeader( new GridHeader( i18n.getString( "gender" ), false, false ) );
- grid.addHeader( new GridHeader( i18n.getString( "date_of_birth" ), false, false ) );
- grid.addHeader( new GridHeader( i18n.getString( "age" ), false, false ) );
grid.addHeader( new GridHeader( i18n.getString( "phone_number" ), false, false ) );
- grid.addHeader( new GridHeader( i18n.getString( "date_scheduled" ), false, false ) );
+ grid.addHeader( new GridHeader( i18n.getString( "program_stage" ), false, false ) );
- String programStage = "";
for ( ProgramStageInstance stageInstance : stageInstances )
{
- String eventName = stageInstance.getProgramStage().getDisplayName();
- if ( !programStage.equals( eventName ) )
+ Patient patient = stageInstance.getProgramInstance().getPatient();
+ String displayPatientName = patient.getFullName();
+ for ( PatientIdentifierType identifierType : identifierTypes )
{
- grid.addRow();
- grid.addValue( eventName );
- grid.addValue( "" );
- grid.addValue( "" );
- grid.addValue( "" );
- grid.addValue( "" );
- grid.addValue( "" );
- programStage = eventName;
+ for ( PatientIdentifier identifier : patient.getIdentifiers() )
+ {
+ if ( identifier.getIdentifierType()!=null && identifier.getIdentifierType().getId() == identifierType.getId() )
+ {
+ displayPatientName = identifier.getIdentifier();
+ break;
+ }
+ }
}
+
grid.addRow();
- Patient patient = stageInstance.getProgramInstance().getPatient();
- grid.addValue( patient.getFullName() );
- grid.addValue( patient.getGender() );
- grid.addValue( DateUtils.getMediumDateString( patient.getBirthDate() ) );
- grid.addValue( patient.getAge() );
+ grid.addValue( DateUtils.getMediumDateString( stageInstance.getDueDate() ) );
+ grid.addValue( displayPatientName );
grid.addValue( patient.getPhoneNumber() );
- grid.addValue( DateUtils.getMediumDateString( stageInstance.getDueDate() ) );
+ grid.addValue( stageInstance.getProgramStage().getDisplayName() );
}
return grid;
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2013-03-04 09:38:55 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2013-03-04 14:05:33 +0000
@@ -1992,9 +1992,10 @@
criteria.setMaxResults( max );
}
+ criteria.addOrder( Order.desc( "executionDate" ) );
+ criteria.addOrder( Order.desc( "dueDate" ) );
criteria.addOrder( Order.asc( "programStage.minDaysFromStart" ) );
- criteria.addOrder( Order.desc( "dueDate" ) );
-
+
return criteria;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetActivityPlansAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetActivityPlansAction.java 2013-03-04 09:38:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetActivityPlansAction.java 2013-03-04 14:05:33 +0000
@@ -37,6 +37,7 @@
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.paging.ActionPagingSupport;
+import org.hisp.dhis.patient.PatientIdentifierType;
import org.hisp.dhis.program.Program;
import org.hisp.dhis.program.ProgramService;
import org.hisp.dhis.program.ProgramStageInstance;
@@ -142,6 +143,13 @@
return program;
}
+ private List<PatientIdentifierType> identifierTypes;
+
+ public List<PatientIdentifierType> getIdentifierTypes()
+ {
+ return identifierTypes;
+ }
+
private List<ProgramStageInstance> programStageInstances;
public List<ProgramStageInstance> getProgramStageInstances()
@@ -169,13 +177,15 @@
orgunitIds.add( orgunit.getId() );
program = programService.getProgram( programId );
-
+
// ---------------------------------------------------------------------
// Program instances for the selected program
// ---------------------------------------------------------------------
if ( type == null )
{
+ identifierTypes = program.getPatientIdentifierTypes();
+
total = programStageInstanceService.getActiveInstanceCount( program, orgunitIds,
format.parseDate( startDate ), format.parseDate( endDate ), statusList );
=== 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-03-04 09:38:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-03-04 14:05:33 +0000
@@ -569,4 +569,5 @@
enter_a_valid_number = Please enter a valid number.
enter_a_number = Enter a number
for = For
-date_scheduled = Date scheduled
\ No newline at end of file
+date_scheduled = Date scheduled
+visit_schedule_form = Visit schedule
\ 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 2013-03-04 09:38:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2013-03-04 14:05:33 +0000
@@ -1060,7 +1060,6 @@
<param name="javascripts">
../dhis-web-commons/ouwt/ouwt.js,
javascript/commons.js,
- javascript/patient.js,
javascript/activityPlan.js
</param>
<param name="requiredAuthorities">F_ACTIVITY_PLAN</param>
=== modified 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 2013-03-04 10:00:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm 2013-03-04 14:05:33 +0000
@@ -14,46 +14,37 @@
<col/>
<col/>
<col width='30%'/>
- #set( $programStage = '' )
+ <thead>
+ <tr>
+ <th>#</th>
+ <th>$i18n.getString('date_scheduled')</th>
+ <th>$i18n.getString('full_name')</th>
+ <th>$i18n.getString('phone_number')</th>
+ <th>$i18n.getString( "program_stage" )</th>
+ </tr>
+ </thead>
+ #set( $mark = false )
#foreach( $programStageInstance in $programStageInstances )
- #set( $eventName = $programStageInstance.programStage.displayName )
- #set( $patient = $programStageInstance.programInstance.patient)
- #if( $eventName != $programStage)
- <tr><td colspan='3' class='bold'>$i18n.getString('for') $eventName</td></tr>
- <tr>
- <th>#</th>
- <th>$i18n.getString('full_name')</th>
- <th>$i18n.getString( "gender" )</th>
- <th>$i18n.getString( "date_of_birth" )</th>
- <th>$i18n.getString( "age" )</th>
- <th>$i18n.getString( "phone_number" )</th>
- <th>$i18n.getString('date_scheduled')</th>
- #set( $mark = false )
- #set( $nr = 0 )
- #set( $programStage = $eventName )
- #end
+ #set($patient = $programStageInstance.programInstance.patient)
<tr #alternate( $mark )>
<td>
- #set( $nr = $nr + 1 )
+ #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount )
$nr
</td>
- <td>$patient.getFullName()</td>
- <td>$i18n.getString($!patient.gender)</td>
-
- <td>$format.formatDate( $!patient.birthDate)</td>
-
- <td>$!patient.getAge()</td>
-
- <td>$!patient.phoneNumber</td>
-
- <td><a href="javascript:loadDataEntry( $programStageInstance.id );">
+ <td>
#if($!programStageInstance.executionDate)
$format.formatDate($!programStageInstance.executionDate)
#else
$format.formatDate($!programStageInstance.dueDate)
#end
- </a>
</td>
+
+ <td><a href="javascript:isDashboard=false;showPatientDashboardForm( '$patient.id' )">$patient.getFullName()</a></td>
+
+ <td>$!patient.phoneNumber</td>
+
+ <td><a href="javascript:loadDataEntryDialog( $programStageInstance.id );">$programStageInstance.programStage.displayName</a></td>
+
</tr>
#set( $mark = !$mark )
#end
=== modified 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 2013-03-04 09:38:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm 2013-03-04 14:05:33 +0000
@@ -14,7 +14,7 @@
});
</script>
-<h3>$i18n.getString( "activity_plan" ) #openHelp('visit_schedule')</h3>
+<h3 id='mainLinkLbl'>$i18n.getString( "visit_schedule_form" ) #openHelp('visit_schedule')</h3>
<form id='activityPlanForm' name='activityPlanForm'>
<input type='hidden' id='isRegistration' name= 'isRegistration' value='false'>
<input type='hidden' id='listAll' name='listAll'>
@@ -25,7 +25,7 @@
<input type="hidden" id='hideLink' name='hideLink' value='false'>
<input type='hidden' id='isSearchByProgram' name='isSearchByProgram' value='false' >
<input type='hidden' id='export' name= 'export'>
- <div id='advanced-search' style='width:550px;'>
+ <div id='selectDiv' class='advanced-search' style='width:550px;'>
<table style="margin-bottom:8px;width:550px;">
<tr>
<td>
@@ -101,7 +101,16 @@
</div>
</form>
-<div id='listPatientDiv'></div>
+
+<div id='listPatientDiv'></div> <!-- List searching patients -->
+<div id='patientDashboard'></div> <!-- Patient dashboard -->
+<div id='editPatientDiv'></div> <!-- Add Patient Form -->
+<div id='resultSearchDiv' style='font-size:13px'></div> <!-- List searching patients -->
+<div id='enrollmentDiv'></div> <!-- Program Enrollment Form -->
+<div id='listRelationshipDiv'></div> <!-- List relationship -->
+<div id='addRelationshipDiv'></div> <!-- Add relationship -->
+<div id='migrationPatientDiv'></div> <!-- Migration Patient -->
+
<div id='contentDataRecord'></div>
#parse( "dhis-web-commons/loader/loader.vm" )
@@ -125,6 +134,6 @@
var i18n_please_select_criteria = '[' + '$encoder.jsEscape( $i18n.getString( "please_select_criteria" ) , "'")' + ']';
var i18n_program_stage = '$encoder.jsEscape( $i18n.getString( "program_stage" ) , "'")';
var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';
-
+ var i18n_main_form_link = '$encoder.jsEscape( $i18n.getString( "visit_schedule_form" ) , "'")';
setDateRange();
</script>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2013-03-01 09:15:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2013-03-04 14:05:33 +0000
@@ -71,7 +71,7 @@
</td>
</tr>
</table>
- <table id='advanced-search' class='hidden'>
+ <table id='advanced-search' class='hidden advanced-search'>
<col/>
<col/>
<col/>
=== modified 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 2013-03-04 10:00:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2013-03-04 14:05:33 +0000
@@ -37,6 +37,8 @@
showById('showEventUpTo');
hideById('startDueDate');
hideById('endDueDate');
+ jQuery('#delete_startDueDate').remove();
+ jQuery('#delete_endDueDate').remove();
jQuery('#startDueDate').datepicker("destroy");
jQuery('#endDueDate').datepicker("destroy");
}
@@ -44,7 +46,6 @@
function showActitityList()
{
- setFieldValue('listAll', "true");
hideById('listPatientDiv');
contentDiv = 'listPatientDiv';
@@ -90,7 +91,7 @@
// Patient program tracking
// --------------------------------------------------------------------
-function loadDataEntry( programStageInstanceId )
+function loadDataEntryDialog( programStageInstanceId )
{
$('#contentDataRecord' ).load("viewProgramStageRecords.action",
{
@@ -204,3 +205,23 @@
}
function entryFormContainerOnReady (){}
+
+// ----------------------------------------------------------------
+// Click Back to main form
+// ----------------------------------------------------------------
+
+function onClickBackBtn()
+{
+ hideById('patientDashboard');
+ hideById('editPatientDiv');
+ hideById('resultSearchDiv');
+ hideById('enrollmentDiv');
+ hideById('listRelationshipDiv');
+ hideById('addRelationshipDiv');
+ hideById('migrationPatientDiv');
+ showById('mainLinkLbl');
+ showById('selectDiv');
+ showById('listPatientDiv');
+ showActitityList();
+}
+
=== 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-02-28 09:32:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm 2013-03-04 14:05:33 +0000
@@ -30,7 +30,7 @@
</tr>
</table>
-<div id='advanced-search' class='hidden'>
+<div id='advanced-search' class='hidden advanced-search'>
<table>
<tr id='programStageAddPatientTR' class='hidden'>
<td>$i18n.getString('status')</td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2013-03-04 09:38:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2013-03-04 14:05:33 +0000
@@ -113,7 +113,7 @@
background-color: #FFCFCF
}
-#advanced-search
+.advanced-search
{
position: relative;
border: 1px solid #a4d2a3;
