- add standard messages for email to settings

app/settings.py

@@ -41,6 +41,11 @@ class Settings:
         self.autoAnnoy = False      #Automatically send payment eMails
         self.annoyDays = 20         #Automatically send mails every x days (default 20)
         self.annoyLimit = 100       #Money limit for autoAnnoy (default 100)
+        #Mail Messages
+        self.singleMessageStandardSubject = u"Baroness - Bierrechnung"
+        self.singleMessageStandardText = u"Hallo %%longname%%\ndu hast %%dept%%€ Schulden.\nBitte überweise diesen Betrag an das Konto:\n\n%%if_is_black%%Weil du zu hohe Schulden hast, bist du geschwärzt%%end_if_is_black%%\nLiebe Grüße,\nDein Bierbaron"
+        self.masMessageStandardSubject = u"Baroness - Bierrechnung"
+        self.masMessageStandardText = u"Hallo %%longname%%\ndu hast %%dept%%€ Schulden.\nBitte überweise diesen Betrag an das Konto:\n\n%%if_is_black%%Weil du zu hohe Schulden hast, bist du geschwärzt%%end_if_is_black%%\nLiebe Grüße,\nDein Bierbaron"
 
         ##Data Logging
         #Fridge Temperature

app/templates/billing_mass_mail.html

@@ -12,15 +12,11 @@
 	{% endif %}
 	<h1>Rechnung an alle verschicken</h1>
 	<form name="billing" method="post" action="/billing/send_all_bills">
-		Betreff:<input type="text" name="subject" value="Bierrechnung von der Baroness"/> <br />
+		Betreff:<input type="text" name="subject" value="{{emailsubject}}"/> <br />
         <textarea cols="80" rows="20" name="message">
-Hallo %%longname%%
-du hast %%dept%%€ Schulden.
-Bitte überweise diesen Betrag an das Konto:
-
-%%if_is_black%%Weil du zu hohe Schulden hast, bist du geschwärzt%%end_if_is_black%%
+{{emailtext}}
 </textarea><br />
-		<p> Warnung: Das versenden vieler emails dauert ein weilchen.</p>
+		<p> Warnung: Das versenden vieler emails dauert ein weilchen. (kann länger als eine Minute sein)</p>
 		<input type="submit" value="Email versenden">
 	</form>
 

app/templates/billing_personal.html

@@ -1,26 +1,14 @@
 {% extends "base.html"%}
 {% set title = "Persönliche Rechnung versenden" %}
 {% block content %}
-	<h3>TODO: </h3>
-	<ul>
-        <li>save default text somewhere and make it configureable</li>
-	</ul>
 	{% if success %}
 		<p>{{ success }}</p>
 	{% endif %}
 	<h1>Rechnung an {{user_to_bill.longname}} verschicken</h1>
 	<form name="billing" method="post" action="/billing/send_personal_bill/{{user_to_bill.name}}">
-		Betreff:<input type="text" name="subject" value="Bierrechnung von der Baroness"/> <br />
+		Betreff:<input type="text" name="subject" value="{{emailsubject}}"/> <br />
         <textarea cols="80" rows="20" name="message">
-Hallo {{user_to_bill.longname}}
-du hast zurzeit {{dept}} € Schulden.
-{% if user_to_bill.isblack %}Weil du zu hohe Schulden hast, bist du geschwärzt.{% endif %}
-Bitte überweise den Betrag an das Konto:
-			Peter Schleter;
-			IBAN; BIC;
-
-dein Baron,
-{{user.longname}}
+{{emailtext}}
 </textarea><br />
 		<input type="submit" value="Email versenden">
 	</form>

app/views.py

@@ -8,10 +8,11 @@ from plot import *
 from user import User
 from fridge import Fridge, Sensor
 from product import Product
-from send_email import send_email, send_emails
+from send_email import send_email, send_emails, parse_email
 from consumption import Consumption
 import bcrypt
 import os
+from settings import *
 
 
 @app.route('/static/<path:path>')
@@ -323,7 +324,9 @@ def send_personal_bill(name=None):
         return render_template('billing.html', users=users, success=success, debt=debt,  user=get_user_by_name(session.get('name')))
 
     if request.method == 'GET':
-        return render_template('billing_personal.html', user_to_bill=get_user_by_name(name), dept=get_debt(name), user=get_user_by_name(session.get('name')))
+        emailtext = parse_email(settings.singleMessageStandardText, get_user_by_name(name), get_debt(name))
+        emailsubject =parse_email(settings.singleMessageStandardSubject, get_user_by_name(name), get_debt(name))
+        return render_template('billing_personal.html', emailtext=emailtext, emailsubject=emailsubject, user=get_user_by_name(session.get('name')), user_to_bill=get_user_by_name(name))
 
 
 @app.route('/billing/send_all_bills', methods=['GET', 'POST'])
@@ -341,11 +344,11 @@ def send_mass_mail(name=None):
         #    subject_parsed = parse_email(subject, user, 3) # change ammount of depts here!
         #    send_email(user.email, subject_parsed, message_parsed)
 
-        success = "An alle user werden Rechnungen versendet."
+        success = "An alle User werden Rechnungen versendet."
         return render_template('billing.html', users=users, success=success, dept=0, user=get_user_by_name(session.get('name')))
 
     if request.method == 'GET':
-        return render_template('billing_mass_mail.html', user=get_user_by_name(session.get('name')))
+        return render_template('billing_mass_mail.html', user=get_user_by_name(session.get('name')), emailtext=settings.masMessageStandardText, emailsubject=settings.masMessageStandardSubject)
 
 
 @app.route('/selfmanagement', methods=['GET', 'POST'])