Skip to content
Snippets Groups Projects
Commit 6e870a1d authored by Rafael László's avatar Rafael László :speech_balloon:
Browse files

update email to send hu user name

parent 38351680
Branches
No related tags found
No related merge requests found
Pipeline #6243 passed
...@@ -6,6 +6,10 @@ sender_email = 'noreply@ujonc.kszk.bme.hu' ...@@ -6,6 +6,10 @@ sender_email = 'noreply@ujonc.kszk.bme.hu'
link = 'https://ujonc.kszk.bme.hu/homework' link = 'https://ujonc.kszk.bme.hu/homework'
def get_full_name(user):
return user.last_name + " " + user.first_name
def read_email(name): def read_email(name):
with codecs.open('common/emails/' + name, 'r', 'utf-8') as myfile: with codecs.open('common/emails/' + name, 'r', 'utf-8') as myfile:
data = myfile.read() data = myfile.read()
...@@ -23,7 +27,7 @@ def send_out_mail(subject, message, sender_email, receiver_email): ...@@ -23,7 +27,7 @@ def send_out_mail(subject, message, sender_email, receiver_email):
def registration(user): def registration(user):
subject = "Kszképzés regisztráció" subject = "Kszképzés regisztráció"
message = read_email('registration.txt') message = read_email('registration.txt')
message = str.format(message % {'name': user.get_full_name()}) message = str.format(message % {'name': get_full_name(user)})
send_out_mail(subject, message, sender_email, [user.email, ]) send_out_mail(subject, message, sender_email, [user.email, ])
pass pass
...@@ -31,7 +35,7 @@ def registration(user): ...@@ -31,7 +35,7 @@ def registration(user):
def admitted(user): def admitted(user):
subject = "Jelentkezés eredménye" subject = "Jelentkezés eredménye"
message = read_email('admitted.txt') message = read_email('admitted.txt')
message = str.format(message % {'name': user.get_full_name()}) message = str.format(message % {'name': get_full_name(user)})
send_out_mail(subject, message, sender_email, [user.email, ]) send_out_mail(subject, message, sender_email, [user.email, ])
pass pass
...@@ -39,7 +43,7 @@ def admitted(user): ...@@ -39,7 +43,7 @@ def admitted(user):
def denied(user): def denied(user):
subject = "Jelentkezés eredménye" subject = "Jelentkezés eredménye"
message = read_email('denied.txt') message = read_email('denied.txt')
message = str.format(message % {'name': user.get_full_name()}) message = str.format(message % {'name': get_full_name(user)})
send_out_mail(subject, message, sender_email, [user.email, ]) send_out_mail(subject, message, sender_email, [user.email, ])
pass pass
...@@ -49,7 +53,7 @@ def new_homework(user, deadline): ...@@ -49,7 +53,7 @@ def new_homework(user, deadline):
subject = "Új házifeladat" subject = "Új házifeladat"
message = read_email('new_homework.txt') message = read_email('new_homework.txt')
message = str.format( message = str.format(
message % {'name': user.get_full_name(), 'link': link, 'deadline': deadline}) message % {'name': get_full_name(user), 'link': link, 'deadline': deadline})
send_out_mail(subject, message, sender_email, [user.email, ]) send_out_mail(subject, message, sender_email, [user.email, ])
pass pass
...@@ -61,7 +65,9 @@ def homework_corrected(user, title, accepted): ...@@ -61,7 +65,9 @@ def homework_corrected(user, title, accepted):
else: else:
status = 'Hibás' status = 'Hibás'
message = read_email('homework_corrected.txt') message = read_email('homework_corrected.txt')
message = str.format(message % {'name': user.get_full_name( message = str.format(message % {'name': get_full_name(user),
), 'link': link, 'status': status, 'title': title}) 'link': link,
'status': status,
'title': title})
send_out_mail(subject, message, sender_email, [user.email, ]) send_out_mail(subject, message, sender_email, [user.email, ])
pass pass
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment