------------------------------------------------------------
revno: 1153
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2-docbook-docs
timestamp: Tue 2014-07-22 18:53:59 +0200
message:
Data value import, attribute option combo
modified:
src/docbkx/en/dhis2_user_man_import_export.xml
src/docbkx/en/dhis2_user_man_web_api.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_import_export.xml'
--- src/docbkx/en/dhis2_user_man_import_export.xml 2014-07-17 13:26:36 +0000
+++ src/docbkx/en/dhis2_user_man_import_export.xml 2014-07-22 16:53:59 +0000
@@ -606,7 +606,8 @@
<row>
<entry>Data element</entry>
<entry>Yes</entry>
- <entry>Refers to id by default, can also be name and code based on selected id scheme</entry>
+ <entry>Refers to ID by default, can also be name and code based on selected id
+ scheme</entry>
</row>
<row>
<entry>Period</entry>
@@ -616,12 +617,18 @@
<row>
<entry>Org unit</entry>
<entry>Yes</entry>
- <entry>Refers to id by default, can also be name and code based on selected id scheme</entry>
+ <entry>Refers to ID by default, can also be name and code based on selected id
+ scheme</entry>
</row>
<row>
<entry>Category option combo</entry>
<entry>No</entry>
- <entry>Refers to id</entry>
+ <entry>Refers to ID</entry>
+ </row>
+ <row>
+ <entry>Attribute option combo</entry>
+ <entry>No</entry>
+ <entry>Refers to ID (from version 2.16)</entry>
</row>
<row>
<entry>Value</entry>
@@ -652,14 +659,14 @@
</tgroup>
</table></para>
<para>The following is an example CSV file which can be imported into DHIS 2. It can be imported both as plain text file or as compressed ZIP file archive.</para>
- <screen>"dataelement","period","orgunit","categoryoptioncombo","value","storedby","timestamp","comment","followup"
-"DUSpd8Jq3M7","201202","gP6hn503KUX","Prlt0C1RF0s","7","bombali","2010-04-17",,"false"
-"DUSpd8Jq3M7","201202","gP6hn503KUX","V6L425pT3A0","10","bombali","2010-04-17",,"false"
-"DUSpd8Jq3M7","201202","OjTS752GbZE","V6L425pT3A0","9","bombali","2010-04-06",,"false"</screen>
+ <screen>"dataelement","period","orgunit","categoryoptioncombo","attributeoptioncombo","value","storedby","timestamp","comment","followup"
+"DUSpd8Jq3M7","201202","gP6hn503KUX","Prlt0C1RF0s",,"7","bombali","2010-04-17",,"false"
+"DUSpd8Jq3M7","201202","gP6hn503KUX","V6L425pT3A0",,"10","bombali","2010-04-17",,"false"
+"DUSpd8Jq3M7","201202","OjTS752GbZE","V6L425pT3A0",,"9","bombali","2010-04-06",,"false"</screen>
</section>
<section>
<title>Event data import</title>
- <para>Event data can also be easily imported with the "Event data import" function. Refer to the section in the WebAPI for more information on the format used for importing events. Otherwise, the functionality is the same as the XML data import used for aggregate data. </para>
+ <para>Event data can also be easily imported with the "Event data import" function. Refer to the section in the WebAPI for more information on the format used for importing events. Otherwise, the functionality is the same as the XML data import used for aggregate data. </para>
</section>
<section id="importPDFdata">
<title>Importing PDF data</title>
=== modified file 'src/docbkx/en/dhis2_user_man_web_api.xml'
--- src/docbkx/en/dhis2_user_man_web_api.xml 2014-07-21 15:38:11 +0000
+++ src/docbkx/en/dhis2_user_man_web_api.xml 2014-07-22 16:53:59 +0000
@@ -682,7 +682,7 @@
that data to the national DHIS 2 instance.</para>
<para>The entry point for the Web API running on the demo instance is <ulink url="http://apps.dhis2.org/demo/api"/>. The entry point provides a convenient HTML page with links to all of the available resources in the Web API. The resource which is most appropriate for our purpose of sending data values is the <emphasis role="italic">dataValueSets</emphasis> resource. A data value set represents a set of data values which have a logical relationship, usually from being captured off the same data entry form. We follow the link to the HTML representation which will take us to <ulink url="http://apps.dhis2.org/demo/api/dataValueSets"/>. The default representation is a HTML page which provides us with useful instructions on how to interact with this resources. It tells us that we can use the POST verb to send values using a XML format defined by the <emphasis role="italic">http://dhis2.org/schema/dxf/2.0</emphasis> namespace:</para>
<screen><dataValueSet xmlns="http://dhis2.org/schema/dxf/2.0" dataSet="dataSetID"
- completeDate="date" period="period" orgUnit="orgUnitID">
+ completeDate="date" period="period" orgUnit="orgUnitID" attributeOptionCombo="aocID">
<dataValue dataElement="dataElementID" value="1"/>
<dataValue dataElement="dataElementID" value="2"/>
<dataValue dataElement="dataElementID" value="3"/>
@@ -693,6 +693,7 @@
"completeData": "date",
"period": "period",
"orgUnit": "orgUnitID",
+ "attributeOptionCombo", "aocID",
"dataValues": [
{ "dataElement": "dataElementID", "value": "1" },
{ "dataElement": "dataElementID", "value": "2" },
@@ -1399,7 +1400,7 @@
<section>
<title>Forms</title>
<para>To retrieve information about a form (which corresponds to a data set and its sections)
- you can interact with the <emphasis role="italic">forms</emphasis> resource. The form response
+ you can interact with the <emphasis role="italic">form</emphasis> resource. The form response
is accessible as XML and JSON and will provide information about each section (group) in the
form as well as each field in the sections, including label and identifiers. By supplying
period and organisation unit identifiers the form response will be populated with data values. </para>
_______________________________________________
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
