dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1518
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Sat 2010-02-27 21:22:30 +0100
message:
  Added help to dhis-web-dataentry
modified:
  dhis-2/dhis-options/src/main/resources/help_content.xml
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.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-options/src/main/resources/help_content.xml'
--- dhis-2/dhis-options/src/main/resources/help_content.xml	2010-02-25 18:35:33 +0000
+++ dhis-2/dhis-options/src/main/resources/help_content.xml	2010-02-27 20:22:30 +0000
@@ -1,6 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <book>
   <chapter>
+    <title>Data entry</title>
+    <section>
+      <title>Learning Objectives</title>
+      <para>After reading this chapter you will be able to understand:</para>
+      <itemizedlist>
+        <listitem>
+          <para>How to do data entry</para>
+        </listitem>
+        <listitem>
+          <para>How to do data validation</para>
+        </listitem>
+        <listitem>
+          <para>How to use standard and customised data entry screens</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+    <section id="dataEntry">
+      <title>Data entry with DHIS 2</title>
+      <para>The data entry module is where data is manually registered in the DHIS 2 database.</para>
+      <section>
+        <title>Opening the “Data Entry” screen</title>
+        <para>Entering data in DHIS 2 is a very simple task, and involves the
+    following steps. Click on the services tab displayed on the main menu. A
+    drop down menu will appear listing the services provided by DHIS2. Click
+    on the <guibutton>Data Entry</guibutton> option.</para>
+        <screenshot>
+          <screeninfo>Open DHIS2 data entry screen</screeninfo>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/open_data_entry_screen.png"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+        <para>You will now enter the data entry module. This module is where the
+    services/ data values are captured / registered into the system. The
+    screen display will be like the screen-shot shown below.</para>
+        <screenshot>
+          <screeninfo>Main data entry screen</screeninfo>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/data_entry_screen_main.png"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </section>
+      <section>
+        <title>Navigate organisation tree and select organisation unit</title>
+        <para>In order to enter data you will first have to select the particular
+    organisation unit (e.g. Sub Centre/PHC/districts etc) for which you are
+    going to enter data. Simply clicking on the concerned organisation unit
+    from the organisation units hierarchy displayed on the left side of the
+    data entry screen.</para>
+        <screenshot>
+          <screeninfo>Select Organisational unit</screeninfo>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/data_entry_screen_select_org_unit.png"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </section>
+      <section>
+        <title>Entering data</title>
+        <para>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.</para>
+        <screenshot>
+          <screeninfo>Select dataset</screeninfo>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/data_entry_select_data_set.png"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+        <para>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
+    entry. You will learn to create and assign datasets to specific
+    organisation unit in a later module. </para>
+      </section>
+    </section>
+  </chapter>
+  <chapter>
     <title>Data elements and indicators</title>
     <para>This sub module is required for the management of the data elements and indicators used by the application. When the ‘Data Elements and Indicators’ options is chosen from the main Maintenance menu, the following screen appears:</para>
     <screenshot>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-02-25 03:10:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-02-27 20:22:30 +0000
@@ -21,7 +21,7 @@
 function getHelpContent( id )
 {
     $.get( 
-       '../dhis-web-commons-help/getHelpContent.action',
+       '../dhis-web-commons-about/getHelpContent.action',
        { "id": id },
        function( data )
        {

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2009-04-17 00:20:52 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2010-02-27 20:22:30 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "data_entry" )</h3>
+<h3>$i18n.getString( "data_entry" ) #openHelp( "dataEntry" )</h3>
 
 <div id="currentSelection">
 	#if ( $organisationUnit ) $encoder.htmlEncode( $organisationUnit.name )#else $i18n.getString( "no_organisationunit_selected" ) #end -