From 47cdf0a98730ba006a24d4d710afdad04c861363 Mon Sep 17 00:00:00 2001 From: Akshen Date: Tue, 5 Sep 2017 14:05:25 +0530 Subject: Updates Workshop Stats - Updates .gitignore - Updates footer, sets it to fixed position - Adds Workshop Stats - Instructor can Download or View Workshop stats from the givin date range - Instructor can view number of workshops per month in chart - Writes test for Workshop Stats --- workshop_app/forms.py | 4 +- workshop_app/reminder_script.py | 10 +- .../static/workshop_app/css/sticky-footer.css | 18 +- workshop_app/templates/workshop_app/base.html | 2 +- .../templates/workshop_app/edit_profile.html | 2 +- workshop_app/templates/workshop_app/manage.html | 4 +- .../templates/workshop_app/my_workshops.html | 14 +- .../templates/workshop_app/profile_updated.html | 2 +- .../templates/workshop_app/propose_workshop.html | 2 +- .../workshop_app/scheduled_workshops.html | 89 -------- .../templates/workshop_app/view_profile.html | 2 +- .../workshop_app/view_workshoptype_list.html | 2 +- .../templates/workshop_app/workshop_stats.html | 245 +++++++++++++++++++++ workshop_app/tests/test_views.py | 52 +++++ workshop_app/urls.py | 2 +- workshop_app/views.py | 238 +++++++++++++++----- 16 files changed, 510 insertions(+), 178 deletions(-) delete mode 100644 workshop_app/templates/workshop_app/scheduled_workshops.html create mode 100644 workshop_app/templates/workshop_app/workshop_stats.html (limited to 'workshop_app') diff --git a/workshop_app/forms.py b/workshop_app/forms.py index cce6dfc..1e9eb05 100644 --- a/workshop_app/forms.py +++ b/workshop_app/forms.py @@ -190,7 +190,6 @@ 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', @@ -198,5 +197,4 @@ class ProposeWorkshopDateForm(forms.ModelForm): widgets = { 'proposed_workshop_date': forms.DateInput(attrs={ 'class':'datepicker'}), - } - + } \ No newline at end of file diff --git a/workshop_app/reminder_script.py b/workshop_app/reminder_script.py index 9b3f059..4c4350c 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 +send_email() 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 @@

Base Template Content. Please override me

{% endblock %} + - \ 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 @@
  • Create Workshop
  • Workshop List
  • My Workshops
    • -
  • Scheduled Workshops
    • +
  • Workshop Stats
    • {% else %}
    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 @@
  • Create Workshop
  • Workshop List
  • My Workshops
    • -
  • Scheduled Workshops
    • +
  • Workshop Stats
    • {% 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 @@
  • Create Workshop
  • Workshop List
  • My Workshops
    • -
  • Scheduled Workshops
    • +
  • Workshop Stats
    • {% else %}
    @@ -61,7 +61,7 @@
  • FAQ's
  • Benefits
  • Workshop List
    • -
  • How to Participate
    • +
  • How to Participate
    • {% endif %} @@ -81,7 +81,7 @@
    -

    Pending

    +

    My Requests

    @@ -122,7 +122,7 @@
    -

    Accepted

    +

    Workshops Accepted

    @@ -171,7 +171,7 @@
    -

    Proposed

    +

    Proposed Workshops

    @@ -211,7 +211,7 @@
    -

    Deleted/Rejected

    +

    Workshops Deleted/Rejected

    @@ -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 @@
  • Create Workshop
  • Workshop List
  • My Workshops
    • -
  • Scheduled Workshops
    • +
  • Workshop Stats
    • {% else %}
    diff --git a/workshop_app/templates/workshop_app/propose_workshop.html b/workshop_app/templates/workshop_app/propose_workshop.html index ce90dc8..95a4008 100644 --- a/workshop_app/templates/workshop_app/propose_workshop.html +++ b/workshop_app/templates/workshop_app/propose_workshop.html @@ -22,7 +22,7 @@ changeMonth: true, changeYear: true, minDate: dateToday, - maxDate: upto + maxDate: upto, // You can put more options here. }); }); 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 a9aedd6..0000000 --- a/workshop_app/templates/workshop_app/scheduled_workshops.html +++ /dev/null @@ -1,89 +0,0 @@ -{% extends 'workshop_app/base.html' %} - -{% block header %} - -{% endblock %} - - -{% block content %} - -
    - {% if scheduled_workshops %} -

    This Table Shows Scheduled Workshops which were Proposed By Coordinators

    -
    -
    - - - - - - - - - - {% csrf_token %} - {% for workshop in proposed_workshops %} - {% if workshop.status == 'ACCEPTED' %} - - - - - - - - - - {% endif %} - {% endfor %} -
    Coordinator NameInstitute NameInstructor NameWorkshop NameWorkshop Date
    {{ workshop.proposed_workshop_coordinator.get_full_name | capfirst }}{{ workshop.proposed_workshop_coordinator.profile.institute | capfirst }}{{ workshop.proposed_workshop_instructor.get_full_name }}{{ workshop.proposed_workshop_title.workshoptype_name }}{{ workshop.proposed_workshop_date | date}}
    -

    This Table Shows Scheduled Workshops based on Instructors Approval

    -
    - - - - - - - - - - - {% csrf_token %} - {% for workshop in requested_workshops %} - {% if workshop.status == 'ACCEPTED' %} - - - - - - - - - - {% endif %} - {% endfor %} -
    Coordinator NameInstitute NameInstructor NameWorkshop NameWorkshop Date
    {{ workshop.requested_workshop_coordinator.get_full_name | capfirst }}{{ workshop.requested_workshop_coordinator.profile.institute | capfirst }}{{ workshop.requested_workshop_instructor.get_full_name }}{{ workshop.requested_workshop_title.workshoptype_name }}{{ workshop.requested_workshop_date | date}}
    - - {% else %} -
    -

    Permission to View Scheduled Workshops is set to False

    -
    - {% endif %} -
    -{% endblock %} diff --git a/workshop_app/templates/workshop_app/view_profile.html b/workshop_app/templates/workshop_app/view_profile.html index d960f45..91efdf1 100644 --- a/workshop_app/templates/workshop_app/view_profile.html +++ b/workshop_app/templates/workshop_app/view_profile.html @@ -15,7 +15,7 @@
  • Create Workshop
  • Workshop List
  • My Workshops
    • -
  • Scheduled Workshops
    • +
  • Workshop Stats
    • {% else %}
    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 @@