Merge pull request #559 from Esmat-Farjad/fix/impot_template

import activty plan template and import report template fixed with ne…

Author: aleemcahn

src/project_reports/utils.py

@@ -10,12 +10,13 @@
 
 from project_reports.models import ActivityPlanReport, ProjectMonthlyReport, ResponseType
 from rh.models import (
-    Currency,
     Disaggregation,
     FacilitySiteType,
     GrantType,
     ImplementationModalityType,
     PackageType,
+    RationSize,
+    RationType,
     TransferCategory,
     TransferMechanismType,
     UnitType,
@@ -288,12 +289,13 @@ def write_import_report_template_sheet(workbook, monthly_report):
         {"header": "response_types", "type": "string", "width": 30},
         {"header": "implementing_partners", "type": "string", "width": 30},
         {"header": "package_type", "type": "string", "width": 30},
+        {"header": "ration_type", "type": "string", "width": 30},
+        {"header": "ration_size", "type": "string", "width": 30},
         {"header": "unit_type", "type": "string", "width": 30},
-        {"header": "units", "type": "string", "width": 30},
+        {"header": "units/transfer_value", "type": "string", "width": 30},
         {"header": "no_of_transfers", "type": "string", "width": 30},
         {"header": "grant_type", "type": "string", "width": 30},
         {"header": "transfer_category", "type": "string", "width": 30},
-        {"header": "currency", "type": "string", "width": 30},
         {"header": "transfer_mechanism_type", "type": "string", "width": 30},
         {"header": "implement_modility_type", "type": "string", "width": 30},
         {"header": "beneficiary_status", "type": "string", "width": 30},
@@ -311,7 +313,6 @@ def write_import_report_template_sheet(workbook, monthly_report):
         {"header": "facility_name", "type": "string", "width": 30},
         {"header": "facility_lat", "type": "string", "width": 30},
         {"header": "facility_long", "type": "string", "width": 30},
-        {"header": "non_hrp_beneficiary", "type": "string", "width": 30},
         {"header": "hrp_beneficiary", "type": "string", "width": 30},
         {"header": "with_safe_spaces", "type": "string", "width": 30},
     ]
@@ -338,30 +339,30 @@ def write_import_report_template_sheet(workbook, monthly_report):
     sheet.column_dimensions[column_letter].width = column["width"]
     # write the rows with report data
     container_dictionary = {
-        "beneficiary_status_list": ["P", "New Beneficiary", "Existing Beneficiaries"],
         "reponseTypeList": ["E"],
         "package_type": ["G"],
-        "unit_type": ["H"],
-        "grant_type": ["K"],
-        "im_modility_type": ["O"],
-        "transfer_mc_type": ["N"],
-        "transfer_category": ["L"],
-        "currency": ["M"],
+        "ration_type": ["H"],
+        "ration_size": ["I"],
+        "unit_type": ["J"],
+        "grant_type": ["M"],
+        "transfer_category": ["N"],
+        "transfer_mc_type": ["O"],
+        "im_modility_type": ["P"],
+        "beneficiary_status_list": ["Q", "New Beneficiary", "Existing Beneficiaries"],
         "safe_space": ["AG", "True", "False"],
-        "facilitySiteTypeList": ["Z"],
+        "facilitySiteTypeList": ["AA"],
     }
     plain_dictionary_lists = {
         "indicatorList": ["B"],
         "activityDomainList": ["C"],
         "activityTypeList": ["D"],
-        "admin0nameList": ["R"],
-        "admin0pcodeList": ["S"],
-        "admin1pcodeList": ["T"],
-        "admin1nameList": ["U"],
-        "admin2pcodeList": ["V"],
-        "admin2nameList": ["W"],
+        "admin0nameList": ["S"],
+        "admin0pcodeList": ["T"],
+        "admin1pcodeList": ["U"],
+        "admin1nameList": ["V"],
+        "admin2pcodeList": ["W"],
+        "admin2nameList": ["X"],
         "implementing_partner_list": ["F"],
-        "non_hrp_beneficiary": ["AE"],
         "hrp_beneficiary": ["AF"],
     }
     project = monthly_report.project
