[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5380: local vn
revno: 5380
committer: Hieu
branch nick: dhis2
timestamp: Tue 2011-12-13 14:46:57 +0700
message:
local vn
. Dataelement group order - Fixed problems in validation.
. Preview - Reduced in formatting number decimal.
removed:
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseDataElementGroupOrder.vm
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseImportItemValues.vm
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseImportItemValuesByCategory.vm
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseImportItemValuesByOrgunits.vm
added:
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementGroupOrder.vm
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/hibernate/HibernateDataElementGroupOrderStore.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/degroup/action/ValidateDataElementGroupOrderAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/NumberUtils.java
local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/configuration.vm
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/dataElementGroupOrder.js
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/preview.js
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/listDataElementGroupOrder.vm
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/dataelementExpressionBuilderForm.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-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm 2011-11-17 02:57:36 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm 2011-12-13 07:46:57 +
@@ -35,7 +35,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
$i18n.getString( "id" ):
$i18n.getString( "description" ):
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/hibernate/HibernateDataElementGroupOrderStore.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/hibernate/HibernateDataElementGroupOrderStore.java 2011-08-03 08:38:38 +
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/hibernate/HibernateDataElementGroupOrderStore.java 2011-12-13 07:46:57 +
@@ -68,7 +68,7 @@
{
Session session = sessionFactory.getCurrentSession();
-String sql = "SELECT * FROM reportexcel_dataelementgrouporders WHERE lower(name) LIKE :name";
+String sql = "SELECT * FROM reportexcel_dataelementgrouporders WHERE lower(name) = :name";
if ( clazzName.equals( ExportReport.class.getSimpleName() ) )
{
@@ -82,7 +82,7 @@
SQLQuery query = session.createSQLQuery( sql );
query.addEntity( DataElementGroupOrder.class );
-query.setString( "name", "%" + name.toLowerCase() + "%" ).setInteger( "reportId", reportId );
+query.setString( "name", name.toLowerCase() ).setInteger( "reportId", reportId );
return (DataElementGroupOrder) query.uniqueResult();
}
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/degroup/action/ValidateDataElementGroupOrderAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/degroup/action/ValidateDataElementGroupOrderAction.java 2011-08-03 08:38:38 +
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/degroup/action/ValidateDataElementGroupOrderAction.java 2011-12-13 07:46:57 +000
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5379: Nullpointer exception when changeing due-dates in a program-satge-instance.
revno: 5379
committer: Tran Chau
branch nick: dhis2
timestamp: Tue 2011-12-13 10:28:43 +0700
message:
Nullpointer exception when changeing due-dates in a program-satge-instance.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js
--
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/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2011-12-13 03:18:09 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2011-12-13 03:28:43 +
@@ -647,8 +647,8 @@
field.style.backgroundColor = '#cc';
- var dateSaver = new DateSaver( programStageInstanceId, field.value, '#ccffcc' );
- dateSaver.save();
+ var dateDueSaver = new DateDueSaver( programStageInstanceId, field.value, '#ccffcc' );
+ dateDueSaver.save();
}
//
@@ -746,7 +746,7 @@
// Saver objects
//-
-function DateSaver( programStageInstanceId_, dueDate_, resultColor_ )
+function DateDueSaver( programStageInstanceId_, dueDate_, resultColor_ )
{
var SUCCESS = '#ccffcc';
var ERROR = '#ff';
___
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 5378: Display the description of date of enrollment and date of incident instead of those fields.
revno: 5378
committer: Tran Chau
branch nick: dhis2
timestamp: Tue 2011-12-13 10:18:09 +0700
message:
Display the description of date of enrollment and date of incident instead of
those fields.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.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/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2011-12-06 17:41:41 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2011-12-13 03:18:09 +
@@ -470,9 +470,16 @@
disable('enrollBtn');
disable('enrollmentDate');
disable('dateOfIncident');
+
jQuery('#enrollBtn').attr('value',i18n_enroll_to_program);
+
setFieldValue( 'enrollmentDate', '' );
setFieldValue( 'dateOfIncident', '' );
+ setInnerHTML('enrollmentDateDescription', '');
+ setInnerHTML('dateOfIncidentDescription', '');
+
+ hideById('programEnrollmentDiv');
+
return;
}
@@ -491,12 +498,16 @@
disable('enrollBtn');
disable('enrollmentDate');
disable('dateOfIncident');
+setInnerHTML('enrollmentDateDescription', '');
+setInnerHTML('dateOfIncidentDescription', '');
}
else
{
enable('enrollBtn');
enable('enrollmentDate');
enable('dateOfIncident');
+showById('enrollmentDateTD');
+showById('dateOfIncidentTD');
}
jQuery('#loaderDiv').hide();
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm 2011-10-29 14:16:54 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm 2011-12-13 03:18:09 +
@@ -50,15 +50,13 @@
-
-
- $i18n.getString( "date_of_enrollment" ) *
- ( )
-
-
-
- $i18n.getString( "date_of_incident" ) *
- ( )
+
+ *
+
+
+
+ *
+
___
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] GIS not displaying in Opera 11.52
Strange effect even after clearing cache: With Opera 11.52, the 2.5 demo was working fine, but trying the below (2.6) link, nothing displayed: http://apps.dhis2.org/dev/dhis-web-mapping/mapping/index.html?view=1148533 Fortunately, things now look good again after I updated to the latest Opera, 11.60 -- Knut Staring Informatics, U. of Oslo http://hisp.uio.no +4791880522 ___ 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
Re: [Dhis2-devs] schema - anyone?
Oh, okay.There used to be one on our wiki those days. Thanks. Ime --- On Mon, 12/12/11, Knut Staring wrote: From: Knut Staring Subject: Re: [Dhis2-devs] schema - anyone? To: "Ime Asangansi" Cc: "Dhis2" Date: Monday, December 12, 2011, 4:17 PM Hi Ime, Not that I'm aware of, but perhaps you could have a go at SchemaSpy or one of the other tools linked to below?http://stackoverflow.com/questions/3223770/tools-to-generate-database-tables-diagram-with-postgresql Please let us know if you get it to work well. Knut On Mon, Dec 12, 2011 at 2:56 PM, Ime Asangansi wrote: Hi, Good day everyone. Please does anyone have a schema diagram of our latest version of the dhis db? Would be very appreciated. thanks Ime ___ 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 -- Knut StaringInformatics, U. of Oslohttp://hisp.uio.no+4791880522 ___ 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 5377: Map generation: fixed bug with legend colors
revno: 5377 committer: Lars Helge Overland branch nick: dhis2 timestamp: Mon 2011-12-12 22:39:45 +0100 message: Map generation: fixed bug with legend colors modified: dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapGenerationService.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-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapGenerationService.java' --- dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapGenerationService.java 2011-12-12 21:17:15 + +++ dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapGenerationService.java 2011-12-12 21:39:45 + @@ -7,6 +7,7 @@ import java.util.LinkedList; import java.util.List; +import org.apache.commons.lang.StringUtils; import org.hisp.dhis.aggregation.AggregatedMapValue; import org.hisp.dhis.mapgeneration.IntervalSet.DistributionStrategy; import org.hisp.dhis.mapping.MapView; @@ -128,9 +129,9 @@ // Get the low and high colors, typically in hexadecimal form, e.g. // '#ff3200' is an orange color -Color colorLow = Utilities.createColorFromString( mapView.getColorLow() != null ? mapView.getColorLow() +Color colorLow = Utilities.createColorFromString( StringUtils.trimToNull( mapView.getColorLow() ) != null ? mapView.getColorLow() : DEFAULT_COLOR_LOW ); -Color colorHigh = Utilities.createColorFromString( mapView.getColorHigh() != null ? mapView.getColorHigh() +Color colorHigh = Utilities.createColorFromString( StringUtils.trimToNull( mapView.getColorHigh() ) != null ? mapView.getColorHigh() : DEFAULT_COLOR_HIGH ); // TODO MapView should be extended to feature opacity ___ 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 5376: Map generation: proper handling for org units without coordinates
revno: 5376
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Mon 2011-12-12 22:17:15 +0100
message:
Map generation: proper handling for org units without coordinates
modified:
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapGenerationService.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-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapGenerationService.java'
--- dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapGenerationService.java 2011-12-09 10:29:57 +
+++ dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapGenerationService.java 2011-12-12 21:17:15 +
@@ -201,19 +201,21 @@
// Build internal map objects for each map value
for ( AggregatedMapValue mapValue : mapValues )
{
-mapObjects.add( buildSingleGeoToolsMapObjectForMapLayer( mapLayer, mapValue ) );
+// Get the org unit for this map value
+OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( mapValue.getOrganisationUnitId() );
+
+if ( orgUnit != null && orgUnit.hasCoordinates() )
+{
+mapObjects.add( buildSingleGeoToolsMapObjectForMapLayer( mapLayer, mapValue, orgUnit ) );
+}
}
return mapObjects;
}
private GeoToolsMapObject buildSingleGeoToolsMapObjectForMapLayer( InternalMapLayer mapLayer,
-AggregatedMapValue mapValue )
+AggregatedMapValue mapValue, OrganisationUnit orgUnit )
{
-
-// Get the org unit for this map value
-OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( mapValue.getOrganisationUnitId() );
-
// Create and setup an internal map object
GeoToolsMapObject mapObject = new GeoToolsMapObject();
mapObject.setName( orgUnit.getName() );
___
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 5375: Defined redirect for api index action
revno: 5375 committer: Lars Helge Overland branch nick: dhis2 timestamp: Mon 2011-12-12 20:10:59 +0100 message: Defined redirect for api index action modified: dhis-2/dhis-web/dhis-web-api/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties -- 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-api/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-api/src/main/resources/struts.xml 2011-12-12 11:18:21 + +++ dhis-2/dhis-web/dhis-web-api/src/main/resources/struts.xml 2011-12-12 19:10:59 + @@ -8,6 +8,7 @@ + ../api F_WEBAPI_CREATE, F_WEBAPI_READ, F_WEBAPI_UPDATE, F_WEBAPI_DELETE === 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 2011-11-21 12:44:20 + +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2011-12-12 19:10:59 + @@ -68,6 +68,7 @@ dhis-web-validationrule-local-in = Validation Analysis dhis-web-mapping = GIS dhis-web-visualizer = Data Visualizer +dhis-web-api = API dhis-web-survey = Survey - Target dhis-web-spreadsheet-reporting = Spreadsheet Reports dhis-web-mobile = Mobiles @@ -75,8 +76,6 @@ dhis-web-maintenance-in = Configuration dhis-web-excelimport = Data Integration dhis-web-linelisting-mp = Manpower -patient_attribute_group = Beneficiary Attribute Group -patient_attribute_group_management = Beneficiary Attribute Group Management #-- Common -# ___ 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 5374: Spanish file utf8-ified
revno: 5374 committer: Knut Staring branch nick: dhis2 timestamp: Mon 2011-12-12 18:52:49 +0100 message: Spanish file utf8-ified modified: dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_es_ES.properties -- 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-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_es_ES.properties' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_es_ES.properties 2011-11-24 16:13:46 + +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_es_ES.properties 2011-12-12 17:52:49 + @@ -1,9 +1,9 @@ -confirm_delete_message=¿Está seguro de querer eliminar el mensaje? +confirm_delete_message=\u00bfEst\u00e1 seguro de querer eliminar el mensaje? enter_subject=Por favor, introduzca un asunto enter_text=Por favor, introduzca texto details=Detalles map_view=Vistas de Mapa -mark_unread=Marcar como no leído +mark_unread=Marcar como no le\u00eddo messages=Mensajes sender=Remitente unread_message=Mensage no leido @@ -13,9 +13,9 @@ reply=Responder subject=Tema username=Nombre de Usuario -write_feedback=Escribir opinión +write_feedback=Escribir opini\u00f3n write_message=Escribir mensaje -write_new_feedback=Escribir nueva opinión +write_new_feedback=Escribir nueva opini\u00f3n write_new_message=Escribir nuevo mensaje olap_url=Enlace (URL) del OLAP rss_hiv_aids=rss VIH/SIDA @@ -29,4 +29,4 @@ rss_health=rss Salud rss_pregnancy=rss Maternidad insert=Insertar -close=Cerrar \ No newline at end of file +close=Cerrar ___ 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
Re: [Dhis2-devs] schema - anyone?
Hi Ime, Not that I'm aware of, but perhaps you could have a go at SchemaSpy or one of the other tools linked to below? http://stackoverflow.com/questions/3223770/tools-to-generate-database-tables-diagram-with-postgresql Please let us know if you get it to work well. Knut On Mon, Dec 12, 2011 at 2:56 PM, Ime Asangansi wrote: > Hi, > > Good day everyone. > > Please does anyone have a schema diagram of our latest version of the dhis > db? > > Would be very appreciated. > > thanks > > Ime > > ___ > 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 > -- Knut Staring Informatics, U. of Oslo http://hisp.uio.no +4791880522 ___ 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 5372: Minor fix
revno: 5372 committer: Knut Staring branch nick: dhis2 timestamp: Mon 2011-12-12 15:13:01 +0100 message: Minor fix modified: dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties -- 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-commons/src/main/resources/i18n_global_fr_FR.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties 2011-12-12 14:11:37 + +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties 2011-12-12 14:13:01 + @@ -1,4 +1,4 @@ -about = A propos +about = \u00c0 propos about_dhis2 = \u00c0 propos DHIS 2 access_denied = Acc\u00e8s refus\u00e9 access_denied_message = Vous n'etes pas autoris\u00e9 \u00e0 voir cette page. ___ 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 5371: Removed duplicate translations
revno: 5371 committer: Knut Staring branch nick: dhis2 timestamp: Mon 2011-12-12 15:11:37 +0100 message: Removed duplicate translations modified: dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_gu_IN.properties -- 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-commons/src/main/resources/i18n_global_fr_FR.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties 2011-12-12 13:11:13 + +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties 2011-12-12 14:11:37 + @@ -7,7 +7,6 @@ add_new = Ajouter nouveau aggregation_operator = Op\u00e9rateur d'agr\u00e9gation all = Seloctionner tous -all = Seloctionner tous alternative_name = Autre nom an_exception_occured = Une exception s'est produite annualized = Annualis\u00e9e @@ -19,7 +18,6 @@ build_revision = Revision de construction cannot_clear_selected_orgunits = Ne peut pas effacer les unit\u00e9s organisation choisie category_option_combo_does_not_exist = La combinaison d'option de cat\u00e9gorie n'existe pas -category_option_combo_does_not_exist = La combinaison d'option de cat\u00e9gorie n'existe pas caused_by = Caus\u00e9 par change_log = Log de modification change_password = Changer le mot de passe @@ -35,17 +33,14 @@ current_user = Utilisateur courant Daily = Quotidien data_element_does_not_exist = L'\u00e9l\u00e9ment de donn\u00e9es n'existe pas -data_element_does_not_exist = L'\u00e9l\u00e9ment de donn\u00e9es n'existe pas database_name = Nom de la base de donn\u00e9es database_type = Type de base de donn\u00e9es database_user = Utilisateur de la base dataelement = El\u00e9ment de donn\u00e9e date_selector = Choisir une date delete = Supprimer -delete = Supprimer delete_confirm = Voulez-vous supprimer? delete_success = Objet supprim\u00e9 -delete_success = Objet supprim\u00e9 denominator = D\u00e9nominateur denominator_aggregation_operator = Operateur d'agr\u00e9gation du d\u00e9nominateur denominator_description = Description du D\u00e9nominateur @@ -123,7 +118,6 @@ indicator_groups = Groupes d'indicateurs indicator_type = Type Indicator int = Entier -int = Nombre intro = Intro ireport_description = Editeur de rapport pour rapports standards java_opts = Java opts @@ -197,10 +191,8 @@ organisation_unit = Uni\u00e9 d'organisation organisation_unit_groups = Groupes d'unit\u00e9s d'organisation organisation_unit_hierarchy = Hi\u00e9rarchie d' unit\u00e9 d'Organisation -organisation_unit_hierarchy = Hi\u00e9rarchie d' unit\u00e9 d'Organisation organisation_unit_selection_tree = S\u00e9lection de l'unit\u00e9 d'Organisation organisation_units = unit\u00e9s d'organisation -organisation_units = unit\u00e9s d'organisation os_architecture = architecture de l'OS os_name = Nom de l'OS os_version = Version de l'OS @@ -210,7 +202,6 @@ pdf_reader = Lecteur PDF percent = Pour cent period_type = Type de p\u00e9riode -period_type = Type de p\u00e9riode phone_number = Num\u00e9ro de t\u00e9l\u00e9phone please_do_not_enter_same_values = S'il vous pla\u00eet ne pas entrer les m\u00eames valeurs please_enter_a_different_value_to_above = S'il vous pla\u00eet entrer une valeur diff\u00e9rente de celle ci-dessus. @@ -248,7 +239,6 @@ please_letters_numbers_spaces_or_some_special_chars_only = S'il vous pla\u00eet seulement les lettres, chiffres, espaces ou certains caract\u00e8res sp\u00e9ciaux comme .,-,(,) , v\u00e9rifier la valeur. please_letters_numbers_spaces_underscores_only = S'il vous pla\u00eet lettres, chiffres, espaces et caract\u00e8res de soulignement Seulement please_select_dataelement = Veuillez s\u00e9lectionner l'\u00e9l\u00e9ment de donn\u00e9es! -please_select_dataset = Veuillez s\u00e9lectionner un ensemble de donn\u00e9es please_select_dataset = Veuillez s\u00e9lectionner un ensemble de donn\u00e9es! please_select_indicator = Veuillez s\u00e9lectionner l'indicateur! please_select_period = Veuillez choisisir la p\u00e9riode! === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_gu_IN.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_gu_IN.properties 2011-11-08 19:36:09 + +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_gu_IN.properties 2011-12-12 14:11:37 + @@ -1,4 +1,4 @@ -not_logged_in=પ્રસંગ ની નોંધ ન થાય +not_logged_in=પ્રસંગ ની નોંધ ન થાય an_exception_occured=બનાવવુ dhis-web-dataentry=ડેટા એન્ટ્રી caused_by=કોસ્ડ બાય ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists
[Dhis2-devs] schema - anyone?
Hi, Good day everyone. Please does anyone have a schema diagram of our latest version of the dhis db? Would be very appreciated. thanks Ime ___ 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 5368: Converted French translations to utf8
revno: 5368 committer: Knut Staring branch nick: dhis2 timestamp: Mon 2011-12-12 12:55:14 +0100 message: Converted French translations to utf8 modified: dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_fr_FR.properties -- 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-commons/src/main/resources/i18n_global_fr_FR.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties 2011-11-08 19:36:09 + +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties 2011-12-12 11:55:14 + @@ -1,103 +1,103 @@ about = A propos -about_dhis2 = À propos DHIS 2 -access_denied = Accès refusé -access_denied_message = Vous n'etes pas autorisé à voir cette page. +about_dhis2 = \u00c0 propos DHIS 2 +access_denied = Acc\u00e8s refus\u00e9 +access_denied_message = Vous n'etes pas autoris\u00e9 \u00e0 voir cette page. active = Actif actual = Actuel add_new = Ajouter nouveau -aggregation_operator = Opérateur d'agrégation +aggregation_operator = Op\u00e9rateur d'agr\u00e9gation all = Seloctionner tous all = Seloctionner tous alternative_name = Autre nom an_exception_occured = Une exception s'est produite -annualized = Annualisée +annualized = Annualis\u00e9e available = Disponible -back = Précédent +back = Pr\u00e9c\u00e9dent BiMonthly = Bimensuel bool = Oui / Non build_date = Date de construction build_revision = Revision de construction -cannot_clear_selected_orgunits = Ne peut pas effacer les unités organisation choisie -category_option_combo_does_not_exist = La combinaison d'option de catégorie n'existe pas -category_option_combo_does_not_exist = La combinaison d'option de catégorie n'existe pas -caused_by = Causé par +cannot_clear_selected_orgunits = Ne peut pas effacer les unit\u00e9s organisation choisie +category_option_combo_does_not_exist = La combinaison d'option de cat\u00e9gorie n'existe pas +category_option_combo_does_not_exist = La combinaison d'option de cat\u00e9gorie n'existe pas +caused_by = Caus\u00e9 par change_log = Log de modification change_password = Changer le mot de passe chrome_description = Navigateur web super rapide pour toutes les plates formes close = Fermer -closedDate_should_be_greater_than_openDate = La date de cloture doit être postérieure à la date d'ouverture +closedDate_should_be_greater_than_openDate = La date de cloture doit \u00eatre post\u00e9rieure \u00e0 la date d'ouverture comment = Commentaire constant = Constante constants = Constantes contact_details = Information de contact -contact_person = Personne à contacter +contact_person = Personne \u00e0 contacter count = compte current_user = Utilisateur courant Daily = Quotidien -data_element_does_not_exist = L'élément de données n'existe pas -data_element_does_not_exist = L'élément de données n'existe pas -database_name = Nom de la base de données -database_type = Type de base de données +data_element_does_not_exist = L'\u00e9l\u00e9ment de donn\u00e9es n'existe pas +data_element_does_not_exist = L'\u00e9l\u00e9ment de donn\u00e9es n'existe pas +database_name = Nom de la base de donn\u00e9es +database_type = Type de base de donn\u00e9es database_user = Utilisateur de la base -dataelement = Elément de donnée +dataelement = El\u00e9ment de donn\u00e9e date_selector = Choisir une date delete = Supprimer delete = Supprimer delete_confirm = Voulez-vous supprimer? -delete_success = Objet supprimé -delete_success = Objet supprimé -denominator = Dénominateur -denominator_aggregation_operator = Operateur d'agrégation du dénominateur -denominator_description = Description du Dénominateur -denominator_formula = Formule du dénominateur +delete_success = Objet supprim\u00e9 +delete_success = Objet supprim\u00e9 +denominator = D\u00e9nominateur +denominator_aggregation_operator = Operateur d'agr\u00e9gation du d\u00e9nominateur +denominator_description = Description du D\u00e9nominateur +denominator_formula = Formule du d\u00e9nominateur dhis2_home_page = Page d'accueil DHIS 2 dhis2_online = DHIS 2 en ligne -dhis-web-caseentry = Enregistrements données patient +dhis-web-caseentry = Enregistrements donn\u00e9es patient dhis-web-dashboard = Tableau de bord dhis-web-dashboard-integration = Tableau de bord -dhis-web-dataentry = Saisie de données -dhis-web-dataentry-national = Saisie de donnée linelisting +dhis-web-dataentry = Saisie de donn\u00e9es +dhis-web-dataentry-national = Saisie de donn\u00e9e linelisting dhis-web-datamart = Data Mart -dhis-web-excelimport = Intégration des données +dhis-web-excelimport = Int\u00e9gration des donn\u00
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5367: dxf2merge: tightened security for /api, now requires ALL or F_WEBAPI_READ (also added F_WEBAPI_CR...
Merge authors:
Morten Olav Hansen (mortenoh)
revno: 5367 [merge]
committer: Morten Olav Hansen
branch nick: dhis2
timestamp: Mon 2011-12-12 12:20:20 +0100
message:
dxf2merge: tightened security for /api, now requires ALL or F_WEBAPI_READ
(also added F_WEBAPI_CREATE, F_WEBAPI_UPDATE, F_WEBAPI_DELETE ... not currently
in use)
added:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/action/
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/action/NoAction.java
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/IndexController.java
dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml
dhis-2/dhis-web/dhis-web-api/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml
--
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 directory 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/action'
=== added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/action/NoAction.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/action/NoAction.java 1970-01-01 00:00:00 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/action/NoAction.java 2011-12-12 11:18:21 +
@@ -0,0 +1,43 @@
+package org.hisp.dhis.api.action;
+
+/*
+ * Copyright (c) 2004-2009, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Morten Olav Hansen
+ */
+public class NoAction
+implements Action
+{
+public String execute()
+throws Exception
+{
+return SUCCESS;
+}
+}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java 2011-12-09 20:53:07 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java 2011-12-12 11:18:21 +
@@ -39,6 +39,7 @@
import org.jfree.chart.ChartUtilities;
import org.jfree.chart.JFreeChart;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/IndexController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/IndexController.java 2011-12-08 14:31:31 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/IndexController.java 2011-12-12 11:18:21 +
@@ -27,6 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
=== modified file 'dhis-2/dhis-web/dhis-web-api
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5366: Facility layer filter bug fixed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 5366 [merge]
committer: Jan Henrik Overland
branch nick: dhis2
timestamp: Mon 2011-12-12 12:03:15 +0100
message:
Facility layer filter bug fixed.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
--
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-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2011-12-02 13:26:11 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2011-12-12 11:01:38 +
@@ -88,6 +88,7 @@
type: []
},
filter: function() {
+var groupSet = this.cmp.groupSet.getRawValue();
var type = this.filtering.options.type;
var add = [];
if (!type.length || !type[0]) {
@@ -96,12 +97,13 @@
else {
for (var i = 0; i < this.filtering.cache.length; i++) {
for (var j = 0; j < type.length; j++) {
-if (this.filtering.cache[i].attributes.type == type[j]) {
+if (this.filtering.cache[i].attributes[groupSet] === type[j]) {
add.push(this.filtering.cache[i]);
}
}
}
}
+
this.layer.removeAllFeatures();
this.layer.addFeatures(add);
},
___
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
Re: [Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 426: Added section on using nginx as a reverse proxy to the setup documentation. Polished up the GIS s...
Any idea about serving up static content? I have not really tried with
charts to see, but not 100% sure that
location ~ \.(gif|jpg|png|css)$ {
root /var/lib/tomcat6/webapps/;
}
is correct. Is there any thing generated on the fly (png's, js) which is
not static?
On Mon, Dec 12, 2011 at 12:43 PM, Bob Jolliffe wrote:
> On 12 December 2011 10:19, Jo Størset wrote:
> >
> > Den 12. des. 2011 kl. 10.16 skrev Jason Pickering:
> >
> >> It is using straight HTTP, and in this example, serves up the static
> content, bypassing the Tomcat server. I have not tried with the web-api,
> but everything else seems to work (and is much faster than Apache with much
> lower memory consumption). Would be good to know if it actually works
> however. :)
> >
> > Haven't looked at it, but I would guess that these are used by tomcat
> for creating the request object:
> >
> > + proxy_set_headerX-Real-IP $remote_addr;
> > + proxy_set_headerX-Forwarded-For
> $proxy_add_x_forwarded_for;
> > + proxy_set_headerHost $http_host;
> >
> >
> > Seems to be a de facto standard [1], so it should be fine. It's
> probably worth it to verify this, though..
> >
> > [1] http://en.wikipedia.org/wiki/X-Forwarded-For
>
> Not sure if X-Forwaded-For is really relevant to this side of the
> problem. This is to make sure the server has access to information
> about the "real" client rather than just the proxy.
>
> Mind you it looks like the 3rd line above deals with the issue of
> whether the client sees the "real" host name in the request. From
> http://wiki.nginx.org/HttpProxyModule#proxy_pass :
>
> "By default, the Host header from the request is not forwarded, but is
> set based on the proxy_pass statement. To forward the requested Host
> header, it is necessary to use: proxy_set_header Host $host;"
>
> So looks ok indeed :-)
>
> Bob
>
> >
> > Jo
>
___
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
Re: [Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 426: Added section on using nginx as a reverse proxy to the setup documentation. Polished up the GIS s...
On 12 December 2011 10:19, Jo Størset wrote: > > Den 12. des. 2011 kl. 10.16 skrev Jason Pickering: > >> It is using straight HTTP, and in this example, serves up the static >> content, bypassing the Tomcat server. I have not tried with the web-api, but >> everything else seems to work (and is much faster than Apache with much >> lower memory consumption). Would be good to know if it actually works >> however. :) > > Haven't looked at it, but I would guess that these are used by tomcat for > creating the request object: > > + proxy_set_header X-Real-IP $remote_addr; > + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; > + proxy_set_header Host $http_host; > > > Seems to be a de facto standard [1], so it should be fine. It's probably > worth it to verify this, though.. > > [1] http://en.wikipedia.org/wiki/X-Forwarded-For Not sure if X-Forwaded-For is really relevant to this side of the problem. This is to make sure the server has access to information about the "real" client rather than just the proxy. Mind you it looks like the 3rd line above deals with the issue of whether the client sees the "real" host name in the request. From http://wiki.nginx.org/HttpProxyModule#proxy_pass : "By default, the Host header from the request is not forwarded, but is set based on the proxy_pass statement. To forward the requested Host header, it is necessary to use: proxy_set_header Host $host;" So looks ok indeed :-) Bob > > Jo ___ 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 5365: (GIS) Stored zeros shown on the map, false zeros filtered out = Automatic legend makes more sense...
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 5365 [merge]
committer: Jan Henrik Overland
branch nick: dhis2
timestamp: Mon 2011-12-12 11:38:34 +0100
message:
(GIS) Stored zeros shown on the map, false zeros filtered out = Automatic
legend makes more sense. + Data element list sorted. + Zoom level not reset
when applying labels.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/plugin.css
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.html
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.js
--
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-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2011-08-11 20:49:21 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2011-12-09 15:26:08 +
@@ -20,6 +20,7 @@
applied= applied
show= Show
hide= Hide
+showhide = Show / hide
toggle= Toggle
boundary = Boundary
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2011-08-11 20:49:21 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2011-12-09 15:26:08 +
@@ -23,6 +23,7 @@
applied: '$encoder.jsEscape($i18n.getString( 'applied' ) , "'")',
show: '$encoder.jsEscape($i18n.getString( 'show' ) , "'")',
hide: '$encoder.jsEscape($i18n.getString( 'hide' ) , "'")',
+showhide: '$encoder.jsEscape($i18n.getString( 'showhide' ) , "'")',
toggle: '$encoder.jsEscape($i18n.getString( 'toggle' ) , "'")',
boundary: '$encoder.jsEscape($i18n.getString( 'boundary' ) , "'")',
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js 2011-12-06 17:41:41 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js 2011-12-09 14:32:33 +
@@ -280,7 +280,8 @@
else {
activateLabels.call(this);
}
-
+
+G.vars.lockPosition = true;
widget.applyValues();
}
},
@@ -1091,7 +1092,7 @@
xtype: 'button',
iconCls: 'icon-assign',
hideLabel: true,
-text: G.i18n.toggle,
+text: G.i18n.showhide,
scope: this,
handler: function() {
if (layer.features.length) {
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2011-12-06 17:41:41 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2011-12-12 10:31:20 +
@@ -62,6 +62,7 @@
url: G.conf.path_mapping + 'getAllIndicators' + G.conf.type,
root: 'indicators',
fields: ['id', 'shortName'],
+sortInfo: {field: 'shortName', direction: 'ASC'},
autoLoad: false,
isLoaded: false,
listeners: {
@@ -85,6 +86,7 @@
Re: [Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 426: Added section on using nginx as a reverse proxy to the setup documentation. Polished up the GIS s...
Den 12. des. 2011 kl. 10.16 skrev Jason Pickering: > It is using straight HTTP, and in this example, serves up the static content, > bypassing the Tomcat server. I have not tried with the web-api, but > everything else seems to work (and is much faster than Apache with much lower > memory consumption). Would be good to know if it actually works however. :) Haven't looked at it, but I would guess that these are used by tomcat for creating the request object: + proxy_set_headerX-Real-IP $remote_addr; + proxy_set_headerX-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_headerHost $http_host; Seems to be a de facto standard [1], so it should be fine. It's probably worth it to verify this, though.. [1] http://en.wikipedia.org/wiki/X-Forwarded-For Jo ___ 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
Re: [Dhis2-devs] [Dhis2-users] update hyperlink in the documentation
On Fri, Dec 9, 2011 at 11:55 PM, Aymar Narodar SOME wrote: > Hi, > Please update the hyperlink at the 2nd line of the context of chapter 17 on > GIS (http://dhis2.org/doc/snapshot/en/user/html/ch17.html), replace http:// > www.diva-gis.org/gd by http://www.diva-gis.org/gdata > regards > Its fixed. Lars > aymar > > ___ > Mailing list: https://launchpad.net/~dhis2-users > Post to : dhis2-us...@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dhis2-users > More help : https://help.launchpad.net/ListHelp > ___ 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-documenters/dhis2/dhis2-docbook-docs] Rev 427: Quickly fixed
revno: 427 committer: Lars Helge Overland branch nick: dhis2-docbook-docs timestamp: Mon 2011-12-12 11:02:05 +0100 message: Quickly fixed modified: src/docbkx/en/dhis2_user_man_creating_gis.xml -- lp:~dhis2-documenters/dhis2/dhis2-docbook-docs https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription === modified file 'src/docbkx/en/dhis2_user_man_creating_gis.xml' --- src/docbkx/en/dhis2_user_man_creating_gis.xml 2011-12-12 07:11:53 + +++ src/docbkx/en/dhis2_user_man_creating_gis.xml 2011-12-12 10:02:05 + @@ -4,7 +4,7 @@ Setting up GIS Context -Setting up the GIS simply means storing coordinates for the organisation units you want to show on the map in the database. Coordinates are often distributed in proprietary formats and will need to be converted to a format which DHIS2 uses. ESRI shapefiles are the most common geospatial vector data format for desktop applications. You might find shapefiles for your country http://www.diva-gis.org/gd";>here or in many other geospatial data repositories on the web. Some amount of work needs to be done in order to use these coordinates in DHIS 2 GIS, namely transforming the data into a suitable format and ensuring the name which are contained in the geospatial data match exactly with the names of the organization units which they should be matched to. +Setting up the GIS simply means storing coordinates for the organisation units you want to show on the map in the database. Coordinates are often distributed in proprietary formats and will need to be converted to a format which DHIS2 uses. ESRI shapefiles are the most common geospatial vector data format for desktop applications. You might find shapefiles for your country http://www.diva-gis.org/gdata";>here or in many other geospatial data repositories on the web. Some amount of work needs to be done in order to use these coordinates in DHIS 2 GIS, namely transforming the data into a suitable format and ensuring the name which are contained in the geospatial data match exactly with the names of the organization units which they should be matched to. If you go to the organisation unit module and edit one of the units, you can see a text field called Coordinates. Here you may fill in its coordinates directly (geojson format) which is useful if you just want to update a couple of units. An example point/facility coordinate: [29.341,-11.154] ___ 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 5364: Fixed compilation error
revno: 5364
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Mon 2011-12-12 10:56:06 +0100
message:
Fixed compilation error
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonAction.java
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonFacilitiesAction.java
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonWithValuesAction.java
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitChildrenAction.java
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetOrganisationUnitChildrenAction.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-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonAction.java'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonAction.java 2011-12-02 13:24:16 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonAction.java 2011-12-12 09:56:06 +
@@ -94,7 +94,7 @@
{
OrganisationUnit parent = organisationUnitService.getOrganisationUnit( parentId );
-level = level == null ? organisationUnitService.getLevelOfOrganisationUnit( parent ) : level;
+level = level == null ? organisationUnitService.getLevelOfOrganisationUnit( parent.getId() ) : level;
Collection organisationUnits = organisationUnitService.getOrganisationUnitsAtLevel( level,
parent );
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonFacilitiesAction.java'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonFacilitiesAction.java 2011-11-16 08:36:37 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonFacilitiesAction.java 2011-12-12 09:56:06 +
@@ -110,7 +110,7 @@
{
OrganisationUnit parent = organisationUnitService.getOrganisationUnit( parentId );
-level = level == null ? organisationUnitService.getLevelOfOrganisationUnit( parent ) : level;
+level = level == null ? organisationUnitService.getLevelOfOrganisationUnit( parent.getId() ) : level;
Collection organisationUnits = organisationUnitService.getOrganisationUnitsAtLevel( level,
parent );
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonWithValuesAction.java'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonWithValuesAction.java 2011-12-05 13:32:32 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonWithValuesAction.java 2011-12-12 09:56:06 +
@@ -124,7 +124,7 @@
{
OrganisationUnit parent = organisationUnitService.getOrganisationUnit( parentId );
-level = level == null ? organisationUnitService.getLevelOfOrganisationUnit( parent ) : level;
+level = level == null ? organisationUnitService.getLevelOfOrganisationUnit( parent.getId() ) : level;
Collection organisationUnits = organisationUnitService.getOrganisationUnitsAtLevel( level,
parent );
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitChildrenAction.java'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitChildrenAction.java 2010-11-17 16:20:22 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitChildrenAction.java 2011-12-12 09:56:06 +
@@ -101,7 +101,7 @@
{
OrganisationUnit unit = organisationUnitService.getOrganisationUnit( node );
-int level = organisationUnitService.getLevelOfOrganisationUnit( unit ) + 1;
+int level = organisationUnitService.getLevelOfOrganisationUnit( unit.getId() ) + 1;
if ( unit != null )
{
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetOrganisationUnitChildrenAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetOrganisationUnitChildrenAction.java 2011-09-14 08:52:13 +
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetOrganisationUnitChildrenAction.java 2011-12-12 09:56:06 +
@@ -101,7 +101,7 @@
{
OrganisationUnit unit = organisationUnitService.getOrganisationUnit( node );
-int level = organisationUnitService.getLevelOfOrganisationUnit
Re: [Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 426: Added section on using nginx as a reverse proxy to the setup documentation. Polished up the GIS s...
It is using straight HTTP, and in this example, serves up the static
content, bypassing the Tomcat server. I have not tried with the web-api,
but everything else seems to work (and is much faster than Apache with much
lower memory consumption). Would be good to know if it actually works
however. :)
Regards,
Jason
On Mon, Dec 12, 2011 at 11:12 AM, Bob Jolliffe wrote:
> Hi guys
>
> I haven't used this myself, but looking at the docs it seems that
> nginx is setup to do straight http proxying ie. it is not talking ajp
> to the backend tomcat server. Is this correct?
>
> I could be wrong, but Jo/Morten this might have some implication with
> the absolute URLs being used in the web-api.
>
> Cheers
> Bob
>
> On 12 December 2011 07:15, wrote:
> >
> > revno: 426
> > committer: Jason P. Pickering
> > branch nick: dhis2-docbook-docs
> > timestamp: Mon 2011-12-12 09:11:53 +0200
> > message:
> > Added section on using nginx as a reverse proxy to the setup
> documentation. Polished up the GIS section a bit.
> > modified:
> > src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml
> > src/docbkx/en/dhis2_user_man_creating_gis.xml
> >
> >
> > --
> > lp:~dhis2-documenters/dhis2/dhis2-docbook-docs
> > https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs
> >
> > Your team DHIS 2 developers is subscribed to branch
> lp:~dhis2-documenters/dhis2/dhis2-docbook-docs.
> > To unsubscribe from this branch go to
> https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription
> >
> > === modified file
> 'src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml'
> > --- src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml
> 2011-10-04 14:33:11 +
> > +++ src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml
> 2011-12-12 07:11:53 +
> > @@ -532,7 +532,30 @@
> > Now, just restart Apache and you should be able to view
> https://foo.mydomain.org/dhis.
> > /etc/init.d/apache2 restart
> >
> > -
> > +
> > + Reverse proxy with nginx
> > + http://wiki.nginx.org";>Nginx is a
> high-performance web server and reverse proxy with built with high
> concurrency, performance and low-memory usage in mind. For more
> installations, nginx may be a better alternative
> than the Apache web server for reverse proxy implementations.
> > + To get started, simply install nginx on your system with
> the following command.
> > + sudo apt-get install nginx
> > + A sample configuration file is below, and should be placed
> in /etc/nginx/sites-available.
> > + server {
> > +listen *:80;
> > +server_name dhis.foo.org;
> > +location ~ \.(gif|jpg|png|css|js)$ {
> > +
> > +root /var/lib/tomcat6/webapps/;
> > +}
> > +
> > +location / {
> > + proxy_pass http://localhost:8080/;
> > + proxy_set_headerX-Real-IP $remote_addr;
> > + proxy_set_headerX-Forwarded-For
> $proxy_add_x_forwarded_for;
> > + proxy_set_headerHost $http_host;
> > + }
> > +}
> > +
> > + You will need to adjust the server_name,
> and proxy_pass variables to suit your particular setup.
> The server name must match exactly the name of the server which will be
> running DHIS. In this particular setup, nginx will serve all static content
> and then redirect dynamic requests to the application server. Once you have
> adjusted the configuration file to suit your needs, be sure to activate it
> by creating a symbolic link in the /etc/nginx/sites-enabled
> directory which points to the file.
> > +
> >
> > Performance tuning
> > To increase Tomcat's performance, you can install the
> native APR library by invoking:
> >
> > === modified file 'src/docbkx/en/dhis2_user_man_creating_gis.xml'
> > --- src/docbkx/en/dhis2_user_man_creating_gis.xml 2011-12-01
> 07:05:24 +
> > +++ src/docbkx/en/dhis2_user_man_creating_gis.xml 2011-12-12
> 07:11:53 +
> > @@ -4,26 +4,29 @@
> > Setting up GIS
> >
> > Context
> > -
> > - Setting up the GIS simply means storing coordinates for the
> organisation units you want to show on the map in the database. Coordinates
> are often distributed in proprietary formats. ESRI shapefiles are the
> most common geospatial vector data format for desktop applications. You
> might find shapefiles for your country http://www.diva-gis.org/gd";>here or many other geospatial data
> repositories on the web. Some amount of work needs to be done in order to
> use these coordinates in DHIS 2 GIS, namely transforming the data into a
> suitable format and ensuring the name which are contained in the geospatial
> data match exactly with the names of the organization units which they
> should be matched to.
> > +Setting up the GIS simply means storing coordinates for the
> organisation units you want to show on the map in the database. Coordinates
> are often
Re: [Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 426: Added section on using nginx as a reverse proxy to the setup documentation. Polished up the GIS s...
Hi guys
I haven't used this myself, but looking at the docs it seems that
nginx is setup to do straight http proxying ie. it is not talking ajp
to the backend tomcat server. Is this correct?
I could be wrong, but Jo/Morten this might have some implication with
the absolute URLs being used in the web-api.
Cheers
Bob
On 12 December 2011 07:15, wrote:
>
> revno: 426
> committer: Jason P. Pickering
> branch nick: dhis2-docbook-docs
> timestamp: Mon 2011-12-12 09:11:53 +0200
> message:
> Added section on using nginx as a reverse proxy to the setup documentation.
> Polished up the GIS section a bit.
> modified:
> src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml
> src/docbkx/en/dhis2_user_man_creating_gis.xml
>
>
> --
> lp:~dhis2-documenters/dhis2/dhis2-docbook-docs
> https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs
>
> Your team DHIS 2 developers is subscribed to branch
> lp:~dhis2-documenters/dhis2/dhis2-docbook-docs.
> To unsubscribe from this branch go to
> https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription
>
> === modified file
> 'src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml'
> --- src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml
> 2011-10-04 14:33:11 +
> +++ src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml
> 2011-12-12 07:11:53 +
> @@ -532,7 +532,30 @@
> Now, just restart Apache and you should be able to view
> https://foo.mydomain.org/dhis.
> /etc/init.d/apache2 restart
>
> -
> +
> + Reverse proxy with nginx
> + http://wiki.nginx.org";>Nginx is a
> high-performance web server and reverse proxy with built with high
> concurrency, performance and low-memory usage in mind. For more
> installations, nginx may be a better alternative
> than the Apache web server for reverse proxy implementations.
> + To get started, simply install nginx on your system with the
> following command.
> + sudo apt-get install nginx
> + A sample configuration file is below, and should be placed in
> /etc/nginx/sites-available.
> + server {
> + listen *:80;
> + server_name dhis.foo.org;
> +location ~ \.(gif|jpg|png|css|js)$ {
> +
> +root /var/lib/tomcat6/webapps/;
> +}
> +
> +location / {
> + proxy_pass http://localhost:8080/;
> + proxy_set_header X-Real-IP $remote_addr;
> + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
> + proxy_set_header Host $http_host;
> + }
> +}
> +
> + You will need to adjust the server_name, and
> proxy_pass variables to suit your particular setup. The
> server name must match exactly the name of the server which will be running
> DHIS. In this particular setup, nginx will serve all static content and then
> redirect dynamic requests to the application server. Once you have adjusted
> the configuration file to suit your needs, be sure to activate it by creating
> a symbolic link in the /etc/nginx/sites-enabled
> directory which points to the file.
> +
>
> Performance tuning
> To increase Tomcat's performance, you can install the native
> APR library by invoking:
>
> === modified file 'src/docbkx/en/dhis2_user_man_creating_gis.xml'
> --- src/docbkx/en/dhis2_user_man_creating_gis.xml 2011-12-01 07:05:24
> +
> +++ src/docbkx/en/dhis2_user_man_creating_gis.xml 2011-12-12 07:11:53
> +
> @@ -4,26 +4,29 @@
> Setting up GIS
>
> Context
> -
> - Setting up the GIS simply means storing coordinates for the
> organisation units you want to show on the map in the database. Coordinates
> are often distributed in proprietary formats. ESRI shapefiles are the most
> common geospatial vector data format for desktop applications. You might
> find shapefiles for your country url="http://www.diva-gis.org/gd";>here or many other geospatial data
> repositories on the web. Some amount of work needs to be done in order to use
> these coordinates in DHIS 2 GIS, namely transforming the data into a suitable
> format and ensuring the name which are contained in the geospatial data match
> exactly with the names of the organization units which they should be matched
> to.
> + Setting up the GIS simply means storing coordinates for the
> organisation units you want to show on the map in the database. Coordinates
> are often distributed in proprietary formats and will need to be converted
> to a format which DHIS2 uses. ESRI shapefiles are the most common geospatial
> vector data format for desktop applications. You might find shapefiles for
> your country http://www.diva-gis.org/gd";>here or in many
> other geospatial data repositories on the web. Some amount of work needs to
> be done in order to use these coordinates in DHIS 2 GIS, namely transforming
> the data into a suitable format and ens
