feat: Changed pdf datetime to event timezones #7452

codedsun · 2020-11-16T10:48:08Z

Fixes #7438

Short description of what this resolves:

feat: Changed pdf datetime to event timezones

Changes proposed in this pull request:

Checklist

I have read the Contribution & Best practices Guide and my PR follows them.
My branch is up-to-date with the Upstream development branch.
The unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

All the functions created/modified in this PR contain relevant docstrings.

codecov · 2020-11-16T10:58:17Z

Codecov Report

Merging #7452 (06841fe) into development (b0a90f0) will increase coverage by 0.04%.
The diff coverage is 7.69%.

@@               Coverage Diff               @@
##           development    #7452      +/-   ##
===============================================
+ Coverage        65.34%   65.38%   +0.04%     
===============================================
  Files              265      265              
  Lines            13239    13235       -4     
===============================================
+ Hits              8651     8654       +3     
+ Misses            4588     4581       -7

Impacted Files	Coverage Δ
app/api/helpers/scheduled_jobs.py	`61.26% <0.00%> (+2.08%)`	⬆️
app/templates/flask_ext/jinja/filters.py	`84.61% <100.00%> (+8.61%)`	⬆️
app/api/events.py	`38.91% <0.00%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update aaacb23...ac50b5f. Read the comment docs.

codedsun · 2020-11-16T11:00:19Z

@iamareebjamal - Review

iamareebjamal · 2020-11-16T11:01:59Z

app/models/event_invoice.py

+        return self.issued_at.astimezone(pytz.timezone(self.event.timezone))
+
+    @property
+    def due_at_tz(self):


Please use datetime helper, it has timezone support already

@iamareebjamal return self.due_at.astimezone(datetime.astimezone(self.event.timezone)) like this?

Or you meant datetime(order.event.timezone) like this in jinja template?

iamareebjamal · 2020-11-16T11:02:32Z

app/templates/pdf/ticket_attendee.html

-            <span style="font-size: 15px;">From: {{ order.event.starts_at | datetime(order.event.timezone) }}</span><br>
-            <span style="font-size: 15px;">To: {{ order.event.ends_at | datetime(order.event.timezone) }}</span>
+            <span style="font-size: 15px;">From: {{ order.event.starts_at_tz | datetime(order.event.timezone) }}</span><br>
+            <span style="font-size: 15px;">To: {{ order.event.ends_at_tz | datetime(order.event.timezone) }}</span>


This was already according to event timezone

codedsun · 2020-11-16T17:01:37Z

@iamareebjamal - Review

iamareebjamal · 2020-11-17T01:00:11Z

app/models/order.py

+        return self.created_at.astimezone(pytz.timezone(self.event.timezone))
+
+    @property
+    def completed_at_tz(self):


As I said in last review, not needed

iamareebjamal · 2020-11-17T01:00:46Z

app/templates/pdf/attendees_pdf.html

@@ -97,10 +97,10 @@ <h3 style="text-align:center;">{{ holders[0].event.name }} - {{ ("Attendees List

                    {% if holder.order and holder.order.status == 'completed' %}
                        <span
-                            class="datetime">{{ holder.order.completed_at | datetime }} - {{ holder.order.completed_at | humanize }}</span>
+                            class="datetime">{{ holder.order.completed_at_tz | datetime }} - {{ holder.order.completed_at_tz | humanize }}</span>


Use the datetime helper as suggested in last review

iamareebjamal · 2020-11-17T01:01:00Z

app/templates/pdf/event_invoice.html

-          font-size: 12px; 
+          background: #FFFFFF;
+          font-family: Arial, sans-serif;
+          font-size: 12px;


iamareebjamal · 2020-11-17T01:01:18Z

app/templates/pdf/orders.html

@@ -103,9 +103,9 @@ <h3 style="text-align:center;">{{ event.name }} - {{ ("Order List") }}</h3>
                                {{ ('NA') }}
                            {% endif %}<br>
                            {% if order.status == 'completed' %}
-                                <span class="datetime">{{ order.completed_at | datetime }}</span>
+                                <span class="datetime">{{ order.completed_at_tz | datetime }}</span>


iamareebjamal

Moved even further from expected since last review

iamareebjamal · 2020-11-17T08:15:51Z

app/templates/pdf/event_invoice.html

-        <div><span>DATE</span> {{ invoice.issued_at | date }}</div>
-        <div><span>DUE DATE</span> {{ invoice.due_at | date }}</div>
+        <div><span>DATE</span> {{ invoice.issued_at | datetime(event.timezone) }}</div>
+        <div><span>DUE DATE</span> {{ invoice.due_at | datetime(event.timezone) }}</div>


This is date and not datetime, make date helper timezone aware

iamareebjamal · 2020-11-17T08:58:38Z

app/templates/pdf/event_invoice.html

-        <div><span>DATE</span> {{ invoice.issued_at | date }}</div>
-        <div><span>DUE DATE</span> {{ invoice.due_at | date }}</div>
+        <div><span>DATE</span> {{ invoice.issued_at | date(event.timezone) }}</div>
+        <div><span>DUE DATE</span> {{ invoice.due_at | date(event.timezone) }}</div>


The date filter is not timezone aware. It'll fail. Please test the changes before asking for review. Reduce the request review cycle please. The changes on this PR either go opposite of what it should be or plain don't work.

Why don't you test it first?

I didn't requested for review this tym. I will test and then ask for review and will make sure to reduce the request review cycle. Sorry for the inconvinience

iamareebjamal · 2020-11-17T16:35:13Z

app/templates/flask_ext/jinja/filters.py

        if not date:
            return ''
-        return date.strftime('%B %d, %Y')
+        return date.astimezone(pytz.timezone(timezone)).strftime('%B %d, %Y')


return simple_datetime_display(date, timezone, '%B %d, %Y')

codedsun · 2020-11-18T13:06:46Z

@iamareebjamal - Review

iamareebjamal · 2020-11-18T13:30:36Z

app/templates/flask_ext/jinja/filters.py

        if not date:
            return ''


Suggested change

if not date:

return ''

iamareebjamal · 2020-11-18T13:31:17Z

Other emails contain time as well

codedsun · 2020-11-18T14:42:25Z

open-event-server/app/api/helpers/system_mails.py

Line 277 in 247e9bf

    
           'subject': 'Your invoice for {event_name} for {date} is available on {app_name}',

open-event-server/app/api/helpers/system_mails.py

Line 292 in 247e9bf

    
           'subject': 'Reminder: Your invoice for {event_name} for {date} is available on {app_name}',

open-event-server/app/api/helpers/system_mails.py

Line 307 in 247e9bf

    
           'subject': 'Reminder: Your invoice for {event_name} for {date} is available on {app_name}',

open-event-server/app/api/helpers/system_mails.py

Line 323 in 247e9bf

    
           'subject': 'Please pay your overdue invoice for {event_name} for {date} on {app_name}',

@iamareebjamal Correct?

iamareebjamal · 2020-11-18T14:48:11Z

After event email and others as well

codedsun · 2020-11-18T14:50:57Z

@iamareebjamal As you mentioned after event email

open-event-server/app/api/helpers/system_mails.py

Lines 144 to 152 in 247e9bf

    
           AFTER_EVENT: { 
        
               'recipient': 'Owner, Organizer, Speaker', 
        
               'subject': 'Event {event_name} is over', 
        
               'message': ( 
        
                   "Hi {email},<br/>" 
        
                   + "Thank You for participating in our event. We hope you enjoyed it. " 
        
                   "Please check out other upcoming events around you on {url} <br />" 
        
               ), 
        
               'sent_at': '1 day after the event',

Are you referring to sent at field? as I can't see anyother field which uses time

iamareebjamal · 2020-11-18T14:52:22Z

No, I must have forgot. If that's it, then yes, those are the only emails

codedsun · 2020-11-18T15:07:15Z

@iamareebjamal - Tested

subject : Your invoice for Event Till March for Oct 2020 is available on Open Event

message:
Hello Suneet  Srivastava,<br><br>The invoice for your event Event Till March on eventyay.com for Oct 2020 is now available. Your invoice payment is due within 30 days.<br><br>Amount Due: INR 100.0<br><br>Please pay within 30 days.<br><br>Pay Now at: <a href='http://eventyay.com/event-invoice/22345ad1/review'>http://eventyay.com/event-invoice/22345ad1/review</a><br><br>A detailed invoice is available in <a href='https://eventyay.com/account/billing/invoices/'>the billing area</a> of your account. If you have any questions about invoices, please find more information on our FAQ at https://support.eventyay.com.<br><br><em>Thank you for using Open Event!</em><br><br>Open Event Team

codedsun · 2020-11-18T15:09:09Z

Thanks! yeah 🎉

auto-label bot added the feature label Nov 16, 2020

iamareebjamal reviewed Nov 16, 2020

View reviewed changes

codedsun force-pushed the timezone branch from 3bc837f to 194c400 Compare November 16, 2020 17:00

iamareebjamal reviewed Nov 17, 2020

View reviewed changes

iamareebjamal requested changes Nov 17, 2020

View reviewed changes

codedsun force-pushed the timezone branch 2 times, most recently from edbe7b4 to c63c60b Compare November 17, 2020 08:13

iamareebjamal reviewed Nov 17, 2020

View reviewed changes

codedsun force-pushed the timezone branch 2 times, most recently from 2ecd492 to 417167b Compare November 17, 2020 08:27

iamareebjamal reviewed Nov 17, 2020

View reviewed changes

codedsun force-pushed the timezone branch from 417167b to c9446a6 Compare November 17, 2020 16:31

iamareebjamal reviewed Nov 17, 2020

View reviewed changes

codedsun force-pushed the timezone branch from c9446a6 to 06841fe Compare November 18, 2020 12:31

iamareebjamal reviewed Nov 18, 2020

View reviewed changes

feat: Changed pdf datetime to event timezones

ac50b5f

codedsun force-pushed the timezone branch from 06841fe to ac50b5f Compare November 18, 2020 15:05

iamareebjamal merged commit 8a65edc into fossasia:development Nov 18, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Changed pdf datetime to event timezones #7452

feat: Changed pdf datetime to event timezones #7452

codedsun commented Nov 16, 2020

codecov bot commented Nov 16, 2020 •

edited

Loading

codedsun commented Nov 16, 2020

iamareebjamal Nov 16, 2020

codedsun Nov 16, 2020

codedsun Nov 16, 2020

iamareebjamal Nov 16, 2020

codedsun commented Nov 16, 2020

iamareebjamal Nov 17, 2020

iamareebjamal Nov 17, 2020

iamareebjamal Nov 17, 2020

iamareebjamal Nov 17, 2020

iamareebjamal left a comment

iamareebjamal Nov 17, 2020

iamareebjamal Nov 17, 2020

codedsun Nov 17, 2020

iamareebjamal Nov 17, 2020

codedsun commented Nov 18, 2020

iamareebjamal Nov 18, 2020

iamareebjamal commented Nov 18, 2020

codedsun commented Nov 18, 2020

iamareebjamal commented Nov 18, 2020

codedsun commented Nov 18, 2020 •

edited

Loading

iamareebjamal commented Nov 18, 2020

codedsun commented Nov 18, 2020

codedsun commented Nov 18, 2020

feat: Changed pdf datetime to event timezones #7452

feat: Changed pdf datetime to event timezones #7452

Conversation

codedsun commented Nov 16, 2020

Short description of what this resolves:

Changes proposed in this pull request:

Checklist

codecov bot commented Nov 16, 2020 • edited Loading

Codecov Report

codedsun commented Nov 16, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codedsun commented Nov 16, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iamareebjamal left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codedsun commented Nov 18, 2020

Choose a reason for hiding this comment

iamareebjamal commented Nov 18, 2020

codedsun commented Nov 18, 2020

iamareebjamal commented Nov 18, 2020

codedsun commented Nov 18, 2020 • edited Loading

iamareebjamal commented Nov 18, 2020

codedsun commented Nov 18, 2020

codedsun commented Nov 18, 2020

codecov bot commented Nov 16, 2020 •

edited

Loading

codedsun commented Nov 18, 2020 •

edited

Loading