[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1294: Added java_opts value to about page.

2010-01-04 Thread noreply 

revno: 1294
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Mon 2010-01-04 13:33:03 +0100
message:
  Added java_opts value to about page.
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm
  
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/LockSelectedOrganisationUnitAction.java


--
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-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java	2009-12-24 10:42:32 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java	2010-01-04 12:33:03 +
@@ -36,7 +36,6 @@
 import java.util.Set;
 
 import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.datalock.DataSetLock;
 import org.hisp.dhis.i18n.I18nService;
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.source.Source;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm	2009-03-03 16:46:36 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm	2010-01-04 12:33:03 +
@@ -10,4 +10,5 @@
   dt$i18n.getString( database_type ):/dtdd$!info.type/dd
   dt$i18n.getString( database_name ):/dtdd$!info.name/dd
   dt$i18n.getString( database_user ):/dtdd$!info.user/dd
+  dt$i18n.getString( java_opts ):/dtdd$!javaOpts/dd
 /dl

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java	2009-08-20 08:17:49 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java	2010-01-04 12:33:03 +
@@ -123,6 +123,13 @@
 return info;
 }
 
+private String javaOpts;
+
+public String getJavaOpts()
+{
+return javaOpts;
+}
+
 // -
 // Action implementation
 // -
@@ -185,7 +192,16 @@
 // -
 
 info = provider.getDatabaseInfo();
-
+
+try
+{
+javaOpts = System.getenv( JAVA_OPTS );
+}
+catch ( SecurityException ex )
+{
+javaOpts = i18n.getString( unknown );
+}
+
 return SUCCESS;
 }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2009-12-21 05:32:40 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2010-01-04 12:33:03 +
@@ -213,6 +213,8 @@
 help_contents = Help Contents
 about_dhis2 = About DHIS 2
 user_account = User account
+unknown = Unknown
+java_opts = Java Opts
 
 #-- Change Log--#
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/LockSelectedOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/LockSelectedOrganisationUnitAction.java	2009-12-24 10:42:32 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/LockSelectedOrganisationUnitAction.java	2010-01-04 12:33:03 +
@@ -27,7 +27,6 @@
 package org.hisp.dhis.dataadmin.action.lock;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.commons.logging.Log;

___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1295: Added ZA jasper reports.

2010-01-04 Thread noreply 

revno: 1295
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Mon 2010-01-04 15:21:28 +0100
message:
  Added ZA jasper reports.
added:
  resources/jrxml/province_hiv_feedback.jrxml
  resources/jrxml/samoh.jrxml
  resources/za_hmis/
  resources/za_hmis/jrxml/
  resources/za_hmis/jrxml/immunisation.jrxml
  resources/za_hmis/jrxml/province_hiv_feedback.jrxml


