Merge branch 'master' into referred_discharge

ohcnetwork · Aug 3, 2023 · f097fdd · f097fdd
2 parents 9ce885f + 01b7269
commit f097fdd
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/care/users/api/serializers/user.py b/care/users/api/serializers/user.py
@@ -284,6 +284,7 @@ class Meta:
             "doctor_medical_council_registration",
             "created_by",
             "home_facility",
+            "weekly_working_hours",
             "local_body",
             "district",
             "state",
@@ -398,6 +399,7 @@ class Meta:
             "doctor_qualification",
             "doctor_experience_commenced_on",
             "doctor_medical_council_registration",
+            "weekly_working_hours",
             "created_by",
             "last_login",
             "home_facility_object",

diff --git a/care/users/migrations/0006_user_weekly_working_hours.py b/care/users/migrations/0006_user_weekly_working_hours.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.2.2 on 2023-08-02 04:39
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("users", "0005_alter_user_alt_phone_number_alter_user_phone_number"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="weekly_working_hours",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(0),
+                    django.core.validators.MaxValueValidator(168),
+                ],
+            ),
+        ),
+    ]
diff --git a/care/users/models.py b/care/users/models.py
@@ -243,6 +243,9 @@ class User(AbstractUser):
     home_facility = models.ForeignKey(
         "facility.Facility", on_delete=models.PROTECT, null=True, blank=True
     )
+    weekly_working_hours = models.IntegerField(
+        validators=[MinValueValidator(0), MaxValueValidator(168)], null=True, blank=True
+    )
 
     doctor_qualification = models.TextField(
         blank=False,

diff --git a/care/users/tests/test_api.py b/care/users/tests/test_api.py
@@ -34,6 +34,7 @@ def get_detail_representation(self, obj=None) -> dict:
             "doctor_experience_commenced_on": obj.doctor_experience_commenced_on,
             "doctor_medical_council_registration": obj.doctor_medical_council_registration,
             "doctor_qualification": obj.doctor_qualification,
+            "weekly_working_hours": obj.weekly_working_hours,
             **self.get_local_body_district_state_representation(obj),
         }