=== modified file 'src/docbkx/en/dhis2_implementation_guide.xml' --- src/docbkx/en/dhis2_implementation_guide.xml 2010-07-15 09:51:14 +0000 +++ src/docbkx/en/dhis2_implementation_guide.xml 2010-09-05 18:50:31 +0000 @@ -40,7 +40,7 @@ Compiling DHIS2 First, create an environment variable called JAVA_OPTS, and set its value to: -Xms128m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=512m . In addition to this environment variable, you will need to ensure that maven is accessible through your console. A sample Windows batch script is provided below. There are two seperate steps during the build process: 1) Building the DHIS2 core modules 2) Building the DHIS2 Web modules and portal. - set start_time=%time% echo Building DHIS 2 Core cd trunk\dhis-2\ call mvn clean install -Dtest=skip -DfailIfNoTests=false echo Building DHIS 2 Web cd dhis-web call mvn clean install -Dtest=skip -DfailIfNoTests=false echo start %start_time% echo finish %time% + set start_time=%time% echo Building DHIS 2 Core cd trunk/dhis-2 call mvn clean install -Dtest=skip -DfailIfNoTests=false echo Building DHIS 2 Web cd dhis-web call mvn clean install -Dtest=skip -DfailIfNoTests=false echo start %start_time% echo finish %time% A sample Linux build script is provided below. #!/bin/sh echo "Building DHIS 2 Core..." cd dhis/trunk/dhis-2 mvn clean install -Dtest=skip -DfailIfNoTests=false echo "Building DHIS 2 Web..." cd dhis-web mvn clean install -Dtest=skip -DfailIfNoTests=false Both of these scripts have been included in the /dhis2/dhis2/dhis2-live-installer directory. Review the INSTALLER-README.txt file for more details of these build scripts and their functionality. === modified file 'src/docbkx/en/dhis2_user_man_data_dimensions.xml' --- src/docbkx/en/dhis2_user_man_data_dimensions.xml 2010-05-13 08:46:48 +0000 +++ src/docbkx/en/dhis2_user_man_data_dimensions.xml 2010-09-05 18:50:31 +0000 @@ -502,7 +502,7 @@ - + @@ -544,7 +544,7 @@ - + === modified file 'src/docbkx/en/dhis2_user_man_excel_reports.xml' --- src/docbkx/en/dhis2_user_man_excel_reports.xml 2010-07-02 05:20:42 +0000 +++ src/docbkx/en/dhis2_user_man_excel_reports.xml 2010-09-05 18:50:31 +0000 @@ -16,7 +16,7 @@ There are six function of this module. - Configuration: Set a path to the directory where the excel template files are stored. This file path should be an absolute directory on your system. For instance, if the templates are stored in C:\Program Files\DHIS2\conf\excelreporting\templates", you should navigate to this directory by clicking the "Browse" button. These templates are used to define the layout of the report, and must be produced through a process documented below. + Configuration: Set a path to the directory where the excel template files are stored. This file path should be an absolute directory on your system. For instance, if the templates are stored in C:/Program Files/DHIS2/conf/excelreporting/templates", you should navigate to this directory by clicking the "Browse" button. These templates are used to define the layout of the report, and must be produced through a process documented below. List of reports: This module allows users to assign reports to different organizational units . There are four types of reports that are currently supported: a report containing standard data elements, a report listing organisation unit groups as rows, a report listing period of time as columns, a report generating data elements combined with categories. === modified file 'src/docbkx/en/dhis2_user_man_import_export.xml' --- src/docbkx/en/dhis2_user_man_import_export.xml 2010-05-12 06:45:52 +0000 +++ src/docbkx/en/dhis2_user_man_import_export.xml 2010-09-05 18:50:31 +0000 @@ -42,7 +42,7 @@ - The exported data values are stored in an ‘xml file’. The file name is defined by the name of the source organisation unit and the period to allow the receiving organisation unit to identify the source and the period of the export file. The XML is placed in your home directory (On Windows this is normally C:\Documents and Settings\ under the sub-directories /dhis / import-export. + The exported data values are stored in an ‘xml file’. The file name is defined by the name of the source organisation unit and the period to allow the receiving organisation unit to identify the source and the period of the export file. The XML is placed in your home directory (On Windows this is normally C:/Documents and Settings/ under the sub-directories /dhis / import-export.
=== modified file 'src/docbkx/en/dhis2_user_man_mobile.xml' --- src/docbkx/en/dhis2_user_man_mobile.xml 2010-07-15 09:15:30 +0000 +++ src/docbkx/en/dhis2_user_man_mobile.xml 2010-09-05 18:50:31 +0000 @@ -44,7 +44,7 @@ following pom.xml files: - in dhis-web-portal\pom.xml, add dependency to dhis-web-mobile: + in dhis-web-portal/pom.xml, add dependency to dhis-web-mobile: <dependency> <groupId>org.hisp.dhis</groupId> @@ -56,12 +56,12 @@ - in dhis-web\pom.xml, add module dhis-web-mobile: + in dhis-web/pom.xml, add module dhis-web-mobile: <module>dhis-web-mobile</module> - in dhis-services\pom.xml, add module dhis-service-mobile: + in dhis-services/pom.xml, add module dhis-service-mobile: <module>dhis-service-mobile</module> @@ -69,8 +69,8 @@ After the pom-files are altered, build your .war-file using mvn clean install. (To skip the tests, use mvn clean install -Dtest=false -DfailIfNoTests=false.) - Copy the dhis.war file from dhis-web-portal\target to the - tomcat\webapps folder. Rename it if you want. + Copy the dhis.war file from dhis-web-portal/target to the + tomcat/webapps folder. Rename it if you want.
Install the GSM modem @@ -82,18 +82,18 @@ comm.jar - Copy it to your java\jreX\lib\ext folder. If you've got multiple + Copy it to your java/jreX/lib/ext folder. If you've got multiple installations of JRE, you can find the path to the installation used by DHIS 2 by right clicking the Monitor Tomcat icon in the system tray, then Configure -> Java. javax.comm.properties - Copy it to your java\jreX\lib folder. + Copy it to your java/jreX/lib folder. win32com.dll - Copy it to your java\jreX\bin folder. + Copy it to your java/jreX/bin folder. Note: You might need administrator privileges to do this. If you still can't do it, try starting Windows in Safe Mode. @@ -105,7 +105,7 @@ formIDLayout.csv - Copy it to your DHIS2_HOME\mi folder. If you have not yet deployed your latest build of DHIS2, you'll have to create the mi folder manually. + Copy it to your DHIS2_HOME/mi folder. If you have not yet deployed your latest build of DHIS2, you'll have to create the mi folder manually. This file specifies which data elements are to be imported. There's one line for each different mobile application in use. The lines start with a mobile application's id, then followed by comma separated data element ids and their categoryoptioncombo ids. The lines will be on the form 1 = <data element id>.<categoryoptioncombo id>, @@ -160,7 +160,7 @@ Import pending messages If SMSs are sent from the phones to the SIM card in the GSM modem while the SMS Service is inactive, the messages will be stored as xml - files in the folder DHIS2_HOME\mi\pending short time after + files in the folder DHIS2_HOME/mi/pending short time after the service is started. On the Receive Data and Import page it will say how many SMSs are pending. These can be imported by pressing the "Import All Pending" button. === modified file 'src/docbkx/en/dhis2_user_man_reporting.xml' --- src/docbkx/en/dhis2_user_man_reporting.xml 2010-08-24 10:48:43 +0000 +++ src/docbkx/en/dhis2_user_man_reporting.xml 2010-09-05 18:50:31 +0000 @@ -274,7 +274,7 @@
Using report tables - To make the report tables reusable over time and across orgunits they can have \ parameters. Three types of parameters are allowed; orgunit, parent orgunit (for listing of orgunits in one area) and reporting month. As a side note I can mention that we are looking into expanding this to include reporting quarter and year, or to make that period parameter more generic with regard to period type somehow. Be able to use period as a parameter makes the report table reusable over time and as such fits nicely with report needs such as monthly, quarterly or annual reports. When a report is run by the user in the DHIS 2 the user must specify the values for the report tables that are linked to the report, and first the report table is re-generated (deleted and re-created with updated data) and then the report is run (in BIRT report engine). + To make the report tables reusable over time and across orgunits they can have parameters. Three types of parameters are allowed; orgunit, parent orgunit (for listing of orgunits in one area) and reporting month. As a side note I can mention that we are looking into expanding this to include reporting quarter and year, or to make that period parameter more generic with regard to period type somehow. Be able to use period as a parameter makes the report table reusable over time and as such fits nicely with report needs such as monthly, quarterly or annual reports. When a report is run by the user in the DHIS 2 the user must specify the values for the report tables that are linked to the report, and first the report table is re-generated (deleted and re-created with updated data) and then the report is run (in BIRT report engine). Report tables can consist of either values related to data elements or indicators, and not a mix of the two. A third report table type is data completeness, which is related to completeness of reporting across orgunits for a given month. Completeness reports will be covered in a separate section. The reason for not mixing data elements and indicators in one report table is due to the cross tab functionality that would be very complex and less useful with yet another dimension. Since two or more report tables can easily be linked to one report this limitation should not have much effect on report design possibilities. @@ -364,14 +364,14 @@ (these examples use the postgres driver, just replace as needed) 2) Designer: - Copy the file postgresql-8.3-603.jdbc3.jar to the folder <BIRT_designer_install_path>\plugins\org.eclipse.birt.report.data.oda.jdbc_2.3.0.v20080610\drivers, for the designer version 2-3-0 + Copy the file postgresql-8.3-603.jdbc3.jar to the folder <BIRT_designer_install_path>/plugins/org.eclipse.birt.report.data.oda.jdbc_2.3.0.v20080610/drivers, for the designer version 2-3-0 3) Viewer: The birt viewer distributed by HISP already contains the necessary drivers. If you download the BIRT viewer from the Eclipse BIRT project you need to put the driver yourself: - Copy the file postgresql-8.3-603.jdbc3.jar to the folder (inside tomcat/webapps/) <BIRT_viewer_path>\WEB-INF\platform\plugins\org.eclipse.birt.report.data.oda.jdbc_2.3.0.v20080610\drivers + Copy the file postgresql-8.3-603.jdbc3.jar to the folder (inside tomcat/webapps/) <BIRT_viewer_path>/WEB-INF/platform/plugins/org.eclipse.birt.report.data.oda.jdbc_2.3.0.v20080610/drivers This will serve as a connection between the reports to be designed and the database from which you will be fetching data. @@ -383,7 +383,7 @@ In Reports->Standard reports fill in the in the details on where the BIRT viewer web application is located - Home: the absolute path to your birt viwer, e.g. E:\dhis2\tomcat\webapps\birt + Home: the absolute path to your birt viwer, e.g. E:/dhis2/tomcat/webapps/birt Directory: the name of the birt viewer folder, e.g. birt