Adjust certificates to work in Chrome, Edge and Firefox (#1233)

* Adjust certificates to work in Chrome, Edge and Firefox * Adjust margin so address isn't cut off
tendenci · Dec 18, 2023 · 985e5cd · 985e5cd
1 parent b49e02e
commit 985e5cd
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 19 deletions.
diff --git a/tendenci/apps/events/views.py b/tendenci/apps/events/views.py
@@ -4513,13 +4513,21 @@ def sample_certificate(request, event_id=0, template_name='events/registrants/ce
     if not request.user.is_superuser or not has_perm(request.user,'events.view_event', event):
         raise Http403
 
-    credits_by_sub_events = {datetime.now().date().strftime('%B %d, %Y'): [{
-        'event_code': event.event_code,
-        'title': event.title,
-        'credits': event.possible_cpe_credits,
-        'irs_credits': 5.0,
-        'alternate_ceu': '123423423487'
-    }]}
+    sub_event_credits = list()
+    credit_event = event # event to use for getting sample credits (single event certificates)
+    for child_event in event.child_events:
+        if child_event.possible_cpe_credits:
+            credit_event = child_event
+            # List of credits by sub-event (symposium certificates)
+            sub_event_credits.append({
+                'event_code': child_event.event_code,
+                'title': child_event.title,
+                'credits': child_event.possible_cpe_credits,
+                'irs_credits': 5.0,
+                'alternate_ceu': '123423423487'
+            })
+
+    credits_by_sub_events = {datetime.now().date().strftime('%B %d, %Y'): sub_event_credits}
 
     registrant = {
         'event': event,
@@ -4528,12 +4536,12 @@ def sample_certificate(request, event_id=0, template_name='events/registrants/ce
         'license_state': 'TX',
         'ptin': 987654321,
         'event_dates_display': event.event_dates_display,
-        'possible_cpe_credits': event.possible_cpe_credits,
-        'credits_earned': event.possible_cpe_credits,
+        'possible_cpe_credits': credit_event.possible_cpe_credits,
+        'credits_earned': credit_event.possible_cpe_credits,
         'irs_credits_earned': 5.0,
         'credits_by_sub_event': credits_by_sub_events,
-        'possible_credits_by_code': event.possible_credits_by_code,
-        'credits_earned_by_code': event.possible_credits_by_code
+        'possible_credits_by_code': credit_event.possible_credits_by_code,
+        'credits_earned_by_code': credit_event.possible_credits_by_code
     }
     # TODO: remove hard-coded symposiums later
     if not (event.has_child_events and (event.type and event.type.name.lower() == 'symposiums')):

diff --git a/tendenci/themes/t7-base/templates/events/registrants/certificate-single-event.html b/tendenci/themes/t7-base/templates/events/registrants/certificate-single-event.html
@@ -4,9 +4,9 @@
 <link rel="stylesheet" href="{% static 'css/events.css' %}">
 <style>
   .certificate {
-      width: 8in;
-      height: 11in;
-      marign: 5px;
+      width: 7.5in;
+      height: 10.5in;
+      margin: 5px;
       border: 1px solid black;
       padding: 2px;
   }
@@ -81,14 +81,14 @@
       line-height: .75em;
   }
   .certificate .row.staff {
-      margin-top: 240px;
+      margin-top: 190px;
       display: flex;
       align-items: center;
       justify-content: space-evenly;
   }
   .certificate .row.address {
       text-align: center;
-      margin-top: 110px;
+      margin-top: 100px;
       font-size: .9em;
   }
   .certificate .row.staff img {
@@ -153,6 +153,13 @@
       width: 50%;
   }
 
+  @media print {
+      @page {
+          size: portrait;
+          margin: 0 .25in 0 .25in !important;
+          size: letter;
+      }
+  }
 </style>
 {% endblock %}
 

diff --git a/tendenci/themes/t7-base/templates/events/registrants/certificate-symposium.html b/tendenci/themes/t7-base/templates/events/registrants/certificate-symposium.html
@@ -5,8 +5,8 @@
 <style>
   .certificate {
       width: 10.8in;
-      height: 8in;
-      marign: 5px;
+      height: 8.1in;
+      margin: 0 0 5px 0;
       border: 1px solid black;
       padding: 2px;
   }
@@ -184,7 +184,12 @@
       width: 166px; 
       text-align: left;
   }
-
+  @media print {
+      @page {
+          size: landscape;
+          margin: .1in 0 .1in 0 !important;
+      }
+  }  
 </style>
 {% endblock %}