summaryrefslogtreecommitdiff
path: root/workshop_app
diff options
context:
space:
mode:
Diffstat (limited to 'workshop_app')
-rw-r--r--workshop_app/models.py7
-rw-r--r--workshop_app/templates/workshop_app/activation.html20
-rw-r--r--workshop_app/templates/workshop_app/create_workshop.html2
-rw-r--r--workshop_app/templates/workshop_app/how_to_participate.html2
-rw-r--r--workshop_app/test_models.py189
-rw-r--r--workshop_app/test_views.py245
-rw-r--r--workshop_app/tests.py3
-rw-r--r--workshop_app/urls.py47
-rw-r--r--workshop_app/views.py6
9 files changed, 507 insertions, 14 deletions
diff --git a/workshop_app/models.py b/workshop_app/models.py
index 8eae29e..422eee7 100644
--- a/workshop_app/models.py
+++ b/workshop_app/models.py
@@ -23,11 +23,12 @@ class Profile(models.Model):
phone_number = models.CharField(
max_length=15,
validators=[RegexValidator(
- regex=r'^\+?1?\d{9,15}$', message=(
+ regex=r'^.{9}$', message=(
"Phone number must be entered \
- in the format: '+929490956'.\
+ in the format: '+99999999'.\
Up to 15 digits allowed.")
- )])
+ )]
+ ,null=False)
position = models.CharField(max_length=32, choices=position_choices)
is_email_verified = models.BooleanField(default=False)
activation_key = models.CharField(max_length=255, blank=True, null=True)
diff --git a/workshop_app/templates/workshop_app/activation.html b/workshop_app/templates/workshop_app/activation.html
index 1262e22..88bada9 100644
--- a/workshop_app/templates/workshop_app/activation.html
+++ b/workshop_app/templates/workshop_app/activation.html
@@ -21,11 +21,25 @@
{% endblock %}
{% block content %}
- {% if status %}
+ {% if status == '2' %}
<div class="container">
<div class="jumbotron">
- <p>{{ status }}</p>
- {{ request.user.profile.activation_key }}
+ <p> Your email is already verified, Please view your profile <a href="{{ URL_ROOT }}/view_profile/">here</a> </p>
+
+ </div>
+ </div>
+ {% elif status == '1' %}
+ <div class="container">
+ <div class="jumbotron">
+ <p> Your activation has expired please register again</p>
+
+ </div>
+ </div>
+ {% elif status == '0' %}
+ <div class="container">
+ <div class="jumbotron">
+ <p> Your account has been activated. Please view your profile <a href="{{ URL_ROOT }}/view_profile/">here</a> </p>
+
</div>
</div>
{% else %}
diff --git a/workshop_app/templates/workshop_app/create_workshop.html b/workshop_app/templates/workshop_app/create_workshop.html
index 2977a58..8b4d4d1 100644
--- a/workshop_app/templates/workshop_app/create_workshop.html
+++ b/workshop_app/templates/workshop_app/create_workshop.html
@@ -1,7 +1,7 @@
{% extends "workshop_app/base.html" %}
{% block title %}
- Create Event
+ Create Workshop
{% endblock %}
{% block extra %}
diff --git a/workshop_app/templates/workshop_app/how_to_participate.html b/workshop_app/templates/workshop_app/how_to_participate.html
index 0d8cc6f..c732a7f 100644
--- a/workshop_app/templates/workshop_app/how_to_participate.html
+++ b/workshop_app/templates/workshop_app/how_to_participate.html
@@ -1,7 +1,7 @@
{% extends 'workshop_app/base.html' %}
{% block title %}
- View Benefits
+ How to Participate
{% endblock %}
{% block extra %}
diff --git a/workshop_app/test_models.py b/workshop_app/test_models.py
new file mode 100644
index 0000000..c9ac41c
--- /dev/null
+++ b/workshop_app/test_models.py
@@ -0,0 +1,189 @@
+from django.test import TestCase
+from .models import (
+ Profile, User, Workshop, WorkshopType,
+ RequestedWorkshop, BookedWorkshop, ProposeWorkshopDate
+ )
+from datetime import datetime
+
+# Setup for Model Test
+def setUpModule():
+ '''
+ Sets up database
+ demo user as coordinator and test user as instructor
+ '''
+
+ demoUser1 = User.objects.create(username='demouser1',
+ email='test.user@gmail.com', password='pass@123')
+ demoUser2 = User.objects.create(username='demouser2',
+ email='test.user@gmail.com', password='pass@123')
+
+ testUser1 = User.objects.create(username='testuser1',
+ email='test.user@gmail.com',password='pass@123')
+
+ testUser2 = User.objects.create(username='testuser2',
+ email='test.user@gmail.com', password='pass@123')
+
+ instructor_profile = Profile.objects.create(user=testUser2, position='instructor',
+ department='cs', institute='ace', phone_number='1122334456',
+ is_email_verified=1)
+
+ coordinator_profile = Profile.objects.create(user=demoUser2, position='coordinator',
+ department='IT', institute='iit', phone_number='1122334456',
+ is_email_verified=1)
+
+ workshoptype1 = WorkshopType.objects.create(workshoptype_name='ISCP',
+ workshoptype_description='Introduction to Scientific Computing in\
+ Python <br> > Numpy <br> > Matplotlib <br> > iPython <br>',
+ workshoptype_duration='1day, 8hours a day')
+
+ requested_workshop = RequestedWorkshop.objects.create(
+ requested_workshop_instructor=testUser2,
+ requested_workshop_coordinator=demoUser2,
+ requested_workshop_title=workshoptype1,
+ requested_workshop_date='2017-07-24'
+ )
+
+ propose_workshop = ProposeWorkshopDate.objects.create(
+ proposed_workshop_coordinator=demoUser2,
+ proposed_workshop_instructor=testUser2,
+ proposed_workshop_title=workshoptype1,
+ proposed_workshop_date='2017-07-06',
+ condition_one=1,
+ condition_two=1,
+ condition_three=1
+ )
+
+
+def tearDownModule():
+ User.objects.all().delete()
+ Profile.objects.all().delete()
+ ProposeWorkshopDate.objects.all().delete()
+ RequestedWorkshop.objects.all().delete()
+ WorkshopType.objects.all().delete()
+
+class ProfileModelTest(TestCase):
+ '''
+ This class tests the Profile Model
+ '''
+ def setUp(self):
+ '''
+ setsup profile for instructor and coordinator
+ '''
+ self.testuser1 = User.objects.get(username='testuser1')
+ self.demouser1 = User.objects.get(username='demouser1')
+
+ self.instructor_profile1 = Profile.objects.create(user=self.testuser1, position='instructor',
+ department='cs', institute='ace', phone_number='1123323344558899192',
+ is_email_verified=1)
+
+ self.coordinator_profile1 = Profile.objects.create(user=self.demouser1, position='coordinator',
+ department='IT', institute='iit', phone_number='112233',
+ is_email_verified=1)
+
+ def test_profile_model(self):
+ self.assertEqual(self.demouser1.email,'test.user@gmail.com')
+ self.assertEqual(self.testuser1.email,'test.user@gmail.com')
+ self.assertEqual(self.instructor_profile1.position,'instructor')
+ self.assertEqual(self.coordinator_profile1.position,'coordinator')
+
+
+class WorkshopTypeModelTest(TestCase):
+ '''
+ This class tests the WorkshopType Model
+ '''
+
+ def setUp(self):
+ self.workshoptype1 = WorkshopType.objects.create(workshoptype_name='ISCP',
+ workshoptype_description='Introduction to Scientific Computing in\
+ Python <br> > Numpy <br> > Matplotlib <br> > iPython <br>',
+ workshoptype_duration='1day, 8hours a day')
+
+ self.workshoptype2 = WorkshopType.objects.create(workshoptype_name='Basic Python',
+ workshoptype_description='Basic Python <br> > DataTypes <br> \
+ > Conditions <br> > Loops <br> > Functions'
+ ,workshoptype_duration='3days, 8hours a day')
+
+ def test_workshoptype_model(self):
+ self.assertEqual(self.workshoptype2.workshoptype_duration,'3days, 8hours a day')
+ self.assertEqual(self.workshoptype1.workshoptype_name, 'ISCP')
+
+
+class WorkshopModelTest(TestCase):
+ '''
+ This class tests the Workshop Model
+ '''
+
+ def setUp(self):
+ self.testuser2 = User.objects.get(username='testuser2')
+ self.instructor_profile = Profile.objects.get(user=self.testuser2)
+ self.workshoptype = WorkshopType.objects.get(workshoptype_name='ISCP')
+ self.workshop = Workshop.objects.create(workshop_instructor=self.testuser2,
+ workshop_title=self.workshoptype,
+ recurrences='RRULE:FREQ=WEEKLY;UNTIL=20170629T183000Z;BYDAY=TH')
+
+ def test_workshop_model(self):
+ self.assertEqual(self.workshop.workshop_title.workshoptype_name,'ISCP' )
+ self.assertEqual(self.workshop.recurrences.rrules[0].__dict__['freq'],2)
+
+
+class RequestedWorkshopModelTest(TestCase):
+ '''
+ This class tests the RequestedWorkshop Model
+ '''
+
+ def setUp(self):
+ self.testuser2 = User.objects.get(username='testuser2')
+ self.demouser2 = User.objects.get(username='demouser2')
+ self.workshoptype = WorkshopType.objects.get(workshoptype_name='ISCP')
+ self.requestedworkshop = RequestedWorkshop.objects.create(
+ requested_workshop_instructor=self.testuser2,
+ requested_workshop_coordinator=self.demouser2,
+ requested_workshop_title=self.workshoptype,
+ requested_workshop_date='2017-05-24'
+ )
+
+ def test_requestedworkshop_model(self):
+ self.assertEqual(self.requestedworkshop.requested_workshop_date, '2017-05-24')
+ self.assertEqual(self.requestedworkshop.status, 'Pending')
+
+
+class ProposedWorkshopDateModelTest(TestCase):
+ '''
+ This class tests the ProposeWorkshopDate Model
+ '''
+
+ def setUp(self):
+ self.testuser2 = User.objects.get(username='testuser2')
+ self.demouser2 = User.objects.get(username='demouser2')
+ self.workshoptype = WorkshopType.objects.get(workshoptype_name='ISCP')
+ self.propose_workshop = ProposeWorkshopDate.objects.create(
+ proposed_workshop_coordinator=self.demouser2,
+ proposed_workshop_instructor=self.testuser2,
+ proposed_workshop_title=self.workshoptype,
+ proposed_workshop_date='2017-06-06',
+ condition_one=1,
+ condition_two=1,
+ condition_three=1
+ )
+
+ def test_proposedworkshopdate_model(self):
+ self.assertEqual(self.propose_workshop.proposed_workshop_title.workshoptype_name,'ISCP')
+ self.assertEqual(self.propose_workshop.condition_three, 1)
+ self.assertEqual(self.propose_workshop.status, 'Pending')
+
+class BookedWorkshopModelTest(TestCase):
+ '''
+ This class tests the BookedWorkshop Model
+ '''
+
+ def setUp(self):
+ self.requestedworkshop = RequestedWorkshop.objects.get(requested_workshop_date='2017-07-24')
+ self.propose_workshop = ProposeWorkshopDate.objects.get(proposed_workshop_date='2017-07-06')
+ self.bwr = BookedWorkshop.objects.create(booked_workshop_requested=self.requestedworkshop)
+ self.bwp = BookedWorkshop.objects.create(booked_workshop_proposed=self.propose_workshop)
+
+ def test_bookedworkshop_model(self):
+ self.assertEqual(self.bwp.booked_workshop_proposed.condition_one,1)
+ self.assertEqual(self.bwr.booked_workshop_requested.requested_workshop_title.workshoptype_name,
+ 'ISCP' )
+
diff --git a/workshop_app/test_views.py b/workshop_app/test_views.py
new file mode 100644
index 0000000..ebf48c0
--- /dev/null
+++ b/workshop_app/test_views.py
@@ -0,0 +1,245 @@
+from .views import view_profile, user_login, edit_profile
+from django.test import TestCase
+from .models import Profile, User, Workshop, WorkshopType,\
+ RequestedWorkshop, BookedWorkshop, ProposeWorkshopDate,\
+ has_profile
+
+from datetime import datetime
+from json import dumps
+from django.test import Client
+from django.contrib.auth.models import Group, Permission
+from django.contrib.auth import authenticate
+from django.core.urlresolvers import reverse
+from .forms import CreateWorkshop
+
+class TestProfile(TestCase):
+ def setUp(self):
+ self.client = Client()
+
+ self.user1 = User.objects.create(
+ username='demo_test_user1',
+ password='pass@123',
+ email='test.user@gmail.com')
+
+ self.user2 = User.objects.create(
+ username='demo_test_user2',
+ email='test.user@gmail.com')
+
+ self.user2.set_password('pass@123')
+ self.user2.save()
+
+ self.user2_profile = Profile.objects.create(
+ user=self.user2,
+ department='cs',
+ institute='ace',
+ position='instructor',
+ phone_number='1122993388',
+ is_email_verified=1
+ )
+
+ def test_has_profile_for_user_without_profile(self):
+ """
+ If no profile exists for user passed as argument return False
+ """
+ has_profile_status = has_profile(self.user1)
+ self.assertFalse(has_profile_status)
+
+ def test_has_profile_for_user_with_profile(self):
+ """
+ If profile exists for user passed as argument return True
+ """
+ has_profile_status = has_profile(self.user2)
+ self.assertTrue(has_profile_status)
+
+ def test_view_profile_denies_anonymous(self):
+ """
+ If not logged in redirect to login page
+ """
+ response = self.client.get(reverse(view_profile), follow=True)
+ redirect_destination = '/login/?next=/view_profile/'
+ self.assertTrue(response.status_code,200)
+ self.assertRedirects(response, redirect_destination)
+
+ def test_edit_profile_get(self):
+ """
+ GET request to edit profile should display profile form
+ """
+
+ self.client.login(username=self.user2, password='pass@123')
+ response = self.client.get(reverse(edit_profile))
+ self.assertEqual(response.status_code, 200)
+ self.client.logout()
+
+ def test_edit_profile_post(self):
+
+ self.client.login(username=self.user2, password='pass@123')
+ response = self.client.post('/edit_profile/',
+ data = {
+ 'first_name': 'demo_test',
+ 'last_name': 'user2',
+ 'institute': 'IIT',
+ 'department': 'Aerospace'
+ })
+
+ updated_profile_user = User.objects.get(id=self.user2.id)
+ updated_profile = Profile.objects.get(user=updated_profile_user)
+
+ self.assertEqual(updated_profile.institute, 'IIT')
+ self.assertEqual(updated_profile.department, 'Aerospace')
+ self.assertEqual(updated_profile.position, 'instructor')
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'workshop_app/profile_updated.html')
+
+
+class TestWorkshopCreation(TestCase):
+ def setUp(self):
+ '''
+ demo user as coordinator and 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])
+
+ self.user_two = User.objects.create(
+ username='demo_user2',
+ email='test.user@gmail.com')
+
+ self.user_two.set_password('pass@123')
+ self.user_two.save()
+
+ self.user_two_profile = Profile.objects.create(
+ user=self.user_two,
+ department='cs',
+ institute='ace',
+ position='coordinator',
+ phone_number='1122993388',
+ is_email_verified=1
+ )
+
+ self.workshoptype = WorkshopType.objects.create(workshoptype_name='ISCP', workshoptype_description='Introduction to Scientific Computing in Python <br>\
+ > Numpy <br> > Matplotlib <br> > iPython <br>', workshoptype_duration='1days, 8hours a day')
+
+ def test_create_workshoptype_superuser(self):
+ self.client.login(username=self.superuser, password='pass@123')
+ self.client.post(('/admin/workshop_app/workshoptype/add/'),
+ data={
+ 'workshoptype_name': 'Basic Python',
+ 'workshoptype_description': 'Basics of Python <br>\
+ > Conditions <br> > Datatypes <br> > Loops <br>',
+ 'workshoptype_duration': '3days, 8hours a day'
+ })
+ self.workshoptype_one = WorkshopType.objects.get(workshoptype_name='Basic Python')
+ self.assertEqual(self.workshoptype_one.workshoptype_name, 'Basic Python')
+ self.assertEqual(self.workshoptype_one.workshoptype_duration, '3days, 8hours a day')
+ self.client.logout()
+
+ def test_create_workshop_instructor(self):
+ self.client.login(username=self.user_one, password='pass@123')
+ self.client.post('/create_workshop/',
+ {
+ 'workshop_title' : (2),
+ 'recurrences' : 'RRULE:FREQ=WEEKLY;UNTIL=20170624T183000Z;BYDAY=WE;'
+ })
+ self.workshop = Workshop.objects.get(workshop_instructor=self.user_one)
+ self.assertEqual(str(self.workshop.workshop_title), 'ISCP 1days, 8hours a day')
+ self.client.logout()
+
+
+ def test_propose_workshop_coordinator(self):
+ self.client.login(username=self.user_two, password='pass@123')
+ self.client.post('/propose_workshop/',
+ {
+ 'condition_one': 1,
+ 'condition_two': 1,
+ 'condition_three': 1,
+ 'proposed_workshop_title': (2),
+ 'proposed_workshop_date': '2017-06-06'
+ })
+ self.proposed_workshop = ProposeWorkshopDate.objects.get(proposed_workshop_date='2017-06-06')
+ self.assertEqual(str(self.proposed_workshop.proposed_workshop_title),'ISCP 1days, 8hours a day')
+ self.client.logout()
+
+
+class TestWorkshopDashboard(TestCase):
+ def setUp(self):
+ 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.permissions = Permission.objects.all()
+ self.user_one.user_permissions.add(self.permissions[44])
+ self.user_one.user_permissions.add(self.permissions[43])
+ self.user_one.user_permissions.add(self.permissions[42])
+
+ self.user_two = User.objects.create(
+ username='demo_user2',
+ email='test.user@gmail.com')
+
+ self.user_two.set_password('pass@123')
+ self.user_two.save()
+
+ self.user_two_profile = Profile.objects.create(
+ user=self.user_two,
+ department='cs',
+ institute='ace',
+ position='coordinator',
+ phone_number='1122993388',
+ is_email_verified=1
+ )
+
+ self.workshoptype = WorkshopType.objects.create(workshoptype_name='ISCP', workshoptype_description='Introduction to Scientific Computing in Python <br>\
+ > Numpy <br> > Matplotlib <br> > iPython <br>', workshoptype_duration='1days, 8hours a day')
+
+ self.workshop = Workshop.objects.create(workshop_instructor=self.user_one,
+ workshop_title=self.workshoptype,
+ recurrences='RRULE:FREQ=WEEKLY;UNTIL=20170624T183000Z;BYDAY=WE;'
+ )
+
+ \ No newline at end of file
diff --git a/workshop_app/tests.py b/workshop_app/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/workshop_app/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/workshop_app/urls.py b/workshop_app/urls.py
new file mode 100644
index 0000000..60da52e
--- /dev/null
+++ b/workshop_app/urls.py
@@ -0,0 +1,47 @@
+"""workshop_portal URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+ https://docs.djangoproject.com/en/1.10/topics/http/urls/
+Examples:
+Function views
+ 1. Add an import: from my_app import views
+ 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home')
+Class-based views
+ 1. Add an import: from other_app.views import Home
+ 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home')
+Including another URLconf
+ 1. Import the include() function: from django.conf.urls import url, include
+ 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
+"""
+from django.conf.urls import url
+from django.contrib import admin
+from workshop_app import views
+import django
+
+js_info_dict = {
+ 'packages': ('recurrence', ),
+}
+
+
+urlpatterns = [
+ url(r'^$', views.index, name='index'),
+ url(r'^register/$', views.user_register),
+ url(r'^activate_user/(?P<key>.+)$', views.activate_user),
+ url(r'^login/$', views.user_login),
+ url(r'^logout/$', views.user_logout),
+ url(r'^view_profile/$', views.view_profile),
+ url(r'^edit_profile/$', views.edit_profile),
+ url(r'^book/$', views.book),
+ url(r'^book_workshop/$', views.book_workshop),
+ url(r'^my_workshops/$', views.my_workshops),
+ url(r'^benefits/$', views.benefits),
+ url(r'^how_to_participate/$', views.how_to_participate),
+ url(r'^faq/$', views.faq),
+ url(r'^manage/$', views.manage),
+ url(r'^view_workshoptype_list/$', views.view_workshoptype_list),
+ 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'^jsi18n/$', django.views.i18n.javascript_catalog, js_info_dict),
+
+]
diff --git a/workshop_app/views.py b/workshop_app/views.py
index 0557207..0efaf54 100644
--- a/workshop_app/views.py
+++ b/workshop_app/views.py
@@ -99,9 +99,9 @@ def activate_user(request, key):
return redirect('/register/')
if user.is_email_verified:
- status = "Your email is already verified"
+ status = "2"
elif timezone.now() > user.key_expiry_time:
- status = "Your activation has expired please register again"
+ status = "1"
Profile.objects.get(user_id=user.user_id).delete()
User.objects.get(id=user.user_id).delete()
return render(request, 'workshop_app/activation.html',
@@ -109,7 +109,7 @@ def activate_user(request, key):
elif key == user.activation_key:
user.is_email_verified = True
user.save()
- status = "Your account has been activated"
+ status = "0"
else:
logout(request)
return redirect('/logout/')
generated by cgit (git 2.34.1) at 2025-02-27 03:39:47 +0000