changes

Core/forms.py

@@ -7,6 +7,7 @@ class PayloadImportForm(forms.ModelForm):
     class Meta:
         model = PayloadUpload
         fields = "__all__"
+        widgets = {'facility': forms.HiddenInput()}
 
     # message_types = [
     #     ("SVCREC", 'Services Received'),

UserManagement/views/main.py

@@ -77,7 +77,7 @@ def authenticate_user(request):
                 facility = request.user.profile.facility
                 transaction_summary = validation_management_models.TransactionSummary.objects.filter(
                     facility_hfr_code=facility.facility_hfr_code).order_by('-transaction_date_time')
-                uploads = validation_management_models.PayloadUpload.objects.all().order_by('-id')[:25]
+                uploads = validation_management_models.PayloadUpload.objects.filter(facility=request.user.profile.facility).order_by('-id')[:25]
                 uploads_table = UploadsTable(uploads)
                 transaction_summary_table = TransactionSummaryTable(transaction_summary)
                 RequestConfig(request, paginate={"per_page": 15}).configure(uploads_table)
@@ -190,9 +190,9 @@ def export_transaction_lines(request):
 
 
 def get_dashboard(request):
-    form = core_forms.PayloadImportForm()
+    form = core_forms.PayloadImportForm(initial={"facility":request.user.profile.facility})
     facility = request.user.profile.facility
-    uploads = validation_management_models.PayloadUpload.objects.all().order_by('-id')[:25]
+    uploads = validation_management_models.PayloadUpload.objects.filter(facility=request.user.profile.facility).order_by('-id')[:25]
     uploads_table = UploadsTable(uploads)
     transaction_summary = validation_management_models.TransactionSummary.objects.filter(facility_hfr_code=facility.facility_hfr_code, is_active=True).order_by('-transaction_date_time')
     transaction_summary_table = TransactionSummaryTable(transaction_summary)
@@ -211,4 +211,4 @@ def get_transaction_summary_lines(request,item_pk):
     RequestConfig(request, paginate={"per_page": 10}).configure(transaction_summary_lines_table)
 
     return render(request,'UserManagement/Dashboard/TransactionLines.html', {"item_pk": item_pk,
-                                                                             "transaction_summary_lines_table":transaction_summary_lines_table})
+                                            "transaction_summary_lines_table":transaction_summary_lines_table})

ValidationManagement/migrations/0003_payloadupload_facility.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.4 on 2021-11-17 12:30
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('MasterData', '0004_remove_facility_dhis_org_unit_uid'),
+        ('ValidationManagement', '0002_transactionsummary_is_active'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='payloadupload',
+            name='facility',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.DO_NOTHING, to='MasterData.facility'),
+            preserve_default=False,
+        ),
+    ]

ValidationManagement/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from MasterData import models as master_data_models
 
 
 # Create your models here.
@@ -147,6 +148,7 @@ def __str__(self):
     date_time_uploaded = models.DateTimeField(auto_now=True)
     message_type = models.CharField(max_length=100, choices=MESSAGE_TYPE_CHOICES)
     file = models.FileField(blank=True, null=True, upload_to="uploads")
+    facility = models.ForeignKey(master_data_models.Facility, on_delete=models.DO_NOTHING)
 
     class Meta:
         db_table = "PayloadUploads"