Update master with latest changes from development (#371)

* Added support for on_hold projects in reports
* Added project name and pinonumber to attribute_data_filtered

Author: HenryVisuri

projects/helpers.py

@@ -864,6 +864,8 @@ def get_attribute_data_filtered_response(attributes, generated_attributes, ignor
 
         # TODO: Rename DOCUMENT_EDIT_URL_FORMAT to be generic url base
         url = settings.DOCUMENT_EDIT_URL_FORMAT.replace("<pk>", str(project.pk)).removesuffix("/edit")
+        response["projektin_nimi"] = project.name
+        response["pinonumero"] = project.pino_number
         response["projektin_osoite"] = url
         response["onhold"] = project.onhold
         response["onhold_at"] = project.onhold_at.strftime("%d.%m.%Y %H:%M:%S") if project.onhold_at else ""

projects/views.py

@@ -1575,6 +1575,14 @@ def get_project_queryset(self, report):
                     params.get(report_filter.identifier),
                     queryset=projects or Project.objects.all(),
                 ))
+        elif report.name == "Keskeytyneet projektit":
+            projects = Project.objects.filter(onhold=True, public=True)
+            for report_filter in filters:
+                projects = report_filter.filter_projects(
+                    params.get(report_filter.identifier),
+                    queryset=projects,
+                )
+            return projects
         else:
             projects = Project.objects.filter(onhold=False, public=True)
             for report_filter in filters: