From 389d843a383019a05c7e77a77876868332bb8c0e Mon Sep 17 00:00:00 2001 From: Amy Silcock Date: Wed, 19 Sep 2018 16:28:52 +0100 Subject: [PATCH 1/4] Provide example of multiple default-aid-type Linked to issue: https://github.com/IATI/IATI-Codelists/issues/169 --- .../iati-activity/default-aid-type.rst | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst b/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst index 41d3d9da..73e4dd56 100644 --- a/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst +++ b/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst @@ -2,14 +2,23 @@ Example Usage ~~~~~~~~~~~~~ Example ``default-aid-type`` for an ``iati-activity``. -| The ``@code`` attribute declares a valid code (*A01*) from the *AidType* codelist. +| The ``@code`` attribute declares a valid code from the specified codelist. | The ``@vocabulary`` attribute declares a valid code (*1*) from the *AidTypeVocabulary* codelist. +.. code-block:: xml + + + + +The default-aid-type element can be repeated in any iati-activity. + .. literalinclude:: ../../activity-standard-example-annotated.xml :language: xml :start-after: :end-before: +The vocabulary is used to declare which AidType list is in use. If this is omitted, then IATI assumes an AidType of 1 (OECD DAC). + Changelog ~~~~~~~~~ 2.03 From 34682c28da2ebf38f415e443491635f5d9d2962d Mon Sep 17 00:00:00 2001 From: Amy Silcock Date: Wed, 19 Sep 2018 16:35:28 +0100 Subject: [PATCH 2/4] Added in note about aid-type overide --- .../iati-activities/iati-activity/default-aid-type.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst b/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst index 73e4dd56..61249719 100644 --- a/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst +++ b/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst @@ -19,6 +19,8 @@ The default-aid-type element can be repeated in any iati-activity. The vocabulary is used to declare which AidType list is in use. If this is omitted, then IATI assumes an AidType of 1 (OECD DAC). +| Note: The ``aid-type`` element can override the ``default-aid-type`` value set in ``iati-activity`` + Changelog ~~~~~~~~~ 2.03 From 2a7bc0ee7febb02cc192827a64b08ced03b2cba4 Mon Sep 17 00:00:00 2001 From: Petya Kangalova Date: Thu, 20 Sep 2018 10:01:18 +0100 Subject: [PATCH 3/4] Fix to specify it is Aid-type vocabulary --- .../iati-activities/iati-activity/default-aid-type.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst b/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst index 61249719..49f6f577 100644 --- a/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst +++ b/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst @@ -17,7 +17,7 @@ The default-aid-type element can be repeated in any iati-activity. :start-after: :end-before: -The vocabulary is used to declare which AidType list is in use. If this is omitted, then IATI assumes an AidType of 1 (OECD DAC). +The vocabulary is used to declare which AidType list is in use. If omitted, an Aid Type Vocabulary of 1 is assumed. | Note: The ``aid-type`` element can override the ``default-aid-type`` value set in ``iati-activity`` From 3869fbebb1bfce1039e575d691be13c97a92dd60 Mon Sep 17 00:00:00 2001 From: Amy Silcock Date: Thu, 20 Sep 2018 10:54:11 +0100 Subject: [PATCH 4/4] default aid type, minor wording to change Keeping this consistent with aid-type by specifying that code 1 is OECD DAC --- .../iati-activities/iati-activity/default-aid-type.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst b/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst index 49f6f577..aef25140 100644 --- a/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst +++ b/en/activity-standard/iati-activities/iati-activity/default-aid-type.rst @@ -17,7 +17,7 @@ The default-aid-type element can be repeated in any iati-activity. :start-after: :end-before: -The vocabulary is used to declare which AidType list is in use. If omitted, an Aid Type Vocabulary of 1 is assumed. +The vocabulary is used to declare which AidType list is in use. If omitted, an AidType Vocabulary of 1 (OECD DAC) is assumed. | Note: The ``aid-type`` element can override the ``default-aid-type`` value set in ``iati-activity``