From ca793931e19e3c43d4ddf4563f0519471d236822 Mon Sep 17 00:00:00 2001
From: AlanJaeger <aland295@gmail.com>
Date: Tue, 11 Jul 2023 15:22:40 -0300
Subject: [PATCH] merge for excel

---
 chats/apps/api/v1/dashboard/viewsets.py | 38 ++++++++++++++++---------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/chats/apps/api/v1/dashboard/viewsets.py b/chats/apps/api/v1/dashboard/viewsets.py
index 212e8962..5d1ecfe5 100644
--- a/chats/apps/api/v1/dashboard/viewsets.py
+++ b/chats/apps/api/v1/dashboard/viewsets.py
@@ -18,6 +18,7 @@
 )
 from chats.apps.api.v1.permissions import HasDashboardAccess
 from chats.apps.projects.models import Project
+from io import BytesIO
 
 
 class DashboardLiveViewset(viewsets.GenericViewSet):
@@ -149,24 +150,29 @@ def export_dashboard(self, request, *args, **kwargs):
         project = self.get_object()
         filter = request.query_params
 
-        general_dataset = get_general_data(project, filter)
-        userinfo_dataset = get_agents_data(project, filter)
-        sector_dataset = get_sector_data(project, filter)
+        user_info_context = {}
+        user_info_context["filters"] = request.query_params
+
+        # General data
+        general_dataset = dashboard_general_data(context=filter, project=project)
+        raw_dataset = DashboardRawDataSerializer(instance=project, context=filter)
+        combined_dataset = {**general_dataset, **raw_dataset.data}
+
+        # Agents Data
+        userinfo_dataset = dashboard_agents_data(context=filter, project=project)
+        # # Sectors Data
+        sector_dataset = dashboard_division_data(context=filter, project=project)
 
         filename = "dashboard_export_data"
 
-        data_frame = pandas.DataFrame([general_dataset])
-        data_frame_1 = pandas.read_json(userinfo_dataset)
-        data_frame_2 = pandas.read_json(sector_dataset)
+        data_frame = pandas.DataFrame([combined_dataset])
+        data_frame_1 = pandas.DataFrame(userinfo_dataset)
+        data_frame_2 = pandas.DataFrame(sector_dataset)
+
+        excel_file = BytesIO()
 
         if "xls" in filter:
-            response = HttpResponse(
-                content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-            )
-            response["Content-Disposition"] = (
-                'attachment; filename="' + filename + ".xlsx"
-            )
-            with pandas.ExcelWriter(response, engine="xlsxwriter") as writer:
+            with pandas.ExcelWriter(excel_file, engine="xlsxwriter") as writer:
                 data_frame.to_excel(
                     writer,
                     sheet_name="dashboard_infos",
@@ -188,6 +194,12 @@ def export_dashboard(self, request, *args, **kwargs):
                     startcol=0,
                     index=False,
                 )
+            response = HttpResponse(content_type="application/vnd.ms-excel")
+            response["Content-Disposition"] = (
+                'attachment; filename="' + filename + ".xlsx"
+            )
+            excel_file.seek(0)
+            response.write(excel_file.read())
             return response
 
         else: