dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7092
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-05-30 13:36:41 +0700
message:
  (patient) Add filter fields for indentifiers and attributes in TB.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/report.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/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-05-29 07:37:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-05-30 06:36:41 +0000
@@ -1000,7 +1000,19 @@
 					name: r.data.id,
 					sortable: false,
 					draggable: false,
-					hidden: eval(TR.value.columns[index].hidden )
+					hidden: eval(TR.value.columns[index].hidden ),
+					editor: {
+						xtype: TR.value.columns[index].valueType,
+						queryMode: 'local',
+						editable: true,
+						valueField: 'name',
+						displayField: 'name',
+						allowBlank: true,
+						store:  new Ext.data.ArrayStore({
+							fields: ['name'],
+							data: TR.value.columns[index].suggested
+						})
+					}
 				}
 			});
 			

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm	2012-05-29 07:37:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm	2012-05-30 06:36:41 +0000
@@ -35,7 +35,7 @@
 update:'$encoder.jsEscape($i18n.getString( 'update' ) , "'")',
 et_no_data:'$encoder.jsEscape($i18n.getString( 'et_no_data' ) , "'")',
 em_no_orgunits:'$encoder.jsEscape($i18n.getString( 'em_no_orgunits' ) , "'")',
-organisation_unit:'$encoder.jsEscape($i18n.getString( 'organisation_units' ) , "'")',
+organisation_units:'$encoder.jsEscape($i18n.getString( 'organisation_units' ) , "'")',
 commons:'$encoder.jsEscape($i18n.getString( 'commons' ) , "'")',
 options:'$encoder.jsEscape($i18n.getString( 'options' ) , "'")',
 reset:'$encoder.jsEscape($i18n.getString( 'reset' ) , "'")',

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm	2012-03-09 01:56:35 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm	2012-05-30 06:36:41 +0000
@@ -5,36 +5,20 @@
 <tr>
     <td style="vertical-align:top">    
     <table class="listTable">
-        <col/>
-        #foreach( $programStage in $program.programStages )
-		<col/>
-        #end       
-        <tr>
-			<th>#</th>
-            <th style="text-align:center">$i18n.getString( "full_name" )</th>
-            #foreach( $programStage in $program.programStages )
-                <th style="text-align:center">$encoder.htmlEncode( $programStage.name )</th>
-            #end                
-        </tr>
-      
-        <tbody id="list">
+        <tbody id="list" style="width:300px; overflow:auto;">
             #set( $mark = false )                 
             #foreach( $programInstance in $programInstances )
                 <tr #alternate( $mark )>                
-                    <td>
-						#set( $nr = ( ( $paging.getCurrentPage() - 1  ) * $paging.pageSize ) + $velocityCount )
-						$nr
-					</td>
-					<td><a href="javascript:showPatientHistory( $programInstance.patient.id )" title='$i18n.getString( "patient_details_and_history" )'>$programInstance.patient.getFullName()</a></td>                    
+					<td>
+						<a href="javascript:showPatientHistory( $programInstance.patient.id )" title='$i18n.getString( "patient_details_and_history" )'>$programInstance.patient.getFullName()</a>
+					</td>				
                     #foreach( $programStageInstance in $programInstance.programStageInstances )
-                        #if( $programStageInstance.executionDate )
-                            <td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">
-                                <a href="javascript:viewRecords( $programStageInstance.id )">
-                                $format.formatDate( $programStageInstance.executionDate )
-                            </td>
-                        #else
-                            <td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">$format.formatDate( $programStageInstance.dueDate ) </td>
-                        #end
+						<td>
+							<img src='images/rightarrow.png'>
+						</td>
+						<td width='100px;'>
+							<input type='button' class='buttonInfo' style='border-color:$colorMap.get( $programStageInstance.id );' value='$programStageInstance.programStage.name $format.formatDate( $programStageInstance.dueDate )' onclick='javascript:viewRecords( $programStageInstance.id )'>
+						</td>
                     #end
                 </tr>
                 #if( $mark )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/report.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/report.css	2012-04-11 06:25:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/report.css	2012-05-30 06:36:41 +0000
@@ -56,4 +56,14 @@
 .visible
 {
 	display: block;
+}
+
+.buttonInfo
+{
+	width: 100px;
+	height: 40px;
+    white-space: normal;
+	border:2px solid; 
+	background-color:#ffffff;
+	cursor:pointer;
 }
\ No newline at end of file