--
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.
=== added file 'resources/jrxml/province_hiv_feedback.jrxml'
--- resources/jrxml/province_hiv_feedback.jrxml	1970-01-01 00:00:00 +
+++ resources/jrxml/province_hiv_feedback.jrxml	2010-01-04 14:21:28 +
@@ -0,0 +1,229 @@
+?xml version=1.0 encoding=UTF-8?
+jasperReport xmlns=http://jasperreports.sourceforge.net/jasperreports; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd; name=province_hiv_feedback language=groovy pageWidth=595 pageHeight=842 columnWidth=555 leftMargin=20 rightMargin=20 topMargin=20 bottomMargin=20
+	queryString
+		![CDATA[select * from _report_hiv_province_feedback;]]
+	/queryString
+	field name=periodid class=java.lang.Integer
+		fieldDescription![CDATA[]]/fieldDescription
+	/field
+	field name=organisationunitid class=java.lang.Integer
+		fieldDescription![CDATA[]]/fieldDescription
+	/field
+	field name=periodname class=java.lang.String
+		fieldDescription![CDATA[]]/fieldDescription
+	/field
+	field name=organisationunitname class=java.lang.String
+		fieldDescription![CDATA[]]/fieldDescription
+	/field
+	field name=reporting_month_name class=java.lang.String
+		fieldDescription![CDATA[]]/fieldDescription
+	/field
+	field name=transmission_rate class=java.lang.Double
+		fieldDescription![CDATA[]]/fieldDescription
+	/field
+	field name=hiv_test_rate_nonanc class=java.lang.Double
+		fieldDescription![CDATA[]]/fieldDescription
+	/field
+	field name=hiv_prev_nonanc class=java.lang.Double
+		fieldDescription![CDATA[]]/fieldDescription
+	/field
+	field name=hiv_testing_cov_ann class=java.lang.Double
+		fieldDescription![CDATA[]]/fieldDescription
+	/field
+	field name=hiv_client_testing_rate class=java.lang.Double
+		fieldDescription![CDATA[]]/fieldDescription
+	/field
+	background
+		band splitType=Stretch/
+	/background
+	title
+		band height=95 splitType=Stretch
+			staticText
+reportElement x=81 y=15 width=392 height=34 forecolor=#3C71B1/
+textElement textAlignment=Center
+	font size=20/
+/textElement
+text![CDATA[HIV Feedback Report]]/text
+			/staticText
+			staticText
+reportElement x=122 y=61 width=311 height=20/
+textElement textAlignment=Center
+	font size=10 isItalic=true pdfFontName=Helvetica-Oblique/
+/textElement
+text![CDATA[South Africa Ministry of Health]]/text
+			/staticText
+		/band
+	/title
+	pageHeader
+		band height=32 splitType=Stretch
+			staticText
+reportElement x=23 y=0 width=58 height=20/
+textElement
+	font size=8 isBold=true pdfFontName=Helvetica-Bold/
+/textElement
+text![CDATA[Month:]]/text
+			/staticText
+			textField
+reportElement x=81 y=0 width=130 height=20/
+textElement
+	font size=8 isBold=true pdfFontName=Helvetica-Bold/
+/textElement
+textFieldExpression class=java.lang.String![CDATA[$F{reporting_month_name}]]/textFieldExpression
+			/textField
+		/band
+	/pageHeader
+	columnHeader
+		band height=36 splitType=Stretch
+			staticText
+reportElement x=23 y=16 width=129 height=20/
+textElement
+	font size=8 isBold=true pdfFontName=Helvetica-Bold/
+/textElement
+text![CDATA[Province]]/text
+			/staticText
+			staticText
+reportElement x=152 y=16 width=80 height=20/
+textElement textAlignment=Center
+	font size=8 isBold=true pdfFontName=Helvetica-Bold/
+/textElement
+text![CDATA[Transmis rate 1 yr]]/text
+			/staticText
+			staticText
+reportElement x=233 y=16 width=80 height=20/
+textElement textAlignment=Center
+	font size=8 isBold=true pdfFontName=Helvetica-Bold/
+/textElement
+text![CDATA[Test rate ex ANC]]/text
+			/staticText
+			staticText
+reportElement x=313 y=16 width=80 height=20/
+textElement textAlignment=Center
+	font size=8 isBold=true pdfFontName=Helvetica-Bold/
+/textElement
+text![CDATA[Prevalence ex ANC]]/text
+			/staticText
+			staticText
+reportElement x=393 y=16 width=80 height=20/
+textElement textAlignment=Center
+	font size=8 isBold=true pdfFontName=Helvetica-Bold/
+/textElement
+text![CDATA[Testing coverage]]/text
+			/staticText
+			staticText
+reportElement x=473 y=16 width=80 height=20/
+textElement textAlignment=Center

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1296: Minor fix

2010-01-04 Thread noreply 

revno: 1296
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Tue 2010-01-05 00:44:45 +0100
message:
  Minor fix
removed:
  resources/jrxml/province_hiv_feedback.jrxml
  resources/jrxml/samoh.jrxml


