dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22424
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10768: When to click on person list button, just display system identifiers instead of private informati...
------------------------------------------------------------
revno: 10768
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-05-06 15:28:39 +0700
message:
When to click on person list button, just display system identifiers instead of private information in visit schedule, program tracking, data entry forms.
modified:
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/dataRecordingSelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.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/webapp/dhis-web-caseentry/activityPlanRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm 2013-04-15 07:46:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm 2013-05-06 08:28:39 +0000
@@ -16,8 +16,14 @@
<th>#</th>
<th>$i18n.getString('date_scheduled')</th>
<th>$i18n.getString('orgunit')</th>
+
+ #if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
<th>$i18n.getString('full_name')</th>
<th>$i18n.getString('phone_number')</th>
+ #else
+ <th>$i18n.getString('system_identifier')</th>
+ #end
+
<th>$i18n.getString('program_stage')</th>
<th>$i18n.getString('operations')</th>
</tr>
@@ -48,6 +54,7 @@
#end
</td>
+ #if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
<td><a href="javascript:isDashboard=false;showPatientDashboardForm( '$patient.id' )">
#set($value="")
#foreach( $identifierType in $identifierTypes)
@@ -65,6 +72,18 @@
</a></td>
<td>$!patient.phoneNumber</td>
+ #else
+ #set($value="")
+ #foreach( $identifier in $patient.identifiers)
+ #if($!identifier.identifierType)
+ #else
+ #set($value=$identifier.identifier)
+ #end
+ #end
+ <td><a href="javascript:isDashboard=false;showPatientDashboardForm( '$patient.id' )">
+ $value
+ </a></td>
+ #end
<td><a href="javascript:loadDataEntryDialog( $programStageInstance.id, '$programStageInstance.programStage.uid' );">$programStageInstance.programStage.displayName</a></td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2013-05-06 08:28:39 +0000
@@ -4,18 +4,32 @@
<tr>
<td valign="top">
<table>
- <tr>
- <td class="bold">$i18n.getString( "full_name" ):</td>
- <td>$encoder.htmlEncode( $patient.getFullName() )<td>
- </tr>
- <tr>
- <td class="bold">$i18n.getString( "gender" ):</td>
- <td>$i18n.getString( $patient.gender )</td>
- </tr>
- <tr>
- <td class="bold">$i18n.getString( "date_of_birth" ):</td>
- <td>$format.formatDate( $patient.birthDate ) ($patient.getAge())<td>
- </tr>
+ #if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
+ <tr>
+ <td class="bold">$i18n.getString( "full_name" ):</td>
+ <td>$encoder.htmlEncode( $patient.getFullName() )<td>
+ </tr>
+ <tr>
+ <td class="bold">$i18n.getString( "gender" ):</td>
+ <td>$i18n.getString( $patient.gender )</td>
+ </tr>
+ <tr>
+ <td class="bold">$i18n.getString( "date_of_birth" ):</td>
+ <td>$format.formatDate( $patient.birthDate ) ($patient.getAge())<td>
+ </tr>
+ #else
+ #set($value="")
+ #foreach( $identifier in $patient.identifiers)
+ #if($!identifier.identifierType)
+ #else
+ #set($value=$identifier.identifier)
+ #end
+ #end
+ <tr>
+ <td class="bold">$i18n.getString('system_identifier'):</td>
+ <td>$value</td>
+ </tr>
+ #end
</table>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm 2013-03-15 08:28:14 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm 2013-05-06 08:28:39 +0000
@@ -28,8 +28,14 @@
<tr>
<th>#</th>
<th>$i18n.getString('date_scheduled')</th>
+
+ #if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
<th>$i18n.getString('full_name')</th>
<th>$i18n.getString('phone_number')</th>
+ #else
+ <th>$i18n.getString('system_identifier')</th>
+ #end
+
<th>$i18n.getString( "program_stage" )</th>
<th>$i18n.getString( "operations" )</th>
</tr>
@@ -52,6 +58,7 @@
#end
</td>
+ #if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
<td><a href="javascript:isDashboard=false;showPatientDashboardForm( '$patient.id' )">
#set($value="")
#foreach( $identifierType in $identifierTypes)
@@ -70,6 +77,19 @@
<td>$!patient.phoneNumber</td>
+ #else
+ #set($value="")
+ #foreach( $identifier in $patient.identifiers)
+ #if($!identifier.identifierType)
+ #else
+ #set($value=$identifier.identifier)
+ #end
+ #end
+ <td><a href="javascript:isDashboard=false;showPatientDashboardForm( '$patient.id' )">
+ $value
+ </a></td>
+ #end
+
<td><a href="javascript:loadDataEntryDialog( $programStageInstance.id );">$programStageInstance.programStage.displayName</a></td>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm 2013-02-13 15:58:32 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm 2013-05-06 08:28:39 +0000
@@ -27,11 +27,13 @@
<table class="listTable">
<colgroup>
<col width="40"/>
- #foreach( $identifierType in $identifierTypes) <col/> #end
+ #if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
+ #foreach( $identifierType in $identifierTypes) <col/> #end
#if( $identifierTypes.size()==0 ) <col/> #end
<col width="60"/>
<col width="110"/>
<col width="60"/>
+ #end
#if($mapPatientOrgunit.size()!=0) <col/> #end
<col/>
<col width="80"/>
@@ -40,16 +42,22 @@
<thead>
<tr>
<th>#</th>
- #foreach( $identifierType in $identifierTypes)
- <th>$encoder.htmlEncode($identifierType.displayName)</th>
+ #if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
+ #foreach( $identifierType in $identifierTypes)
+ <th>$encoder.htmlEncode($identifierType.displayName)</th>
+ #end
+
+ #if( $identifierTypes.size()==0 )
+ <th>$i18n.getString( "full_name" )</th>
+ #end
+ <th>$i18n.getString( "gender" )</th>
+ <th>$i18n.getString( "date_of_birth" )</th>
+ <th>$i18n.getString( "age" )</th>
+ <th class="{sorter: false}">$i18n.getString( "phone_number" )</th>
+ #else
+ <th>$i18n.getString('system_identifier')</th>
#end
- #if( $identifierTypes.size()==0 )
- <th>$i18n.getString( "full_name" )</th>
- #end
- <th>$i18n.getString( "gender" )</th>
- <th>$i18n.getString( "date_of_birth" )</th>
- <th>$i18n.getString( "age" )</th>
- <th class="{sorter: false}">$i18n.getString( "phone_number" )</th>
+
#if($mapPatientOrgunit.size()!=0)
<th>$i18n.getString( "hierachy_orgunit" )</th>
#end
@@ -64,30 +72,45 @@
#set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount )
$nr
</td>
- #set($value="")
- #foreach( $identifierType in $identifierTypes)
+
+ #if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
+ #set($value="")
+ #foreach( $identifierType in $identifierTypes)
+ #foreach( $identifier in $patient.identifiers)
+ #if($identifier.identifierType.id==$identifierType.id)
+ #set($value=$identifier.identifier)
+ #end
+ #end
+ #end
+ #if($value=="")
+ #set($value=$patient.getFullName())
+ #end
+ <td style="cursor:pointer;" onclick="javascript:showUpdatePatientForm('$patient.id');">
+ <a>$encoder.htmlEncode($value)</a>
+ </td>
+ <td>
+ $i18n.getString( $patient.gender )
+ </td>
+ <td>
+ $format.formatDate( $patient.birthDate )
+ </td>
+ <td>
+ $encoder.htmlEncode( $patient.getAge() )
+ </td>
+ <td>$!patient.phoneNumber</td>
+ #else
+ #set($value="")
#foreach( $identifier in $patient.identifiers)
- #if($identifier.identifierType.id==$identifierType.id)
+ #if($!identifier.identifierType)
+ #else
#set($value=$identifier.identifier)
#end
#end
- #end
- #if($value=="")
- #set($value=$patient.getFullName())
- #end
- <td style="cursor:pointer;" onclick="javascript:showUpdatePatientForm('$patient.id');">
- <a>$encoder.htmlEncode($value)</a>
- </td>
- <td>
- $i18n.getString( $patient.gender )
- </td>
- <td>
- $format.formatDate( $patient.birthDate )
- </td>
- <td>
- $encoder.htmlEncode( $patient.getAge() )
- </td>
- <td>$!patient.phoneNumber</td>
+ <td style="cursor:pointer;" onclick="javascript:showUpdatePatientForm('$patient.id');">
+ <a>$value</a>
+ </td>
+ #end
+
#if($mapPatientOrgunit.size()!=0)
<td>$!mapPatientOrgunit.get($patient.id)</td>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm 2013-05-06 07:12:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm 2013-05-06 08:28:39 +0000
@@ -39,13 +39,12 @@
<col/>
<col/>
<col/>
- <col/>
#end
+ <col/>
#if($mapPatientOrgunit.size()!=0)
<col/>
#end
- <col/>
<col width="200"/>
<thead>
@@ -72,6 +71,7 @@
#else
<th>$i18n.getString("system_identifier")</th>
#end
+
#if($mapPatientOrgunit.size()!=0)
<th>$i18n.getString( "hierachy_orgunit" )</th>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm 2013-04-13 07:22:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm 2013-05-06 08:28:39 +0000
@@ -9,10 +9,11 @@
<input type='hidden' id='ps_$programStageInstance.id' name='ps_$programStageInstance.id' programStageName='$programStageInstance.programStage.displayName' >
<div class='dashboard-area'>
+ #set($status = $programStageInstance.getEventStatus())
+ #if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
<div class="link-area" style="height:200px">
<p class='header'>$i18n.getString("demographics")</p>
<div class="contentProviderTable" style="height:200px">
- #set($status = $programStageInstance.getEventStatus())
<table>
<tr>
<td class="bold">$i18n.getString( "full_name" ):</td>
@@ -45,6 +46,7 @@
</table>
</div>
</div>
+ #end
<div class="link-area-tracking">
<p class='header'>
