dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 423
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2-docbook-docs
timestamp: Thu 2011-12-01 09:05:24 +0200
message:
  Few adjustments to data entry text based on new behaviour of the data entry screens. Some clarifications to setting up GIS text.
added:
  src/docbkx/en/resources/images/data_entry/data_entry_overview.png
modified:
  pom.xml
  src/docbkx/en/dhis2_user_man_creating_gis.xml
  src/docbkx/en/dhis2_user_man_data_entry.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 'pom.xml'
--- pom.xml	2011-10-04 19:44:03 +0000
+++ pom.xml	2011-12-01 07:05:24 +0000
@@ -248,6 +248,7 @@
               <argLine>-Xmx1024m</argLine>
               <foCustomization>${docbook.source}/en/resources/xsl/fop-cust.xsl</foCustomization>
               <doubleSided>1</doubleSided>
+			  <paperType>A4</paperType>
               <includes>dhis2_user_manual_en.xml</includes>
               <sourceDirectory>${docbook.source}/en/</sourceDirectory>
               <postProcess>
@@ -266,6 +267,7 @@
               <argLine>-Xmx1024m</argLine>
               <foCustomization>${docbook.source}/en/resources/xsl/fop-cust.xsl</foCustomization>
               <doubleSided>1</doubleSided>
+			  <paperType>A4</paperType>
               <includes>dhis2_implementation_guide_en.xml</includes>
               <sourceDirectory>${docbook.source}/en/</sourceDirectory>
               <postProcess>
@@ -284,6 +286,7 @@
               <argLine>-Xmx1024m</argLine>
               <foCustomization>${docbook.source}/en/resources/xsl/fop-cust.xsl</foCustomization>
               <doubleSided>1</doubleSided>
+			  <paperType>A4</paperType>
               <includes>dhis2_end_user_manual.xml</includes>
               <sourceDirectory>${docbook.source}/en/</sourceDirectory>
               <postProcess>

=== modified file 'src/docbkx/en/dhis2_user_man_creating_gis.xml'
--- src/docbkx/en/dhis2_user_man_creating_gis.xml	2011-09-12 12:04:23 +0000
+++ src/docbkx/en/dhis2_user_man_creating_gis.xml	2011-12-01 07:05:24 +0000
@@ -5,14 +5,15 @@
   <section>
     <title>Context</title>
     <para>
