Merge pull request #13 from app-generator/export-issue

fix export issues

Author: app-generator

django_dyn_dt/templates/static/src/controller/index.js

@@ -211,8 +211,8 @@ export const exportController = (dataTable) => {
 export const exportData = (dataTable, type) => {
 
     const searchParam = new URLSearchParams(window.location.search).get('search') || ''
-
-    const hiddenColumns = myData.headings.filter((d,i) => !dataTable.columns.visible(i))
+    
+    const hiddenColumns = myData.headings.filter((d,i) => !dataTable.columns().visible(i))
 
     fetch (`/datatb/${modelName}/export/`,
         {method: 'POST',body: JSON.stringify({

django_dyn_dt/views.py

@@ -149,10 +149,9 @@ def export(request, **kwargs):
     export_type = request_body.get('type', 'csv')
     filter_options = Q()
 
-    headings = filter(lambda field: field.name not in hidden, _get_headings(model_class))
-    headings = list(headings)
+    headings = list(_get_headings(model_class))
     for field in headings:
-        field_name = field.name
+        field_name = field
         try:
             filter_options = filter_options | Q(**{field_name + '__icontains': search_key})
         except Exception as _:
@@ -163,12 +162,12 @@ def export(request, **kwargs):
     for data in all_data:
         this_row = []
         for heading in headings:
-            this_row.append(getattr(data, heading.name))
+            this_row.append(getattr(data, heading))
         table_data.append(this_row)
 
     df = pd.DataFrame(
         table_data,
-        columns=tuple(heading.name for heading in headings))
+        columns=tuple(heading for heading in headings))
     if export_type == 'pdf':
         base64encoded = get_pdf(df)
     elif export_type == 'xlsx':