diff --git a/care/facility/migrations/0318_merge_20220917_2113.py b/care/facility/migrations/0318_merge_20220917_2113.py new file mode 100644 index 0000000000..c339cf7b2e --- /dev/null +++ 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 new file mode 100644 index 0000000000..edfa609fa6 --- /dev/null +++ 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 index 8fde7b5107..1f2c42167f 100644 --- 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 index eb47813eda..3b1b61fd67 100644 --- 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"], }