feat: Added custom form fields in export attendee pdf

fossasia · Nov 13, 2020 · cd28617 · cd28617
1 parent 1840383
commit cd28617
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/app/api/helpers/tasks.py b/app/api/helpers/tasks.py
@@ -541,7 +541,7 @@ def export_attendees_pdf_task(self, event_id):
     try:
         attendees_pdf_url = create_save_pdf(
             render_template(
-                'pdf/attendees_pdf.html', holders=attendees, fields=custom_forms
+                'pdf/attendees_pdf.html', holders=attendees, custom_forms=custom_forms
             ),
             UPLOAD_PATHS['exports-temp']['pdf'].format(event_id=event_id, identifier=''),
         )

diff --git a/app/templates/pdf/attendees_pdf.html b/app/templates/pdf/attendees_pdf.html
@@ -107,34 +107,33 @@ <h3 style="text-align:center;">{{ holders[0].event.name }} - {{ ("Attendees List
 
                 </td>
                 <td style="text-align:center;"><br>
-                    <strong>
-                        First Name :<br>
-                        Last Name :<br>
-                        Email :<br>
-                    </strong>
+                    {% for field in custom_forms %}
+                        {{ field.name }} <br>
+                     {% endfor %}
                     Amount :<br>
                     Ticket Name :<br>
                     Status :<br>
-                </td>
-                <td><br>
-                    <strong>
-                        {{ holder.firstname }}<br>
-                        {{ holder.lastname }}<br>
-                        {{ holder.email }}<br>
-                    </strong>
+                 </td>
+                 <td><br>
+                     {% for field in custom_forms %}
+                        {% if field.is_complex and holder.complex_field_values %}
+                            {{ holder.complex_field_values[field.field_identifier] }} <br>
+                        {% else %}
+                            {{ holder | attr(field.field_identifier) }} <br>
+                        {% endif %}
+                     {% endfor %}
                     {% if holder.ticket.price %}
-                        {{ holder.event.payment_currency }}{{ holder.ticket.price | money }}
+                        {{ holder.event.payment_currency }}{{ holder.ticket.price | money }} <br>
                     {% else %}
-                        {{ "Free Ticket" }}
-                    {% endif %}<br>
+                        {{ "Free Ticket" }} <br>
+                    {% endif %}
                     {{ holder.ticket.name }}<br>
                     {% if holder.is_checked_in %}
                         {{ ("Checked In") }}<br>
                     {% else %}
                         {{ ("Not Checked In") }}<br>
                     {% endif %}
-                </td>
-            </tr>
+                 </td>
         {% endif %}
     {% endfor %}
     </tbody>

diff --git a/tests/all/integration/api/helpers/test_csv_jobs_util.py b/tests/all/integration/api/helpers/test_csv_jobs_util.py
@@ -7,6 +7,7 @@
 from tests.all.integration.utils import OpenEventTestCase
 from tests.factories import common
 from tests.factories.attendee import AttendeeFactory
+from tests.factories.custom_form import CustomFormFactory
 from tests.factories.order import OrderFactory
 from tests.factories.session import SessionFactory
 from tests.factories.speaker import SpeakerFactory
@@ -28,9 +29,10 @@ def test_export_attendees_csv(self):
 
         with self.app.test_request_context():
             test_attendee = AttendeeFactory()
-            field_data = export_attendees_csv([test_attendee])
-            self.assertEqual(field_data[1][3], common.string_)
-            self.assertEqual(field_data[1][5], test_attendee.email)
+            custom_forms = CustomFormFactory()
+            field_data = export_attendees_csv([test_attendee], [custom_forms])
+            self.assertEqual(field_data[1][8], common.string_)
+            self.assertEqual(field_data[1][7], test_attendee.email)
 
     def _test_export_session_csv(self, test_session=None):
         with self.app.test_request_context():