some more minor changes

arike/facilities/migrations/0010_auto_20220312_1912.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.2.12 on 2022-03-12 13:42
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('facilities', '0009_auto_20220304_2237'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='facility',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2022, 3, 12, 13, 42, 45, 775102, tzinfo=utc)),
+        ),
+        migrations.AlterField(
+            model_name='localbody',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2022, 3, 12, 13, 42, 45, 774451, tzinfo=utc)),
+        ),
+        migrations.AlterField(
+            model_name='state',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2022, 3, 12, 13, 42, 45, 773814, tzinfo=utc)),
+        ),
+        migrations.AlterField(
+            model_name='ward',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2022, 3, 12, 13, 42, 45, 774777, tzinfo=utc)),
+        ),
+    ]

arike/patients/forms.py

@@ -42,7 +42,6 @@ class Meta:
             "education",
             "occupation",
             "remarks",
-            "patient",
         ]
 
 

arike/patients/migrations/0016_auto_20220312_1912.py

@@ -0,0 +1,40 @@
+# Generated by Django 3.2.12 on 2022-03-12 13:42
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('patients', '0015_auto_20220304_2237'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='disease',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2022, 3, 12, 13, 42, 45, 778296, tzinfo=utc)),
+        ),
+        migrations.AlterField(
+            model_name='familymember',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2022, 3, 12, 13, 42, 45, 777857, tzinfo=utc)),
+        ),
+        migrations.AlterField(
+            model_name='patient',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2022, 3, 12, 13, 42, 45, 777382, tzinfo=utc)),
+        ),
+        migrations.AlterField(
+            model_name='patientdisease',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2022, 3, 12, 13, 42, 45, 778569, tzinfo=utc)),
+        ),
+        migrations.AlterField(
+            model_name='treatment',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2022, 3, 12, 13, 42, 45, 778881, tzinfo=utc)),
+        ),
+    ]

arike/patients/urls.py

@@ -31,7 +31,9 @@
     path("<pk>/delete/", view=PatientDeleteView.as_view(), name="delete"),
     path("<pk>/family/", view=FamilyListVeiw.as_view(), name="family"),
     path("<pk>/family/add/", view=MemberCreateView.as_view(), name="family_add"),
-    path("<pk>/family/<id>/", view=MemberUpdateView.as_view(), name="family_update"),
+    path(
+        "<pk>/family/<id>/update", view=MemberUpdateView.as_view(), name="family_update"
+    ),
     path("<pk>/family/del/<id>/", view=MemberDeleteView.as_view(), name="family_del"),
     path("<pk>/disease/", view=DiseaseListVeiw.as_view(), name="disease"),
     path("<pk>/disease/add/", view=DiseaseCreateView.as_view(), name="disease_add"),

arike/patients/views.py

@@ -13,7 +13,7 @@
 )
 from arike.patients.models import FamilyMember, Patient, PatientDisease, Treatment
 from arike.facilities.models import Ward
-from arike.visits.models import TreatmentNote, VisitDetails, VisitSchedule
+from arike.visits.models import TreatmentNote, VisitDetails
 from arike.users.models import UserRoles
 
 
@@ -66,16 +66,24 @@ def delete(self, request: HttpRequest, *args: str, **kwargs):
 class GenericFamilyMemberFormView(NurseAuthMixin):
     form_class = FamilyMemberForm
     template_name = "family/form.html"
-    slug_field = "id"
+    slug_field = "pk"
     slug_url_kwarg = "id"
 
     def get_queryset(self):
-        patient_pk = self.kwargs["pk"]
-        return FamilyMember.objects.filter(patient__pk=patient_pk, deleted=False)
+        return FamilyMember.objects.all()
+
+    def get_object(self):
+        return self.get_queryset().get(pk=self.kwargs["id"])
 
     def get_success_url(self):
         return reverse_lazy("patients:family", kwargs={"pk": self.kwargs["pk"]})
 
+    def form_valid(self, form):
+        self.object = form.save(commit=False)
+        self.object.patient = Patient.objects.get(pk=self.kwargs["pk"])
+        self.object.save()
+        return HttpResponseRedirect(self.get_success_url())
+
 
 class MemberCreateView(GenericFamilyMemberFormView, CreateView):
     pass
@@ -96,12 +104,14 @@ class GenericDiseaseFormView(NurseAuthMixin):
     slug_url_kwarg = "id"
 
     def get_queryset(self):
-        patient_pk = self.kwargs["pk"]
-        return PatientDisease.objects.filter(patient__pk=patient_pk)
+        return PatientDisease.objects.all()
 
     def get_success_url(self):
         return reverse_lazy("patients:disease", kwargs={"pk": self.kwargs["pk"]})
 
+    def get_object(self):
+        return self.get_queryset().get(pk=self.kwargs["id"])
+
     def form_valid(self, form):
         self.object = form.save(commit=False)
         self.object.patient = Patient.objects.get(pk=self.kwargs["pk"])
@@ -128,12 +138,14 @@ class GenericTreatmentFormView(NurseAuthMixin):
     slug_url_kwarg = "id"
 
     def get_queryset(self):
-        patient_pk = self.kwargs["pk"]
-        return Treatment.objects.filter(patient__pk=patient_pk)
+        return Treatment.objects.all()
 
     def get_success_url(self):
         return reverse_lazy("patients:treatments", kwargs={"pk": self.kwargs["pk"]})
 
+    def get_object(self):
+        return self.get_queryset().get(pk=self.kwargs["id"])
+
     def form_valid(self, form):
         self.object = form.save(commit=False)
         self.object.patient = Patient.objects.get(pk=self.kwargs["pk"])

arike/users/migrations/0015_auto_20220312_1912.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.12 on 2022-03-12 13:42
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0014_alter_user_email_preff_time'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='email_last_sent',
+            field=models.DateField(default=datetime.date(2022, 3, 12)),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='email_preff_time',
+            field=models.TimeField(default=datetime.time(13, 42, 45, 775599)),
+        ),
+    ]

arike/visits/migrations/0007_auto_20220312_1912.py

@@ -0,0 +1,30 @@
+# Generated by Django 3.2.12 on 2022-03-12 13:42
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('visits', '0006_auto_20220304_2237'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='treatmentnote',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2022, 3, 12, 13, 42, 45, 780550, tzinfo=utc)),
+        ),
+        migrations.AlterField(
+            model_name='visitdetails',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2022, 3, 12, 13, 42, 45, 780052, tzinfo=utc)),
+        ),
+        migrations.AlterField(
+            model_name='visitschedule',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2022, 3, 12, 13, 42, 45, 779619, tzinfo=utc)),
+        ),
+    ]

arike/visits/views.py

@@ -89,7 +89,7 @@ class TreatmentsListVeiw(NurseAuthMixin, ListView):
     def get_queryset(self):
         schedule = VisitSchedule.objects.get(pk=self.kwargs["pk"])
         patient = schedule.patient
-        treatments = Treatment.objects.filter(patient=patient)
+        treatments = Treatment.objects.filter(patient=patient, deleted=False)
         return treatments
 
     def get_context_data(self, **kwargs):
@@ -106,7 +106,9 @@ class GenericTreatmenNotetFormView(NurseAuthMixin):
 
     def get_queryset(self):
         schedule = VisitSchedule.objects.get(pk=self.kwargs["pk"])
-        return TreatmentNote.objects.filter(treatment__patient=schedule.patient)
+        return TreatmentNote.objects.filter(
+            treatment__patient=schedule.patient, deleted=False
+        )
 
     def get_success_url(self):
         return reverse_lazy("visits:treatments", kwargs={"pk": self.kwargs["pk"]})