From b82bfbc0be25bc91c802271463cf3f22d157d7f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodor=20M=C3=A1t=C3=A9?= <bodor.mate@kszk.bme.hu>
Date: Sat, 2 Feb 2019 11:41:55 +0100
Subject: [PATCH] emails
---
src/common/email.py | 61 +++++++++++++++++++++++++++++----------------
src/stats/views.py | 1 -
2 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/src/common/email.py b/src/common/email.py
index 1c4151e..96b34ca 100644
--- a/src/common/email.py
+++ b/src/common/email.py
@@ -1,32 +1,51 @@
from django.core.mail import send_mail
+import codecs
+sender_email = 'noreply@kszkepzes.sch.bme.hu'
+link = 'kszkepzes.sch.bme.hu/homework'
-def registration(email):
- subject = "REGISTRATION TEST"
- message = "Üdvözlünk a kszképzésen!"
- send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
+def read_email(name):
+ with codecs.open('common/emails/' + name, 'r', 'utf-8') as myfile:
+ data = myfile.read()
+ return data
-def admitted(email):
- subject = "ADMITTED TEST"
- message = "Gratulálunk, te vagy a kiválasztott!!"
- send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
+def registration(user):
+ subject = "Kszképzés regisztráció"
+ message = read_email('registration.txt')
+ message = str.format(message %{'name': user.get_full_name()})
+ send_mail(subject, message, sender_email, [user.email, ])
-def denied(email):
- subject = "DENIED TEST"
- message = "Sajnos idén nem nyertél felvételt, próbáld meg legközelebb"
- send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
+def admitted(user):
+ subject = "Jelentkezés eredménye"
+ message = read_email('admitted.txt')
+ message = str.format(message % {'name': user.get_full_name()})
+ send_mail(subject, message, sender_email, [user.email, ])
-def new_homework(emails):
- subject = "NEW HOMEWORK TEST"
- message = "Szia!\nEgy új házi lett kiadva, ha tíz percen belül megoldod akkor fasza gyerek vagy," \
- " ha nem életed végéig bánnifogod..."
- send_mail(subject, message, 'noreply@devteam.sch.bme.hu', emails)
+def denied(user):
+ subject = "Jelentkezés eredménye"
+ message = read_email('denied.txt')
+ message = str.format(message % {'name': user.get_full_name()})
+ send_mail(subject, message, sender_email, [user.email, ])
-def homework_corrected(email):
- subject = "HOMEWORK CORRECTED TEST"
- message = "Nagyszerű mentoraink kijavították házifeladatod, vajon most kaptál meglepit?!"
- send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
+
+def new_homework(user, deadline):
+ deadline = deadline.strftime('%Y-%m-%d %H:%M')
+ subject = "Új házifeladat"
+ message = read_email('new_homework.txt')
+ message = str.format(message % {'name': user.get_full_name(), 'link': link, 'deadline': deadline})
+ send_mail(subject, message, sender_email, [user.email, ])
+
+
+def homework_corrected(user, title, accepted):
+ subject = "Házifeladat eredménye"
+ if accepted:
+ status = 'Elfogadva'
+ else:
+ status = 'Hibás'
+ message = read_email('homework_corrected.txt')
+ message = str.format(message % {'name': user.get_full_name(), 'link': link, 'status': status, 'title': title })
+ send_mail(subject, message, sender_email, [user.email, ])
diff --git a/src/stats/views.py b/src/stats/views.py
index 69ab78c..393de2c 100644
--- a/src/stats/views.py
+++ b/src/stats/views.py
@@ -31,4 +31,3 @@ class NoteViewSet(viewsets.ModelViewSet):
if event_id is not None:
return queryset.filter(event=event_id)
return queryset
-
--
GitLab