Excel export with new api

geocity/apps/submissions/filters.py

@@ -59,7 +59,7 @@ class BaseSubmissionFilterSet(django_filters.FilterSet):
     created_at = django_filters.DateFilter(
         field_name="created_at",
         lookup_expr="date",
-        label=_("Date de création le"),
+        label=_("Date de création"),
         widget=DatePickerInput(
             attrs={"placeholder": "ex: 15/02/2019"},
             options={"format": "DD/MM/YYYY", "locale": "fr"},
@@ -131,6 +131,7 @@ class Meta:
             "forms__category",
             "forms",
             "created_at",
+            "sent_date",
             "starts_at_min",
             "ends_at_max",
             "author__last_name",

geocity/apps/submissions/management/commands/fixturize.py

@@ -14,6 +14,7 @@
 from geocity import settings
 from geocity.apps.accounts.models import *
 from geocity.apps.accounts.users import get_integrator_permissions
+from geocity.apps.api.services import convert_string_to_api_key
 from geocity.apps.forms.models import *
 from geocity.apps.reports.models import *
 from geocity.apps.submissions.contact_type_choices import *
@@ -306,6 +307,7 @@ def create_form(
 
         form_obj = Form.objects.create(
             name=form,
+            api_name=convert_string_to_api_key(form),
             category=form_category_obj,
             is_public=True,
             notify_services=True,
@@ -433,6 +435,7 @@ def create_field(self, field, integrator_group):
         field, created = Field.objects.get_or_create(
             integrator=integrator,
             name=name,
+            api_name=convert_string_to_api_key(name),
             placeholder=placeholder,
             help_text=help_text,
             input_type=input_type,

geocity/apps/submissions/tables.py

@@ -1,12 +1,20 @@
+import collections
+import json
 from datetime import datetime
+from io import BytesIO as IO
 
 import django_tables2 as tables
+import pandas
 from django.conf import settings
+from django.http import FileResponse
 from django.template.defaultfilters import floatformat
+from django.utils import timezone
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
+from django_tables2.export.views import ExportMixin
 from django_tables2_column_shifter.tables import ColumnShiftTable
 
+from ..api.serializers import SubmissionPrintSerializer
 from . import models
 from .payments.models import Transaction
 
@@ -363,3 +371,67 @@ class Meta:
             "status",
         )
         template_name = "django_tables2/bootstrap.html"
+
+
+class PandasExportMixin(ExportMixin):
+    def create_export(self, export_format):
+
+        if not export_format in ["xlsx"]:
+            raise NotImplementedError
+
+        records = {}
+        submissions_qs = self.get_table_data().filter()
+
+        # # Make sure there will be no bypass
+        # submissions_list = submissions_qs.values_list("id", flat=True)
+        # visible_submissions_for_user = models.Submission.objects.filter_for_user(
+        #     self.request.user,
+        # ).values_list("id", flat=True)
+
+        # if not all(item in visible_submissions_for_user for item in submissions_list):
+        #     raise SuspiciousOperation
+
+        for submission in submissions_qs:
+            list_selected_forms = list(
+                submission.selected_forms.values_list("form_id", flat=True)
+            )
+            sheet_name = "_".join(map(str, list_selected_forms))
+            ordered_dict = SubmissionPrintSerializer(submission).data
+            ordered_dict.move_to_end("geometry")
+            data_dict = dict(ordered_dict)
+            data_str = json.dumps(data_dict)
+            record = json.loads(data_str, object_pairs_hook=collections.OrderedDict)
+
+            if sheet_name not in records.keys():
+                records[sheet_name] = record
+            else:
+                record_list = []
+                record_list.append(records[sheet_name])
+                record_list.append(record)
+                records[sheet_name] = record_list
+
+        now = timezone.now()
+
+        if export_format == "xlsx":
+            excel_file = IO()
+            xlwriter = pandas.ExcelWriter(excel_file)
+
+            for key in records:
+                dataframe = pandas.json_normalize(records[key])
+                dataframe.to_excel(xlwriter, sheet_name=key)
+
+            xlwriter.close()
+            excel_file.seek(0)
+            filename = f"geocity_export_{now:%Y-%m-%d}.xlsx"
+
+            content_type = "content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'"
+
+        response = FileResponse(
+            excel_file,
+            filename=filename,
+            as_attachment=False,
+        )
+        response["Content-Type"] = content_type
+        response["Content-Disposition"] = f'attachment; filename="{filename}"'
+
+        return response

geocity/apps/submissions/templatetags/submissions_extras.py

@@ -1,6 +1,6 @@
 import json
 import os.path
-from datetime import datetime, timezone
+from datetime import date, datetime, timezone
 
 from django import template
 from django.forms import modelformset_factory
@@ -122,6 +122,8 @@ def human_field_value(value):
         return _("Oui") if value else _("Non")
     elif isinstance(value, float):
         return floatformat(value, arg=-2)
+    elif isinstance(value, date):
+        return value.strftime("%d.%m.%Y")
     elif isinstance(value, list):
         return render_to_string("submissions/_field_value_list.html", {"values": value})
     elif not value:

geocity/apps/submissions/views.py

@@ -40,7 +40,6 @@
 from django.views.generic.edit import DeleteView
 from django.views.generic.list import ListView
 from django_filters.views import FilterView
-from django_tables2.export.views import ExportMixin
 from django_tables2.views import SingleTableMixin
 
 from geocity.apps.accounts.decorators import (
@@ -73,6 +72,7 @@
 )
 from .tables import (
     CustomFieldValueAccessibleSubmission,
+    PandasExportMixin,
     TransactionsTable,
     get_custom_dynamic_table,
 )
@@ -1615,7 +1615,7 @@ def submission_media_download(request, property_value_id):
 @method_decorator(login_required, name="dispatch")
 @method_decorator(check_mandatory_2FA, name="dispatch")
 @method_decorator(permanent_user_required, name="dispatch")
-class SubmissionList(ExportMixin, SingleTableMixin, FilterView):
+class SubmissionList(PandasExportMixin, SingleTableMixin, FilterView):
     paginate_by = int(os.environ["PAGINATE_BY"])
     template_name = "submissions/submissions_list.html"
 
@@ -1638,7 +1638,7 @@ def get_queryset(self):
                 )
             )
             .order_by(
-                F("sent_date").desc(nulls_last=True),
+                F("sent_date").desc(nulls_last=False),
                 F("created_at").desc(nulls_last=True),
             )
         )

geocity_export_2023-06-19.csv

@@ -0,0 +1,2 @@
+;id;type;properties.additional_decision_information;properties.contacts.autres.contact_type_display;properties.contacts.autres.id;properties.contacts.autres.first_name;properties.contacts.autres.last_name;properties.contacts.autres.company_name;properties.contacts.autres.vat_number;properties.contacts.autres.address;properties.contacts.autres.zipcode;properties.contacts.autres.city;properties.contacts.autres.phone;properties.contacts.autres.email;properties.creditor_type;properties.status_display;properties.author.first_name;properties.author.last_name;properties.author.address;properties.author.zipcode;properties.author.user_id;properties.author.city;properties.author.company_name;properties.author.vat_number;properties.author.iban;properties.author.phone_first;properties.author.phone_second;properties.author.email;properties.geotime_aggregated.start_date;properties.geotime_aggregated.end_date;properties.geotime_aggregated.comments;properties.geotime_aggregated.external_links;properties.submission_id;properties.submission_status;properties.submission_shortname;properties.submission_administrative_entity.id;properties.submission_administrative_entity.name;properties.submission_administrative_entity.ofs_id;properties.submission_administrative_entity.link;properties.submission_administrative_entity.phone;properties.submission_forms;properties.submission_meta_types;properties.submission_forms_names.8;properties.submission_current_inquiry;properties.submission_price;properties.submission_sent_date;properties.submission_fields.permis_de_fouille.title.form;properties.submission_fields.permis_de_fouille.title.category;properties.submission_fields.permis_de_fouille.title.form_category;properties.submission_fields.permis_de_fouille.fields.largeur_m.name;properties.submission_fields.permis_de_fouille.fields.largeur_m.value;properties.submission_fields.permis_de_fouille.fields.hauteur_m.name;properties.submission_fields.permis_de_fouille.fields.hauteur_m.value;properties.submission_fields.permis_de_fouille.fields.commentaire.name;properties.submission_fields.permis_de_fouille.fields.commentaire.value;properties.submission_fields.permis_de_fouille.fields.adresse.name;properties.submission_fields.permis_de_fouille.fields.adresse.value;properties.submission_fields.permis_de_fouille.fields.adresse_avec_geocodage.name;properties.submission_fields.permis_de_fouille.fields.adresse_avec_geocodage.value;properties.submission_fields.permis_de_fouille.fields.impact_sur_la_chaussee.name;properties.submission_fields.permis_de_fouille.fields.impact_sur_la_chaussee.value;properties.submission_fields.permis_de_fouille.fields.a_moins_de_3m_dun_arbre.name;properties.submission_fields.permis_de_fouille.fields.a_moins_de_3m_dun_arbre.value;properties.amend_fields.permis_de_fouille.title.form;properties.amend_fields.permis_de_fouille.title.category;properties.amend_fields.permis_de_fouille.title.form_category;geometry.type;geometry.coordinates
+0;281;Feature;;Autres;1;first_entity-pilot-0;Demo;;;Place Pestalozzi 2;1234;first_entity;012 345 67 89;[email protected];Auteur de la demande, first_entity-pilot-0 Demo;Envoyée, en attente de traitement;first_entity-pilot-0;Demo;Place Pestalozzi 2;1234;5;first_entity;;;;012 345 67 89;012 345 67 89;[email protected];24.06.2023 09:39;25.06.2023 09:39;;;281;1;;1;first_entity;5938;https://mapnv.ch;;[8];[0];Permis de fouille (Chantier);;;19.06.2023 09:40;Permis de fouille;Chantier;Permis de fouille (Chantier);Largeur [m];3.0;Hauteur [m];5.0;Commentaire;abcdefgh;Adresse;Allée Johann-Heinrich-Pestalozzi Johann-Heinrich-Pestalozzi-Allee 2, 2503 Biel/Bienne;Adresse avec géocodage;Allée Johann-Heinrich-Pestalozzi Johann-Heinrich-Pestalozzi-Allee 2, 2503 Biel/Bienne;Impact sur la chaussée;True;À moins de 3m d'un arbre;non;Permis de fouille;Chantier;Permis de fouille (Chantier);Polygon;[[[2538045.14, 1181481.84], [2538045.14, 1219706.25], [2586407.25, 1219706.25], [2586407.25, 1181481.84], [2538045.14, 1181481.84]]]