dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17094
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6703: (patient) Minor fix for tabular report.
------------------------------------------------------------
revno: 6703
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-04-23 19:19:27 +0700
message:
(patient) Minor fix for tabular report.
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/webapp/dhis-web-caseentry/app/app.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/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 2012-04-19 10:02:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2012-04-23 12:19:27 +0000
@@ -411,8 +411,6 @@
}
}
-
-
// Identifier types
if ( idens != null && idens.size() > 0 )
{
=== 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 2012-04-18 04:03:50 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2012-04-23 12:19:27 +0000
@@ -252,9 +252,7 @@
String sqlATTR = " select distinct psi.programstageinstanceid from patientdatavalue pdv "
+ "inner join programstageinstance psi on pdv.programstageinstanceid=psi.programstageinstanceid ";
String sqlDE = " select distinct psi.programstageinstanceid from patientdatavalue pdv "
- + "inner join programstageinstance psi on pdv.programstageinstanceid=psi.programstageinstanceid "
- + "INNER JOIN patientattributevalue as pav ON pav.patientid = p.patientid "
- + "INNER JOIN patientattribute as pa ON pa.patientattributeid = pav.patientattributeid ";
+ + "inner join programstageinstance psi on pdv.programstageinstanceid=psi.programstageinstanceid ";
String condition = "FROM patientdatavalue pdv "
+ "INNER JOIN programstageinstance psi ON pdv.programstageinstanceid=psi.programstageinstanceid "
+ "INNER JOIN programinstance pi ON pi.programinstanceid=psi.programinstanceid ";
=== 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-04-23 06:31:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2012-04-23 12:19:27 +0000
@@ -610,9 +610,14 @@
for( var i=0; i<colLen; i++ )
{
var col = cols[i];
- if( col.name )
- {
- var dataIndex = col.dataIndex;
+ var dataIndex = col.dataIndex;
+
+ if( dataIndex== 'col1' )
+ {
+ p.searchingValues.push( col.name + col.hidden + "_" );
+ }
+ else if( col.name )
+ {
var value = editor.data[dataIndex];
if( value!=null && value!= '')
{
@@ -948,7 +953,7 @@
// grid
this.datatable = Ext.create('Ext.grid.Panel', {
- height: TR.util.viewport.getSize().y - 68,
+ height: TR.util.viewport.getSize().y - 60,
columns: cols,
scroll: 'both',
title: TR.cmp.settings.program.rawValue + " - " + TR.cmp.params.programStage.rawValue + " " + TR.i18n.report,
@@ -961,48 +966,6 @@
}
}
},
- lbar: [
- {
- xtype: 'label',
- style: 'padding:45px 3px 3 0px',
- },
- {
- xtype: 'button',
- icon: 'images/clearFilter.png',
- tooltip: TR.i18n.clear_filter,
- handler: function() {
- var cols = [];
- var grid = TR.datatable.datatable;
- var i = 0;
- for( var index=0; index<grid.columns.length; index++)
- {
- var col = grid.columns[index];
-
- cols[i] = col;
- i++;
-
- var subCols = col.items;
- for( var subIndex=0; subIndex<subCols.length; subIndex++)
- {
- cols[i] = subCols.getAt(subIndex);
- i++;
- }
- }
-
- var editor = grid.getStore().getAt(0);
- var colLen = cols.length;
- for( var i=1; i<colLen; i++ )
- {
- var col = cols[i];
- var dataIndex = col.dataIndex;
- TR.store.datatable.first().data[dataIndex] = "";
- }
-
- TR.exe.execute();
- }
- }
-
- ],
bbar: [
{
xtype: 'button',
@@ -1110,15 +1073,43 @@
TR.exe.execute();
}
}
+
}
})
],
store: TR.store.datatable
,listeners: {
- celldblclick: function(grid,rowIndex,cellIndex,e){
- if( rowIndex==0 && cellIndex==0 )
+ cellclick: function ( o, idx, colIdx, e ) {
+ if ( e.index == 0 && colIdx == 1 )
{
- grid.getView().focusRow(this.rowIndex);
+ var cols = [];
+ var grid = TR.datatable.datatable;
+ var i = 0;
+ for( var index=0; index<grid.columns.length; index++)
+ {
+ var col = grid.columns[index];
+
+ cols[i] = col;
+ i++;
+
+ var subCols = col.items;
+ for( var subIndex=0; subIndex<subCols.length; subIndex++)
+ {
+ cols[i] = subCols.getAt(subIndex);
+ i++;
+ }
+ }
+
+ var editor = grid.getStore().getAt(0);
+ var colLen = cols.length;
+ for( var i=1; i<colLen; i++ )
+ {
+ var col = cols[i];
+ var dataIndex = col.dataIndex;
+ TR.store.datatable.first().data[dataIndex] = "";
+ }
+
+ TR.exe.execute();
}
}
}
@@ -2019,7 +2010,7 @@
id: 'center',
region: 'center',
layout: 'fit',
- bodyStyle: 'padding-top:5px',
+ bodyStyle: 'padding-top:0px, padding-bottom:0px',
tbar: {
xtype: 'toolbar',
cls: 'tr-toolbar',
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css 2012-04-19 18:09:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css 2012-04-23 12:19:27 +0000
@@ -676,3 +676,5 @@
font-style: italic;
font-weight: weight;
}
+
+
