Added medicine_administration field (#1025)

* added medicine_administration field * removed unused import
ohcnetwork · Sep 20, 2022 · 8bd904f · 8bd904f
1 parent b717ef8
commit 8bd904f
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/care/facility/migrations/0318_merge_20220917_2113.py b/care/facility/migrations/0318_merge_20220917_2113.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.11 on 2022-09-17 15:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('facility', '0317_merge_20220915_2209'),
+        ('facility', '0315_auto_20220909_0925'),
+    ]
+
+    operations = [
+    ]
diff --git a/care/facility/migrations/0319_dailyround_medicine_administration.py b/care/facility/migrations/0319_dailyround_medicine_administration.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.11 on 2022-09-17 16:03
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('facility', '0318_merge_20220917_2113'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dailyround',
+            name='medicine_administration',
+            field=django.contrib.postgres.fields.jsonb.JSONField(default=list),
+        ),
+    ]
diff --git a/care/facility/models/daily_round.py b/care/facility/models/daily_round.py
@@ -435,6 +435,10 @@ class InsulinIntakeFrequencyType(enum.Enum):
         default=list, validators=[JSONFieldSchemaValidator(NURSING_PROCEDURE)]
     )
 
+    medicine_administration = JSONField(
+        default=list,
+    )
+
     meta = JSONField(default=dict, validators=[JSONFieldSchemaValidator(META)])
 
     def cztn(self, value):

diff --git a/care/facility/models/json_schema/daily_round.py b/care/facility/models/json_schema/daily_round.py
@@ -33,7 +33,7 @@
     "items": [
         {
             "type": "object",
-            "properties": {"name": {"type": "string"}, "quantity": {"type": "number"},},
+            "properties": {"name": {"type": "string"}, "quantity": {"type": "number"}, },
             "additionalProperties": False,
             "required": ["name", "quantity"],
         }
@@ -63,7 +63,7 @@
     "items": [
         {
             "type": "object",
-            "properties": {"name": {"type": "string"}, "quantity": {"type": "number"},},
+            "properties": {"name": {"type": "string"}, "quantity": {"type": "number"}, },
             "additionalProperties": False,
             "required": ["name", "quantity"],
         }