--
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.
=== removed file 'resources/jrxml/province_hiv_feedback.jrxml'
--- resources/jrxml/province_hiv_feedback.jrxml	2010-01-04 14:21:28 +
+++ resources/jrxml/province_hiv_feedback.jrxml	1970-01-01 00:00:00 +
@@ -1,229 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-jasperReport xmlns=http://jasperreports.sourceforge.net/jasperreports; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd; name=province_hiv_feedback language=groovy pageWidth=595 pageHeight=842 columnWidth=555 leftMargin=20 rightMargin=20 topMargin=20 bottomMargin=20
-	queryString
-		![CDATA[select * from _report_hiv_province_feedback;]]
-	/queryString
-	field name=periodid class=java.lang.Integer
-		fieldDescription![CDATA[]]/fieldDescription
-	/field
-	field name=organisationunitid class=java.lang.Integer
-		fieldDescription![CDATA[]]/fieldDescription
-	/field
-	field name=periodname class=java.lang.String
-		fieldDescription![CDATA[]]/fieldDescription
-	/field
-	field name=organisationunitname class=java.lang.String
-		fieldDescription![CDATA[]]/fieldDescription
-	/field
-	field name=reporting_month_name class=java.lang.String
-		fieldDescription![CDATA[]]/fieldDescription
-	/field
-	field name=transmission_rate class=java.lang.Double
-		fieldDescription![CDATA[]]/fieldDescription
-	/field
-	field name=hiv_test_rate_nonanc class=java.lang.Double
-		fieldDescription![CDATA[]]/fieldDescription
-	/field
-	field name=hiv_prev_nonanc class=java.lang.Double
-		fieldDescription![CDATA[]]/fieldDescription
-	/field
-	field name=hiv_testing_cov_ann class=java.lang.Double
-		fieldDescription![CDATA[]]/fieldDescription
-	/field
-	field name=hiv_client_testing_rate class=java.lang.Double
-		fieldDescription![CDATA[]]/fieldDescription
-	/field
-	background
-		band splitType=Stretch/
-	/background
-	title
-		band height=95 splitType=Stretch
-			staticText
-reportElement x=81 y=15 width=392 height=34 forecolor=#3C71B1/
-textElement textAlignment=Center
-	font size=20/
-/textElement
-text![CDATA[HIV Feedback Report]]/text
-			/staticText
-			staticText
-reportElement x=122 y=61 width=311 height=20/
-textElement textAlignment=Center
-	font size=10 isItalic=true pdfFontName=Helvetica-Oblique/
-/textElement
-text![CDATA[South Africa Ministry of Health]]/text
-			/staticText
-		/band
-	/title
-	pageHeader
-		band height=32 splitType=Stretch
-			staticText
-reportElement x=23 y=0 width=58 height=20/
-textElement
-	font size=8 isBold=true pdfFontName=Helvetica-Bold/
-/textElement
-text![CDATA[Month:]]/text
-			/staticText
-			textField
-reportElement x=81 y=0 width=130 height=20/
-textElement
-	font size=8 isBold=true pdfFontName=Helvetica-Bold/
-/textElement
-textFieldExpression class=java.lang.String![CDATA[$F{reporting_month_name}]]/textFieldExpression
-			/textField
-		/band
-	/pageHeader
-	columnHeader
-		band height=36 splitType=Stretch
-			staticText
-reportElement x=23 y=16 width=129 height=20/
-textElement
-	font size=8 isBold=true pdfFontName=Helvetica-Bold/
-/textElement
-text![CDATA[Province]]/text
-			/staticText
-			staticText
-reportElement x=152 y=16 width=80 height=20/
-textElement textAlignment=Center
-	font size=8 isBold=true pdfFontName=Helvetica-Bold/
-/textElement
-text![CDATA[Transmis rate 1 yr]]/text
-			/staticText
-			staticText
-reportElement x=233 y=16 width=80 height=20/
-textElement textAlignment=Center
-	font size=8 isBold=true pdfFontName=Helvetica-Bold/
-/textElement
-text![CDATA[Test rate ex ANC]]/text
-			/staticText
-			staticText
-reportElement x=313 y=16 width=80 height=20/
-textElement textAlignment=Center
-	font size=8 isBold=true pdfFontName=Helvetica-Bold/
-/textElement
-text![CDATA[Prevalence ex ANC]]/text
-			/staticText
-			staticText
-reportElement x=393 y=16 width=80 height=20/
-textElement textAlignment=Center
-	font size=8 isBold=true pdfFontName=Helvetica-Bold/
-/textElement
-text![CDATA[Testing coverage]]/text
-			/staticText
-			staticText
-reportElement x=473 y=16 width=80 height=20/
-textElement textAlignment=Center
-	font size=8 isBold=true pdfFontName=Helvetica-Bold/
-/textElement
-text![CDATA[Test rate]]/text
-			/staticText
-		/band
-	/columnHeader
-

Re: [Dhis2-devs] Problems running DHIS 2 Live on Windows 7

2010-01-04 Thread Lars Helge Øverland 
2009/12/21 Lars Helge Øverland larshe...@gmail.com



 2009/12/21 Saptarshi Purkayastha sun...@gmail.com

 Hi Lars,

 The JRE release notes reads that Windows 7 support was added to 1.6.0_u16,
 so probably you need that one or newer... but I suspect 1.6.0_u14 also had
 added some Windows 7 support.

 You should try the 1.6.0_16 and higher JRE and probably the batch scripts
 need to run as administrator... rest it does work fine on Windows 7 32-bit
 as well.


 Thanks for the tip.. That computer is running update 17 so it shouldn't be
 that.. Will try to build a new executable.



The problem was unrelated to Win7, rather a weird port-already-in-use error.

Lars
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] Getting Locale Code

2010-01-04 Thread Viet Nguyen 
Hi,

I am trying to apply jQuery Validation plugin into dhis2 india branch.

