diff options
| -rw-r--r-- | workshop_app/static/workshop_app/js/datepicker.js | 3 | ||||
| -rw-r--r-- | workshop_app/templates/workshop_app/workshop_status_coordinator.html | 17 | ||||
| -rw-r--r-- | workshop_app/templates/workshop_app/workshop_status_instructor.html | 13 | ||||
| -rw-r--r-- | workshop_app/urls.py | 10 | ||||
| -rw-r--r-- | workshop_app/views.py | 13 |
5 files changed, 30 insertions, 26 deletions
diff --git a/workshop_app/static/workshop_app/js/datepicker.js b/workshop_app/static/workshop_app/js/datepicker.js index f419f86..19f91d6 100644 --- a/workshop_app/static/workshop_app/js/datepicker.js +++ b/workshop_app/static/workshop_app/js/datepicker.js @@ -4,10 +4,7 @@ $(document).ready(function () { placement: 'top', trigger: 'hover' }); -}); -//ToolTip popup function on-hover -$(document).ready(function () { $('[data-toggle="popinfo"]').popover({ placement: 'top', trigger: 'hover' diff --git a/workshop_app/templates/workshop_app/workshop_status_coordinator.html b/workshop_app/templates/workshop_app/workshop_status_coordinator.html index 489ba0a..e1c790a 100644 --- a/workshop_app/templates/workshop_app/workshop_status_coordinator.html +++ b/workshop_app/templates/workshop_app/workshop_status_coordinator.html @@ -4,25 +4,32 @@ My Workshops {% endblock %} +{% block extra-custom-scripts %} +<style > + .table-heading{ + color: #04a9cf; + } + </style> +{% endblock %} + {% block content %} {% if not workshops %} <div class="container"> <div class="jumbotron"> <h1>Welcome {{ user.first_name }}</h1> <p>Information Related to your workshops will be shown here, you can also - propose a Workshop as per your available date in <strong>Workshops > Propose a Workshop - tab</strong> .</p> + propose a Workshop as per your available date in <strong>Propose Workshop tab</strong> .</p> </div> </div> {% else %} - <h3 class="text-center" style="color:#2952a2;">The status of your workshops </h3> + <h3 class="text-center">The status of your workshops </h3> <br> <!-- Accepted View --> <br> <div class="container"> - <h3 class="text-center" style="color: #04a9cf;"><strong>Workshops Accepted</strong></h3> + <h3 class="text-center table-heading"><strong>Workshops Accepted</strong></h3> <table class="table table-striped"> <thead> <tr> @@ -53,7 +60,7 @@ <br> <div class="container"> - <h3 class="text-center" style="color: #04a9cf;"><strong>Workshops Proposed By Me</strong></h3> + <h3 class="text-center table-heading"><strong>Workshops Proposed By Me</strong></h3> <table class="table table-striped"> <thead> <tr> diff --git a/workshop_app/templates/workshop_app/workshop_status_instructor.html b/workshop_app/templates/workshop_app/workshop_status_instructor.html index dc6f18b..8657b8d 100644 --- a/workshop_app/templates/workshop_app/workshop_status_instructor.html +++ b/workshop_app/templates/workshop_app/workshop_status_instructor.html @@ -5,6 +5,11 @@ {% endblock %} {% block extra-dependencies %} + <style > + .table-heading{ + color: #04a9cf; + } + </style> <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> <script src="https://code.jquery.com/jquery-1.12.4.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script> @@ -27,13 +32,13 @@ </div> </div> {% else %} - <h3 class="text-center" style="color:#2952a2;">The status of your workshops </h3> + <h3 class="text-center">The status of your workshops </h3> <br> <!-- Accepted View --> <br> <div class="container"> - <h3 align="center" style="color: #04a9cf;"><strong>Workshops Accepted</strong></h3> + <h3 align="center" class="table-heading"><strong>Workshops Accepted</strong></h3> <table class="table table-striped"> <thead> <tr> @@ -57,7 +62,7 @@ <td>{{ workshop.date | date }} {% if workshop.date > today %} - <span class="material-icons datepicker" style="cursor:pointer;" + <span class="material-icons datepicker btn" data-toggle="popinfo" title="Note" data-content="Click here to change date" @@ -87,7 +92,7 @@ <!-- Proposed View --> <br> <div class="container"> - <h3 class="text-center" style="color: #04a9cf;"><strong>Workshops Proposed By Coordinators</strong> + <h3 class="text-center table-heading"><strong>Workshops Proposed By Coordinators</strong> </h3> <table class="table table-striped"> <thead> diff --git a/workshop_app/urls.py b/workshop_app/urls.py index 3bffbd8..3c22a05 100644 --- a/workshop_app/urls.py +++ b/workshop_app/urls.py @@ -27,11 +27,11 @@ urlpatterns = [ url(r'^edit_profile/$', views.edit_profile), url(r'^workshop_status$', views.workshop_status_coordinator, name='workshop_status_coordinator'), url(r'^dashboard$', views.workshop_status_instructor, name='workshop_status_instructor'), - url(r'^accept_workshop/([1-9][0-9]*)$', views.accept_workshop, name='accept_workshop'), - url(r'^change_workshop_date/([1-9][0-9]*)$', views.change_workshop_date, name='change_workshop_date'), + url(r'^accept_workshop/(?P<workshop_id>\d+)', views.accept_workshop, name='accept_workshop'), + url(r'^change_workshop_date/(?P<workshop_id>\d+)$', views.change_workshop_date, name='change_workshop_date'), url(r'^propose_workshop/$', views.propose_workshop), url(r'^workshop_types/$', views.workshop_type_list), - url(r'^workshop_type_details/([1-9][0-9]*)$', views.workshop_type_details, name='workshop_type_details'), - url('^workshops/([1-9][0-9]*)$', views.workshop_details, name='workshop_details'), - url(r'^view_profile/([1-9][0-9]*)$', views.view_comment_profile, name='view_profile'), + url(r'^workshops/(?P<workshop_id>\d+)$', views.workshop_details, name='workshop_details'), + url(r'^workshop_type_details/(?P<workshop_type_id>\d+)$', views.workshop_type_details, name='workshop_type_details'), + url(r'^view_profile/(?P<workshop_type_id>\d+)$', views.view_comment_profile, name='view_profile') ] diff --git a/workshop_app/views.py b/workshop_app/views.py index 1f339d9..1a84833 100644 --- a/workshop_app/views.py +++ b/workshop_app/views.py @@ -1,4 +1,5 @@ from django.http import Http404 +from django.db.models import Q from django.urls import reverse try: @@ -217,16 +218,11 @@ def workshop_status_instructor(request): if not is_instructor(user): return redirect(get_landing_page(user)) today = timezone.now().date() - proposed_workshop = Workshop.objects.filter( + workshops = Workshop.objects.filter(Q( instructor=user.id, date__gte=today, - ).order_by('-date') - - proposed_workshop_pending = Workshop.objects.filter( - status=0 - ).order_by('-date') + ) | Q(status=0)).order_by('-date') - workshops = list(proposed_workshop) + list(proposed_workshop_pending) return render(request, 'workshop_app/workshop_status_instructor.html', {"workshops": workshops, "today": today}) @@ -272,8 +268,7 @@ def change_workshop_date(request, workshop_id): if not is_instructor(user): return redirect(get_landing_page(user)) if request.method == 'POST': - client_data = request.POST - new_workshop_date = datetime.strptime(client_data.get('new_date'), "%Y-%m-%d") + new_workshop_date = datetime.strptime(request.POST.get('new_date'), "%Y-%m-%d") today = datetime.today() if today <= new_workshop_date: workshop = Workshop.objects.filter(id=workshop_id) |