Merge pull request #7 from ShelterAssociates/master

Data Merge
ShelterAssociates · Jan 13, 2017 · 7d2c8bf · 7d2c8bf
2 parents e9a562a + 5609557
commit 7d2c8bf
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/component/migrations/filter_data.json b/component/migrations/filter_data.json
@@ -18,7 +18,7 @@
       "display_type":"M",
       "visible":true,
       "order":3.0,
-      "blob":"{\"linecolor\":\"#b2f780\", \"linewidth\":2, \"polycolor\":\"#b2f780\"}",
+      "blob":"{\"linecolor\":\"#FFF200\", \"linewidth\":2, \"polycolor\":\"#FFF200\"}",
       "code":"group_ye18c77/group_yw8pj39/Current_place_of_defecation_toilet:01"
     }
   },
@@ -41,7 +41,7 @@
     "pk":19,
     "model": "component.Metadata",
     "fields":{
-      "name":"Community toilet block (CTB)",
+      "name":"Were using Community toilet block",
       "section":2,
       "level":"H",
       "type":"F",
@@ -108,7 +108,7 @@
       "display_type":"M",
       "visible":true,
       "order":10.0,
-      "blob":"{\"linecolor\":\"#f78086\", \"linewidth\":2, \"polycolor\":\"#f78086\"}",
+      "blob":"{\"linecolor\":\"#00A7E4\", \"linewidth\":2, \"polycolor\":\"#00A7E4\"}",
       "code":"group_ye18c77/group_yw8pj39/Are_you_interested_in_individu:02"
     }
   },
@@ -123,7 +123,7 @@
       "display_type":"M",
       "visible":true,
       "order":2.0,
-      "blob":"{\"linecolor\":\"#d580f7\", \"linewidth\":2, \"polycolor\":\"#d580f7\"}",
+      "blob":"{\"linecolor\":\"#B2E71D\", \"linewidth\":2, \"polycolor\":\"#B2E71D\"}",
       "code":"group_ye18c77/group_yw8pj39/what_is_the_ownership_status_of_the_house:01"
     }
   },
@@ -138,7 +138,7 @@
       "display_type":"M",
       "visible":true,
       "order":3.0,
-      "blob":"{\"linecolor\":\"#f1f780\", \"linewidth\":2, \"polycolor\":\"#f1f780\"}",
+      "blob":"{\"linecolor\":\"#27AF4B\", \"linewidth\":2, \"polycolor\":\"#27AF4B\"}",
       "code":"group_ye18c77/group_yw8pj39/what_is_the_ownership_status_of_the_house:02"
     }
   },
@@ -153,7 +153,7 @@
       "display_type":"M",
       "visible":true,
       "order":2.0,
-      "blob":"{\"linecolor\":\"#f78880\", \"linewidth\":2, \"polycolor\":\"#f78880\"}",
+      "blob":"{\"linecolor\":\"#03FD06\", \"linewidth\":2, \"polycolor\":\"#03FD06\"}",
       "code":"group_ye18c77/group_yw8pj39/type_of_water_connection:01"
     }
   },
@@ -168,7 +168,7 @@
       "display_type":"M",
       "visible":true,
       "order":3.0,
-      "blob":"{\"linecolor\":\"#f7db80\", \"linewidth\":2, \"polycolor\":\"#f7db80\"}",
+      "blob":"{\"linecolor\":\"#FCF400\", \"linewidth\":2, \"polycolor\":\"#FCF400\"}",
       "code":"group_ye18c77/group_yw8pj39/type_of_water_connection:02"
     }
   },
@@ -183,7 +183,7 @@
       "display_type":"M",
       "visible":true,
       "order":4.0,
-      "blob":"{\"linecolor\":\"#8096f7\", \"linewidth\":2, \"polycolor\":\"#8096f7\"}",
+      "blob":"{\"linecolor\":\"#3C49CB\", \"linewidth\":2, \"polycolor\":\"#3C49CB\"}",
       "code":"group_ye18c77/group_yw8pj39/type_of_water_connection:03"
     }
   },
@@ -242,8 +242,8 @@
       "type":"F",
       "display_type":"M",
       "visible":true,
-      "order":1.0,
-      "blob":"{\"linecolor\":\"#b8cef2\", \"linewidth\":2, \"polycolor\":\"#b8cef2\"}",
+      "order":2.0,
+      "blob":"{\"linecolor\":\"#2AAD50\", \"linewidth\":2, \"polycolor\":\"#2AAD50\"}",
       "code":""
     }
   },
@@ -257,7 +257,7 @@
       "type":"F",
       "display_type":"M",
       "visible":true,
-      "order":2.0,
+      "order":3.0,
       "blob":"{\"linecolor\":\"#80f7f1\", \"linewidth\":2, \"polycolor\":\"#80f7f1\"}",
       "code":""
     }
@@ -272,8 +272,23 @@
       "type":"F",
       "display_type":"M",
       "visible":true,
-      "order":3.0,
-      "blob":"{\"linecolor\":\"#f780f5\", \"linewidth\":2, \"polycolor\":\"#f780f5\"}",
+      "order":4.0,
+      "blob":"{\"linecolor\":\"#FF7E2B\", \"linewidth\":2, \"polycolor\":\"#FF7E2B\"}",
+      "code":""
+    }
+  },
+  {
+    "pk":36,
+    "model": "component.Metadata",
+    "fields":{
+      "name":"Facilitated by Shelter",
+      "section":7,
+      "level":"H",
+      "type":"F",
+      "display_type":"M",
+      "visible":true,
+      "order":1.0,
+      "blob":"{\"linecolor\":\"#FCF400\", \"linewidth\":2, \"polycolor\":\"#FCF400\"}",
       "code":""
     }
   }

diff --git a/component/migrations/initial_data.json b/component/migrations/initial_data.json
@@ -66,7 +66,7 @@
     "pk":2,
     "model": "component.Metadata",
     "fields":{
-      "name":"Community toilet blocks (CTBs)",
+      "name":"Community toilet blocks",
       "section":2,
       "level":"H",
       "type":"C",
@@ -178,7 +178,7 @@
       "display_type":"M",
       "visible":true,
       "order":3.0,
-      "blob":"{\"linecolor\":\"#ff1182\", \"linewidth\":4, \"polycolor\":\"#ff1182\"}",
+      "blob":"{\"linecolor\":\"#1DB44D\", \"linewidth\":4, \"polycolor\":\"#1DB44D\"}",
       "code":""
     }
   },

diff --git a/component/models.py b/component/models.py
@@ -39,7 +39,7 @@ class Metadata(models.Model):
     visible  = models.BooleanField() # BooleanField
     order  = models.FloatField()
     blob  = JSONField()
-    code = models.CharField(max_length=512)
+    code = models.CharField(max_length=512,blank=True,null=True)
 
 
     def __unicode__(self):