@@ -371,9 +372,11 @@ def write_import_report_template_sheet(workbook, monthly_report):
     container_dictionary["im_modility_type"].extend(
         list(ImplementationModalityType.objects.values_list("name", flat=True))
     )
+    container_dictionary["ration_size"].extend(list(RationSize.objects.values_list("name", flat=True).order_by("-id")))
+    container_dictionary["ration_type"].extend(list(RationType.objects.values_list("name", flat=True)))
     container_dictionary["transfer_mc_type"].extend(list(TransferMechanismType.objects.values_list("name", flat=True)))
     container_dictionary["transfer_category"].extend(list(TransferCategory.objects.values_list("name", flat=True)))
-    container_dictionary["currency"].extend(list(Currency.objects.values_list("name", flat=True)))
+
     facility = list(FacilitySiteType.objects.filter(cluster__code="health").values_list("name", flat=True))
     responseType = list(ResponseType.objects.values_list("name", flat=True))
     num_rows = 2
@@ -399,7 +402,6 @@ def write_import_report_template_sheet(workbook, monthly_report):
             plain_dictionary_lists["implementing_partner_list"].append(
                 str(location.implementing_partner.code if location.implementing_partner else "")
             )
-            plain_dictionary_lists["non_hrp_beneficiary"].append(str(plan.beneficiary if plan.beneficiary else ""))
             plain_dictionary_lists["hrp_beneficiary"].append(str(plan.hrp_beneficiary if plan.hrp_beneficiary else ""))
             num_rows += 1
 

src/rh/templates/rh/activity_plans/import_activity_plans.html

@@ -23,7 +23,9 @@
                     <div class="activity-title">
                         <span>Import Project Activity Plans and Target Locations</span>
                     </div>
-                    <a href="{% url 'projects-ap-import-template' project.pk %}?csrfmiddlewaretoken={{ csrf_token }}"  class="btn btn-grey" onclick="return confirm('Download template?');">Download template</a>
+                    <a href="{% url 'projects-ap-import-template' project.pk %}?csrfmiddlewaretoken={{ csrf_token }}"  
+                    class="btn btn-gray" onclick="return confirm('Download template?');">Download template
+                    </a>
                 </div>
 
                 <p class="pb-2">Import Activity Plans and Target Locations from a CSV file</p>
@@ -57,6 +59,10 @@
                     <li> <span class="icon-info mr-2"></span> 
                         <a class="underline" href="{% url 'guides-detail' 'project-and-activity-planning' %}">Project and planning guide</a>
                     </li>
+                    <li class="text-red my-3"><strong>Important Note: </strong>
+                        The first row of the template is populated with demo data for your guidance.
+                        Please replace it with your accurate project activity plan data before uploading.
+                    </li>
                 </ul>
 
                 {% if errors %}

src/rh/views/projects.py

@@ -258,18 +258,18 @@ def export_activity_plans_import_template(request, pk):
         "activity_type",
         "activity_detail",
         "indicator",
-        "beneficiary",
         "hrp_beneficiary",
         "description",
         "package_type",
         "unit_type",
-        "units",
+        "ration_type",
+        "ration_size",
+        "units/transfer_value",
         "no_of_transfers",
         "grant_type",
         "transfer_category",
-        "currency",
         "transfer_mechanism_type",
-        "implement_modility_type",
+        "implement_modality_type",
         "admin0name",
         "admin0pcode",
         "admin1name",
@@ -313,18 +313,18 @@ def export_activity_plans_import_template(request, pk):
         at.name,
         adt.name if adt else None,
         ind.name,
-        BeneficiaryType.objects.filter(type="non-hrp").values_list("name", flat=True).first(),
         BeneficiaryType.objects.filter(type="hrp").values_list("name", flat=True).first(),
         "[input any note or description]",
-        "75%",
+        "Standard",
+        "",
         "KG",
-        "1",
-        "200",
-        "Conditional, Unrestricted",
+        "100%",
+        "500",
+        "4",
+        "Conditional and Unrestricted",
         "Individual",
-        "AFN",
-        "Bank",
-        "Cash",
+        "Distribution",
+        "In Kind",
         "Afghanistan",
         "AF",
         "Kabul",