Instructor Creates a Workshop

The Instructor Creates a Workshop which is displayed in the /manage template
irrespective of who is the Instructor

4 files changed, 22 insertions, 6 deletions

diff --git a/workshop_app/forms.py b/workshop_app/forms.py
index 420181e..a7f3fa1 100644
--- a/workshop_app/forms.py
+++ b/workshop_app/forms.py
@@ -129,4 +129,6 @@ class CreateWorkshop(forms.ModelForm):
 
     class Meta:
         model = Workshop
-        fields = ['workshop_title', 'date', 'start_time', 'end_time']
\ No newline at end of file
+        fields = ['workshop_title', 'date', 'start_time', 'end_time']
+
+
diff --git a/workshop_app/models.py b/workshop_app/models.py
index 2735069..8fe7d3a 100644
--- a/workshop_app/models.py
+++ b/workshop_app/models.py
@@ -32,7 +32,9 @@ class Profile(models.Model):
 	position = models.CharField(max_length=32, choices=position_choices)
 
 	def __str__(self):
-		return u"{0} {1} | {2} ".format(self.user.first_name, 
+		return u"id: {0}| {1} {2} | {3} ".format(
+											self.user.id,
+											self.user.first_name, 
 											self.user.last_name, 
 											self.user.email
 										    ) 
@@ -54,7 +56,7 @@ class Workshop(models.Model):
 	"""Instructor Creates workshop based on
 	Courses	available"""
 
-	workshop_creator = models.ForeignKey(Profile, on_delete=models.CASCADE)
+	workshop_creator = models.ForeignKey(User, on_delete=models.CASCADE)
 	workshop_title = models.ForeignKey(Course, on_delete=models.CASCADE,\
 		 help_text='Select the course you would like to create a workshop for')
 	date = models.DateField()
diff --git a/workshop_app/templates/workshop_app/manage.html b/workshop_app/templates/workshop_app/manage.html
index 4a399a1..b2404ed 100644
--- a/workshop_app/templates/workshop_app/manage.html
+++ b/workshop_app/templates/workshop_app/manage.html
@@ -28,7 +28,6 @@
 	{{ w.end_time }}<br>
 	{{ w.workshop_creator }}<br>
 	{{ w.workshop_title }}
-	{{ w.status }}
 	{% endfor %}
 </div>
 
diff --git a/workshop_app/views.py b/workshop_app/views.py
index f32e4a1..e20a742 100644
--- a/workshop_app/views.py
+++ b/workshop_app/views.py
@@ -22,6 +22,13 @@ from workshop_portal.settings import (
 
 def index(request):
 	'''Landing Page'''
+
+	user = request.user
+	if user.is_authenticated():
+		if user.groups.filter(name='instructor').count() > 0:
+			return redirect('/manage/')
+		return redirect('/book/')
+
 	return render(request, "workshop_app/index.html")
 
 def is_instructor(user):
@@ -158,11 +165,17 @@ def create_workshop(request):
 	'''Instructor creates workshops'''
 
 	user = request.user
+	#profile = User.objects.get(user_id=user.id)
+	print user.id
 	if is_instructor(user):
 		if request.method == 'POST':
 			form = CreateWorkshop(request.POST)
 			if form.is_valid():
-				form.save()
+				form_data = form.save(commit=False)
+				#form_data.profile_id = profile.id
+				form_data.workshop_creator = user
+				form_data.workshop_creator.save()
+				form_data.save()
 				return redirect('/manage/')
 		else:
 			form = CreateWorkshop()
@@ -223,7 +236,7 @@ def send_email(request, call_on, user_position=None):
 						Since you have ask for Instructor Profile, \n \
 						we will get back to you soon after verifying your \n \
 						profile. \
-						If you don\'t get any response within 3days, \
+						In case if you don\'t get any response within 3days, \
 						Please contact us at   '
 			send_mail(
 					'Welcome to FOSSEE', message, EMAIL_HOST_USER,