dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #21219
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9974: Add css for visit schedule result.
------------------------------------------------------------
revno: 9974
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-03-05 12:09:03 +0700
message:
Add css for visit schedule result.
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/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/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-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-05 04:09:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm 2013-03-05 05:09:03 +0000
@@ -9,63 +9,64 @@
</table>
#if( $programStageInstances && $programStageInstances.size()>0 )
-<div class='visit-schedule' height='100%'>
- <table class='listTable'>
- <col/>
- <col/>
- <col width='30%'/>
- <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($patient = $programStageInstance.programInstance.patient)
- <tr #alternate( $mark )>
- <td>
- #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount )
- $nr
- </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' )">
- #set($value="")
- #foreach( $identifierType in $identifierTypes)
- #foreach( $identifier in $patient.identifiers)
- #if($identifier.identifierType.id==$identifierType.id)
- #set($value=$identifier.identifier)
- #end
+
+<table class='listTable gridTable'>
+ <col/>
+ <col/>
+ <col width='30%'/>
+ <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>
+ <tbody id="list">
+ #set( $mark = false )
+ #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>
+ #if($!programStageInstance.executionDate)
+ $format.formatDate($!programStageInstance.executionDate)
+ #else
+ $format.formatDate($!programStageInstance.dueDate)
+ #end
+ </td>
+
+ <td><a href="javascript:isDashboard=false;showPatientDashboardForm( '$patient.id' )">
+ #set($value="")
+ #foreach( $identifierType in $identifierTypes)
+ #foreach( $identifier in $patient.identifiers)
+ #if($identifier.identifierType.id==$identifierType.id)
+ #set($value=$identifier.identifier)
#end
#end
- #if($value=="")
- #set($value=$patient.getFullName())
- #end
-
- $value
- </a></td>
-
- <td>$!patient.phoneNumber</td>
-
- <td><a href="javascript:loadDataEntryDialog( $programStageInstance.id );">$programStageInstance.programStage.displayName</a></td>
-
- </tr>
- #set( $mark = !$mark )
- #end
-
- <div class="paging-container">
- #parse( "/dhis-web-commons/paging/paging.vm" )
- </div>
+ #end
+ #if($value=="")
+ #set($value=$patient.getFullName())
+ #end
+
+ $value
+ </a></td>
+
+ <td>$!patient.phoneNumber</td>
+
+ <td><a href="javascript:loadDataEntryDialog( $programStageInstance.id );">$programStageInstance.programStage.displayName</a></td>
+
+ </tr>
+ #set( $mark = !$mark )
+ #end
+ </tbody>
+</table>
+<div class="paging-container">
+ #parse( "/dhis-web-commons/paging/paging.vm" )
</div>
<div id="detailsInfo"></div>
=== 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-04 14:05:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2013-03-05 05:09:03 +0000
@@ -66,8 +66,8 @@
<tr id='minimized-advanced-search' class="hidden">
<td align='right' colspan='5' height="50px">
$i18n.getString('you_have_active_filters')
- <input type="button" class='large-button' value="$i18n.getString('show_all')" onclick='showFilterForm()'>
- <input type="button" class='large-button' value="$i18n.getString('clear_all')" onclick='removeAllOption()'>
+ <input type="button" class='normal-button' value="$i18n.getString('show_all')" onclick='showFilterForm()'>
+ <input type="button" class='normal-button' value="$i18n.getString('clear_all')" onclick='removeAllOption()'>
</td>
</tr>
</table>
@@ -94,7 +94,7 @@
</td>
<td>
<input type="text" id="searchText" name="searchText" value="$!searchText">
- <input type="button" class='large-button' name="clearSearchBtn" value='$i18n.getString( "clear" )' onclick="removeAttributeOption('advSearchBox0');" disabled>
+ <input type="button" class='normal-button' name="clearSearchBtn" value='$i18n.getString( "clear" )' onclick="removeAttributeOption('advSearchBox0');" disabled>
</td>
</tr>
@@ -102,8 +102,8 @@
<tfoot>
<tr>
<td colspan="2">
- <input type="button" class='large-button' id='addSearchOptionBtn' name='addSearchOptionBtn' value="$i18n.getString('add')" onclick='addAttributeOption()' />
- <input type="button" class='large-button' id='clearAllBtn' name='clearAllBtnaddSearchOptionBtn' value="$i18n.getString('clear_all')" onclick='removeAllOption()' />
+ <input type="button" class='normal-button' id='addSearchOptionBtn' name='addSearchOptionBtn' value="$i18n.getString('add')" onclick='addAttributeOption()' />
+ <input type="button" class='normal-button' id='clearAllBtn' name='clearAllBtnaddSearchOptionBtn' value="$i18n.getString('clear_all')" onclick='removeAllOption()' />
</td>
</tr>
</tfoot>
=== 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-05 04:09:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2013-03-05 05:09:03 +0000
@@ -38,7 +38,7 @@
hideById('startDueDate');
hideById('endDueDate');
jQuery('#delete_endDueDate').remove();
- jQuery('#delete_endDueDate').remove();
+ jQuery('#delete_startDueDate').remove();
jQuery('#startDueDate').datepicker("destroy");
jQuery('#endDueDate').datepicker("destroy");
}
@@ -68,7 +68,7 @@
{
showById('colorHelpLink');
showById('listPatientDiv');
- resize();
+ setTableStyles();
hideLoader();
});
}
@@ -114,6 +114,33 @@
});
}
+
+function statusEventOnChange()
+{
+ if( !byId('useCalendar').checked )
+ {
+ var statusEvent = getFieldValue("statusEvent");
+
+ if( statusEvent == '1_2_3_4'
+ || statusEvent == '3_4'
+ || statusEvent == '2_3_4' ){
+ enable('showEventSince');
+ enable('showEventUpTo');
+ setDateRange();
+ }
+ else if( statusEvent == '3' ){
+ disable('showEventSince');
+ enable('showEventUpTo');
+ setDateRange();
+ }
+ else{
+ enable('showEventSince');
+ disable('showEventUpTo');
+ setDateRange();
+ }
+ }
+}
+
function setDateRange()
{
var statusEvent = getFieldValue("statusEvent");
=== 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 14:05:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2013-03-05 05:09:03 +0000
@@ -504,7 +504,7 @@
}
.gridTable th, .gridTable td {
- line-height: 170%;
+ line-height: 200%;
}
/* Treepanel contextmenu */
@@ -527,22 +527,3 @@
.coordinates2{
width: 150px;
}
-
-
-.visit-schedule
-{
- overflow-y: auto;
- overflow-x:hidden;
-}
-
-.visit-schedule table
-{
- width:100%;
-}
-
-.visit-schedule td
-{
- padding-top:3px;
- padding-bottom:3px;
- border-bottom:1px solid #cad5e5;
-}
