diff options
| -rw-r--r-- | statistics_app/views.py | 3 | ||||
| -rw-r--r-- | workshop_app/models.py | 4 | ||||
| -rw-r--r-- | workshop_app/templates/workshop_app/index.html | 2 | ||||
| -rw-r--r-- | workshop_app/templates/workshop_app/propose_workshop.html | 7 | ||||
| -rw-r--r-- | workshop_portal/settings.py | 4 |
5 files changed, 12 insertions, 8 deletions
diff --git a/statistics_app/views.py b/statistics_app/views.py index 6a33f56..a97c5c3 100644 --- a/statistics_app/views.py +++ b/statistics_app/views.py @@ -205,7 +205,6 @@ def workshop_stats(request): writer = csv.writer(response) header = [ 'coordinator name', - 'coordinator email', 'instructor name', 'workshop', 'date', @@ -220,7 +219,6 @@ def workshop_stats(request): try: row = [ workshop.proposed_workshop_coordinator, - str(workshop.propossed_workshop_coordinator.profile.user.email), workshop.proposed_workshop_instructor, workshop.proposed_workshop_title, workshop.proposed_workshop_date, @@ -232,7 +230,6 @@ def workshop_stats(request): except BaseException: row = [ workshop.requested_workshop_coordinator, - str(workshop.requested_workshop_coordinator.profile.user.email), workshop.requested_workshop_instructor, workshop.requested_workshop_title, workshop.requested_workshop_date, diff --git a/workshop_app/models.py b/workshop_app/models.py index 04c3227..680e075 100644 --- a/workshop_app/models.py +++ b/workshop_app/models.py @@ -205,7 +205,7 @@ class ProposeWorkshopDate(models.Model): """ condition_one = models.BooleanField(default=False, help_text='We assure to\ - give minimum 30 participants for the workshop.') + give minimum 25 participants for the workshop.') condition_two = models.BooleanField(default=False, help_text='We agree \ that this booking won\'t be cancelled without \ 2days of prior notice to the instructor and fossee.') @@ -291,4 +291,4 @@ class ProfileComments(models.Model): self.created_date, self.coordinator_profile, self.instructor_profile - )
\ No newline at end of file + ) diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html index 118f875..2ad4e85 100644 --- a/workshop_app/templates/workshop_app/index.html +++ b/workshop_app/templates/workshop_app/index.html @@ -121,7 +121,7 @@ $(document).ready(function(){ <div class="col-4"> <br> - <a href="#"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_4.png"></a> + <a href="{{URL_ROOT}}/view_workshoptype_details/3"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_4.png"></a> </div> </div> diff --git a/workshop_app/templates/workshop_app/propose_workshop.html b/workshop_app/templates/workshop_app/propose_workshop.html index fb164a5..8f1550f 100644 --- a/workshop_app/templates/workshop_app/propose_workshop.html +++ b/workshop_app/templates/workshop_app/propose_workshop.html @@ -45,6 +45,11 @@ </style> <div class="container"> + <div class="alert alert-info"> + Please Note: Students have to take a mandatory test before Advanced Python + Workshop only those who will clear this test will be eligible to attend + the workshop. + </div> <form method="post"> {% csrf_token %} <br/> @@ -52,5 +57,7 @@ <br><br> <button class="btn btn-success" type="submit">Submit</button> </form> + <br> + </div> {% endblock %} diff --git a/workshop_portal/settings.py b/workshop_portal/settings.py index 385a02a..e7f9adb 100644 --- a/workshop_portal/settings.py +++ b/workshop_portal/settings.py @@ -151,7 +151,7 @@ EMAIL_USE_TLS = EMAIL_USE_TLS EMAIL_TIMEOUT = 300 SENDER_EMAIL = SENDER_EMAIL -#EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' #Change this to the production url PRODUCTION_URL = 'your_production_url' @@ -159,7 +159,7 @@ PRODUCTION_URL = 'your_production_url' ADMIN_EMAIL = 'your admin email' #Set True or False to view/hide -SHOW_WORKSHOP_STATS = False +SHOW_WORKSHOP_STATS = True LOGIN_REDIRECT_URL = '/profile' SESSION_EXPIRE_AT_BROWSER_CLOSE = True |