-      Setting up the GIS simply means storing coordinates for the organisation units you want to show on the map in the database. Coordinates are distributed in shapefiles, which is the most common geospatial vector data format for desktop applications (you might find shapefiles for your country at http://www.diva-gis.org/gdata). The work that needs to be done in order to use these coordinates in DHIS 2 GIS is transfering them and storing them with the corresponding organisation units in the database.
-    </para>
-    <para>If you go to the organisation unit module and edit one of the units, you can see a textfield called Coordinates. Here you may fill in its coordinates directly (geojson format) which is quite neat if you just want to update a couple of units.</para>
+      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 <ulink url="http://www.diva-gis.org/gd";>here</ulink> 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. </para>
+    <para>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.</para>
     <para>An example point/facility coordinate:</para>
     <para><programlisting><userinput>[29.341,-11.154]</userinput></programlisting></para>
     <para>An example polygon/area coordinates string:</para>
     <para><programlisting><userinput>[[[[29.343,-11.154],[28.329,-11.342],[28.481,-10.239],[29.833,-10.412]]]]</userinput></programlisting></para>
-    <para>However, if you are going to e.g. add coordinates for all units at a certain level you don&apos;t want to do that manually. This is where the automatic GML import comes into play and the following section explains the preferred way of using it.</para>
+    <para>However, if you are going to e.g. add coordinates for all units at a certain level you don&apos;t want to do that manually. This is where the automatic GML import comes into play and the following section explains the preferred way of using it.<note>
+        <para>The only projection system supported by DHIS2 is EPSG 4326. Coordinates must be stored with the longitude (east/west position) proceeding the latitude (north/south position. If you vector data is in a different format than EPSG 4326, you will need to reproject first before importing. </para>
+      </note></para>
   </section>
   <section id="gisSetup">
     <title>Importing coordinates</title>
@@ -34,7 +35,7 @@
       Unfortunately, the GML file is not ready for importation yet. Open it in a robust text editor like Geany (Linux) or Notepad++ (Windows). GML is an XML based format which means that you will recognize the regular XML tag hierarchy. In the GML file an organisation unit is represented as a &lt;gml:featureMember&gt;. Inside the feature members we usually find a lot of attributes, but we are just going to import their coordinates. In order to do this DHIS 2 will match the name of the feature members to the organisation unit names in the database. To get the name of the feature members in the GML file the importer will look for a property called &quot;ogr:Name&quot;. Figure out what property that is holding the name of the feature members (could be &quot;ogr:DISTRICT_NAME&quot;, &quot;ogr:NAME_1&quot; or whatever, this differs from shapefile to shapefile) and rename it to &quot;ogr:Name&quot;. Ensure that both the start and the end tags are renamed properly. They are supposed to look like e.g.: &lt;ogr:Name&gt;Moyamba District&lt;/ogr:Name&gt;
     </para>
     <para>
-      Note that the name of the feature members in the GML file must be spelled exactly the same as the organisation units in the database. Otherwise the importer will not recognize it and thus not transfer any coordinates. E.g. &quot;Moyamba&quot; in the GML file migth be called &quot;Moyamba District&quot; in the database. Creative use of the &quot;rename all&quot; function in the text editor is usually of great help in these situations, as you do not want to edit numerous feature members manually. Have a brief look at the names and compare them to the names in the database. If they seem to match fairly good, it is about time to do a preview in the import-export module.
+      Note that the name of the feature members in the GML file must be spelled exactly the same as the organisation units in the database. Otherwise the importer will not recognize it and thus not transfer any coordinates. E.g. &quot;Moyamba&quot; in the GML file might be called &quot;Moyamba District&quot; in the database. Creative use of the &quot;rename all&quot; function in the text editor is usually of great help in these situations, as you do not want to edit numerous feature members manually. Have a brief look at the names and compare them to the names in the database. If they seem to match fairly good, it is about time to do a preview in the import-export module.
     </para>
     <para>
       Go to Services -&gt; Import-Export, select &quot;Preview&quot;, select the GML file and click &quot;Import&quot;. Look for new/updated organisation units. Our intention is to add coordinates to already existing organisation units in the database, so we want as many updates as possible and 0 new. Those listed as new will be created as root units and mess up the organisation unit trees in DHIS 2. If any listed as new, click the number and the organisation units in question will appear in the list below. If there are any slight misspellings compared to the organisation unit names in the database - fix them and do the preview again. Otherwise, click the &quot;discard all&quot; button below the list and then the &quot;Import all&quot; button above the list.

=== modified file 'src/docbkx/en/dhis2_user_man_data_entry.xml'
--- src/docbkx/en/dhis2_user_man_data_entry.xml	2011-09-27 03:39:21 +0000
+++ src/docbkx/en/dhis2_user_man_data_entry.xml	2011-12-01 07:05:24 +0000
@@ -40,12 +40,12 @@
         </listitem>
       </orderedlist>
       <para>By now you should see the data entry form. </para>
-      <para>You can change the type of form using the radio buttons above the form in the top right corner. The available types are: 1) &quot;Default forms&quot; which are  simple list-based or tabular forms, 2) &quot;Section forms&quot; which can consist of multiple tables and better mimic the paper forms, or 3) &quot;Custom forms&quot; which follow a completely custom design defined by the user. Section and custom forms require that these have been set up by the user first, while default is always available. In the top-right corner just above the form you can switch between the three types of forms.    </para>
+      <para>Depending on how the data entry form has been implemented, you will see three different types of foms: Default forms, section forms, or custom forms. If a custom form exists, it will be displayed, followed in order of precedence by a section form, and finally a default form.</para>
       <screenshot>
         <screeninfo>Main data entry screen</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="100%" fileref="resources/images/dhis2UserManual/data_entry_ke.png" format="PNG"/>
+            <imagedata width="100%" fileref="resources/images/data_entry/data_entry_overview.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -55,7 +55,6 @@
       <para>Simply start entering data by clicking inside the first field and type in the value. Move to the next field using the Tab button. Shift+Tab will take you back one step. The values are saved immediately and do not require any save/finished button click. A green field indicates that the value has been saved in the system (on the server). On a slow connection it might take some time before the values are saved. </para>
       <para><emphasis role="bold">Input validation:</emphasis> If you type in an invalid value, e.g. a character in a field that only accepts numeric values you will get a pop-up that explains the problem and the field will be coloured yellow (not saved) until you have corrected the value. If you have defined a min/max range for the field (data element+organisation unit combination) a pop-up message will notify you when the value is out of range, and the value will remain unsaved until you have changed the value (or updated the  range and then re-entered the value). </para>
       <para><emphasis role="bold">Disabled fields:</emphasis> If a field is disabled (grey) it means that the field should not be filled. The cursor will automatically jump to the next open field. </para>
-      <para><emphasis role="bold">Hide/show section data:</emphasis> When using section forms it is possible to minimise and maximise sections by clicking on the section headers.</para>
       <para><emphasis role="bold">Data history:</emphasis> By double-clicking on any input field in the form a data history window opens showing the last 12 values registered for the current field (organisation unit+data element+categoryoptioncombo) in a bar chart. This window also shows the min and max range and allows for adjusting the range for the specific organisation unit and data element combination. </para>
       <screenshot>
         <screeninfo>Data entry section form with history pop-up</screeninfo>

=== added file 'src/docbkx/en/resources/images/data_entry/data_entry_overview.png'
Binary files src/docbkx/en/resources/images/data_entry/data_entry_overview.png	1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/data_entry/data_entry_overview.png	2011-12-01 07:05:24 +0000 differ