From 36b482002c24cb628b9a09c8069c3c0bbea5bcee Mon Sep 17 00:00:00 2001
From: Rui Coelho <ruicoelho@ua.pt>
Date: Mon, 27 Apr 2020 16:41:06 +0100
Subject: [PATCH] fix

---
 Frontend/app/templates/calendar/calendar.html | 20 ++++++-------------
 Frontend/app/views.py                         |  4 ++--
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Frontend/app/templates/calendar/calendar.html b/Frontend/app/templates/calendar/calendar.html
index f1e1d24..7eeb4ad 100644
--- a/Frontend/app/templates/calendar/calendar.html
+++ b/Frontend/app/templates/calendar/calendar.html
@@ -11,29 +11,21 @@
     <div class="container">
         <br>
         <br>
-
-        {% for i in database %}
-            {{ i }}
-        {% endfor %}
-
         <a href="{% url 'registertest' %}" class="btn btn-success">
             <span class="glyphicon glyphicon-thumbs-up"></span>Register Test</a>
 
-        <div id="calendar"></div>
+        <div id="evoCalendar"></div>
 
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
         <script src="{% static 'evo-calendar/js/evo-calendar.js' %}"></script>
 
         <script>
-            $('#calendar').evoCalendar({
+
+
+            $('#evoCalendar').evoCalendar({
                 theme: 'Royal Navy',
-                {% for i in database %}
-                    calendarEvents: [ {
-                        id: {{ i.t_id }},
-                        name: {{ i.name }},
-                        date: {{ i.data }},
-                        type: {{ i.type }} }]
-                {% endfor %}
+                    calendarEvents: {% autoescape off %} {{ database }}
+            {% endautoescape %}
             })
         </script>
     </div>
diff --git a/Frontend/app/views.py b/Frontend/app/views.py
index b2be0ff..a3903e3 100644
--- a/Frontend/app/views.py
+++ b/Frontend/app/views.py
@@ -871,8 +871,8 @@ def calendar(request):
             t_id = test['id']
             name = test['author'] + ' - ' + test['name']
             data = test['begin_date']
-            tests.append({'name': name, 'data': data, 'id': str(t_id), 'type': 'event'})
-
+            tests.append({'name': name, 'date': data, 'id': str(t_id), 'type': 'event'})
+        print(tests)
         return render(request, 'calendar/calendar.html', {'database': tests})
     else:
         return redirect('login')
\ No newline at end of file