=== modified file 'src/docbkx/en/dhis2_user_man_data_administration.xml' --- src/docbkx/en/dhis2_user_man_data_administration.xml 2010-12-10 12:58:14 +0000 +++ src/docbkx/en/dhis2_user_man_data_administration.xml 2011-01-14 12:02:57 +0000 @@ -25,7 +25,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -50,25 +50,19 @@ - + - By clicking on an organisational unit, and the clicking the "Browse" button, a summary of submitted data elements present in the database is returned for all immediate children of the selected organisational as shown below + By clicking on an organisational unit, and the clicking the "Browse" button, a summary of submitted data elements present in the database is returned for all immediate children of the selected organisational as shown below: - + - By clicking on one of the organisational units, a detailed list of data elements is presented by each time period as shown below. - - - - - - + By clicking on one of the organisational units, a detailed list of data elements is presented by each time period. For each of the data browser summaries, a PDF export can be produced by specifying a filename in the "Filename" field, selecting a font size, a page layout (Landscape or Portrait) and pressing the "Export PDF" button. You will then be prompted to select a location to save the file to, which can then be viewed with any PDF reader (e.g. Adobe Acrobat Reader, xpdf, etc).
@@ -235,7 +229,7 @@ - + @@ -248,28 +242,14 @@ - + The unlocked data sets for the period are displayed and the user will then have to choose the data sets to be locked. - - - - - - - After choosing the datasets to be locked, double click on each one by one to display the organisation unit tree in the field below. Click on the organisation unit to lock the dataset. - - - - - - - The Apply Locks on All button locks the dataset for all the organisation units to which that dataset has been assigned. ‘Remove locks on All’ removes all locks put on the organisation units corresponding to the selected dataset. After the operations are completed the user must click ‘Save’ to apply the settings. The ‘Lock at level’ button locks datasets at a particular level that the user chooses. . ‘Unlock at Level’ removes locks that have been put on the organisation units corresponding to the selected dataset at the selected level. After the operations are completed, the user must click ‘Save’ to apply the settings. The ‘Save’ button will also lock those organisation unit datasets that have been specified by the user.
=== modified file 'src/docbkx/en/dhis2_user_man_data_entry.xml' --- src/docbkx/en/dhis2_user_man_data_entry.xml 2011-01-14 09:02:46 +0000 +++ src/docbkx/en/dhis2_user_man_data_entry.xml 2011-01-14 12:02:57 +0000 @@ -34,7 +34,7 @@ Main data entry screen - + @@ -52,14 +52,6 @@ When you select an organisational unit (or orgunit) from the organisation unit tree, datasets available for this orgunit will then appear as a drop-down list in the data set box as depicted below. - - Select dataset - - - - - - If the dataset field is disabled it means that there are no datasets assigned for the selected organisation unit or that your user role is not authorised to enter data. For now we shall limit our concern to data === modified file 'src/docbkx/en/dhis2_user_man_gis.xml' --- src/docbkx/en/dhis2_user_man_gis.xml 2011-01-11 14:37:46 +0000 +++ src/docbkx/en/dhis2_user_man_gis.xml 2011-01-14 12:02:57 +0000 @@ -81,6 +81,14 @@
Using the GIS module
+ + Main data entry screen + + + + + + Thematic mapping This panel lets you use your registered maps for thematic mapping. All you need to do is selecting your desired indicator/dataelement-period-map combination in the left side menu. Calculation method @@ -111,6 +119,13 @@ Exporting/saving map images Click the image icon on the map toolbar and the print window will open. Title: Image title, will appear as a headline in the image. Layers: Choose whether polygons, points or both will be printed. Width/Height: The pixel resolution of the image. Choose among the predefined "small" (800x600), "medium" (1190x880), "large" (1920x1200) or type the exact number of pixels yourself (type the number only, avoid text like "px"). If you want to exclude the legend from the image, untick the legend checkbox. Finally click the export button to print the image (PNG).
+
+ Layer options + Right-click any layer in the layer tree in the upper right corner to open the layer options context menu. There are currently three layer options available for vector layers: "Locate feature", "Show/hide labels" and "Opacity". Locate feature (organisation unit): Click one of the units in the list and its color in the map will change to the color you have specified in the "Highlight color" combo box. If the list of organisation units is long you can easily create a text filter in the textfield below. Show/hide labels: By clicking this option, a label with the organisation unit name and its value (based on the current indicator/period selection) appears on the map. Opacity: Adjust the opacity/transparency of the layer in the map. + + +Click the image icon on the map toolbar and the print window will open. Title: Image title, will appear as a headline in the image. Layers: Choose whether polygons, points or both will be printed. Width/Height: The pixel resolution of the image. Choose among the predefined "small" (800x600), "medium" (1190x880), "large" (1920x1200) or type the exact number of pixels yourself (type the number only, avoid text like "px"). If you want to exclude the legend from the image, untick the legend checkbox. Finally click the export button to print the image (PNG). +
Background information === modified file 'src/docbkx/en/dhis2_user_man_import_export.xml' --- src/docbkx/en/dhis2_user_man_import_export.xml 2010-10-18 12:55:04 +0000 +++ src/docbkx/en/dhis2_user_man_import_export.xml 2011-01-14 12:02:57 +0000 @@ -35,13 +35,6 @@ The import or export is available only when the selected organisation (source/destination) has defined datasets. This is because datasets help to define which data is to be or is being exported. Further, which specific data elements get exported is determined by the composition of the dataset being exported. If there are no datasets defined for an organisation unit, it indicates that no data values are registered for this level of organisation or lower. To access the main Import-Export module, choose Services->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.
@@ -53,19 +46,12 @@ - + A pop-up save option will appear on the displayed screen (see picture below) prompting the saving of the exported data. You may save the export folder on your desktop or any other folder by selecting the ‘Save to Disk’ option from the pop-up prompt. - - - - - - -
Exporting metadata to other DHIS2 systems @@ -76,7 +62,7 @@ - + @@ -87,7 +73,7 @@ - + @@ -124,7 +110,7 @@ Default import screen - + === modified file 'src/docbkx/en/dhis2_user_man_indicators.xml' --- src/docbkx/en/dhis2_user_man_indicators.xml 2010-12-08 13:58:54 +0000 +++ src/docbkx/en/dhis2_user_man_indicators.xml 2011-01-14 12:02:57 +0000 @@ -6,7 +6,7 @@ - + @@ -18,11 +18,11 @@
Indicators Indicators are composed of multiple data elements, and typically consist of a numerator and denominator. Indicators are never entered in DHIS2, but are derived from combinations of data elements and factors. Indicators are used to calculate coverage rates, incidence and other values are are a result of data element values that have been entered into the system. - To access the Indicator maintains page, press Maintenance->Data element and indicators->Indicators from the main DHIS2 menu. Similar to data elements, you can add, delete, modify and view extra information about the indicators in the system. + To access the Indicator maintains page, press Maintenance -> Data Element and Indicators -> Indicator from the main DHIS2 menu. Similar to data elements, you can add, delete, modify and view extra information about the indicators in the system. - + @@ -45,7 +45,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -144,7 +144,7 @@ - + === removed file 'src/docbkx/en/resources/images/GIS/admin_panel.png' Binary files src/docbkx/en/resources/images/GIS/admin_panel.png 2010-03-11 11:45:09 +0000 and src/docbkx/en/resources/images/GIS/admin_panel.png 1970-01-01 00:00:00 +0000 differ === removed file 'src/docbkx/en/resources/images/GIS/assign_org_units.png' Binary files src/docbkx/en/resources/images/GIS/assign_org_units.png 2010-03-11 11:45:09 +0000 and src/docbkx/en/resources/images/GIS/assign_org_units.png 1970-01-01 00:00:00 +0000 differ === removed file 'src/docbkx/en/resources/images/GIS/dhis_gis_center_point.png' Binary files src/docbkx/en/resources/images/GIS/dhis_gis_center_point.png 2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/GIS/dhis_gis_center_point.png 1970-01-01 00:00:00 +0000 differ === removed file 'src/docbkx/en/resources/images/GIS/geoserver_center_point.png' Binary files src/docbkx/en/resources/images/GIS/geoserver_center_point.png 2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/GIS/geoserver_center_point.png 1970-01-01 00:00:00 +0000 differ === removed file 'src/docbkx/en/resources/images/GIS/get_name_geojson.png' Binary files src/docbkx/en/resources/images/GIS/get_name_geojson.png 2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/GIS/get_name_geojson.png 1970-01-01 00:00:00 +0000 differ === removed file 'src/docbkx/en/resources/images/GIS/get_name_geoserver.png' Binary files src/docbkx/en/resources/images/GIS/get_name_geoserver.png 2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/GIS/get_name_geoserver.png 1970-01-01 00:00:00 +0000 differ === removed file 'src/docbkx/en/resources/images/GIS/register_geodata.png' Binary files src/docbkx/en/resources/images/GIS/register_geodata.png 2010-03-11 11:45:09 +0000 and src/docbkx/en/resources/images/GIS/register_geodata.png 1970-01-01 00:00:00 +0000 differ === modified file 'src/docbkx/en/resources/images/dhis2UserManual/data_entry_screen_main.png' Binary files src/docbkx/en/resources/images/dhis2UserManual/data_entry_screen_main.png 2011-01-14 09:02:46 +0000 and src/docbkx/en/resources/images/dhis2UserManual/data_entry_screen_main.png 2011-01-14 12:02:57 +0000 differ === renamed directory 'src/docbkx/en/resources/images/GIS' => 'src/docbkx/en/resources/images/gis' === added file 'src/docbkx/en/resources/images/gis/gis_main.png' Binary files src/docbkx/en/resources/images/gis/gis_main.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/gis/gis_main.png 2011-01-14 12:02:57 +0000 differ === modified file 'src/docbkx/en/resources/images/import_export/export_to_dhis2.png' Binary files src/docbkx/en/resources/images/import_export/export_to_dhis2.png 2009-12-10 14:21:14 +0000 and src/docbkx/en/resources/images/import_export/export_to_dhis2.png 2011-01-14 12:02:57 +0000 differ === removed file 'src/docbkx/en/resources/images/import_export/export_to_dhis2.xcf' Binary files src/docbkx/en/resources/images/import_export/export_to_dhis2.xcf 2009-12-10 14:21:14 +0000 and src/docbkx/en/resources/images/import_export/export_to_dhis2.xcf 1970-01-01 00:00:00 +0000 differ === modified file 'src/docbkx/en/resources/images/import_export/import_default.png' Binary files src/docbkx/en/resources/images/import_export/import_default.png 2010-01-19 19:29:45 +0000 and src/docbkx/en/resources/images/import_export/import_default.png 2011-01-14 12:02:57 +0000 differ === modified file 'src/docbkx/en/resources/images/import_export/metadata_detail.png' Binary files src/docbkx/en/resources/images/import_export/metadata_detail.png 2009-12-10 14:21:14 +0000 and src/docbkx/en/resources/images/import_export/metadata_detail.png 2011-01-14 12:02:57 +0000 differ === added file 'src/docbkx/en/resources/images/import_export/metadata_export.png' Binary files src/docbkx/en/resources/images/import_export/metadata_export.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/import_export/metadata_export.png 2011-01-14 12:02:57 +0000 differ === removed directory 'src/docbkx/en/resources/images/import_export/metadata_export.png' === removed file 'src/docbkx/en/resources/images/import_export/metdata_export.png' Binary files src/docbkx/en/resources/images/import_export/metdata_export.png 2009-12-10 14:21:14 +0000 and src/docbkx/en/resources/images/import_export/metdata_export.png 1970-01-01 00:00:00 +0000 differ === modified file 'src/docbkx/en/resources/images/maintainence/data_browser1.png' Binary files src/docbkx/en/resources/images/maintainence/data_browser1.png 2010-01-14 14:47:26 +0000 and src/docbkx/en/resources/images/maintainence/data_browser1.png 2011-01-14 12:02:57 +0000 differ === modified file 'src/docbkx/en/resources/images/maintainence/data_browser_dataset_detail.png' Binary files src/docbkx/en/resources/images/maintainence/data_browser_dataset_detail.png 2010-01-18 15:58:42 +0000 and src/docbkx/en/resources/images/maintainence/data_browser_dataset_detail.png 2011-01-14 12:02:57 +0000 differ === modified file 'src/docbkx/en/resources/images/maintainence/data_browser_org_unit1.png' Binary files src/docbkx/en/resources/images/maintainence/data_browser_org_unit1.png 2010-01-14 14:47:26 +0000 and src/docbkx/en/resources/images/maintainence/data_browser_org_unit1.png 2011-01-14 12:02:57 +0000 differ === removed file 'src/docbkx/en/resources/images/maintainence/data_browser_orgunit2.png' Binary files src/docbkx/en/resources/images/maintainence/data_browser_orgunit2.png 2010-01-14 14:47:26 +0000 and src/docbkx/en/resources/images/maintainence/data_browser_orgunit2.png 1970-01-01 00:00:00 +0000 differ === modified file 'src/docbkx/en/resources/images/maintainence/data_browser_orgunit2a.png' Binary files src/docbkx/en/resources/images/maintainence/data_browser_orgunit2a.png 2010-01-14 14:47:26 +0000 and src/docbkx/en/resources/images/maintainence/data_browser_orgunit2a.png 2011-01-14 12:02:57 +0000 differ === modified file 'src/docbkx/en/resources/images/maintainence/data_browsing_data_sets.png' Binary files src/docbkx/en/resources/images/maintainence/data_browsing_data_sets.png 2010-01-18 15:58:42 +0000 and src/docbkx/en/resources/images/maintainence/data_browsing_data_sets.png 2011-01-14 12:02:57 +0000 differ === modified file 'src/docbkx/en/resources/images/maintainence/data_dictionary.png' Binary files src/docbkx/en/resources/images/maintainence/data_dictionary.png 2010-02-06 13:15:50 +0000 and src/docbkx/en/resources/images/maintainence/data_dictionary.png 2011-01-14 12:02:57 +0000 differ === added file 'src/docbkx/en/resources/images/maintainence/data_locking_main.png' Binary files src/docbkx/en/resources/images/maintainence/data_locking_main.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/maintainence/data_locking_main.png 2011-01-14 12:02:57 +0000 differ === modified file 'src/docbkx/en/resources/images/maintainence/data_stats.png' Binary files src/docbkx/en/resources/images/maintainence/data_stats.png 2010-01-18 15:58:42 +0000 and src/docbkx/en/resources/images/maintainence/data_stats.png 2011-01-14 12:02:57 +0000 differ === modified file 'src/docbkx/en/resources/images/maintainence/indicator_add.png' Binary files src/docbkx/en/resources/images/maintainence/indicator_add.png 2010-02-06 13:15:50 +0000 and src/docbkx/en/resources/images/maintainence/indicator_add.png 2011-01-14 12:02:57 +0000 differ === modified file 'src/docbkx/en/resources/images/maintainence/indicator_group_sets.png' Binary files src/docbkx/en/resources/images/maintainence/indicator_group_sets.png 2010-02-06 13:15:50 +0000 and src/docbkx/en/resources/images/maintainence/indicator_group_sets.png 2011-01-14 12:02:57 +0000 differ === added file 'src/docbkx/en/resources/images/maintainence/indicator_maintenance_main.png' Binary files src/docbkx/en/resources/images/maintainence/indicator_maintenance_main.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/maintainence/indicator_maintenance_main.png 2011-01-14 12:02:57 +0000 differ === modified file 'src/docbkx/en/resources/images/maintainence/indicator_numerator_denominator.png' Binary files src/docbkx/en/resources/images/maintainence/indicator_numerator_denominator.png 2010-02-06 13:15:50 +0000 and src/docbkx/en/resources/images/maintainence/indicator_numerator_denominator.png 2011-01-14 12:02:57 +0000 differ === modified file 'src/docbkx/en/resources/images/maintainence/indicator_type.png' Binary files src/docbkx/en/resources/images/maintainence/indicator_type.png 2010-02-06 13:15:50 +0000 and src/docbkx/en/resources/images/maintainence/indicator_type.png 2011-01-14 12:02:57 +0000 differ === removed file 'src/docbkx/en/resources/images/maintainence/inidcator_maintainance_main.png' Binary files src/docbkx/en/resources/images/maintainence/inidcator_maintainance_main.png 2010-02-06 13:15:50 +0000 and src/docbkx/en/resources/images/maintainence/inidcator_maintainance_main.png 1970-01-01 00:00:00 +0000 differ