-
Notifications
You must be signed in to change notification settings - Fork 19
Expand file tree
/
Copy pathdiff.txt
More file actions
1230 lines (1068 loc) · 57.6 KB
/
diff.txt
File metadata and controls
1230 lines (1068 loc) · 57.6 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/apiserver/apiserver/api/management/commands/run_hourly.py b/apiserver/apiserver/api/management/commands/run_hourly.py
index 1a5cb29..8ccac91 100644
--- a/apiserver/apiserver/api/management/commands/run_hourly.py
+++ b/apiserver/apiserver/api/management/commands/run_hourly.py
@@ -15,7 +15,7 @@ class Command(BaseCommand):
# do this hourly in case an admin causes a change
models.StatsMemberCount.objects.update_or_create(
- date=utils.today_alberta_tz(),
+ date=utils.today_local_tz(),
defaults=dict(
member_count=counts['member_count'],
green_count=counts['green_count'],
@@ -26,7 +26,7 @@ class Command(BaseCommand):
)
models.StatsSignupCount.objects.update_or_create(
- month=utils.today_alberta_tz().replace(day=1),
+ month=utils.today_local_tz().replace(day=1),
defaults=dict(signup_count=signup_count),
)
@@ -45,7 +45,7 @@ class Command(BaseCommand):
# within 6-7 hours from now
count = 0
- now = utils.now_alberta_tz()
+ now = utils.now_local_tz()
current_hour_start = now.replace(minute=0, second=0, microsecond=0)
in_six_hours = current_hour_start + timedelta(hours=6)
@@ -104,7 +104,7 @@ class Command(BaseCommand):
# that happened 6-7 hours ago if they haven't already
count = 0
- now = utils.now_alberta_tz()
+ now = utils.now_local_tz()
current_hour_start = now.replace(minute=0, second=0, microsecond=0)
six_hours_ago = current_hour_start - timedelta(hours=6)
diff --git a/apiserver/apiserver/api/management/commands/run_weekly.py b/apiserver/apiserver/api/management/commands/run_weekly.py
index 22b3a18..b73b127 100644
--- a/apiserver/apiserver/api/management/commands/run_weekly.py
+++ b/apiserver/apiserver/api/management/commands/run_weekly.py
@@ -20,7 +20,7 @@ class Command(BaseCommand):
paused_date__isnull=True
)
- today = utils.today_alberta_tz()
+ today = utils.today_local_tz()
_, this_week, _ = today.isocalendar()
members_to_remind = active_subsidized_members.filter(application_date__week=this_week)
diff --git a/apiserver/apiserver/api/models.py b/apiserver/apiserver/api/models.py
index 0f84c89..2da8f98 100644
--- a/apiserver/apiserver/api/models.py
+++ b/apiserver/apiserver/api/models.py
@@ -6,15 +6,16 @@ from django.contrib.contenttypes.models import ContentType
from django.utils.timezone import now, pytz
from simple_history.models import HistoricalRecords
from simple_history import register
+from .. import settings
-TIMEZONE_CALGARY = pytz.timezone('America/Edmonton')
+DISPLAY_TZ = pytz.timezone(settings.DISPLAY_TIMEZONE)
register(User)
IGNORE = '+'
-def today_alberta_tz():
- return datetime.now(TIMEZONE_CALGARY).date()
+def today_local_tz():
+ return datetime.now(DISPLAY_TZ).date()
class Member(models.Model):
user = models.OneToOneField(User, related_name='member', blank=True, null=True, on_delete=models.SET_NULL)
@@ -44,9 +45,9 @@ class Member(models.Model):
is_instructor = models.BooleanField(default=False)
is_vetter = models.BooleanField(default=False)
status = models.CharField(max_length=32, blank=True, null=True)
- expire_date = models.DateField(default=today_alberta_tz, null=True)
- current_start_date = models.DateField(default=today_alberta_tz, null=True)
- application_date = models.DateField(default=today_alberta_tz, null=True)
+ expire_date = models.DateField(default=today_local_tz, null=True)
+ current_start_date = models.DateField(default=today_local_tz, null=True)
+ application_date = models.DateField(default=today_local_tz, null=True)
vetted_date = models.DateField(blank=True, null=True)
orientation_date = models.DateField(blank=True, null=True, default=None)
lathe_cert_date = models.DateField(blank=True, null=True, default=None)
@@ -80,7 +81,7 @@ class Transaction(models.Model):
recorder = models.ForeignKey(User, related_name=IGNORE, blank=True, null=True, on_delete=models.SET_NULL)
member_id = models.IntegerField(blank=True, null=True)
- date = models.DateField(default=today_alberta_tz)
+ date = models.DateField(default=today_local_tz)
amount = models.DecimalField(max_digits=7, decimal_places=2)
reference_number = models.CharField(max_length=64, blank=True, null=True)
memo = models.TextField(blank=True, null=True)
@@ -176,7 +177,7 @@ class Session(models.Model):
list_display = ['datetime', 'course', 'instructor']
search_fields = ['datetime', 'course__name', 'instructor__username']
def __str__(self):
- return '%s @ %s' % (self.course.name, self.datetime.astimezone(TIMEZONE_CALGARY).strftime('%Y-%m-%d %-I:%M %p'))
+ return '%s @ %s' % (self.course.name, self.datetime.astimezone(DISPLAY_TZ).strftime('%Y-%m-%d %-I:%M %p'))
class Training(models.Model):
user = models.ForeignKey(User, related_name='training', blank=True, null=True, on_delete=models.SET_NULL)
@@ -184,7 +185,7 @@ class Training(models.Model):
member_id = models.IntegerField(blank=True, null=True)
attendance_status = models.TextField(blank=True, null=True)
- sign_up_date = models.DateField(default=today_alberta_tz, blank=True, null=True)
+ sign_up_date = models.DateField(default=today_local_tz, blank=True, null=True)
paid_date = models.DateField(blank=True, null=True)
history = HistoricalRecords()
@@ -210,7 +211,7 @@ class MetaInfo(models.Model):
backup_id = models.TextField()
class StatsMemberCount(models.Model):
- date = models.DateField(default=today_alberta_tz)
+ date = models.DateField(default=today_local_tz)
member_count = models.IntegerField()
green_count = models.IntegerField()
six_month_plus_count = models.IntegerField()
@@ -230,7 +231,7 @@ class StatsSignupCount(models.Model):
search_fields = ['month', 'signup_count', 'retain_count', 'vetted_count']
class StatsSpaceActivity(models.Model):
- date = models.DateField(default=today_alberta_tz)
+ date = models.DateField(default=today_local_tz)
card_scans = models.IntegerField()
list_display = ['date', 'card_scans']
diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py
index 9c9180e..56d44c3 100644
--- a/apiserver/apiserver/api/serializers.py
+++ b/apiserver/apiserver/api/serializers.py
@@ -770,7 +770,7 @@ class CourseListSerializer(CourseSerializer):
fields = ['id', 'name', 'is_old', 'description', 'tags', 'num_interested', 'recent_date', 'is_archived']
def get_is_archived(self, obj):
- fourteen_months_ago = utils.now_alberta_tz() - datetime.timedelta(days=425)
+ fourteen_months_ago = utils.now_local_tz() - datetime.timedelta(days=425)
recent_date = getattr(obj, 'recent_date', None)
if recent_date == None or recent_date < fourteen_months_ago:
@@ -859,7 +859,7 @@ class CourseDetailSerializer(serializers.ModelSerializer):
def get_suggestion(self, obj):
def iter_dates():
- start_of_month = utils.today_alberta_tz().replace(day=1)
+ start_of_month = utils.today_local_tz().replace(day=1)
for i in range(90):
yield start_of_month + datetime.timedelta(days=i)
@@ -873,14 +873,14 @@ class CourseDetailSerializer(serializers.ModelSerializer):
yield date
def next_date(weekday, week_num=False, fake_start=False):
- start = fake_start or utils.today_alberta_tz()
+ start = fake_start or utils.today_local_tz()
for date in iter_matching_dates(weekday, week_num):
if date > start:
return date
raise
def course_is_usually_monthly(course):
- two_months_ago = utils.now_alberta_tz() - datetime.timedelta(days=61)
+ two_months_ago = utils.now_local_tz() - datetime.timedelta(days=61)
recent_sessions = obj.sessions.filter(datetime__gte=two_months_ago)
if recent_sessions.count() < 3:
return True
@@ -893,7 +893,7 @@ class CourseDetailSerializer(serializers.ModelSerializer):
date = next_date(calendar.SATURDAY, week_num=3)
time = datetime.time(10, 0)
dt = datetime.datetime.combine(date, time)
- dt = utils.TIMEZONE_CALGARY.localize(dt)
+ dt = utils.DISPLAY_TZ.localize(dt)
cost = 0
max_students = None
elif obj.id == 317:
@@ -901,7 +901,7 @@ class CourseDetailSerializer(serializers.ModelSerializer):
# but December's gets skipped
next_month = next_date(calendar.WEDNESDAY, week_num=3).month
if next_month == 12:
- one_month_ahead = utils.today_alberta_tz() + datetime.timedelta(days=31)
+ one_month_ahead = utils.today_local_tz() + datetime.timedelta(days=31)
date = next_date(calendar.THURSDAY, week_num=3, fake_start=one_month_ahead)
elif next_month % 2 == 0:
date = next_date(calendar.WEDNESDAY, week_num=3)
@@ -909,7 +909,7 @@ class CourseDetailSerializer(serializers.ModelSerializer):
date = next_date(calendar.THURSDAY, week_num=3)
time = datetime.time(19, 0)
dt = datetime.datetime.combine(date, time)
- dt = utils.TIMEZONE_CALGARY.localize(dt)
+ dt = utils.DISPLAY_TZ.localize(dt)
cost = 0
max_students = None
elif prev_session:
@@ -921,7 +921,7 @@ class CourseDetailSerializer(serializers.ModelSerializer):
offset_weeks = 1
dt = dt + datetime.timedelta(weeks=offset_weeks)
- five_days_from_now = utils.now_alberta_tz() + datetime.timedelta(days=5)
+ five_days_from_now = utils.now_local_tz() + datetime.timedelta(days=5)
while dt < five_days_from_now:
dt = dt + datetime.timedelta(weeks=offset_weeks)
diff --git a/apiserver/apiserver/api/tests.py b/apiserver/apiserver/api/tests.py
index a979a45..2bb5868 100644
--- a/apiserver/apiserver/api/tests.py
+++ b/apiserver/apiserver/api/tests.py
@@ -126,7 +126,7 @@ class TestAddMonths(TestCase):
class TestCalcStatus(TestCase):
def test_calc_member_status_14_days(self):
- expire_date = utils.today_alberta_tz() + datetime.timedelta(days=14)
+ expire_date = utils.today_local_tz() + datetime.timedelta(days=14)
status = utils.calc_member_status(expire_date)
@@ -141,28 +141,28 @@ class TestCalcStatus(TestCase):
self.assertEqual(status, 'Current')
def test_calc_member_status_90_days(self):
- expire_date = utils.today_alberta_tz() + datetime.timedelta(days=90)
+ expire_date = utils.today_local_tz() + datetime.timedelta(days=90)
status = utils.calc_member_status(expire_date)
self.assertEqual(status, 'Prepaid')
def test_calc_member_status_tomorrow(self):
- expire_date = utils.today_alberta_tz() + datetime.timedelta(days=1)
+ expire_date = utils.today_local_tz() + datetime.timedelta(days=1)
status = utils.calc_member_status(expire_date)
self.assertEqual(status, 'Current')
def test_calc_member_status_today(self):
- expire_date = utils.today_alberta_tz()
+ expire_date = utils.today_local_tz()
status = utils.calc_member_status(expire_date)
self.assertEqual(status, 'Due')
def test_calc_member_status_yesterday(self):
- expire_date = utils.today_alberta_tz() - datetime.timedelta(days=1)
+ expire_date = utils.today_local_tz() - datetime.timedelta(days=1)
status = utils.calc_member_status(expire_date)
@@ -177,14 +177,14 @@ class TestCalcStatus(TestCase):
self.assertEqual(status, 'Overdue')
def test_calc_member_status_85_days_ago(self):
- expire_date = utils.today_alberta_tz() - datetime.timedelta(days=85)
+ expire_date = utils.today_local_tz() - datetime.timedelta(days=85)
status = utils.calc_member_status(expire_date)
self.assertEqual(status, 'Overdue')
def test_calc_member_status_95_days_ago(self):
- expire_date = utils.today_alberta_tz() - datetime.timedelta(days=95)
+ expire_date = utils.today_local_tz() - datetime.timedelta(days=95)
status = utils.calc_member_status(expire_date)
@@ -218,7 +218,7 @@ class TestTallyMembership(TestCase):
def test_tally_membership_months_prepaid(self):
member = self.get_member_clear_transactions()
test_num_months = 8
- start_date = utils.today_alberta_tz() - relativedelta.relativedelta(months=6, days=14)
+ start_date = utils.today_local_tz() - relativedelta.relativedelta(months=6, days=14)
end_date = start_date + relativedelta.relativedelta(months=test_num_months)
member.current_start_date = start_date
@@ -240,7 +240,7 @@ class TestTallyMembership(TestCase):
def test_tally_membership_months_current(self):
member = self.get_member_clear_transactions()
test_num_months = 7
- start_date = utils.today_alberta_tz() - relativedelta.relativedelta(months=6, days=14)
+ start_date = utils.today_local_tz() - relativedelta.relativedelta(months=6, days=14)
end_date = start_date + relativedelta.relativedelta(months=test_num_months)
member.current_start_date = start_date
@@ -262,7 +262,7 @@ class TestTallyMembership(TestCase):
def test_tally_membership_months_due(self):
member = self.get_member_clear_transactions()
test_num_months = 6
- start_date = utils.today_alberta_tz() - relativedelta.relativedelta(months=6, days=14)
+ start_date = utils.today_local_tz() - relativedelta.relativedelta(months=6, days=14)
end_date = start_date + relativedelta.relativedelta(months=test_num_months)
member.current_start_date = start_date
@@ -284,7 +284,7 @@ class TestTallyMembership(TestCase):
def test_tally_membership_months_overdue(self):
member = self.get_member_clear_transactions()
test_num_months = 5
- start_date = utils.today_alberta_tz() - relativedelta.relativedelta(months=6, days=14)
+ start_date = utils.today_local_tz() - relativedelta.relativedelta(months=6, days=14)
end_date = start_date + relativedelta.relativedelta(months=test_num_months)
member.current_start_date = start_date
@@ -306,7 +306,7 @@ class TestTallyMembership(TestCase):
def test_tally_membership_months_overdue_pause(self):
member = self.get_member_clear_transactions()
test_num_months = 1
- start_date = utils.today_alberta_tz() - relativedelta.relativedelta(months=6, days=14)
+ start_date = utils.today_local_tz() - relativedelta.relativedelta(months=6, days=14)
end_date = start_date + relativedelta.relativedelta(months=test_num_months)
member.current_start_date = start_date
@@ -328,7 +328,7 @@ class TestTallyMembership(TestCase):
def test_tally_membership_months_dont_run(self):
member = self.get_member_clear_transactions()
- start_date = utils.today_alberta_tz()
+ start_date = utils.today_local_tz()
member.current_start_date = start_date
member.paused_date = start_date
diff --git a/apiserver/apiserver/api/utils.py b/apiserver/apiserver/api/utils.py
index 711b65d..09a35b2 100644
--- a/apiserver/apiserver/api/utils.py
+++ b/apiserver/apiserver/api/utils.py
@@ -29,13 +29,13 @@ from .. import settings, secrets
STATIC_FOLDER = 'data/static/'
-TIMEZONE_CALGARY = pytz.timezone('America/Edmonton')
+DISPLAY_TZ = pytz.timezone(settings.DISPLAY_TIMEZONE)
-def today_alberta_tz():
- return datetime.now(TIMEZONE_CALGARY).date()
+def today_local_tz():
+ return datetime.now(DISPLAY_TZ).date()
-def now_alberta_tz():
- return datetime.now(TIMEZONE_CALGARY)
+def now_local_tz():
+ return datetime.now(DISPLAY_TZ)
def alert_tanner(message):
try:
@@ -108,7 +108,7 @@ def calc_member_status(expire_date, fake_date=None):
'''
Return: member status
'''
- today = fake_date or today_alberta_tz()
+ today = fake_date or today_local_tz()
difference = num_months_difference(expire_date, today)
@@ -155,7 +155,7 @@ def tally_membership_months(member, fake_date=None):
member.status = status
if status == 'Expired Member':
- member.paused_date = today_alberta_tz()
+ member.paused_date = today_local_tz()
msg = 'Member has expired: {} {}'.format(member.preferred_name, member.last_name)
alert_tanner(msg)
logger.info(msg)
@@ -280,7 +280,7 @@ def process_garden_image(upload):
draw = ImageDraw.Draw(pic)
- timestamp = now_alberta_tz().strftime('%a %b %-d, %Y %-I:%M %p')
+ timestamp = now_local_tz().strftime('%a %b %-d, %Y %-I:%M %p')
font = ImageFont.truetype('DejaVuSans.ttf', 60)
draw.text((10, 10), timestamp, (0,0,0), font=font)
@@ -472,7 +472,7 @@ def register_user(data, user):
user.is_superuser = True
user.save()
- user.member.vetted_date = today_alberta_tz()
+ user.member.vetted_date = today_local_tz()
user.member.save()
diff --git a/apiserver/apiserver/api/utils_email.py b/apiserver/apiserver/api/utils_email.py
index 75cb748..e33e469 100644
--- a/apiserver/apiserver/api/utils_email.py
+++ b/apiserver/apiserver/api/utils_email.py
@@ -43,7 +43,7 @@ def send_welcome_email(member):
def send_ical_email(member, session, ical_file):
def replace_fields(text):
- date = session.datetime.astimezone(utils.TIMEZONE_CALGARY).strftime('%A, %B %d')
+ date = session.datetime.astimezone(utils.DISPLAY_TZ).strftime('%A, %B %d')
return text.replace(
'[name]', member.preferred_name,
diff --git a/apiserver/apiserver/api/utils_paypal.py b/apiserver/apiserver/api/utils_paypal.py
index 1c2a731..af8ce6f 100644
--- a/apiserver/apiserver/api/utils_paypal.py
+++ b/apiserver/apiserver/api/utils_paypal.py
@@ -251,7 +251,7 @@ def check_training(data, training_id, amount):
if training.attendance_status == 'Waiting for payment':
training.attendance_status = 'Confirmed'
- training.paid_date = utils.today_alberta_tz()
+ training.paid_date = utils.today_local_tz()
training.save()
logger.info('IPN - Amount valid for training cost, id: ' + str(training.id))
diff --git a/apiserver/apiserver/api/utils_stats.py b/apiserver/apiserver/api/utils_stats.py
index ba18547..7fa4d8b 100644
--- a/apiserver/apiserver/api/utils_stats.py
+++ b/apiserver/apiserver/api/utils_stats.py
@@ -103,7 +103,7 @@ def calc_member_counts():
paused_count = members.count() - member_count
green_count = num_current + num_prepaid
- six_months_ago = utils.today_alberta_tz() - timedelta(days=183)
+ six_months_ago = utils.today_local_tz() - timedelta(days=183)
six_month_plus_count = not_paused.filter(application_date__lte=six_months_ago).count()
vetted_count = not_paused.filter(vetted_date__isnull=False).count()
@@ -137,7 +137,7 @@ def calc_member_counts():
)
def calc_signup_counts():
- month_beginning = utils.today_alberta_tz().replace(day=1)
+ month_beginning = utils.today_local_tz().replace(day=1)
members = models.Member.objects
new_members = members.filter(application_date__gte=month_beginning)
@@ -236,9 +236,9 @@ def check_maintenance_list():
return []
def calc_card_scans():
- date = utils.today_alberta_tz()
+ date = utils.today_local_tz()
dt = datetime.combine(date, datetime.min.time())
- midnight = utils.TIMEZONE_CALGARY.localize(dt)
+ midnight = utils.DISPLAY_TZ.localize(dt)
cards = models.Card.objects
count = cards.filter(last_seen__gte=midnight).count()
@@ -251,7 +251,7 @@ def calc_card_scans():
)
def calc_drink_sales():
- six_months_ago = utils.today_alberta_tz() - timedelta(days=183)
+ six_months_ago = utils.today_local_tz() - timedelta(days=183)
drinks_since = {
'1970-01-01': {
diff --git a/apiserver/apiserver/api/views.py b/apiserver/apiserver/api/views.py
index f191e67..b3fab43 100644
--- a/apiserver/apiserver/api/views.py
+++ b/apiserver/apiserver/api/views.py
@@ -226,7 +226,7 @@ class MemberViewSet(Base, Retrieve, Update):
raise exceptions.PermissionDenied()
member = self.get_object()
member.status = 'Paused Member'
- member.paused_date = utils.today_alberta_tz()
+ member.paused_date = utils.today_local_tz()
member.save()
msg = 'Member has been paused: {} {}'.format(member.preferred_name, member.last_name)
@@ -239,10 +239,10 @@ class MemberViewSet(Base, Retrieve, Update):
if not is_admin_director(self.request.user):
raise exceptions.PermissionDenied()
- today = utils.today_alberta_tz()
+ today = utils.today_local_tz()
member = self.get_object()
- difference = utils.today_alberta_tz() - member.paused_date
+ difference = utils.today_local_tz() - member.paused_date
if difference.days > 370: # give some leeway
logging.info('Member has been away for %s days (since %s), unvetting...', difference.days, member.paused_date)
member.vetted_date = None
@@ -287,7 +287,7 @@ class MemberViewSet(Base, Retrieve, Update):
logging.info('Auto-certifying precix...')
if utils_ldap.is_configured():
utils_ldap.add_to_group(member, 'CNC-Precix-Users')
- member.precix_cnc_cert_date = utils.today_alberta_tz()
+ member.precix_cnc_cert_date = utils.today_local_tz()
RABBIT_COURSE = 247
attended_rabbit = models.Training.objects.filter(
@@ -301,7 +301,7 @@ class MemberViewSet(Base, Retrieve, Update):
logging.info('Auto-certifying rabbit...')
if utils_ldap.is_configured():
utils_ldap.add_to_group(member, 'Laser Users')
- member.rabbit_cert_date = utils.today_alberta_tz()
+ member.rabbit_cert_date = utils.today_local_tz()
TROTEC_COURSE = 321
attended_trotec = models.Training.objects.filter(
@@ -315,7 +315,7 @@ class MemberViewSet(Base, Retrieve, Update):
logging.info('Auto-certifying trotec...')
if utils_ldap.is_configured():
utils_ldap.add_to_group(member, 'Trotec Users')
- member.trotec_cert_date = utils.today_alberta_tz()
+ member.trotec_cert_date = utils.today_local_tz()
MOPA_COURSE = 519
attended_mopa = models.Training.objects.filter(
@@ -329,7 +329,7 @@ class MemberViewSet(Base, Retrieve, Update):
logging.info('Auto-certifying MOPA...')
if utils_ldap.is_configured():
utils_ldap.add_to_group(member, 'MOPA Users')
- member.mopa_cert_date = utils.today_alberta_tz()
+ member.mopa_cert_date = utils.today_local_tz()
EUFYMAKEUV_COURSE = 520
attended_eufymakeuv = models.Training.objects.filter(
@@ -343,9 +343,9 @@ class MemberViewSet(Base, Retrieve, Update):
logging.info('Auto-certifying EUFYMAKEUV...')
if utils_ldap.is_configured():
utils_ldap.add_to_group(member, 'Eufymake Users')
- member.eufymakeuv_cert_date = utils.today_alberta_tz()
+ member.eufymakeuv_cert_date = utils.today_local_tz()
- member.vetted_date = utils.today_alberta_tz()
+ member.vetted_date = utils.today_local_tz()
member.save()
return Response(200)
@@ -544,11 +544,11 @@ class TrainingViewSet(Base, Retrieve, Create, Update):
if requires_vetted:
if status == 'Attended' and member.vetted_date:
logging.info('Granting certification: %s', session.course.name)
- return utils.today_alberta_tz()
+ return utils.today_local_tz()
else:
if status == 'Attended':
logging.info('Granting certification: %s', session.course.name)
- return utils.today_alberta_tz()
+ return utils.today_local_tz()
logging.info('Not granting certification: %s', session.course.name)
return None
@@ -760,7 +760,7 @@ class QuizViewSet(Base):
logging.info('Granting quiz certification: %s', quiz)
- member.wood_cert_date = utils.today_alberta_tz()
+ member.wood_cert_date = utils.today_local_tz()
member.save()
elif quiz == 'scanner':
@@ -778,7 +778,7 @@ class QuizViewSet(Base):
logging.info('Granting quiz certification: %s', quiz)
- member.scanner_cert_date = utils.today_alberta_tz()
+ member.scanner_cert_date = utils.today_local_tz()
member.save()
else:
@@ -950,7 +950,7 @@ class DoorViewSet(viewsets.ViewSet, List):
card.save()
member = card.user.member
- t = utils.now_alberta_tz().strftime('%Y-%m-%d %H:%M:%S, %a %I:%M %p')
+ t = utils.now_local_tz().strftime('%Y-%m-%d %H:%M:%S, %a %I:%M %p')
logger.info('Scan - Time: {} | Name: {} {} ({})'.format(t, member.preferred_name, member.last_name, member.id))
last_scan = dict(
@@ -1502,7 +1502,7 @@ class VettingViewSet(Base, List):
def get_queryset(self):
queryset = models.Member.objects
- four_weeks_ago = utils.today_alberta_tz() - datetime.timedelta(days=28)
+ four_weeks_ago = utils.today_local_tz() - datetime.timedelta(days=28)
queryset = queryset.filter(status__in=['Prepaid', 'Current', 'Due'])
queryset = queryset.filter(paused_date__isnull=True)
queryset = queryset.filter(vetted_date__isnull=True)
@@ -1632,7 +1632,7 @@ class ProtocoinViewSet(Base):
if training:
if training.attendance_status == 'Waiting for payment':
training.attendance_status = 'Confirmed'
- training.paid_date = utils.today_alberta_tz()
+ training.paid_date = utils.today_local_tz()
training.save()
return Response(200)
@@ -2261,7 +2261,7 @@ class PinballViewSet(Base):
@action(detail=False, methods=['get'])
def monthly_high_scores(self, request):
- now = utils.now_alberta_tz()
+ now = utils.now_local_tz()
current_month_start = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
members = models.Member.objects.all()
@@ -2340,7 +2340,7 @@ class HostingViewSet(Base):
message = '{} just offered to host for {} hours from now until {}!'.format(
hosting_user.member.preferred_name,
hours,
- h.finished_at.astimezone(utils.TIMEZONE_CALGARY).strftime('%-I:%M %p, %b %d'),
+ h.finished_at.astimezone(utils.DISPLAY_TZ).strftime('%-I:%M %p, %b %d'),
)
if hosting_user.member.discourse_username:
message += ' Tag @{} here to get their attention.'.format(
@@ -2354,7 +2354,7 @@ class HostingViewSet(Base):
hosting = models.Hosting.objects.order_by('-finished_at').first()
closing = dict(
time=hosting.finished_at.timestamp(),
- time_str=hosting.finished_at.astimezone(utils.TIMEZONE_CALGARY).strftime('%-I:%M %p'),
+ time_str=hosting.finished_at.astimezone(utils.DISPLAY_TZ).strftime('%-I:%M %p'),
first_name=hosting.user.member.preferred_name,
)
cache.set('closing', closing)
@@ -2381,7 +2381,7 @@ class HostingViewSet(Base):
@action(detail=False, methods=['get'])
def monthly_high_scores(self, request):
- now = utils.now_alberta_tz()
+ now = utils.now_local_tz()
current_month_start = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
members = models.Member.objects.all()
@@ -2467,7 +2467,7 @@ class StorageSpaceViewSet(Base, List, Retrieve, Update):
@action(detail=False, methods=['get'], permission_classes=[])
def available(self, request):
- three_months_ago = utils.today_alberta_tz() - datetime.timedelta(days=89)
+ three_months_ago = utils.today_local_tz() - datetime.timedelta(days=89)
queryset = models.StorageSpace.objects.filter(
location='member_shelves'
).filter(
@@ -2508,7 +2508,7 @@ class StorageSpaceViewSet(Base, List, Retrieve, Update):
if storage.user:
owner_name = storage.user.member.preferred_name
- three_months_ago = utils.today_alberta_tz() - datetime.timedelta(days=89) # 1 day slack from the UI
+ three_months_ago = utils.today_local_tz() - datetime.timedelta(days=89) # 1 day slack from the UI
owner_paused_date = storage.user.member.paused_date
owner_long_expired = owner_paused_date and owner_paused_date <= three_months_ago
diff --git a/apiserver/apiserver/settings.py b/apiserver/apiserver/settings.py
index 7037f14..7f3b379 100644
--- a/apiserver/apiserver/settings.py
+++ b/apiserver/apiserver/settings.py
@@ -179,6 +179,8 @@ LANGUAGE_CODE = 'en-us'
TIME_ZONE = 'UTC'
+DISPLAY_TIMEZONE = os.environ.get('DISPLAY_TIMEZONE', 'America/Edmonton')
+
USE_I18N = True
USE_L10N = True
diff --git a/apiserver/scripts/calc_subs_membership_length.py b/apiserver/scripts/calc_subs_membership_length.py
index a49e017..a44200b 100755
--- a/apiserver/scripts/calc_subs_membership_length.py
+++ b/apiserver/scripts/calc_subs_membership_length.py
@@ -5,7 +5,7 @@ django.setup()
from django.db.models import Prefetch, Sum
from apiserver.api import models, utils
-today = utils.today_alberta_tz()
+today = utils.today_local_tz()
members = models.Member.objects.filter(paused_date__isnull=True)
related_tx = Prefetch(
diff --git a/apiserver/scripts/convert_card_seen.py b/apiserver/scripts/convert_card_seen.py
index 8977d0f..0418eb9 100755
--- a/apiserver/scripts/convert_card_seen.py
+++ b/apiserver/scripts/convert_card_seen.py
@@ -8,7 +8,7 @@ import pytz
from apiserver.api import models, utils
-tz = pytz.timezone('America/Edmonton')
+tz = utils.DISPLAY_TZ
cards = models.Card.objects.order_by('last_seen_at')
diff --git a/apiserver/scripts/embroidery_auth_update.py b/apiserver/scripts/embroidery_auth_update.py
index deb99a0..f27bf19 100755
--- a/apiserver/scripts/embroidery_auth_update.py
+++ b/apiserver/scripts/embroidery_auth_update.py
@@ -24,7 +24,7 @@ for session in sessions:
if student.attendance_status == 'Attended':
member = get_member(student)
if not member.embroidery_cert_date:
- member.embroidery_cert_date = session.datetime.astimezone(pytz.timezone('America/Edmonton')).date()
+ member.embroidery_cert_date = session.datetime.astimezone(utils.DISPLAY_TZ).date()
member.save()
print('Done.')
diff --git a/apiserver/scripts/import_card_scans.py b/apiserver/scripts/import_card_scans.py
index a4323f7..4c70d64 100755
--- a/apiserver/scripts/import_card_scans.py
+++ b/apiserver/scripts/import_card_scans.py
@@ -7,16 +7,12 @@ django.setup()
import csv
from datetime import datetime, timedelta
-from apiserver.api import models
-from django.utils.timezone import now, pytz
-
-def today_alberta_tz():
- return datetime.now(pytz.timezone('America/Edmonton')).date()
+from apiserver.api import models, utils
days = {}
date = datetime(2020, 3, 7).date()
-while date <= today_alberta_tz():
+while date <= utils.today_local_tz():
days[str(date)] = set()
date += timedelta(days=1)
@@ -28,7 +24,7 @@ with open('scans.csv', newline='') as csvfile:
for row in reader:
datetime_obj = datetime.strptime(row['date'], "%Y-%m-%d %H:%M:%S")
datetime_obj_utc = datetime_obj.replace(tzinfo=pytz.timezone('UTC'))
- date = datetime_obj_utc.astimezone(pytz.timezone('America/Edmonton'))
+ date = datetime_obj_utc.astimezone(utils.DISPLAY_TZ)
card = row['card_number']
diff --git a/apiserver/scripts/import_old_portal.py b/apiserver/scripts/import_old_portal.py
index b7120d7..df9d499 100755
--- a/apiserver/scripts/import_old_portal.py
+++ b/apiserver/scripts/import_old_portal.py
@@ -230,7 +230,7 @@ for o in old:
new['course'] = models.Course.objects.get(id=o.course_id)
new['old_instructor'] = o.instructor
dt = o.datetime.replace(tzinfo=None)
- dt = timezone.pytz.timezone('America/Edmonton').localize(dt)
+ dt = utils.DISPLAY_TZ.localize(dt)
new['datetime'] = dt.astimezone(timezone.pytz.UTC)
models.Session.objects.create(**new)
diff --git a/apiserver/scripts/import_rabbit_group.py b/apiserver/scripts/import_rabbit_group.py
index ca02f87..204c973 100755
--- a/apiserver/scripts/import_rabbit_group.py
+++ b/apiserver/scripts/import_rabbit_group.py
@@ -52,7 +52,7 @@ print()
for m in good_members.values():
if not m.rabbit_cert_date:
- m.rabbit_cert_date = utils.today_alberta_tz()
+ m.rabbit_cert_date = utils.today_local_tz()
print('certified', m.first_name, m.last_name)
m.save()
else:
diff --git a/apiserver/scripts/import_trotec_group.py b/apiserver/scripts/import_trotec_group.py
index eb63235..2db8306 100755
--- a/apiserver/scripts/import_trotec_group.py
+++ b/apiserver/scripts/import_trotec_group.py
@@ -52,7 +52,7 @@ print()
for m in good_members.values():
if not m.trotec_cert_date:
- m.trotec_cert_date = utils.today_alberta_tz()
+ m.trotec_cert_date = utils.today_local_tz()
print('certified', m.first_name, m.last_name)
m.save()
else:
diff --git a/apiserver/scripts/lockout_auth_update.py b/apiserver/scripts/lockout_auth_update.py
index bc6d618..2b91732 100755
--- a/apiserver/scripts/lockout_auth_update.py
+++ b/apiserver/scripts/lockout_auth_update.py
@@ -26,7 +26,7 @@ for session in sessions:
if student.attendance_status == 'Attended':
member = get_member(student)
if not member.orientation_date:
- member.orientation_date = session.datetime.astimezone(pytz.timezone('America/Edmonton')).date()
+ member.orientation_date = session.datetime.astimezone(utils.DISPLAY_TZ).date()
member.save()
# Lathe
@@ -39,7 +39,7 @@ for session in sessions:
if student.attendance_status == 'Attended':
member = get_member(student)
if not member.lathe_cert_date:
- member.lathe_cert_date = session.datetime.astimezone(pytz.timezone('America/Edmonton')).date()
+ member.lathe_cert_date = session.datetime.astimezone(utils.DISPLAY_TZ).date()
member.save()
# Manual Mill
@@ -52,7 +52,7 @@ for session in sessions:
if student.attendance_status == 'Attended':
member = get_member(student)
if not member.mill_cert_date:
- member.mill_cert_date = session.datetime.astimezone(pytz.timezone('America/Edmonton')).date()
+ member.mill_cert_date = session.datetime.astimezone(utils.DISPLAY_TZ).date()
member.save()
@@ -66,7 +66,7 @@ for session in sessions:
if student.attendance_status == 'Attended':
member = get_member(student)
if not member.wood_cert_date:
- member.wood_cert_date = session.datetime.astimezone(pytz.timezone('America/Edmonton')).date()
+ member.wood_cert_date = session.datetime.astimezone(utils.DISPLAY_TZ).date()
member.save()
# Woodworking-2 tools
@@ -79,7 +79,7 @@ for session in sessions:
if student.attendance_status == 'Attended':
member = get_member(student)
if not member.wood2_cert_date:
- member.wood2_cert_date = session.datetime.astimezone(pytz.timezone('America/Edmonton')).date()
+ member.wood2_cert_date = session.datetime.astimezone(utils.DISPLAY_TZ).date()
member.save()
# CNC tools
@@ -92,7 +92,7 @@ for session in sessions:
if student.attendance_status == 'Attended':
member = get_member(student)
if not member.cnc_cert_date:
- member.cnc_cert_date = session.datetime.astimezone(pytz.timezone('America/Edmonton')).date()
+ member.cnc_cert_date = session.datetime.astimezone(utils.DISPLAY_TZ).date()
member.save()
print('Done.')
diff --git a/webclient/src/Admin.js b/webclient/src/Admin.js
index 4d9ceb8..94b159b 100644
--- a/webclient/src/Admin.js
+++ b/webclient/src/Admin.js
@@ -5,7 +5,7 @@ import { Button, Container, Checkbox, Form, Header, Icon, Input, Table } from 's
import * as Datetime from 'react-datetime';
import moment from 'moment-timezone';
import download from 'downloadjs';
-import { apiUrl, statusColor, requester, useIsMobile } from './utils.js';
+import { apiUrl, statusColor, requester, useIsMobile, DISPLAY_TIMEZONE } from './utils.js';
let vettingCache = false;
let historyCache = false;
@@ -197,7 +197,7 @@ export function AdminHistory(props) {
<Table.Row>
<Table.Cell>
<a onClick={() => setFocus(x.id)}>
- {moment.utc(x.history_date).tz('America/Edmonton').format('YYYY-MM-DD')}
+ {moment.utc(x.history_date).tz(DISPLAY_TIMEZONE).format('YYYY-MM-DD')}
</a>
</Table.Cell>
<Table.Cell>{isMobile && 'User: '}{x.is_system ? 'System' : (x.history_user || 'Deleted User')}</Table.Cell>
@@ -282,7 +282,7 @@ export function AdminBackups(props) {
{backups.filter(x => x.download_time).map(x =>
<Table.Row key={x.backup_user}>
<Table.Cell>{isMobile && 'User: '}{x.backup_user}</Table.Cell>
- <Table.Cell>{isMobile && 'Last: '}{moment.utc(x.download_time).tz('America/Edmonton').format('LLLL')}</Table.Cell>
+ <Table.Cell>{isMobile && 'Last: '}{moment.utc(x.download_time).tz(DISPLAY_TIMEZONE).format('LLLL')}</Table.Cell>
<Table.Cell>{isMobile && '24h ago: '}{x.less_than_24h ? 'Yes' : 'No - please investigate'}</Table.Cell>
</Table.Row>
)}
diff --git a/webclient/src/AdminMembers.js b/webclient/src/AdminMembers.js
index 5773db7..2901ad2 100644
--- a/webclient/src/AdminMembers.js
+++ b/webclient/src/AdminMembers.js
@@ -3,7 +3,7 @@ import { Link, useParams } from 'react-router-dom';
import './light.css';
import { Button, Checkbox, Dimmer, Form, Message, Header, Icon, Image, Segment, Table, List, ListItem } from 'semantic-ui-react';
import moment from 'moment-timezone';
-import { statusColor, BasicTable, staticUrl, requester } from './utils.js';
+import { statusColor, BasicTable, staticUrl, requester, DISPLAY_TIMEZONE } from './utils.js';
import { TrainingList } from './Training.js';
function AdminCardDetail(props) {
@@ -75,9 +75,9 @@ function AdminCardDetail(props) {
Last Seen:{' '}
{input.last_seen ?
input.last_seen > '2021-11-14T02:01:35.415685Z' ?
- moment.utc(input.last_seen).tz('America/Edmonton').format('lll')
+ moment.utc(input.last_seen).tz(DISPLAY_TIMEZONE).format('lll')
:
- moment.utc(input.last_seen).tz('America/Edmonton').format('ll')
+ moment.utc(input.last_seen).tz(DISPLAY_TIMEZONE).format('ll')
:
'Unknown'
}
@@ -669,7 +669,7 @@ export function AdminCert(props) {
if (loading) return;
setLoading(true);
let data = Object();
- data[field] = moment.utc().tz('America/Edmonton').format('YYYY-MM-DD');
+ data[field] = moment.utc().tz(DISPLAY_TIMEZONE).format('YYYY-MM-DD');
requester('/members/' + member.id + '/', 'PATCH', token, data)
.then(res => {
refreshResult();
diff --git a/webclient/src/Cards.js b/webclient/src/Cards.js
index 0427833..62d8e50 100644
--- a/webclient/src/Cards.js
+++ b/webclient/src/Cards.js
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
import './light.css';
import moment from 'moment-timezone';
import { Button, Container, Header, Table } from 'semantic-ui-react';
-import { BasicTable, staticUrl, useIsMobile } from './utils.js';
+import { BasicTable, staticUrl, useIsMobile, DISPLAY_TIMEZONE } from './utils.js';
export function Cards(props) {
const { user, token } = props;
@@ -48,9 +48,9 @@ export function Cards(props) {
<Table.Cell>
{isMobile && 'Last Scan: '}{x.last_seen ?
x.last_seen > '2021-11-14T02:01:35.415685Z' ?
- moment.utc(x.last_seen).tz('America/Edmonton').format('lll')
+ moment.utc(x.last_seen).tz(DISPLAY_TIMEZONE).format('lll')
:
- moment.utc(x.last_seen).tz('America/Edmonton').format('ll')
+ moment.utc(x.last_seen).tz(DISPLAY_TIMEZONE).format('ll')
:
'Unknown'
}
@@ -76,9 +76,9 @@ export function Cards(props) {
<Table.Cell>
{card.last_seen ?
card.last_seen > '2021-11-14T02:01:35.415685Z' ?
- moment.utc(card.last_seen).tz('America/Edmonton').format('lll')
+ moment.utc(card.last_seen).tz(DISPLAY_TIMEZONE).format('lll')
:
- moment.utc(card.last_seen).tz('America/Edmonton').format('ll')
+ moment.utc(card.last_seen).tz(DISPLAY_TIMEZONE).format('ll')
:
'Unknown'
}
diff --git a/webclient/src/Classes.js b/webclient/src/Classes.js
index 3881252..09378c8 100644
--- a/webclient/src/Classes.js
+++ b/webclient/src/Classes.js
@@ -3,7 +3,7 @@ import { Link, useParams } from 'react-router-dom';
import './light.css';
import { Label, Button, Container, Dropdown, Form, FormField, Header, Icon, Input, Segment, Table } from 'semantic-ui-react';
import moment from 'moment-timezone';
-import { apiUrl, isAdmin, getInstructor, getInstructorDiscourseLink, BasicTable, requester, useIsMobile } from './utils.js';
+import { apiUrl, isAdmin, getInstructor, getInstructorDiscourseLink, BasicTable, requester, useIsMobile, DISPLAY_TIMEZONE } from './utils.js';
import { NotFound } from './Misc.js';
import { InstructorClassDetail, InstructorClassAttendance } from './InstructorClasses.js';
import { PayPalPayNow } from './PayPal.js';
@@ -29,10 +29,10 @@ function ClassTable(props) {
<Table.Cell>{x.course_data.name}</Table.Cell>
<Table.Cell>
<Link to={'/classes/'+x.id}>
- {moment.utc(x.datetime).tz('America/Edmonton').format('ddd, ll')}
+ {moment.utc(x.datetime).tz(DISPLAY_TIMEZONE).format('ddd, ll')}
</Link>
<span style={{float: 'right'}}>
- Time: {x.is_cancelled ? 'Cancelled' : moment.utc(x.datetime).tz('America/Edmonton').format('LT')}
+ Time: {x.is_cancelled ? 'Cancelled' : moment.utc(x.datetime).tz(DISPLAY_TIMEZONE).format('LT')}
</span>
</Table.Cell>
<Table.Cell>
@@ -76,10 +76,10 @@ function ClassTable(props) {
<Table.Cell> {x.course_data.name}</Table.Cell>
<Table.Cell>
<Link to={'/classes/'+x.id}>
- {moment.utc(x.datetime).tz('America/Edmonton').format('ddd, ll')}
+ {moment.utc(x.datetime).tz(DISPLAY_TIMEZONE).format('ddd, ll')}
</Link>
</Table.Cell>
- <Table.Cell>{x.is_cancelled ? 'Cancelled' : moment.utc(x.datetime).tz('America/Edmonton').format('LT')}</Table.Cell>
+ <Table.Cell>{x.is_cancelled ? 'Cancelled' : moment.utc(x.datetime).tz(DISPLAY_TIMEZONE).format('LT')}</Table.Cell>
<Table.Cell>{getInstructor(x)}</Table.Cell>
<Table.Cell>{x.cost === '0.00' ? 'Free' : '$'+x.cost}</Table.Cell>
<Table.Cell>
@@ -269,9 +269,9 @@ function NewClassTableCourse(props) {
<Table.Row key={x.id} active={x.datetime < now || x.is_cancelled}>
<Table.Cell>
<Link to={'/classes/'+x.id}>
- {moment.utc(x.datetime).tz('America/Edmonton').format(' MMM Do')}
+ {moment.utc(x.datetime).tz(DISPLAY_TIMEZONE).format(' MMM Do')}
</Link>
- {' - '}{x.is_cancelled ? 'Cancelled' : moment.utc(x.datetime).tz('America/Edmonton').format('LT')}
+ {' - '}{x.is_cancelled ? 'Cancelled' : moment.utc(x.datetime).tz(DISPLAY_TIMEZONE).format('LT')}
</Table.Cell>
<Table.Cell>{x.cost === '0.00' ? 'Free' : '$'+x.cost.slice(0,-3)}</Table.Cell>
@@ -738,13 +738,13 @@ export function Class(props) {
<Table.Row>
<Table.Cell>Date:</Table.Cell>
<Table.Cell>
- {moment.utc(clazz.datetime).tz('America/Edmonton').format('ll')}
+ {moment.utc(clazz.datetime).tz(DISPLAY_TIMEZONE).format('ll')}
</Table.Cell>
</Table.Row>
<Table.Row>
<Table.Cell>Time:</Table.Cell>
<Table.Cell>
- {clazz.is_cancelled ? 'Cancelled' : moment.utc(clazz.datetime).tz('America/Edmonton').format('LT')}
+ {clazz.is_cancelled ? 'Cancelled' : moment.utc(clazz.datetime).tz(DISPLAY_TIMEZONE).format('LT')}
</Table.Cell>
</Table.Row>
<Table.Row>
diff --git a/webclient/src/Courses.js b/webclient/src/Courses.js
index 2db94b7..e705366 100644
--- a/webclient/src/Courses.js
+++ b/webclient/src/Courses.js
@@ -3,7 +3,7 @@ import { Link, useParams } from 'react-router-dom';
import './light.css';
import { Button, Label, Container, Header, Input, Segment, Table } from 'semantic-ui-react';
import moment from 'moment-timezone';