For showing the error messages in different languages, I need a language
code. But could not find this code anywhere. So what I did is adding this
method  into I18n class:

public String getCurrentLocaleCode()
{
if( specificResourceBundle != null )
{
return specificResourceBundle.getLocale().getLanguage() + _ +
specificResourceBundle.getLocale().getCountry();
}
if( globalResourceBundle != null )
{
return globalResourceBundle.getLocale().getLanguage() + _ +
globalResourceBundle.getLocale().getCountry();
}
return null;
}

So ... is  this a good way ? If not, please suggest me a better way.

And I can also apply this plugin to global branch if you want.

Thanks,

-- 
Nguyen Pham Hoang Quoc Viet
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help   : https://help.launchpad.net/ListHelp

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1297: Improved function in Excel Reporting module.

2010-01-04 Thread noreply 

revno: 1297
committer: hieu hieu.hispviet...@gmail.com
branch nick: trunk
timestamp: Tue 2010-01-05 14:36:05 +0700
message:
  Improved function in Excel Reporting module.
+ Added a new method which is used to check ReportItem that is known as 
EXCEL FORMULA.
+ REQUIREMENT/RECOMMENDATION for creating a new report item ( EXCEL FORMULA 
) MUST use '$' simple in front of either any column or any row which is fixed 
from now, ie, $A$1 , $B10 , CT$36 , etc...
modified:
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportCategoryAction.java
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportOrganizationGroupListingAction.java
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/advance/action/GenerateAdvancedReportCategoryAction.java
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/advance/action/GenerateAdvancedReportOrgGroupListingAction.java
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExcelUtils.java


--
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-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportCategoryAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportCategoryAction.java	2009-12-21 11:09:00 +
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportCategoryAction.java	2010-01-05 07:36:05 +
@@ -84,6 +84,8 @@
 {
 for ( ReportExcelItem reportItem : reportExcelItems )
 {
+int iRow = 0;
+int iCol = 0;
 int rowBegin = reportItem.getRow();
 
 for ( DataElementGroupOrder dataElementGroup : reportExcel.getDataElementOrders() )
@@ -94,12 +96,12 @@
 if ( reportItem.getItemType().equalsIgnoreCase( ReportExcelItem.TYPE.DATAELEMENT_NAME ) )
 {
 ExcelUtils.writeValueByPOI( rowBegin, reportItem.getColumn(), String.valueOf( dataElementGroup
-.getName() ), ExcelUtils.TEXT, sheet, this.csText12BoldCenter );   
+.getName() ), ExcelUtils.TEXT, sheet, this.csText12BoldCenter );
 }
 else if ( reportItem.getItemType().equalsIgnoreCase( ReportExcelItem.TYPE.DATAELEMENT_CODE ) )
 {
 ExcelUtils.writeValueByPOI( rowBegin, reportItem.getColumn(), String.valueOf( dataElementGroup
-.getCode() ), ExcelUtils.TEXT, sheet, this.csText12BoldCenter ); 
+.getCode() ), ExcelUtils.TEXT, sheet, this.csText12BoldCenter );
 }
 
 rowBegin++;
@@ -125,8 +127,8 @@
 }
 else if ( reportItem.getItemType().equalsIgnoreCase( ReportExcelItem.TYPE.FORMULA_EXCEL ) )
 {
-ExcelUtils.writeFormulaByPOI( rowBegin, reportItem.getColumn(), reportItem.getExpression(),
-sheet, this.csFormula ); 
+ExcelUtils.writeFormulaByPOI( rowBegin, reportItem.getColumn(), ExcelUtils
+.checkingExcelFormula( reportItem.getExpression(), iRow, iCol ), sheet, this.csFormula );
 }
 else
 {
@@ -143,26 +145,25 @@
 newReportItem.setExpression( expression );
 
 double value = this.getDataValue( newReportItem, organisationUnit );
-
+
 ExcelUtils.writeValueByPOI( rowBegin, reportItem.getColumn(), String.valueOf( value ),
 ExcelUtils.NUMBER, sheet, this.csNumber );
-
+
 }
 rowBegin++;
 serial++;
+iRow++;
 }
 
 if ( reportItem.getItemType().equalsIgnoreCase( ReportExcelItem.TYPE.DATAELEMENT ) )
 {
 String columnName = ExcelUtils.convertColNumberToColName( reportItem.getColumn() );
 String formula = SUM( + columnName + (beginChapter + 1) + : + columnName + (rowBegin - 1) + );
-
-ExcelUtils.writeFormulaByPOI( beginChapter, reportItem.getColumn(), formula,
-sheet, this.csFormula );   
-   
+
+