dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22789
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11066: Rearranged the tracking program list.
------------------------------------------------------------
revno: 11066
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-05-29 11:50:23 +0700
message:
Rearranged the tracking program list.
modified:
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java
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/programTrackingRecords.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
--
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/patient/hibernate/HibernatePatientStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java 2013-05-28 09:04:10 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java 2013-05-29 04:50:23 +0000
@@ -610,7 +610,7 @@
if ( isPriorityEvent )
{
subSQL += ",pgi.followup ";
- orderBy = " ORDER BY pgi.followup desc, duedate asc ";
+ orderBy = " ORDER BY pgi.followup desc, p.patientid, p.firstname, p.middlename, p.lastname, duedate asc ";
patientGroupBy += ",pgi.followup ";
}
else
=== 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-28 09:04:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js 2013-05-29 04:50:23 +0000
@@ -1,4 +1,4 @@
-
+isAjax = true;
function orgunitSelected( orgUnits, orgUnitNames )
{
var width = jQuery('#programIdAddPatient').width();
@@ -93,7 +93,6 @@
setInnerHTML('searchInforLbl',i18n_list_all_patients);
showById('colorHelpLink');
showById('listEventDiv');
- setTableStyles();
hideLoader();
});
}
=== 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-28 06:42:25 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm 2013-05-29 04:50:23 +0000
@@ -29,9 +29,7 @@
<col width='30%'/>
<thead>
<tr>
- <th>#</th>
<th>$i18n.getString('risk')</th>
- <th>$i18n.getString('date_scheduled')</th>
<th>$i18n.getString('full_name')</th>
<th>$i18n.getString('phone_number')</th>
<th>$i18n.getString( "events" )</th>
@@ -39,15 +37,15 @@
</tr>
</thead>
<tbody id="list">
- #set( $mark = false )
+ #set($patientId='')
+ #set($count=1)
+ #set($class='listRow')
+ #set($alterclass='listAlternateRow')
#foreach( $programStageInstance in $programStageInstances )
#set($patient = $programStageInstance.programInstance.patient)
- <tr id='tr$programStageInstance.id'>
- <td>
- #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount )
- $nr
- </td>
- <td>
+ <tr>
+ #if( $patientId != $patient.id )
+ <td name="infor_$patient.id" class='$class'>
#set( $comment = $!programStageInstance.programInstance.patientComment.commentText )
#if( $$!programStageInstance.programInstance.followup == 'true')
<img src='../images/marked.png' alt='$comment'>
@@ -55,15 +53,8 @@
<img src='../images/unmarked.png'>
#end
</td>
- <td>
- #if($!programStageInstance.executionDate)
- $format.formatDate($!programStageInstance.executionDate)
- #else
- $format.formatDate($!programStageInstance.dueDate)
- #end
- </td>
- <td><a href="javascript:isDashboard=false;showPatientDashboardForm( '$patient.id' )">
+ <td name='infor_$patient.id' class='$class'><a href="javascript:isDashboard=false;showPatientDashboardForm( '$patient.id' )">
#set($value="")
#foreach( $identifierType in $identifierTypes)
#foreach( $identifier in $patient.identifiers)
@@ -79,16 +70,45 @@
$value
</a></td>
- <td>$!patient.phoneNumber</td>
-
- <td><a href="javascript:programTrackingList( $programStageInstance.id, false );">$programStageInstance.programStage.displayName</a></td>
-
- <td>
+ <td name='infor_$patient.id' class='$class'>$!patient.phoneNumber</td>
+ #set($rowspan=1)
+ #if($class=='listRow')
+ #set($class='listAlternateRow')
+ #set($alterclass='listRow')
+ #else
+ #set($class='listRow')
+ #set($alterclass='listAlternateRow')
+ #end
+ #else
+ #set($rowspan=$rowspan+1)
+ <script>
+ jQuery("[name=infor_" + "$patient.id]").attr('rowspan',$rowspan)
+ </script>
+ #end
+
+ <td class='$alterclass'>
+ <a href="javascript:programTrackingList( $programStageInstance.id, false );">
+ $programStageInstance.programStage.displayName
+ (#if($!programStageInstance.executionDate)
+ $format.formatDate($!programStageInstance.executionDate)
+ #else
+ $format.formatDate($!programStageInstance.dueDate)
+ #end)
+ </a>
+ </td>
+
+ #if( $patientId != $patient.id )
+ <td class='$alterclass' name='opt_$patient.id'>
<a href="javascript:isDashboard=false;showPatientDashboardForm( '$patient.id' )" title="$i18n.getString( 'patient_dashboard' )"><img src="../images/enroll.png" alt='$i18n.getString( "patient_dashboard" )'></a>
- <a href="javascript:programTrackingList( $programStageInstance.id, false );" title="$i18n.getString( 'reschedule_and_set_status' )"><img src="images/data_entry.png" alt="$i18n.getString( 'reschedule_and_set_status' )"></a>
<a href="javascript:showPatientHistory('$patient.id')" title='$i18n.getString( "patient_details_and_history" )'><img src="../images/information.png" alt='$i18n.getString( "patient_details_and_history" )'></a>
</td>
+ #else
+ <script>
+ jQuery("[name=opt_" + "$patient.id]").attr('rowspan',$rowspan)
+ </script>
+ #end
+ #set( $patientId = $patient.id )
</tr>
#end
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2013-05-29 02:44:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2013-05-29 04:50:23 +0000
@@ -140,7 +140,7 @@
F_RELATIONSHIPTYPE_ADD=Add Relationship Type
F_ORGANISATION_REGISTRATION=Organisation Unit Registration
F_PATIENT_REMOVE_EMPTY_EVENTS=Remove Empty Person Events
-F_ACCESS_PATIENT_ATTRIBUTES = Search Persons By Patient Attributes
+F_ACCESS_PATIENT_ATTRIBUTES = View and search Person identifiers
F_PATIENTATTRIBUTE_ADD=Add Person Attribute
F_PATIENTATTRIBUTE_UPDATE=Update Person Attribute
F_PATIENTATTRIBUTE_DELETE=Delete Person Attribute
