[#297] Fix activity-status to status conversion

akvo · Sep 4, 2013 · 16a39ef · 16a39ef
1 parent a0d3318
commit 16a39ef
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/akvo/api/xml/iati-xslt.xml b/akvo/api/xml/iati-xslt.xml
@@ -75,20 +75,24 @@
   </xsl:template>
 
   <!-- status -->
-  <xsl:template match="activity-status[@code='1']">
-    <status>H</status>
+  <xsl:template match="activity-status[@code='1']"><!-- Pipeline/identification -->
+    <status>H</status><!-- Needs funding -->
   </xsl:template>
 
-  <xsl:template match="activity-status[@code='2']">
-    <status>A</status>
+  <xsl:template match="activity-status[@code='2']"><!-- Implementation -->
+    <status>A</status><!-- Active -->
   </xsl:template>
 
-  <xsl:template match="activity-status[@code='3']">
-    <status>C</status>
+  <xsl:template match="activity-status[@code='3']"><!-- Completion -->
+    <status>C</status><!-- Complete -->
   </xsl:template>
 
-  <xsl:template match="activity-status[@code='4']">
-    <status>A</status>
+  <xsl:template match="activity-status[@code='4']"><!-- Post-completion -->
+    <status>C</status><!-- Complete -->
+  </xsl:template>
+
+  <xsl:template match="activity-status[@code='5']"><!-- Cancelled -->
+    <status>L</status><!-- Cancelled -->
   </xsl:template>
 
   <!-- categories ManyToManyField -->

diff --git a/akvo/scripts/asset_manager/map.py b/akvo/scripts/asset_manager/map.py
@@ -1 +1 @@
-BUNDLE_MAP = {'partner_sites_style': {'path': 'partner_sites/css/', 'hash': '4cb1bbc54afc5e93731ea1cfec7456105dca127a', 'type': 'css'}, 'widget_project_updates': {'path': 'widgets/project_updates/css/', 'hash': '57ddaa0abcaef475a634bc2d6d0d59dc924ba109', 'type': 'css'}, 'akvo_ps_machinery_js': {'path': 'partner_sites/js/', 'hash': '2fcbb22efb57981a99cd9746f3b98575b4fa2b3c', 'type': 'js'}, 'widget_project_small': {'path': 'widgets/project_small/css/', 'hash': '984d858f5eff775d79c942a17358e5817a4092e2', 'type': 'css'}, 'widget_cobranded_leader': {'path': 'widgets/cobranded_leader/css/', 'hash': '1ae4b5057b7a715f2e00c20588bdc20a119dff39', 'type': 'css'}, 'partner_sites_script': {'path': 'partner_sites/js/', 'hash': 'a039f7e10cb45144d27a621a0469d61851dd5d02', 'type': 'js'}, 'akvo_ie6_style': {'path': 'akvo/css/', 'hash': '2c103c8bc0834a3e4145e6ce86541613b898d552', 'type': 'css'}, 'widget_cobranded_banner': {'path': 'widgets/cobranded_banner/css/', 'hash': '31ddbde98bffa9e8705c4b9a945d94202e20131b', 'type': 'css'}, 'widget_cobranded_narrow': {'path': 'widgets/cobranded_narrow/css/', 'hash': '572e7203abead79cf733c5687d67a9b4f8cf0a0c', 'type': 'css'}, 'akvo_machinery_js': {'path': 'akvo/js/', 'hash': 'a41a9fc8ab48f34a1ae43d6cb274d6b8d28edfeb', 'type': 'js'}, 'widget_project_list': {'path': 'widgets/project_list/css/', 'hash': '64aaf44be5a55cabef3a0713a826c365eb7c20f2', 'type': 'css'}, 'widget_project': {'path': 'widgets/project/css/', 'hash': '4611d301f23eb9e63ed276d0b51dea16def73b52', 'type': 'css'}, 'widget_project_contribute': {'path': 'widgets/project_contribute/css/', 'hash': '36d113a496eec7965e63b0d67728a0612f8673e4', 'type': 'css'}, 'akvo_script': {'path': 'akvo/js/', 'hash': 'ae51c1a25415070e2470dc11e830b2df9b267ee7', 'type': 'js'}, 'akvo_style': {'path': 'akvo/css/', 'hash': '2c3dc0aaee91dfb33c6dd2c282d6e3ea1b260cab', 'type': 'css'}, 'widget_cobranded_short': {'path': 'widgets/cobranded_short/css/', 'hash': '9b3f65379cf13146713cca113e6e8d2f621ab4de', 'type': 'css'}, 'widget_project_narrow': {'path': 'widgets/project_narrow/css/', 'hash': '984d858f5eff775d79c942a17358e5817a4092e2', 'type': 'css'}}
+BUNDLE_MAP = {'partner_sites_style': {'path': 'partner_sites/css/', 'hash': '4cb1bbc54afc5e93731ea1cfec7456105dca127a', 'type': 'css'}, 'widget_project_updates': {'path': 'widgets/project_updates/css/', 'hash': '57ddaa0abcaef475a634bc2d6d0d59dc924ba109', 'type': 'css'}, 'akvo_ps_machinery_js': {'path': 'partner_sites/js/', 'hash': '2fcbb22efb57981a99cd9746f3b98575b4fa2b3c', 'type': 'js'}, 'widget_project_small': {'path': 'widgets/project_small/css/', 'hash': '984d858f5eff775d79c942a17358e5817a4092e2', 'type': 'css'}, 'widget_cobranded_leader': {'path': 'widgets/cobranded_leader/css/', 'hash': '1ae4b5057b7a715f2e00c20588bdc20a119dff39', 'type': 'css'}, 'partner_sites_script': {'path': 'partner_sites/js/', 'hash': 'a039f7e10cb45144d27a621a0469d61851dd5d02', 'type': 'js'}, 'akvo_ie6_style': {'path': 'akvo/css/', 'hash': '2c103c8bc0834a3e4145e6ce86541613b898d552', 'type': 'css'}, 'widget_cobranded_banner': {'path': 'widgets/cobranded_banner/css/', 'hash': '31ddbde98bffa9e8705c4b9a945d94202e20131b', 'type': 'css'}, 'widget_cobranded_narrow': {'path': 'widgets/cobranded_narrow/css/', 'hash': '572e7203abead79cf733c5687d67a9b4f8cf0a0c', 'type': 'css'}, 'akvo_machinery_js': {'path': 'akvo/js/', 'hash': 'a41a9fc8ab48f34a1ae43d6cb274d6b8d28edfeb', 'type': 'js'}, 'widget_project_list': {'path': 'widgets/project_list/css/', 'hash': '64aaf44be5a55cabef3a0713a826c365eb7c20f2', 'type': 'css'}, 'widget_project': {'path': 'widgets/project/css/', 'hash': '4611d301f23eb9e63ed276d0b51dea16def73b52', 'type': 'css'}, 'widget_project_contribute': {'path': 'widgets/project_contribute/css/', 'hash': '36d113a496eec7965e63b0d67728a0612f8673e4', 'type': 'css'}, 'akvo_script': {'path': 'akvo/js/', 'hash': 'ae51c1a25415070e2470dc11e830b2df9b267ee7', 'type': 'js'}, 'akvo_style': {'path': 'akvo/css/', 'hash': '2c3dc0aaee91dfb33c6dd2c282d6e3ea1b260cab', 'type': 'css'}, 'widget_cobranded_short': {'path': 'widgets/cobranded_short/css/', 'hash': '9b3f65379cf13146713cca113e6e8d2f621ab4de', 'type': 'css'}, 'widget_project_narrow': {'path': 'widgets/project_narrow/css/', 'hash': '984d858f5eff775d79c942a17358e5817a4092e2', 'type': 'css'}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		BUNDLE_MAP = {'partner_sites_style': {'path': 'partner_sites/css/', 'hash': '4cb1bbc54afc5e93731ea1cfec7456105dca127a', 'type': 'css'}, 'widget_project_updates': {'path': 'widgets/project_updates/css/', 'hash': '57ddaa0abcaef475a634bc2d6d0d59dc924ba109', 'type': 'css'}, 'akvo_ps_machinery_js': {'path': 'partner_sites/js/', 'hash': '2fcbb22efb57981a99cd9746f3b98575b4fa2b3c', 'type': 'js'}, 'widget_project_small': {'path': 'widgets/project_small/css/', 'hash': '984d858f5eff775d79c942a17358e5817a4092e2', 'type': 'css'}, 'widget_cobranded_leader': {'path': 'widgets/cobranded_leader/css/', 'hash': '1ae4b5057b7a715f2e00c20588bdc20a119dff39', 'type': 'css'}, 'partner_sites_script': {'path': 'partner_sites/js/', 'hash': 'a039f7e10cb45144d27a621a0469d61851dd5d02', 'type': 'js'}, 'akvo_ie6_style': {'path': 'akvo/css/', 'hash': '2c103c8bc0834a3e4145e6ce86541613b898d552', 'type': 'css'}, 'widget_cobranded_banner': {'path': 'widgets/cobranded_banner/css/', 'hash': '31ddbde98bffa9e8705c4b9a945d94202e20131b', 'type': 'css'}, 'widget_cobranded_narrow': {'path': 'widgets/cobranded_narrow/css/', 'hash': '572e7203abead79cf733c5687d67a9b4f8cf0a0c', 'type': 'css'}, 'akvo_machinery_js': {'path': 'akvo/js/', 'hash': 'a41a9fc8ab48f34a1ae43d6cb274d6b8d28edfeb', 'type': 'js'}, 'widget_project_list': {'path': 'widgets/project_list/css/', 'hash': '64aaf44be5a55cabef3a0713a826c365eb7c20f2', 'type': 'css'}, 'widget_project': {'path': 'widgets/project/css/', 'hash': '4611d301f23eb9e63ed276d0b51dea16def73b52', 'type': 'css'}, 'widget_project_contribute': {'path': 'widgets/project_contribute/css/', 'hash': '36d113a496eec7965e63b0d67728a0612f8673e4', 'type': 'css'}, 'akvo_script': {'path': 'akvo/js/', 'hash': 'ae51c1a25415070e2470dc11e830b2df9b267ee7', 'type': 'js'}, 'akvo_style': {'path': 'akvo/css/', 'hash': '2c3dc0aaee91dfb33c6dd2c282d6e3ea1b260cab', 'type': 'css'}, 'widget_cobranded_short': {'path': 'widgets/cobranded_short/css/', 'hash': '9b3f65379cf13146713cca113e6e8d2f621ab4de', 'type': 'css'}, 'widget_project_narrow': {'path': 'widgets/project_narrow/css/', 'hash': '984d858f5eff775d79c942a17358e5817a4092e2', 'type': 'css'}}
		BUNDLE_MAP = {'partner_sites_style': {'path': 'partner_sites/css/', 'hash': '4cb1bbc54afc5e93731ea1cfec7456105dca127a', 'type': 'css'}, 'widget_project_updates': {'path': 'widgets/project_updates/css/', 'hash': '57ddaa0abcaef475a634bc2d6d0d59dc924ba109', 'type': 'css'}, 'akvo_ps_machinery_js': {'path': 'partner_sites/js/', 'hash': '2fcbb22efb57981a99cd9746f3b98575b4fa2b3c', 'type': 'js'}, 'widget_project_small': {'path': 'widgets/project_small/css/', 'hash': '984d858f5eff775d79c942a17358e5817a4092e2', 'type': 'css'}, 'widget_cobranded_leader': {'path': 'widgets/cobranded_leader/css/', 'hash': '1ae4b5057b7a715f2e00c20588bdc20a119dff39', 'type': 'css'}, 'partner_sites_script': {'path': 'partner_sites/js/', 'hash': 'a039f7e10cb45144d27a621a0469d61851dd5d02', 'type': 'js'}, 'akvo_ie6_style': {'path': 'akvo/css/', 'hash': '2c103c8bc0834a3e4145e6ce86541613b898d552', 'type': 'css'}, 'widget_cobranded_banner': {'path': 'widgets/cobranded_banner/css/', 'hash': '31ddbde98bffa9e8705c4b9a945d94202e20131b', 'type': 'css'}, 'widget_cobranded_narrow': {'path': 'widgets/cobranded_narrow/css/', 'hash': '572e7203abead79cf733c5687d67a9b4f8cf0a0c', 'type': 'css'}, 'akvo_machinery_js': {'path': 'akvo/js/', 'hash': 'a41a9fc8ab48f34a1ae43d6cb274d6b8d28edfeb', 'type': 'js'}, 'widget_project_list': {'path': 'widgets/project_list/css/', 'hash': '64aaf44be5a55cabef3a0713a826c365eb7c20f2', 'type': 'css'}, 'widget_project': {'path': 'widgets/project/css/', 'hash': '4611d301f23eb9e63ed276d0b51dea16def73b52', 'type': 'css'}, 'widget_project_contribute': {'path': 'widgets/project_contribute/css/', 'hash': '36d113a496eec7965e63b0d67728a0612f8673e4', 'type': 'css'}, 'akvo_script': {'path': 'akvo/js/', 'hash': 'ae51c1a25415070e2470dc11e830b2df9b267ee7', 'type': 'js'}, 'akvo_style': {'path': 'akvo/css/', 'hash': '2c3dc0aaee91dfb33c6dd2c282d6e3ea1b260cab', 'type': 'css'}, 'widget_cobranded_short': {'path': 'widgets/cobranded_short/css/', 'hash': '9b3f65379cf13146713cca113e6e8d2f621ab4de', 'type': 'css'}, 'widget_project_narrow': {'path': 'widgets/project_narrow/css/', 'hash': '984d858f5eff775d79c942a17358e5817a4092e2', 'type': 'css'}}