Skip to content
Snippets Groups Projects
Commit 628dba61 authored by Christian Dresen's avatar Christian Dresen
Browse files

[WarpFood] Added WarpFood Mattermost Notification for opening, closing and...

[WarpFood] Added WarpFood Mattermost Notification for opening, closing and ordering a Sheet. Closed #34. Added Links to Mattermost notifications. Closed #35.
parent 6e87a915
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-10-11 23:22+0200\n" "POT-Creation-Date: 2016-10-13 16:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -525,9 +525,16 @@ msgid "order" ...@@ -525,9 +525,16 @@ msgid "order"
msgstr "Bestellen" msgstr "Bestellen"
#: warpfood/templates/warpfood/view.html:73 #: warpfood/templates/warpfood/view.html:73
#, python-format #, fuzzy, python-format
msgid "this_sheet_was_ordered %(sheet.order_time | naturaltime)s by %(sheet.order_user)s" #| msgid ""
msgstr "Dieses Sheet wurde %(sheet.order_time | naturaltime)s von %(sheet.order_user)s bestellt." #| "this_sheet_was_ordered %(sheet.order_time | naturaltime)s by "
#| "%(sheet.order_user)s"
msgid ""
" this_sheet_was_ordered %(sheet.order_time | naturaltime)s by "
"%(sheet.order_user)s"
msgstr ""
"Dieses Sheet wurde %(sheet.order_time | naturaltime)s von "
"%(sheet.order_user)s bestellt."
#: warpfood/templates/warpfood/view.html:84 #: warpfood/templates/warpfood/view.html:84
msgid "article" msgid "article"
...@@ -558,10 +565,34 @@ msgstr "Produkt Liste" ...@@ -558,10 +565,34 @@ msgstr "Produkt Liste"
msgid "are_you_sure" msgid "are_you_sure"
msgstr "Bist du sicher ?" msgstr "Bist du sicher ?"
#: warpfood/views.py:27 #: warpfood/views.py:30
#, python-format
msgid ""
"pizza_sheet_opened_for_%(est_order_time)s_at_%(pizza_service)s_%(sheet_id)s_"
"%(link)s"
msgstr ""
"[PizzaSheet #%(sheet_id)s](%(link)s) bei %(pizza_service)s mit vorraussichtlicher Bestellzeit "
"%(est_order_time)s geöffnet"
#: warpfood/views.py:119
#, python-format
msgid "pizza_sheet_closed_%(sheet_id)s_%(link)s"
msgstr ""
"[PizzaSheet #%(sheet_id)s](%(link)s) wurde geschlossen."
#: warpfood/views.py:121
#, python-format
msgid "pizza_sheet_opened_again_%(sheet_id)s_%(link)s"
msgstr ""
"[PizzaSheet #%(sheet_id)s](%(link)s) wurde erneut geöffnet"
#: warpfood/views.py:142
#, python-format #, python-format
msgid "pizza_sheet_opened_for_%(est_order_time)s_at_%(pizza_service)s" msgid ""
msgstr "PizzaSheet bei %(pizza_service)s mit vorraussichtlicher Bestellzeit %(est_order_time)s geöffnet" "pizza_sheet_ordered_at_%(order_time)s_by_%(username)s_%(sheet_id)s_%(link)s"
msgstr ""
"[PizzaSheet #%(sheet_id)s](%(link)s) wurde um %(order_time)s Uhr von %(username)s bestellt"
#: warpmain/templates/warpmain/about.html:5 warpzone/util.py:9 #: warpmain/templates/warpmain/about.html:5 warpzone/util.py:9
msgid "about" msgid "about"
...@@ -625,7 +656,7 @@ msgstr "Erstellen" ...@@ -625,7 +656,7 @@ msgstr "Erstellen"
msgid "markdown_support" msgid "markdown_support"
msgstr "Support" msgstr "Support"
#: warpmain/templates/warpmain/main.html:53 #: warpmain/templates/warpmain/main.html:56
msgid "created_by" msgid "created_by"
msgstr "Erstellt von" msgstr "Erstellt von"
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-10-11 23:22+0200\n" "POT-Creation-Date: 2016-10-13 17:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -376,12 +376,27 @@ msgstr "Password Changed Recently" ...@@ -376,12 +376,27 @@ msgstr "Password Changed Recently"
#: warpauth/util.py:5 #: warpauth/util.py:5
msgid "mail_content_password_changed_recently" msgid "mail_content_password_changed_recently"
msgstr "Hello, \n\n Your password was changed recently. \n \n Yours, \n WarpInfra Team" msgstr ""
"Hello, \n"
"\n"
" Your password was changed recently. \n"
" \n"
" Yours, \n"
" WarpInfra Team"
#: warpauth/views/register.py:16 #: warpauth/views/register.py:16
#, python-format #, python-format
msgid "https://infra.warpzone.ms/account/registration/activate/%(token)s" msgid "https://infra.warpzone.ms/account/registration/activate/%(token)s"
msgstr "Hello, \n\n Thank you for your registration. To activate your account, please click on the following Link:\n \n https://infra.warpzone.ms/account/registration/activate/%(token)s \n\n Yours, \n WarpInfra Team" msgstr ""
"Hello, \n"
"\n"
" Thank you for your registration. To activate your account, please click on "
"the following Link:\n"
" \n"
" https://infra.warpzone.ms/account/registration/activate/%(token)s \n"
"\n"
" Yours, \n"
" WarpInfra Team"
#: warpauth/views/register.py:17 #: warpauth/views/register.py:17
msgid "Your registration for WarpInfra" msgid "Your registration for WarpInfra"
...@@ -510,7 +525,9 @@ msgstr "order" ...@@ -510,7 +525,9 @@ msgstr "order"
msgid "" msgid ""
" this_sheet_was_ordered %(sheet.order_time | naturaltime)s by " " this_sheet_was_ordered %(sheet.order_time | naturaltime)s by "
"%(sheet.order_user)s" "%(sheet.order_user)s"
msgstr "This sheed was ordered %(sheet.order_time | naturaltime)s by %(sheet.order_user)s" msgstr ""
"This sheed was ordered %(sheet.order_time | naturaltime)s by "
"%(sheet.order_user)s"
#: warpfood/templates/warpfood/view.html:84 #: warpfood/templates/warpfood/view.html:84
msgid "article" msgid "article"
...@@ -541,10 +558,34 @@ msgstr "Product List" ...@@ -541,10 +558,34 @@ msgstr "Product List"
msgid "are_you_sure" msgid "are_you_sure"
msgstr "Are you sure?" msgstr "Are you sure?"
#: warpfood/views.py:27 #: warpfood/views.py:30
#, python-format #, python-format
msgid "pizza_sheet_opened_for_%(est_order_time)s_at_%(pizza_service)s" msgid ""
msgstr "A pizza sheet was opened for %(est_order_time)s at %(pizza_service)s" "pizza_sheet_opened_for_%(est_order_time)s_at_%(pizza_service)s_%(sheet_id)s_"
"%(link)s"
msgstr ""
"[PizzaSheet #%(sheet_id)s](%(link)s) bei %(pizza_service)s mit vorraussichtlicher Bestellzeit "
"%(est_order_time)s geöffnet"
#: warpfood/views.py:119
#, python-format
msgid "pizza_sheet_closed_%(sheet_id)s_%(link)s"
msgstr ""
"[PizzaSheet #%(sheet_id)s](%(link)s) wurde geschlossen."
#: warpfood/views.py:121
#, python-format
msgid "pizza_sheet_opened_again_%(sheet_id)s_%(link)s"
msgstr ""
"[PizzaSheet #%(sheet_id)s](%(link)s) wurde erneut geöffnet"
#: warpfood/views.py:142
#, python-format
msgid ""
"pizza_sheet_ordered_at_%(order_time)s_by_%(username)s_%(sheet_id)s_%(link)s"
msgstr ""
"[PizzaSheet #%(sheet_id)s](%(link)s) wurde um %(order_time)s Uhr von %(username)s "
"bestellt"
#: warpmain/templates/warpmain/about.html:5 warpzone/util.py:9 #: warpmain/templates/warpmain/about.html:5 warpzone/util.py:9
msgid "about" msgid "about"
...@@ -608,7 +649,7 @@ msgstr "Create" ...@@ -608,7 +649,7 @@ msgstr "Create"
msgid "markdown_support" msgid "markdown_support"
msgstr "Support" msgstr "Support"
#: warpmain/templates/warpmain/main.html:53 #: warpmain/templates/warpmain/main.html:56
msgid "created_by" msgid "created_by"
msgstr "Created by" msgstr "Created by"
......
...@@ -16,6 +16,8 @@ from datetime import datetime, timedelta ...@@ -16,6 +16,8 @@ from datetime import datetime, timedelta
# ToDo: Insert TemplateTag for Euro Format # ToDo: Insert TemplateTag for Euro Format
# ToDo: Username with hidden Field. Maybe insecure # ToDo: Username with hidden Field. Maybe insecure
# #
def get_sheet_link(request, sheet):
return request.get_host()+"/pizza/view/"+str(sheet.id)
def index(request): def index(request):
form = FoodSheetForm() form = FoodSheetForm()
...@@ -24,7 +26,9 @@ def index(request): ...@@ -24,7 +26,9 @@ def index(request):
form = FoodSheetForm(request.POST) form = FoodSheetForm(request.POST)
if form.is_valid(): if form.is_valid():
sheet = form.save() sheet = form.save()
send_to_mattermost("PizzaSheet", "town-square", _("pizza_sheet_opened_for_%(est_order_time)s_at_%(pizza_service)s") % ({'est_order_time': sheet.estimated_order_time, 'pizza_service':sheet.food_service})) arguments = {'est_order_time': sheet.estimated_order_time, 'pizza_service':sheet.food_service, 'sheet_id':sheet.id, 'link':get_sheet_link(request, sheet)}
message = _("pizza_sheet_opened_for_%(est_order_time)s_at_%(pizza_service)s_%(sheet_id)s_%(link)s") % (arguments)
send_to_mattermost("PizzaSheet", "town-square", message)
time_threshold = datetime.now() - timedelta(days=1) time_threshold = datetime.now() - timedelta(days=1)
FoodSheet.objects.filter(order_time__lte=time_threshold).delete() FoodSheet.objects.filter(order_time__lte=time_threshold).delete()
...@@ -110,7 +114,12 @@ def toggle_closed(request, sheet_id=0): ...@@ -110,7 +114,12 @@ def toggle_closed(request, sheet_id=0):
sheet = FoodSheet.objects.get(id=sheet_id) sheet = FoodSheet.objects.get(id=sheet_id)
sheet.closed = not sheet.closed sheet.closed = not sheet.closed
sheet.save() sheet.save()
arguments = {'order_time': sheet.order_time, 'username':sheet.order_user, 'sheet_id':sheet.id, 'link':get_sheet_link(request, sheet)}
if sheet.closed:
message = _("pizza_sheet_closed_%(sheet_id)s_%(link)s") % (arguments)
else:
message = _("pizza_sheet_opened_again_%(sheet_id)s_%(link)s") % (arguments)
send_to_mattermost("PizzaSheet", "town-square", message)
return redirect("/pizza/view/%s" % (sheet_id)) return redirect("/pizza/view/%s" % (sheet_id))
...@@ -129,7 +138,9 @@ def sheet_ordered(request, sheet_id=0): ...@@ -129,7 +138,9 @@ def sheet_ordered(request, sheet_id=0):
sheet.order_time = datetime.now() sheet.order_time = datetime.now()
sheet.order_user = str(request.user) sheet.order_user = str(request.user)
sheet.save() sheet.save()
arguments = {'order_time': sheet.order_time.strftime("%H:%M"), 'username':sheet.order_user, 'sheet_id':sheet.id, 'link':get_sheet_link(request, sheet)}
message = _("pizza_sheet_ordered_at_%(order_time)s_by_%(username)s_%(sheet_id)s_%(link)s") % (arguments)
send_to_mattermost("PizzaSheet", "town-square", message)
return redirect("/pizza/view/%s" % sheet_id) return redirect("/pizza/view/%s" % sheet_id)
def delete_order(request, order_id=0): def delete_order(request, order_id=0):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment