| Workshop Name : | +{{ workshop_type.name }} | +
|---|---|
| Duration : | +{{ workshop_type.duration }} | +
| Description : | +{{ workshop_type.description }} | +
| Terms and Conditions : | +{{ workshop_type.terms_and_conditions }} | +
| id | Workshop Name | Workshop Duration | +Action | @@ -119,5 +81,5 @@ - + {% endblock %} diff --git a/workshop_app/urls.py b/workshop_app/urls.py index 4bb140c..76a0be6 100644 --- a/workshop_app/urls.py +++ b/workshop_app/urls.py @@ -32,6 +32,7 @@ urlpatterns = [ url(r'^my_workshops/$', views.my_workshops), 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'^workshop_type_details/([1-9][0-9]*)$', views.workshop_type_details, name='workshop_type_details'), + url(r'^add_workshop_type$', views.add_workshop_type, name='add_workshop_type'), 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..d71f066 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,13 +8,13 @@ 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 from .forms import ( UserRegistrationForm, UserLoginForm, - ProfileForm, WorkshopForm + ProfileForm, WorkshopForm, WorkshopTypeForm ) from .models import ( Profile, User, @@ -360,13 +362,26 @@ def workshop_type_list(request): workshop_types = WorkshopType.objects.all() 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 add_workshop_type(request): + if not is_instructor(request.user): + return redirect(get_landing_page(request.user)) + if request.method == 'POST': + form = WorkshopTypeForm(request.POST) + if form.is_valid(): + form_data = form.save() + return redirect(reverse('workshop_type_details', args=[form_data.id])) + else: + form = WorkshopTypeForm + return render(request, 'workshop_app/add_workshop_type.html', {'form': form}) + + @login_required def view_comment_profile(request, user_id): """instructor can view/post comments on coordinator profile """ -- cgit From a06daa5d5bbb7225c52292e6b5cfeb624d668bdd Mon Sep 17 00:00:00 2001 From: pnshiralkar Date: Thu, 7 May 2020 19:39:09 +0530 Subject: File upload done --- workshop_app/forms.py | 13 ++- workshop_app/models.py | 2 +- .../templates/workshop_app/edit_workshop_type.html | 102 +++++++++++++++++++++ workshop_app/urls.py | 2 +- workshop_app/views.py | 36 +++++++- 5 files changed, 150 insertions(+), 5 deletions(-) create mode 100644 workshop_app/templates/workshop_app/edit_workshop_type.html diff --git a/workshop_app/forms.py b/workshop_app/forms.py index fcb34c4..4bef28c 100644 --- a/workshop_app/forms.py +++ b/workshop_app/forms.py @@ -1,9 +1,11 @@ from string import punctuation, digits from django import forms +from django.forms import inlineformset_factory from django.utils import timezone -from .models import (Profile, Workshop, ProfileComments, department_choices, title, source, states, WorkshopType) +from .models import (Profile, Workshop, ProfileComments, department_choices, title, source, states, WorkshopType, + AttachmentFile) try: from string import letters @@ -202,3 +204,12 @@ class WorkshopTypeForm(forms.ModelForm): class Meta: model = WorkshopType exclude = [] + + +class AttachmentFileForm(forms.ModelForm): + def __init__(self, *args, **kwargs): + super(AttachmentFileForm, self).__init__(*args, **kwargs) + + class Meta: + model = AttachmentFile + exclude = ['workshop_type'] diff --git a/workshop_app/models.py b/workshop_app/models.py index b35d9a7..b43600f 100644 --- a/workshop_app/models.py +++ b/workshop_app/models.py @@ -145,7 +145,7 @@ class WorkshopType(models.Model): class AttachmentFile(models.Model): - attachments = models.FileField(upload_to=attachments, blank=True, + attachments = models.FileField(upload_to=attachments, blank=False, help_text='Please upload workshop documents one by one, \ ie.workshop schedule, instructions etc. \ Please Note: Name of Schedule file should be similar to \ diff --git a/workshop_app/templates/workshop_app/edit_workshop_type.html b/workshop_app/templates/workshop_app/edit_workshop_type.html new file mode 100644 index 0000000..9c883d7 --- /dev/null +++ b/workshop_app/templates/workshop_app/edit_workshop_type.html @@ -0,0 +1,102 @@ +{% extends 'workshop_app/base.html' %} + +{% block title %} + Add new Workshop type +{% endblock %} + +{% block extra-dependencies %} +{% endblock %} + +{% block extra-custom-scripts %} + + +{% endblock %} + +{% block content %} +
|---|