diff options
| author | Akshen | 2017-09-06 14:43:06 +0530 |
|---|---|---|
| committer | GitHub | 2017-09-06 14:43:06 +0530 |
| commit | 9991c9343f157ac23cf87c4c1cd371b8b21865b7 (patch) | |
| tree | 691c83bf1566a01469124558d523c336ac1bbb8b | |
| parent | 021b3b64d70eb4b9bc4024fbfa5a2cb286d87043 (diff) | |
| parent | ebebc30a5ab8328c2330f0c03302ef7db8715365 (diff) | |
| download | workshop_booking-9991c9343f157ac23cf87c4c1cd371b8b21865b7.tar.gz workshop_booking-9991c9343f157ac23cf87c4c1cd371b8b21865b7.tar.bz2 workshop_booking-9991c9343f157ac23cf87c4c1cd371b8b21865b7.zip | |
Merge pull request #20 from Akshen/develop
Develop
21 files changed, 678 insertions, 168 deletions
@@ -32,3 +32,10 @@ migrations/ #MAC OS specific .DS_Store +#Pycharm +.idea/inspectionProfiles/ +.idea/misc.xml +.idea/modules.xml +.idea/workshop_portal.iml +.idea/workspace.xml +.idea/vcs.xml diff --git a/static/workshop_app/css/sticky-footer.css b/static/workshop_app/css/sticky-footer.css index 924258c..7e5ed4c 100644 --- a/static/workshop_app/css/sticky-footer.css +++ b/static/workshop_app/css/sticky-footer.css @@ -36,14 +36,16 @@ background-color: #efefef; } -/* Footer CSS */ +/** + * Footer Styles + */ + .footer { - position: relative; - bottom: 0; - right: 0; - left: 0; -} -.hiddenRow { - padding: 0 !important; + position: fixed; + right: 0; + bottom: 0; + left: 0; + background-color: #efefef; + text-align: center; }
\ No newline at end of file diff --git a/workshop_app/admin.py b/workshop_app/admin.py index 11f7b6d..a28cdb3 100644 --- a/workshop_app/admin.py +++ b/workshop_app/admin.py @@ -14,7 +14,7 @@ except ImportError: #Custom Classes class ProfileAdmin(admin.ModelAdmin): - list_display = ['user', 'institute','department','phone_number','position'] + list_display = ['title','user', 'institute','location','department','phone_number','position'] list_filter = ['position', 'department'] actions = ['download_csv'] @@ -25,12 +25,12 @@ class ProfileAdmin(admin.ModelAdmin): filename=profile_data.csv' writer = csv.writer(response) - writer.writerow(['user', 'institute','department','phone_number', + writer.writerow(['title','user', 'institute', 'location','department','phone_number', 'position']) for q in queryset: - writer.writerow([q.user, q.institute, - q.department, q.phone_number, + writer.writerow([q.title, q.user, q.institute, + q.location, q.department, q.phone_number, q.position]) openfile.seek(0) diff --git a/workshop_app/forms.py b/workshop_app/forms.py index cce6dfc..81eef79 100644 --- a/workshop_app/forms.py +++ b/workshop_app/forms.py @@ -37,6 +37,28 @@ department_choices = ( ("others", "Others"), ) +title = ( + ("Professor", "Prof."), + ("Doctor", "Dr."), + ("Shriman", "Shri"), + ("Shrimati", "Smt"), + ("Kumari", "Ku"), + ("Mr", "Mr."), + ("Mrs", "Mrs."), + ("Miss", "Ms."), + ("other", "Other"), + ) + +source = ( + ("FOSSEE Email", "FOSSEE Email"), + ("FOSSEE website", "FOSSEE website"), + ("Google", "Google"), + ("Social Media", "Social Media"), + ("From other College", "From other College"), + ("Others", "Others"), + ) + + class UserRegistrationForm(forms.Form): """A Class to create new form for User's Registration. It has the various fields and functions required to register @@ -49,6 +71,7 @@ class UserRegistrationForm(forms.Form): password = forms.CharField(max_length=32, widget=forms.PasswordInput()) confirm_password = forms.CharField\ (max_length=32, widget=forms.PasswordInput()) + title = forms.ChoiceField(choices=title) first_name = forms.CharField(max_length=32) last_name = forms.CharField(max_length=32) phone_number = forms.RegexField(regex=r'^.{10}$', @@ -59,7 +82,8 @@ class UserRegistrationForm(forms.Form): help_text='Please write full name of your Institute/Organization') department = forms.ChoiceField(help_text='Department you work/study', choices=department_choices) - + location = forms.CharField(max_length=255, help_text="Place/City") + source = forms.ChoiceField(choices=source) def clean_username(self): u_name = self.cleaned_data["username"] @@ -110,6 +134,9 @@ class UserRegistrationForm(forms.Form): new_profile.department = cleaned_data["department"] #new_profile.position = cleaned_data["position"] new_profile.phone_number = cleaned_data["phone_number"] + new_profile.location = cleaned_data["location"] + new_profile.title = cleaned_data["title"] + new_profile.source = cleaned_data["source"] new_profile.activation_key = generate_activation_key(new_user.username) new_profile.key_expiry_time = timezone.now() + \ timezone.timedelta(days=1) @@ -190,13 +217,11 @@ class ProposeWorkshopDateForm(forms.ModelForm): self.fields['proposed_workshop_title'].label = "Workshop :" self.fields['proposed_workshop_date'].label = "Workshop Date :" - class Meta: model = ProposeWorkshopDate exclude = ['status', 'proposed_workshop_instructor', 'proposed_workshop_coordinator'] widgets = { 'proposed_workshop_date': forms.DateInput(attrs={ - 'class':'datepicker'}), - } - + 'class':'datepicker'}) + }
\ No newline at end of file diff --git a/workshop_app/models.py b/workshop_app/models.py index b3ca1fc..408b36a 100644 --- a/workshop_app/models.py +++ b/workshop_app/models.py @@ -24,6 +24,27 @@ department_choices = ( ("others", "Others"), ) +title = ( + ("Professor", "Prof."), + ("Doctor", "Dr."), + ("Shriman", "Shri"), + ("Shrimati", "Smt"), + ("Kumari", "Ku"), + ("Mr", "Mr."), + ("Mrs", "Mrs."), + ("Miss", "Ms."), + ("other", "Other"), + ) + +source = ( + ("FOSSEE Email", "FOSSEE Email"), + ("FOSSEE website", "FOSSEE website"), + ("Google", "Google"), + ("Social Media", "Social Media"), + ("From other College", "From other College"), + ("Others", "Others"), + ) + def has_profile(user): """ check if user has profile """ @@ -36,6 +57,7 @@ class Profile(models.Model): """Profile for users(instructors and coordinators)""" user = models.OneToOneField(User) + title = models.CharField(max_length=32,blank=True, choices=title) institute = models.CharField(max_length=150) department = models.CharField(max_length=150, choices=department_choices) phone_number = models.CharField( @@ -52,6 +74,8 @@ class Profile(models.Model): help_text='Select Coordinator if you want to organise a workshop\ in your college/school. <br> Select Instructor if you want to conduct\ a workshop.') + source = models.CharField(max_length=255, blank=True,choices=source) + location = models.CharField(max_length=255,blank=True, help_text="Place/City") is_email_verified = models.BooleanField(default=False) activation_key = models.CharField(max_length=255, blank=True, null=True) key_expiry_time = models.DateTimeField(blank=True, null=True) diff --git a/workshop_app/reminder_script.py b/workshop_app/reminder_script.py index 9b3f059..e346c6d 100644 --- a/workshop_app/reminder_script.py +++ b/workshop_app/reminder_script.py @@ -25,16 +25,15 @@ from workshop_portal.settings import ( from workshop_app.models import * from datetime import datetime, date - def send_email(): - tomorrow = date.today() + dt.timedelta(days=2) + upcoming = date.today() + dt.timedelta(days=2) upcoming_requested_workshops = RequestedWorkshop.objects.filter( - requested_workshop_date=tomorrow, + requested_workshop_date=upcoming, status='ACCEPTED' ) upcoming_proposed_workshops = ProposeWorkshopDate.objects.filter( - proposed_workshop_date=tomorrow, + proposed_workshop_date=upcoming, status='ACCEPTED' ) for w in upcoming_proposed_workshops: @@ -81,5 +80,4 @@ def send_email(): [w.requested_workshop_instructor.email], fail_silently=False ) - send_email()
\ No newline at end of file diff --git a/workshop_app/send_mails.py b/workshop_app/send_mails.py index f76a7c2..32d6f71 100644 --- a/workshop_app/send_mails.py +++ b/workshop_app/send_mails.py @@ -105,7 +105,7 @@ def send_email( request, call_on, try: send_mail( "Coordinator Registration at FOSSEE, IIT Bombay", message, SENDER_EMAIL, - [request.user.email], fail_silently=False + [request.user.email], fail_silently=True ) except Exception: @@ -137,7 +137,7 @@ def send_email( request, call_on, send_mail( "New FOSSEE Workshop booking on {0}".format(workshop_date), message, SENDER_EMAIL, [other_email], - fail_silently=False + fail_silently=True ) except Exception: send_smtp_email(request=request, @@ -168,7 +168,7 @@ def send_email( request, call_on, send_mail( "Pending Request for New FOSSEE Workshop booking on {0}" .format(workshop_date), message, SENDER_EMAIL, - [request.user.email], fail_silently=False + [request.user.email], fail_silently=True ) except Exception: send_smtp_email(request=request, @@ -257,7 +257,7 @@ def send_email( request, call_on, try: send_mail("FOSSEE Workshop booking rejected for {0}" .format(workshop_date), message, SENDER_EMAIL, - [request.user.email], fail_silently=False) + [request.user.email], fail_silently=True) except Exception: send_smtp_email(request=request, subject="FOSSEE Workshop booking rejected for {0}". @@ -272,13 +272,14 @@ def send_email( request, call_on, We regret to inform you that your workshop booking has been rejected due to unavailability of the instructor. You may try booking other available - slots {2}/book/ """ + slots {2}/book/ or you can also Propose a workshop + based on your available date.""" .format(workshop_date, workshop_title, PRODUCTION_URL)) try: send_mail("FOSSEE Workshop booking rejected for {0}". format(workshop_date), message, SENDER_EMAIL, - [other_email], fail_silently=False) + [other_email], fail_silently=True) except Exception: send_smtp_email(request=request, subject="FOSSEE Workshop booking rejected for {0}". @@ -296,7 +297,7 @@ def send_email( request, call_on, try: send_mail("FOSSEE workshop deleted for {0}".format(workshop_date), message, SENDER_EMAIL, [request.user.email], - fail_silently=False) + fail_silently=True) except Exception: send_smtp_email(request=request, subject="FOSSEE Workshop deleted for {0}". diff --git a/workshop_app/static/workshop_app/css/sticky-footer.css b/workshop_app/static/workshop_app/css/sticky-footer.css index 924258c..7e5ed4c 100644 --- a/workshop_app/static/workshop_app/css/sticky-footer.css +++ b/workshop_app/static/workshop_app/css/sticky-footer.css @@ -36,14 +36,16 @@ background-color: #efefef; } -/* Footer CSS */ +/** + * Footer Styles + */ + .footer { - position: relative; - bottom: 0; - right: 0; - left: 0; -} -.hiddenRow { - padding: 0 !important; + position: fixed; + right: 0; + bottom: 0; + left: 0; + background-color: #efefef; + text-align: center; }
\ No newline at end of file diff --git a/workshop_app/templates/workshop_app/base.html b/workshop_app/templates/workshop_app/base.html index 391fa9b..b2a5335 100644 --- a/workshop_app/templates/workshop_app/base.html +++ b/workshop_app/templates/workshop_app/base.html @@ -44,10 +44,10 @@ <h1>Base Template Content. Please override me</h1> {% endblock %} +</body> <footer class="footer"> <div class="container"> <p align="center">Developed by FOSSEE group, IIT Bombay</p> </div> </footer> -</body> </html>
\ No newline at end of file diff --git a/workshop_app/templates/workshop_app/edit_profile.html b/workshop_app/templates/workshop_app/edit_profile.html index 5e01430..70ad417 100644 --- a/workshop_app/templates/workshop_app/edit_profile.html +++ b/workshop_app/templates/workshop_app/edit_profile.html @@ -15,7 +15,7 @@ <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li> <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> - <li><a href="{{ URL_ROOT }}/scheduled_workshops/">Scheduled Workshops</a></li> + <li><a href="{{ URL_ROOT }}/workshop_stats/">Workshop Stats</a></li> </ul> {% else %} <div class="navbar-header"> diff --git a/workshop_app/templates/workshop_app/manage.html b/workshop_app/templates/workshop_app/manage.html index 9aac809..97f1604 100644 --- a/workshop_app/templates/workshop_app/manage.html +++ b/workshop_app/templates/workshop_app/manage.html @@ -10,7 +10,7 @@ <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> - <li><a href="{{ URL_ROOT }}/scheduled_workshops/">Scheduled Workshops</a></li> + <li><a href="{{ URL_ROOT }}/workshop_stats/">Workshop Stats</a></li> </ul> <ul class="nav navbar-nav navbar-right"> <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> @@ -126,4 +126,4 @@ </div> {% endif %} -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/workshop_app/templates/workshop_app/my_workshops.html b/workshop_app/templates/workshop_app/my_workshops.html index c36485e..740e28f 100644 --- a/workshop_app/templates/workshop_app/my_workshops.html +++ b/workshop_app/templates/workshop_app/my_workshops.html @@ -49,7 +49,7 @@ <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li> <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> - <li><a href="{{ URL_ROOT }}/scheduled_workshops/">Scheduled Workshops</a></li> + <li><a href="{{ URL_ROOT }}/workshop_stats/">Workshop Stats</a></li> </ul> {% else %} <div class="navbar-header"> @@ -61,7 +61,7 @@ <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li> <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> - <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> + <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> </ul> {% endif %} @@ -81,7 +81,7 @@ <!-- Pending View --> <div class="container"> - <h3 align="center"><strong><u>Pending</u></strong></h3> + <h3 align="center"><strong><u>My Requests</u></strong></h3> <table class="table table-striped"> <thead> <tr> @@ -122,7 +122,7 @@ <!-- Accepted View --> <div class="container"> - <h3 align="center"><strong><u>Accepted</u></strong></h3> + <h3 align="center"><strong><u>Workshops Accepted</u></strong></h3> <table class="table table-striped"> <thead> <tr> @@ -171,7 +171,7 @@ <!-- Proposed View --> <div class="container"> - <h3 align="center"><strong><u>Proposed</u></strong></h3> + <h3 align="center"><strong><u>Proposed Workshops</u></strong></h3> <table class="table table-striped"> <thead> <tr> @@ -211,7 +211,7 @@ <!-- Deleted/Rejected View --> <div class="container"> - <h3 align="center"><strong><u>Deleted/Rejected</u></strong></h3> + <h3 align="center"><strong><u>Workshops Deleted/Rejected</u></strong></h3> <table class="table table-striped"> <thead> <tr> @@ -295,4 +295,4 @@ {% endif %} {% endif %} -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/workshop_app/templates/workshop_app/profile_updated.html b/workshop_app/templates/workshop_app/profile_updated.html index e0aa3ad..abeb3de 100644 --- a/workshop_app/templates/workshop_app/profile_updated.html +++ b/workshop_app/templates/workshop_app/profile_updated.html @@ -15,7 +15,7 @@ <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> - <li><a href="{{ URL_ROOT }}/scheduled_workshops/">Scheduled Workshops</a></li> + <li><a href="{{ URL_ROOT }}/workshop_stats/">Workshop Stats</a></li> </ul> {% else %} <div class="navbar-header"> diff --git a/workshop_app/templates/workshop_app/scheduled_workshops.html b/workshop_app/templates/workshop_app/scheduled_workshops.html deleted file mode 100644 index 8ebb2e6..0000000 --- a/workshop_app/templates/workshop_app/scheduled_workshops.html +++ /dev/null @@ -1,64 +0,0 @@ -{% extends 'workshop_app/base.html' %} - -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a> - </div> - <ul class="nav navbar-nav"> - <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> - <li><a href="{{ URL_ROOT }}/scheduled_workshops/">Scheduled Workshops</a></li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - </div> - </nav> -{% endblock %} - - -{% block content %} - - <div class="container"> - {% if scheduled_workshops %} - <h3>This Table Shows Scheduled Workshops Proposed By Coordinators</h3> - <br> - <table class="table table-hover"> - <thead> - <tr> - <th>Coordinator Name</th> - <th>Institute Name</th> - <th>Instructor Name</th> - <th>Workshop Name</th> - <th>Workshop Date</th> - </tr> - </thead> - {% csrf_token %} - {% for workshop in accepted_workshops %} - {% if workshop.status == 'ACCEPTED' %} - <tbody> - <tr> - <td>{{ workshop.proposed_workshop_coordinator.get_full_name | capfirst }}</td> - <td>{{ workshop.proposed_workshop_coordinator.profile.institute | capfirst }}</td> - <td>{{ workshop.proposed_workshop_instructor.get_full_name }}</td> - <td>{{ workshop.proposed_workshop_title.workshoptype_name }}</td> - <td>{{ workshop.proposed_workshop_date | date}}</td> - </tr> - </tbody> - {% endif %} - {% endfor %} - </table> - {% else %} - <div class="jumbotron"> - <h2>Permission to View Scheduled Workshops is set to False</h2> - </div> - {% endif %} - </div> - - - -{% endblock %}
\ No newline at end of file diff --git a/workshop_app/templates/workshop_app/view_profile.html b/workshop_app/templates/workshop_app/view_profile.html index d960f45..8f1fbae 100644 --- a/workshop_app/templates/workshop_app/view_profile.html +++ b/workshop_app/templates/workshop_app/view_profile.html @@ -15,7 +15,7 @@ <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li> <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> - <li><a href="{{ URL_ROOT }}/scheduled_workshops/">Scheduled Workshops</a></li> + <li><a href="{{ URL_ROOT }}/workshop_stats/">Workshop Stats</a></li> </ul> {% else %} <div class="navbar-header"> @@ -69,6 +69,10 @@ <th><label for="id_department"><h5>{{ user.profile.department }}</h5></label></th> </tr> <tr> + <th><label for="id_location"><h5>Location:</h5></label></th> + <th><label for="id_location"><h5>{{ user.profile.location }}</h5></label></th> + </tr> + <tr> <th><label for="id_position"><h5>Position:</h5></label></th> <th><label for="id_position"><h5>{{ user.profile.position }}</h5></label></th> </tr> diff --git a/workshop_app/templates/workshop_app/view_workshoptype_list.html b/workshop_app/templates/workshop_app/view_workshoptype_list.html index 53d32ce..75cee32 100644 --- a/workshop_app/templates/workshop_app/view_workshoptype_list.html +++ b/workshop_app/templates/workshop_app/view_workshoptype_list.html @@ -15,7 +15,7 @@ <ul class="nav navbar-nav"> {% if request.user.profile.position == 'instructor'%} <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li><a href="{{ URL_ROOT }}/scheduled_workshops/">Scheduled Workshops</a></li> + <li><a href="{{ URL_ROOT }}/workshop_stats/">Workshop Stats</a></li> {% else %} <li><a href="{{ URL_ROOT }}/book/">Book</a></li> <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> diff --git a/workshop_app/templates/workshop_app/workshop_stats.html b/workshop_app/templates/workshop_app/workshop_stats.html new file mode 100644 index 0000000..bc6387b --- /dev/null +++ b/workshop_app/templates/workshop_app/workshop_stats.html @@ -0,0 +1,290 @@ +{% extends 'workshop_app/base.html' %} + +{% block header %} + <nav class="navbar navbar-default navbar-custom"> + <div class="container-fluid"> + <div class="navbar-header"> + <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a> + </div> + <ul class="nav navbar-nav"> + <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> + <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> + <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> + <li class="active"><a href="{{ URL_ROOT }}/workshop_stats/" >Workshop Stats</a></li> + </ul> + <ul class="nav navbar-nav navbar-right"> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + </ul> + </div> + </nav> +{% endblock %} + +{% block extra %} + <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://code.jquery.com/ui/1.12.1/jquery-ui.js"></script> + <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script> + + <!-- For Charts --> + + <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.6.0/Chart.bundle.min.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.6.0/Chart.min.js"></script> + +<script> + var dateToday = new Date(); + var upto = new Date(); + + dateToday.setDate(dateToday.getDate() - 1); + upto.setFullYear(dateToday.getFullYear() + 1); + + $( function() { + from = $( "#from" ) + .datepicker({ + defaultDate: "+1w", + changeMonth: true, + changeYear: true, + showButtonPanel: true, + maxDate: dateToday, + dateFormat: "yy-mm-dd" + }) + .on( "change", function() { + to.datepicker( "option", "minDate", getDate( this ) ); + }), + to = $( "#to" ).datepicker({ + defaultDate: "+1w", + changeMonth: true, + changeYear: true, + showButtonPanel: true, + minDate: dateToday, + maxDate: upto, + dateFormat: "yy-mm-dd" + }) + .on( "change", function() { + from.datepicker( "option", "maxDate", getDate( this ) ); + }); + + function getDate( element ) { + var date; + try { + date = $.datepicker.parseDate( dateFormat, element.value ); + } catch( error ) { + date = null; + } + return date; + } + } ); + + </script> + +{% endblock %} + +{% block content %} + +<div class="container"> + {% if show_workshop_stats %} + <div align="right"> + <form method="POST" > + {% csrf_token %} + <div class="form-group"> + <label for="from">From</label> + <input type="text" id="from" name="from"> + <label for="to">to</label> + <input type="text" id="to" name="to"> + <button class="btn btn-warning" type="submit" name="Download" value="Download">Download</button> + <button class="btn btn-info" type="submit" name="View" value="View">View</button> + </div> + </form> + + {% if messages %} + <ul class="messages"> + {% for message in messages %} + <div class="alert alert-{{ message.tags }}"> + <li {% if message.tags %} class="{{ message.tags }}"{% endif %}> {{ message }} + </li> + </div> + {% endfor %} + </ul> + {% endif %} + + </div> + <br> + <table class="table table-hover"> + <thead> + <tr> + <th>Coordinator Name</th> + <th>Institute Name</th> + <th>Instructor Name</th> + <th>Workshop Name</th> + <th>Workshop Date</th> + <th>Requested/Proposed By</th> + </tr> + </thead> + {% csrf_token %} + {% for workshop in upcoming_workshops %} + {% if workshop.proposed_workshop_date %} + <tbody> + <tr> + <td>{{ workshop.proposed_workshop_coordinator.get_full_name | capfirst }}</td> + <td>{{ workshop.proposed_workshop_coordinator.profile.institute | capfirst }}</td> + <td>{{ workshop.proposed_workshop_instructor.get_full_name }}</td> + <td>{{ workshop.proposed_workshop_title.workshoptype_name }}</td> + <td>{{ workshop.proposed_workshop_date | date}}</td> + <td>Coordinator</td> + </tr> + </tbody> + {% else %} + <tbody> + <tr> + <td>{{ workshop.requested_workshop_coordinator.get_full_name | capfirst }}</td> + <td>{{ workshop.requested_workshop_coordinator.profile.institute | capfirst }}</td> + <td>{{ workshop.requested_workshop_instructor.get_full_name }}</td> + <td>{{ workshop.requested_workshop_title.workshoptype_name }}</td> + <td>{{ workshop.requested_workshop_date | date}}</td> + <td>Instructor</td> + </tr> + </tbody> + {% endif %} + {% endfor %} + </table> + + <!-- Page Navigation --> + <div class="container"> + <div class="Page-Nav" align="center"> + <nav aria-label="Page navigation"> + <ul class="pagination pagination-sm"> + <li class="page-item"> + {% if upcoming_workshops.has_previous %} + <a class="page-link" tabindex="-1" + href="?page={{ upcoming_workshops.previous_page_number }}">Previous</a> + {% endif %} + </li> + <li class="page-item"> + <span class="current"> + Page {{ upcoming_workshops.number }} of {{ upcoming_workshops.paginator.num_pages }} + </span> + </li> + <li class="page-item"> + {% if upcoming_workshops.has_next %} + <a class="page-link" href="?page={{ upcoming_workshops.next_page_number }}">Next + </a> + {% endif %} + </li> + </ul> + </nav> + </div> + </div> + {% else %} + <div class="jumbotron"> + <h2>Permission to View Upcoming Workshops is set to false, please set it to true in settings.py</h2> + </div> + {% endif %} +</div> + +<br> +<div class="row"> + <br> + <div class="col-md-12 "> + <br> + <div class="widget" style="padding-left: 22px;"> + <fieldset> + <label for="radio-1">Number of Workshops per Month</label> + <input type="radio" name="radio-1" id="radio-1" value="NWPM"> + <label for="radio-2">Overall Workshop Count</label> + <input type="radio" name="radio-1" id="radio-2" value="OWC"> + </fieldset> + </div> + <canvas id="myChartPie" width="90px" height="12px"></canvas> + + <script> + $( function() { + $( "fieldset" ).controlgroup(); + }); + + var ctx1 = document.getElementById("myChartPie").getContext('2d'); + var myChart; + $('input[type=radio]').change(function() { + if (this.value == 'NWPM') {//Number of Workshops per month + if(myChart){ + myChart.destroy(); + } + myChart = new Chart(ctx1, { + type: 'bar', + data: { + labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', ' December'], + datasets: [{ + label: 'Number of workshops per Month for '+ dateToday.getFullYear(), + data: {{ workshop_count }}, + backgroundColor: [ + 'rgba(255, 99, 132, 0.2)', + 'rgba(54, 162, 235, 0.2)', + 'rgba(255, 206, 86, 0.2)', + 'rgba(75, 192, 192, 0.2)', + 'rgba(153, 102, 255, 0.2)', + 'rgba(242, 38, 19, 0.2)', + 'rgba(25, 91, 13, 0.2)', + 'rgba(54, 12, 235, 0.2)', + 'rgba(150, 40, 27, 0.2)', + 'rgba(66, 114, 155, 0.2)', + 'rgba(219, 10, 91, 0.2)', + 'rgba(191, 191, 191, 0.2)' + ], + borderColor: [ + 'rgba(255, 99, 132, 1)', + 'rgba(54, 162, 235, 1)', + 'rgba(255, 206, 86, 1)', + 'rgba(75, 192, 192, 1)', + 'rgba(153, 102, 255, 1)', + 'rgba(242, 38, 19, 1)', + 'rgba(25, 91, 13, 1)', + 'rgba(54, 12, 235, 1)', + 'rgba(150, 40, 27 ,1)', + 'rgba(66, 114, 155, 1)', + 'rgba(219, 10, 91, 1)', + 'rgba(191, 191, 191, 1)' + ], + borderWidth: 1 + }] + }, + options: { + responsive: true, + scales: { + yAxes: [{ + ticks: { + beginAtZero:true + } + }] + } + } + }); + } + else if (this.value == 'OWC') { //Overall Workshop Count + if(myChart){ + myChart.destroy(); + } + myChart = new Chart(ctx1, { + type: 'pie', + data: { + labels : {{ workshoptype_count.0 | safe}}, + datasets: [{ + data: {{ workshoptype_count.1 }}, + //Add more color scheme if workshop number increases + backgroundColor: [ + 'rgba(153, 102, 255, 1)', + 'rgba(191, 191, 1, 1)', + 'rgba(75, 192, 192, 1)', + 'rgba(153, 102, 255, 1)' + ] + }] + }, + options: { + responsive: true + } + }); + } + }); + </script> + </div> +</div> +<br> +{% endblock %} diff --git a/workshop_app/tests/test_views.py b/workshop_app/tests/test_views.py index 5dbfff5..583efd2 100644 --- a/workshop_app/tests/test_views.py +++ b/workshop_app/tests/test_views.py @@ -10,6 +10,7 @@ from django.contrib.auth.models import Group, Permission from django.contrib.auth import authenticate from django.core.urlresolvers import reverse from workshop_app.forms import CreateWorkshop +from django.conf import settings class TestProfile(TestCase): def setUp(self): @@ -289,3 +290,54 @@ class TestStaticPages(TestCase): def test_view_workshoptype_details(self): response = self.client.get('/view_workshoptype_details/') self.assertEqual(response.status_code, 200) + + +class TestWorkshopStats(TestCase): + def setUp(self): + ''' + test user as instructor + ''' + self.superuser = User.objects.create_superuser( + username='admin', + password='pass@123', + email='test.user@gmail.com') + + self.mod_group = Group.objects.create(name='instructor') + + self.user_one = User.objects.create( + username='test_user1', + email='test.user@gmail.com') + + self.user_one.set_password('pass@123') + self.user_one.save() + + self.user_one_profile = Profile.objects.create( + user=self.user_one, + department='cs', + institute='IIT', + position='instructor', + phone_number='1122993388', + is_email_verified=1 + ) + + #Add user_one in instructor group and give required permissions + self.mod_group.user_set.add(self.user_one) + self.permission = (Permission.objects.all()) + self.user_one.user_permissions.add(self.permission[44]) + self.user_one.user_permissions.add(self.permission[43]) + self.user_one.user_permissions.add(self.permission[42]) + + def test_workshop_stats(self): + settings.SHOW_WORKSHOP_STATS = True + self.client.login(username=self.user_one, password='pass@123') + response = self.client.post('/workshop_stats/', + { + 'from': '2017-01-01', + 'to': '2017-12-31', + 'Download': 'download' + } + ) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.get('Content-Disposition'),'attachment;\ + filename="records_from_2017-01-01_to_2017-12-31.csv"') + diff --git a/workshop_app/urls.py b/workshop_app/urls.py index 6c2a04d..3d3b76a 100644 --- a/workshop_app/urls.py +++ b/workshop_app/urls.py @@ -44,7 +44,7 @@ urlpatterns = [ url(r'^view_workshoptype_details/$', views.view_workshoptype_details), url(r'^create_workshop/$', views.create_workshop), url(r'^propose_workshop/$', views.propose_workshop), - url(r'^scheduled_workshops/$', views.scheduled_workshops), + url(r'^workshop_stats/$', views.workshop_stats), url(r'^testimonials/$', views.testimonials), url(r'^file_view/(?P<workshop_title>[\w|\W]+)$', views.file_view), url(r'^jsi18n/$', django.views.i18n.javascript_catalog, js_info_dict), diff --git a/workshop_app/views.py b/workshop_app/views.py index 19b0d5f..d037d3b 100644 --- a/workshop_app/views.py +++ b/workshop_app/views.py @@ -1,15 +1,16 @@ from .forms import ( - UserRegistrationForm, UserLoginForm, - ProfileForm, CreateWorkshop, - ProposeWorkshopDateForm - ) + UserRegistrationForm, UserLoginForm, + ProfileForm, CreateWorkshop, + ProposeWorkshopDateForm + ) from .models import ( - Profile, User, - has_profile, Workshop, - WorkshopType, RequestedWorkshop, - BookedWorkshop, ProposeWorkshopDate, - Testimonial - ) + Profile, User, + has_profile, Workshop, + WorkshopType, RequestedWorkshop, + BookedWorkshop, ProposeWorkshopDate, + Testimonial + ) +from django.template.loader import get_template from django.template import RequestContext from datetime import datetime, date from django.contrib.auth import login, logout, authenticate @@ -27,7 +28,9 @@ from textwrap import dedent from django.conf import settings from os import listdir, path, sep from zipfile import ZipFile +from django.contrib import messages import datetime as dt +import csv try: from StringIO import StringIO as string_io except ImportError: @@ -192,13 +195,13 @@ def book(request): for d in range(len(dates)): workshop_occurence = [ - dates[d].strftime("%d-%m-%Y"), - workshops.workshop_instructor, - workshops.workshop_title, - workshops.workshop_instructor_id, - workshops.workshop_title_id, - workshops.workshop_title.workshoptype_description - ] + dates[d].strftime("%d-%m-%Y"), + workshops.workshop_instructor, + workshops.workshop_title, + workshops.workshop_instructor_id, + workshops.workshop_title_id, + workshops.workshop_title.workshoptype_description + ] workshop_occurence_list.append(workshop_occurence) del workshop_occurence @@ -225,8 +228,8 @@ def book(request): #Objects of RequestedWorkshop for that particular coordinator rW_obj = RequestedWorkshop.objects.filter( - requested_workshop_coordinator=request.user - ) + requested_workshop_coordinator=request.user + ) for r in rW_obj: x = r.requested_workshop_date.strftime("%d-%m-%Y") for a in workshop_occurence_list: @@ -272,32 +275,32 @@ def book_workshop(request): queue = RequestedWorkshop.objects.filter( requested_workshop_instructor=client_data[1], requested_workshop_date=datetime.strptime( - client_data[0][2:], "%d-%m-%Y" - ), + client_data[0][2:], "%d-%m-%Y" + ), requested_workshop_title=client_data[-2] ).count() + 1 return HttpResponse(str(queue)) workshops_list = Workshop.objects.filter( - workshop_instructor=client_data[1], - workshop_title_id=client_data[2] - ) + workshop_instructor=client_data[1], + workshop_title_id=client_data[2] + ) today = datetime.now() + dt.timedelta(days=3) upto = datetime.now() + dt.timedelta(weeks=52) for workshop in workshops_list: workshop_recurrence_list = workshop.recurrences.between( - today, - upto, - inc=True - ) + today, + upto, + inc=True + ) rW_obj = RequestedWorkshop() if RequestedWorkshop.objects.filter( requested_workshop_instructor=workshop.workshop_instructor, requested_workshop_date=datetime.strptime( - client_data[0][2:], "%d-%m-%Y", - ), + client_data[0][2:], "%d-%m-%Y", + ), requested_workshop_coordinator=request.user, requested_workshop_title=client_data[-1] ).count() > 0: @@ -312,8 +315,8 @@ def book_workshop(request): rW_obj.requested_workshop_instructor = workshop.workshop_instructor rW_obj.requested_workshop_coordinator = request.user rW_obj.requested_workshop_date = datetime.strptime( - workshop_date,"%d-%m-%Y" - ) + workshop_date,"%d-%m-%Y" + ) rW_obj.requested_workshop_title = workshop.workshop_title rW_obj.save() @@ -361,8 +364,8 @@ def manage(request): try: #Can Handle Multiple Workshops workshop_details = Workshop.objects.filter( - workshop_instructor=user.id - ) + workshop_instructor=user.id + ) workshop_occurence_list = [] today = datetime.now() + dt.timedelta(days=3) @@ -866,11 +869,12 @@ def file_view(request, workshop_title): zipfile_name.seek(0) response = HttpResponse(content_type='application/zip') response['Content-Disposition'] = 'attachment; filename={0}.zip'.format( - filename.workshoptype_name.replace(" ", "_") - ) + filename.workshoptype_name.replace(" ", "_") + ) response.write(zipfile_name.read()) return response + def testimonials(request): testimonials = Testimonial.objects.all().order_by('-id') paginator = Paginator(testimonials, 3) #Show upto 12 workshops per page @@ -884,28 +888,193 @@ def testimonials(request): except EmptyPage: #If page is out of range(e.g 999999), deliver last page. messages = paginator.page(paginator.num_pages) - return render(request, 'workshop_app/testimonals.html', {"messages":messages}) + return render(request, 'workshop_app/testimonals.html', + {"messages":messages}) + + +def check_workshop_type(x): + try: + y = datetime.strftime(x.proposed_workshop_date, '%d-%m-%Y') + except: + y = datetime.strftime(x.requested_workshop_date, '%d-%m-%Y') + return y + @login_required -def scheduled_workshops(request): +def workshop_stats(request): user = request.user today = datetime.now() - upto = datetime.now() + dt.timedelta(days=15) + upto = today + dt.timedelta(days=15) + + #For Monthly Chart + workshop_count = [0] * 12 + for x in range(12): + workshop_count[x] +=RequestedWorkshop.objects.filter( + requested_workshop_date__year=str(today.year), + requested_workshop_date__month=str(x+1), + status='ACCEPTED').count() + workshop_count[x] +=ProposeWorkshopDate.objects.filter( + proposed_workshop_date__year=str(today.year), + proposed_workshop_date__month=str(x+1), + status='ACCEPTED').count() + + #Count Total Number of workshops for each type + workshop_titles = WorkshopType.objects.all() + workshoptype_dict = {} + for title in workshop_titles: + workshoptype_dict[title]=0 + + for title in workshoptype_dict.keys(): + workshoptype_dict[title] += RequestedWorkshop.objects.filter( + requested_workshop_title=title, + status='ACCEPTED').count() + workshoptype_dict[title] += ProposeWorkshopDate.objects.filter( + proposed_workshop_title=title, + status='ACCEPTED').count() + #For Pie Chart + workshoptype_num = [] + workshoptype_title = [] + for title in workshoptype_dict.keys(): + workshoptype_title.append(str(title)) + + for count in workshoptype_dict.values(): + workshoptype_num.append(count) + + workshoptype_count = [workshoptype_title, workshoptype_num] + del workshoptype_title, workshoptype_num + + if request.method == 'POST': + try: + from_dates = request.POST.get('from') + to_dates = request.POST.get('to') + + #Fetches Accepted workshops which were proposed by Coordinators + proposed_workshops = ProposeWorkshopDate.objects.filter( + proposed_workshop_date__range=(from_dates, to_dates), + status='ACCEPTED' + ) + + # Fetches Accepted workshops which were Accepted by + # Instructors based on their Availability + requested_workshops = RequestedWorkshop.objects.filter( + requested_workshop_date__range=(from_dates, to_dates), + status='ACCEPTED' + ) + + upcoming_workshops = [] + + for workshop in proposed_workshops: + upcoming_workshops.append(workshop) + + for workshop in requested_workshops: + upcoming_workshops.append(workshop) + + upcoming_workshops = sorted(upcoming_workshops, + key=lambda x: check_workshop_type(x)) + + download = request.POST.get('Download') + if download: + response = HttpResponse(content_type='text/csv') + + response['Content-Disposition'] = 'attachment;\ + filename="records_from_{0}_to_{1}.csv"'.format( + from_dates,to_dates + ) + + writer = csv.writer(response) + header = [ + 'coordinator name', + 'instructor name', + 'workshop', + 'date', + 'status', + 'institute name' + ] + + writer.writerow(header) + + for workshop in upcoming_workshops: + try: + row = [ + workshop.proposed_workshop_coordinator, + workshop.proposed_workshop_instructor, + workshop.proposed_workshop_title, + workshop.proposed_workshop_date, + workshop.status, + workshop.proposed_workshop_coordinator.profile.institute + ] + + except: + row = [ + workshop.requested_workshop_coordinator, + workshop.requested_workshop_instructor, + workshop.requested_workshop_title, + workshop.requested_workshop_date, + workshop.status, + workshop.requested_workshop_coordinator.profile.institute + ] + + writer.writerow(row) + return response + else: + return render(request, 'workshop_app/workshop_stats.html', + { + "upcoming_workshops": upcoming_workshops, + "show_workshop_stats": settings.SHOW_WORKSHOP_STATS, + "workshop_count": workshop_count, + "workshoptype_count": workshoptype_count, + + }) + except: + messages.info(request, 'Please enter Valid Dates') + if is_instructor(user) and is_email_checked(user): try: - accepted_workshops = ProposeWorkshopDate.objects.filter( - proposed_workshop_date__range=(today, upto) + #Fetches Accepted workshops which were proposed by Coordinators + proposed_workshops = ProposeWorkshopDate.objects.filter( + proposed_workshop_date__range=(today, upto), + status='ACCEPTED' + ) + + #Fetches Accepted workshops which were Accepted by + # Instructors based on their Availability + requested_workshops = RequestedWorkshop.objects.filter( + requested_workshop_date__range=(today, upto), + status='ACCEPTED' ) - accepted_workshops = (sorted(accepted_workshops, - key=lambda x: datetime.strftime( - x.proposed_workshop_date, '%d-%m-%Y' - ))) + + upcoming_workshops = [] + for workshop in proposed_workshops: + upcoming_workshops.append(workshop) + + for workshop in requested_workshops: + upcoming_workshops.append(workshop) + + upcoming_workshops = sorted(upcoming_workshops, + key=lambda x: check_workshop_type(x)) + except: - accepted_workshops = None - return render(request, 'workshop_app/scheduled_workshops.html', + upcoming_workshops = None + + paginator = Paginator(upcoming_workshops, 12) + + page = request.GET.get('page') + try: + upcoming_workshops = paginator.page(page) + except PageNotAnInteger: + #If page is not an integer, deliver first page. + upcoming_workshops = paginator.page(1) + except EmptyPage: + #If page is out of range(e.g 999999), deliver last page. + upcoming_workshops = paginator.page(paginator.num_pages) + + + return render(request, 'workshop_app/workshop_stats.html', { - "accepted_workshops": accepted_workshops, - "scheduled_workshops": settings.SCHEDULED_WORKSHOPS + "upcoming_workshops": upcoming_workshops, + "show_workshop_stats": settings.SHOW_WORKSHOP_STATS, + "workshop_count": workshop_count, + "workshoptype_count": workshoptype_count, }) else: - redirect('/book/')
\ No newline at end of file + redirect('/manage/') diff --git a/workshop_portal/settings.py b/workshop_portal/settings.py index 0ec34bb..8fe4a3e 100644 --- a/workshop_portal/settings.py +++ b/workshop_portal/settings.py @@ -159,7 +159,7 @@ PRODUCTION_URL = 'your_production_url' ADMIN_EMAIL = 'your admin email' -SCHEDULED_WORKSHOPS = False #Set True or False to view/hide +SHOW_WORKSHOP_STATS = 1 #Set True or False to view/hide LOGIN_REDIRECT_URL = '/profile' -SESSION_EXPIRE_AT_BROWSER_CLOSE = True +SESSION_EXPIRE_AT_BROWSER_CLOSE = True
\ No newline at end of file |