-
-
Welcome {{ user.first_name }}
-
Information Related to your workshops will be shown here, you can also
- propose a Workshop as per your available date in Workshops > Propose a Workshop
- tab .
-
+
+
+
Welcome {{ user.first_name }}
+
Information Related to your workshops will be shown here, you can also
+ propose a Workshop as per your available date in Workshops > Propose a Workshop
+ tab .
- {% endif %}
+
{% endif %}
{% endblock %}
diff --git a/workshop_app/templates/workshop_app/workshop_status.html b/workshop_app/templates/workshop_app/workshop_status.html
new file mode 100644
index 0000000..b6e3731
--- /dev/null
+++ b/workshop_app/templates/workshop_app/workshop_status.html
@@ -0,0 +1,234 @@
+{% extends "workshop_app/base.html" %}
+
+{% block title %}
+ Workshop Status
+{% endblock %}
+
+{% block extra-dependencies %}
+
+
+
+{% endblock %}
+{% block extra-custom-scripts %}
+
+{% endblock %}
+
+
+{% block content %}
+ {% if workshops %}
+
The status of your workshops
+
+
+
+
+
+
Workshops Accepted
+
+
+
+ {% if request.user.profile.position == 'instructor' %}
+ Coordinator Name
+ Institute
+ {% else %}
+ Instructor Name
+ {% endif %}
+ Workshop Name
+ Workshop Day
+ Status
+
+
+ {% csrf_token %}
+ {% for workshop in workshops %}
+
+
+ {% if workshop.status == 1 and workshop.workshop_type %}
+ {% if request.user.profile.position == 'instructor' %}
+
+
+ {{ workshop.coordinator.get_full_name }}
+ {{ workshop.coordinator.profile.institute }}
+ {% else %}
+ {{ workshop.instructor.get_full_name }}
+ {% endif %}
+ {{ workshop.workshop_type |capfirst }}
+ {% if workshop.date > today %}
+ {{ workshop.date | date }}
+ event
+
+
+
+
+ {% else %}
+ {{ workshop.date | date }}
+ {% endif %}
+ {{ workshop.get_status }}
+
+
+ {% endfor %}
+
+
+
+
+
+
+
+
+
+ {% if request.user.profile.position == 'instructor' %}
+
Workshops Proposed By Coordinators
+
+ {% else %}
+
Workshops Proposed By Me
+ {% endif %}
+
+
+
+ {% if request.user.profile.position == 'instructor' %}
+ Coordinator Name
+ Institute
+ {% else %}
+
+ {% endif %}
+ Workshop Name
+ Workshop Day
+ Status
+ {% if request.user.profile.position == 'instructor' %}
+ Action
+ {% endif %}
+
+
+ {% csrf_token %}
+ {% for workshop in workshops %}
+
+
+ {% if workshop.status == 0 and workshop.tnc_accepted %}
+ {% if request.user.profile.position == 'instructor' %}
+
+
+
+ {{ workshop.coordinator.get_full_name }}
+ {{ workshop.coordinator.profile.institute }}
+ {% endif %}
+ {{ workshop.workshop_type }}
+ {{ workshop.date | date }}
+
+ {{ workshop.get_status }}
+
+
+ {% endif %}
+ {% endif %}
+
+
+
+ {% endfor %}
+
+
+
+
+
+ {% else %}
+ {% if request.user.profile.position == 'instructor' %}
+
+
+
Welcome {{ user.first_name }}
+
Your workshop related information will be shown here, Please navigate to Workshop list and
+ depending upon
+ your expertise and availability create a workshop by going to
+ Create Workshop .
+
+
+ {% else %}
+
+
+
Welcome {{ user.first_name }}
+
Information Related to your workshops will be shown here, you can also
+ propose a Workshop as per your available date in Workshops > Propose a Workshop
+ tab .
+
+
+ {% endif %}
+ {% endif %}
+
+{% endblock %}
diff --git a/workshop_app/urls.py b/workshop_app/urls.py
index 4bb140c..57baaf5 100644
--- a/workshop_app/urls.py
+++ b/workshop_app/urls.py
@@ -17,7 +17,7 @@ from django.conf.urls import url
from workshop_app import views
js_info_dict = {
- 'packages': ('recurrence', ),
+ 'packages': ('recurrence',),
}
urlpatterns = [
@@ -29,9 +29,10 @@ urlpatterns = [
url(r'^logout/$', views.user_logout),
url(r'^view_profile/$', views.view_profile),
url(r'^edit_profile/$', views.edit_profile),
- url(r'^my_workshops/$', views.my_workshops),
+ url(r'^my_workshops/$', views.my_workshops, name='my_workshops'), # Coordinator
+ url(r'^workshop_status/$', views.workshop_status, name='workshop_status'), # Instructor
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),
url(r'^view_profile/([1-9][0-9]*)$', views.view_comment_profile),
- ]
+]
diff --git a/workshop_app/views.py b/workshop_app/views.py
index 5d0525c..cd58326 100644
--- a/workshop_app/views.py
+++ b/workshop_app/views.py
@@ -1,3 +1,5 @@
+from django.urls import reverse
+
try:
from StringIO import StringIO as string_io
except ImportError:
@@ -6,7 +8,7 @@ from datetime import datetime
from django.contrib.auth import login, logout, authenticate
from django.contrib.auth.decorators import login_required
-from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from django.core.paginator import Paginator
from django.shortcuts import render, redirect
from django.utils import timezone
@@ -42,8 +44,8 @@ def is_instructor(user):
def get_landing_page(user):
# For now, landing pages of both instructor and coordinator are same
if is_instructor(user):
- return '/my_workshops/'
- return '/my_workshops/'
+ return reverse('workshop_status')
+ return reverse('my_workshops')
# View functions
@@ -194,103 +196,40 @@ def edit_profile(request):
# Workshop views
-@login_required
-def my_workshops(request):
- user = request.user
- if user.is_authenticated:
- # View for instructor
- if is_instructor(user):
- if request.method == 'POST':
- client_data = request.POST
- action = request.POST.get('action')
- if action == 'accept':
- workshop = Workshop.objects.get(id=client_data.get('workshop_id'))
- # Change Status of the selected workshop
- workshop.status = 1
- workshop.instructor = user
- workshop.save()
- # Parameters for emails
- coordinator_email = workshop.coordinator.email
- coordinator_name = workshop.coordinator.profile.user.get_full_name()
- coordinator_phone = workshop.coordinator.profile.phone_number
- coordinator_institute = workshop.coordinator.profile.institute
- instructor_phone = request.user.profile.phone_number
- workshop_title = workshop.workshop_type.name
- workshop_date = str(workshop.date)
-
- # For Instructor
- send_email(request, call_on='Booking Confirmed',
- user_position='instructor',
- workshop_date=workshop_date,
- workshop_title=workshop_title,
- user_name=str(coordinator_name),
- other_email=coordinator_email,
- phone_number=coordinator_phone,
- institute=coordinator_institute
- )
-
- # For Coordinator
- send_email(request, call_on='Booking Confirmed',
- workshop_date=workshop_date,
- workshop_title=workshop_title,
- other_email=coordinator_email,
- phone_number=instructor_phone
- )
-
- elif action == 'change_date':
- cid = client_data.get('cid')
- new_workshop_date = datetime.strptime(client_data.get('new_date'), "%Y-%m-%d")
- coordinator_email = User.objects.get(id=cid)
- today = datetime.today()
- if today > new_workshop_date:
- # Invalid date
- pass
- else:
- workshop = Workshop.objects.filter(id=client_data.get('workshop_id'))
- workshop_date = workshop.first().date
- workshop.update(date=new_workshop_date)
-
- # For Instructor
- send_email(request, call_on='Change Date',
- user_position='instructor',
- workshop_date=str(workshop_date),
- new_workshop_date=str(new_workshop_date.date())
- )
- # For Coordinator
- send_email(request, call_on='Change Date',
- new_workshop_date=str(new_workshop_date.date()),
- workshop_date=str(workshop_date),
- other_email=coordinator_email.email
- )
- today = timezone.now()
- proposed_workshop = Workshop.objects.filter(
- instructor=user.id,
- date__gte=today,
- ).order_by('-date')
+def my_workshops(request):
+ """ Workshops proposed by Coordinator """
+ user = request.user
+ if is_instructor(user):
+ return redirect(get_landing_page(user))
+ workshops = Workshop.objects.filter(
+ coordinator=user.id
+ ).order_by('-date')
+ return render(request, 'workshop_app/my_workshops.html',
+ {"workshops": workshops})
- proposed_workshop_pending = Workshop.objects.filter(
- status=0
- ).order_by('-date')
- workshops = list(proposed_workshop) + list(proposed_workshop_pending)
+def workshop_status(request):
+ """ Workshops to accept and accepted by Instructor """
+ user = request.user
+ if not is_instructor(user):
+ return redirect(get_landing_page(user))
+ today = timezone.now().date()
+ proposed_workshop = Workshop.objects.filter(
+ instructor=user.id,
+ date__gte=today,
+ ).order_by('-date')
- return render(request, 'workshop_app/my_workshops.html',
- {"workshops": workshops,
- "today": today})
+ proposed_workshop_pending = Workshop.objects.filter(
+ status=0
+ ).order_by('-date')
- # Coordinator view
- else:
- workshops = Workshop.objects.filter(
- coordinator=user.id
- ).order_by('-date')
- return render(request, 'workshop_app/my_workshops.html',
- {"workshops": workshops})
- # Not logged in view
- else:
- return redirect('/login/')
+ workshops = list(proposed_workshop) + list(proposed_workshop_pending)
+ return render(request, 'workshop_app/workshop_status.html',
+ {"workshops": workshops,
+ "today": today})
# TODO: Show terms n conditions of selected ws type
@@ -362,14 +301,14 @@ def workshop_type_list(request):
paginator = Paginator(workshop_types, 12) # Show upto 12 workshops per page
page = request.GET.get('page')
- workshop_type = paginator.get_page(paginator.num_pages)
+ workshop_type = paginator.get_page(page)
return render(request, 'workshop_app/workshop_type_list.html', {'workshop_type': workshop_type})
@login_required
def view_comment_profile(request, user_id):
- """instructor can view/post comments on coordinator profile """
+ """Instructor can view coordinator profile """
user = request.user
if is_instructor(user) and is_email_checked(user):
coordinator_profile = Profile.objects.get(user_id=user_id)
--
cgit