dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #03491
[Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 60: Started updating sample dxf file (not yet complete)
------------------------------------------------------------
revno: 60
committer: Bob Jolliffe <bobj@bobj-laptop>
branch nick: dhis2-docbook-docs
timestamp: Sat 2009-12-05 15:49:20 +0000
message:
Started updating sample dxf file (not yet complete)
modified:
src/schemas/dxf_v2_schema/sample_dxf2.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/schemas/dxf_v2_schema/sample_dxf2.xml'
--- src/schemas/dxf_v2_schema/sample_dxf2.xml 2009-10-30 15:37:22 +0000
+++ src/schemas/dxf_v2_schema/sample_dxf2.xml 2009-12-05 15:49:20 +0000
@@ -1,19 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?oxygen RNGSchema="file:dxf2.rng" type="xml"?>
-<dxf xmlns="http://dhis2.org/ns/schema/dxf2";>
+<?oxygen RNGSchema="dxf2_1.rng" type="xml"?>
+
+<dxf xmlns="http://dhis2.org/ns/schema/dxf2"; >
<metadata>
+
+ <orgUnitStructure>
+ <groupSets/>
+ <organisationUnitGroups/>
+ <organisationUnits>
+ <organisationUnit id="ou1">
+ <uuid/>
+ <name>Bob's District</name>
+ <alternativename>Bob's District</alternativename>
+ <shortname>Bob's District</shortname>
+ <code>DISTRICT_BOB</code>
+ <description/>
+ <openingDate/>
+ <closedDate/>
+ <active/>
+ <comment/>
+ <geoCode/>
+ <dataSets/>
+ <organisationGroups/>
+ <children>
+ <organisationUnit id="ou2">
+ <uuid></uuid>
+ <name>Bob's Clinic</name>
+ <alternativename>Bob's Clinic</alternativename>
+ <shortname>Bob's Clinic</shortname>
+ <code></code>
+ <description></description>
+ <openingDate></openingDate>
+ <closedDate></closedDate>
+ <active></active>
+ <comment></comment>
+ <geoCode></geoCode>
+ <dataSets></dataSets>
+ <organisationGroups></organisationGroups>
+ <children></children>
+ </organisationUnit>
+ <organisationUnit id="ou3">
+ <uuid></uuid>
+ <name></name>
+ <alternativename></alternativename>
+ <shortname></shortname>
+ <code></code>
+ <description></description>
+ <openingDate></openingDate>
+ <closedDate></closedDate>
+ <active></active>
+ <comment></comment>
+ <geoCode></geoCode>
+ <dataSets></dataSets>
+ <organisationGroups></organisationGroups>
+ <children>
+ <organisationUnit id="ou4">
+ <uuid></uuid>
+ <name></name>
+ <alternativename></alternativename>
+ <shortname></shortname>
+ <code></code>
+ <description></description>
+ <openingDate></openingDate>
+ <closedDate></closedDate>
+ <active></active>
+ <comment></comment>
+ <geoCode></geoCode>
+ <dataSets></dataSets>
+ <organisationGroups></organisationGroups>
+ <children></children>
+ </organisationUnit>
+
+ </children>
+ </organisationUnit>
+
+ </children>
+ </organisationUnit>
+ </organisationUnits>
+ <organisationUnitLevels/>
+ </orgUnitStructure>
+
<categories>
- <category>
- <id>1</id>
+ <category id="cat1">
<uuid/>
<name>Gender</name>
<alternativename/>
<shortname>Gender</shortname>
<code>CL_GENDER</code>
<description/>
- <categoryOption>
- <id>1</id>
+ <categoryOption id="catopt1">
<uuid/>
<name>Male</name>
<alternativename/>
@@ -21,8 +97,7 @@
<code>MALE</code>
<description/>
</categoryOption>
- <categoryOption>
- <id>2</id>
+ <categoryOption id="catopt2">
<uuid/>
<name>Female</name>
<alternativename/>
@@ -31,16 +106,14 @@
<description/>
</categoryOption>
</category>
- <category>
- <id>2</id>
+ <category id="cat2">
<uuid/>
<name>Age</name>
<alternativename/>
<shortname>Age</shortname>
<code>CL_AGE</code>
<description/>
- <categoryOption>
- <id>3</id>
+ <categoryOption id="catopt3">
<uuid/>
<name>Under 5</name>
<alternativename/>
@@ -48,8 +121,7 @@
<code>UNDER_5</code>
<description/>
</categoryOption>
- <categoryOption>
- <id>4</id>
+ <categoryOption id="catopt4">
<uuid/>
<name>5 to 10</name>
<alternativename/>
@@ -63,14 +135,12 @@
<categoryCombos>
<!-- The default categoryCombo has no categories-->
- <categoryCombo>
- <id>1</id>
+ <categoryCombo id="categoryCombo1">
<name>default</name>
<categories/>
</categoryCombo>
- <categoryCombo>
- <id>2</id>
+ <categoryCombo id="categoryCombo2">
<name>Age - Sex combination</name>
<categories>
<categoryId>1</categoryId>
@@ -82,31 +152,27 @@
<categoryOptionCombos>
<!-- default has no values-->
- <categoryOptionCombo>
- <id>1</id>
+ <categoryOptionCombo id="categoryOptionCombo1" categoryComboId="categoryCombo1" >
<uuid/>
<name>default</name>
<alternativename/>
<shortname>default</shortname>
<code/>
<description/>
- <categoryComboId>1</categoryComboId>
</categoryOptionCombo>
- <categoryOptionCombo>
- <id>2</id>
+ <categoryOptionCombo id="categoryOptionCombo1" categoryComboId="categoryCombo1">
<uuid/>
<name>Male under 5</name>
<alternativename/>
<shortname>Male under 5</shortname>
<code/>
<description/>
- <categoryComboId>2</categoryComboId>
- <categoryOptionId>1</categoryOptionId>
- <categoryOptionId>3</categoryOptionId>
+ <categoryoptionID id="catopt1"/>
+ <categoryoptionID id="catopt3"/>
</categoryOptionCombo>
- <categoryOptionCombo>
+ <categoryOptionCombo id="categoryOptionCombo2" categoryComboId="categoryCombo1">
<id>3</id>
<uuid/>
<name>Female under 5</name>
@@ -220,6 +286,10 @@
</dataElements>
+
+ <indicatorTypes/>
+ <indicators/>
+
<dataElementGroupSets>
<dataElementGroupSet>
<id>1</id>
@@ -229,28 +299,30 @@
<shortname>Age</shortname>
<code>AGE</code>
<description/>
- <dataElementGroup>
- <id>1</id>
- <uuid/>
- <name>Under 5</name>
- <alternativename/>
- <shortname>Under 5</shortname>
- <code/>
- <description/>
- <dataElementId>2</dataElementId>
- <dataElementId>3</dataElementId>
- </dataElementGroup>
- <dataElementGroup>
- <id>2</id>
- <uuid/>
- <name>Over 5</name>
- <alternativename/>
- <shortname>Over 5</shortname>
- <code/>
- <description/>
- <dataElementId>4</dataElementId>
- <dataElementId>5</dataElementId>
- </dataElementGroup>
+ <Groups>
+ <dataElementGroup>
+ <id>1</id>
+ <uuid/>
+ <name>Under 5</name>
+ <alternativename/>
+ <shortname>Under 5</shortname>
+ <code/>
+ <description/>
+ <dataElementID>2</dataElementID>
+ <dataElementID>3</dataElementID>
+ </dataElementGroup>
+ <dataElementGroup>
+ <id>2</id>
+ <uuid/>
+ <name>Over 5</name>
+ <alternativename/>
+ <shortname>Over 5</shortname>
+ <code/>
+ <description/>
+ <dataElementID>4</dataElementID>
+ <dataElementID>5</dataElementID>
+ </dataElementGroup>
+ </Groups>
</dataElementGroupSet>
<dataElementGroupSet>
<id>2</id>
@@ -260,50 +332,40 @@
<shortname>Sex</shortname>
<code/>
<description/>
- <dataElementGroup>
- <id>3</id>
- <uuid/>
- <name>Male</name>
- <alternativename/>
- <shortname>Male</shortname>
- <code/>
- <description/>
- <dataElementId>2</dataElementId>
- <dataElementId>5</dataElementId>
- </dataElementGroup>
+ <Groups>
+ <dataElementGroup>
+ <id>3</id>
+ <uuid/>
+ <name>Male</name>
+ <alternativename/>
+ <shortname>Male</shortname>
+ <code/>
+ <description/>
+ <dataElementID>2</dataElementID>
+ <dataElementID>5</dataElementID>
+ </dataElementGroup>
+ </Groups>
</dataElementGroupSet>
-
+
</dataElementGroupSets>
-
- <indicatorTypes/>
- <indicators/>
- <!-- these are formatted the same as dataElementGroupSet -->
- <IndicatorGroupSets/>
-
- <organisationUnits>
- <organisationUnit>
+
+ <indicatorGroupSets/>
+
+ <dataSets>
+ <dataSet>
<id>1</id>
- <uuid/>
- <name>Bobs Clinic</name>
- <shortName>Bobs Clinic</shortName>
- <code/>
- <openingDate/>
- <closedDate/>
- <active>true</active>
- <comment/>
- <geoCode/>
- </organisationUnit>
- </organisationUnits>
-
- <organisationUnitRelationships/>
- <organisationUnitGroups/>
- <organisationUnitGroupMembers/>
- <groupSets/>
- <groupSetMembers/>
- <organisationUnitLevels/>
- <dataSetSourceAssociations/>
-
-
+ <name>Ante-Natal monthly</name>
+ <shortName>Ante-Natal monthly</shortName>
+ <code></code>
+ <periodType>Monthly</periodType>
+ <dataelements>
+ <id>2</id>
+ <id>3</id>
+ </dataelements>
+ </dataSet>
+ </dataSets>
+ <dataDictionaries/>
+
<periods>
<period>
<id>1</id>
