Finalize unregister function, force POST request and includes date information

Author: lioneltrebuchon

amivapi/events/email_links.py

@@ -7,7 +7,7 @@
 Needed when external users want to sign up for public events or users want to
 sign off via links.
 """
-import sys
+from datetime import datetime
 from bson import ObjectId
 from eve.methods.delete import deleteitem_internal
 from eve.methods.patch import patch_internal
@@ -17,7 +17,7 @@
 from amivapi.events.queue import update_waiting_list
 from amivapi.events.utils import get_token_secret
 
-email_blueprint = Blueprint('emails', __name__)
+email_blueprint = Blueprint('emails', __name__, template_folder='templates')
 
 
 def add_confirmed_before_insert(items):
@@ -86,18 +86,26 @@ def on_delete_signup(token):
         query = {'_id': user}
         data_user = current_app.data.driver.db['users'].find_one(query)
         user = data_user["firstname"]
-
+    event = data_signup['event']
+    query = {'_id': event}
+    data_event = current_app.data.driver.db['events'].find_one(query)
+    event_name = data_event["title_en"]
+    if event_name is None:
+        event_name = data_event["title_en"]
+    print(data_event["time_start"])
+    event_date = datetime.strftime(data_event["time_start"], '%Y-%m-%d %H:%M')
     # Serve the unregister_event page
     response = make_response(render_template("unregister_event.html",
                                              user=user,
-                                             event=data_signup["title_en"],
+                                             event=event_name,
+                                             event_date=event_date,
                                              error_msg=error_msg,
                                              token=token))
     response.set_cookie('token', token)
     return response
 
 
-@email_blueprint.route('/delete_confirmed/<token>')
+@email_blueprint.route('/delete_confirmed/<token>', methods = ['POST'])
 def on_delete_confirmed(token):
     try:
         s = URLSafeSerializer(get_token_secret())

amivapi/events/emails.py

@@ -36,13 +36,14 @@ def notify_signup_accepted(event, signup):
     deletion_link = url_for('emails.on_delete_signup', token=token,
                             _external=True)
 
-    mail([email],
-         'Eventsignup accepted',
-         current_app.config['ACCEPT_EMAIL_TEXT'].format(
-             name=name,
-             title=event.get('title_en') or event.get('title_de'),
-             link=deletion_link,
-             deadline=event['time_register_end'].strftime('%H.%M %d.%m.%Y')))
+    print(deletion_link)
+    # mail([email],
+    #      'Eventsignup accepted',
+    #      current_app.config['ACCEPT_EMAIL_TEXT'].format(
+    #          name=name,
+    #          title=event.get('title_en') or event.get('title_de'),
+    #          link=deletion_link,
+    #          deadline=event['time_register_end'].strftime('%H.%M %d.%m.%Y')))
 
 
 def send_confirmmail_to_unregistered_users(items):

amivapi/events/templates/unregister_event.html

@@ -29,15 +29,15 @@ <h1>
       </h1>
       <p>
         {% if user and event %}
-        We will irrevocably unregister you (<em>{{user}}</em>) from the event <em>{{event}}</em>.
+        We will irrevocably unregister you (<em>{{user}}</em>) from the event <em>{{event}}</em> on <em>{{event_date}}</em>.
         Is that ok?
         {% else %}
         You clicked on a opt-out link of the AMIV at ETHZ student organization. We cannot process your request,
           because we either do <em>{not}</em> know the event you wish to unregister from, or your user name, or both.
         {% endif %}
       </p>
 
-       <form action="/delete_confirmed/{token}" method="POST">
+       <form action="/delete_confirmed/{{token}}" method="POST">
         <input type="submit" value="I agree">
       </form>