From b4936905e74ab6c4ba5fdbd5c400dd2d15269ff0 Mon Sep 17 00:00:00 2001 From: Akshen Date: Tue, 4 Apr 2017 16:36:57 +0530 Subject: Booking Done TODO rendering on instructor and coordinator --- workshop_app/models.py | 3 +- workshop_app/static/workshop_app/js/overlay.js | 12 ++-- workshop_app/templates/workshop_app/booking.html | 62 ++++++++++++----- .../workshop_app/registeration_error.html | 2 +- workshop_app/views.py | 79 +++++++++++----------- 5 files changed, 94 insertions(+), 64 deletions(-) (limited to 'workshop_app') diff --git a/workshop_app/models.py b/workshop_app/models.py index 096ce5d..03be064 100644 --- a/workshop_app/models.py +++ b/workshop_app/models.py @@ -87,12 +87,13 @@ class RequestedWorkshop(models.Model): User, related_name="%(app_label)s_%(class)s_related" ) + requested_workshop_date = models.DateField() status = models.CharField( max_length=32, default="Pending", choices=status_choices ) requested_workshop_title = models.ForeignKey( - Workshop, + Course, on_delete=models.CASCADE ) diff --git a/workshop_app/static/workshop_app/js/overlay.js b/workshop_app/static/workshop_app/js/overlay.js index 6563c0d..b4165c4 100644 --- a/workshop_app/static/workshop_app/js/overlay.js +++ b/workshop_app/static/workshop_app/js/overlay.js @@ -1,7 +1,7 @@ -function overlay(course_no) { - el = document.getElementById("overlay"); - course_id = document.getElementById("course_id"); - el.style.visibility = (el.style.visibility == "visible") ? "hidden" : "visible"; +// function overlay(course_no) { +// el = document.getElementById("overlay"); +// course_id = document.getElementById("course_id"); +// el.style.visibility = (el.style.visibility == "visible") ? "hidden" : "visible"; - console.log(course_no); -} \ No newline at end of file +// console.log(course_no); +// } \ No newline at end of file diff --git a/workshop_app/templates/workshop_app/booking.html b/workshop_app/templates/workshop_app/booking.html index 5089d77..153374a 100644 --- a/workshop_app/templates/workshop_app/booking.html +++ b/workshop_app/templates/workshop_app/booking.html @@ -5,31 +5,59 @@ {% endblock %} {% block extra %} - - - + {% endblock %} {% block header %} +