Merge pull request #122 from manavgoyal53/master

Some errors removed and functionalities added.

Author: manavgoyal53

FusionIIIT/Fusion/urls.py

@@ -39,13 +39,9 @@
     url(r'^finance/', include('applications.finance_accounts.urls')),
     url(r'^gymkhana/', include('applications.gymkhana.urls')),
     url(r'^library/', include('applications.library.urls')),
-    # url(r'^accounts/', include('allauth.urls')),
     url(r'^ocms/', include('applications.online_cms.urls')),
-    # url(r'^login/', auth_views.login, name='login'),
-    # url(r'^logout/', auth_views.logout, name='logout'),
     url(r'^academic-procedures/', include('applications.academic_procedures.urls', namespace='procedures')),
     url(r'^aims/', include('applications.academic_information.urls')),
-    # url(r'^notifications/', include(notifications.urls, namespace='notifications')),
     url(r'^notifications/', include('applications.notifications_extension.urls', namespace='notifications')),
     url(r'^accounts/', include('allauth.urls')),
     url(r'^__debug__/', include(debug_toolbar.urls)),

FusionIIIT/applications/academic_procedures/migrations/0012_auto_20200123_2006.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.27 on 2020-01-23 20:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('academic_procedures', '0011_auto_20191127_1056'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='finalregistrations',
+            name='batch',
+            field=models.IntegerField(default=2020),
+        ),
+        migrations.AlterField(
+            model_name='initialregistrations',
+            name='batch',
+            field=models.IntegerField(default=2020),
+        ),
+        migrations.AlterField(
+            model_name='register',
+            name='year',
+            field=models.IntegerField(default=2020),
+        ),
+    ]

FusionIIIT/applications/central_mess/migrations/0003_auto_20200123_2006.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.27 on 2020-01-23 20:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('central_mess', '0002_auto_20191101_0008'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='monthly_bill',
+            name='month',
+            field=models.CharField(default=1, max_length=20),
+        ),
+        migrations.AlterField(
+            model_name='monthly_bill',
+            name='year',
+            field=models.IntegerField(default=2020),
+        ),
+        migrations.AlterField(
+            model_name='payments',
+            name='year',
+            field=models.IntegerField(default=2020),
+        ),
+    ]

FusionIIIT/applications/eis/migrations/0002_auto_20200123_2006.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.27 on 2020-01-23 20:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('eis', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='emp_achievement',
+            name='a_year',
+            field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
+        ),
+        migrations.AlterField(
+            model_name='emp_confrence_organised',
+            name='k_year',
+            field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
+        ),
+        migrations.AlterField(
+            model_name='emp_expert_lectures',
+            name='l_year',
+            field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
+        ),
+        migrations.AlterField(
+            model_name='emp_keynote_address',
+            name='k_year',
+            field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
+        ),
+        migrations.AlterField(
+            model_name='emp_mtechphd_thesis',
+            name='s_year',
+            field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
+        ),
+        migrations.AlterField(
+            model_name='emp_patents',
+            name='p_year',
+            field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
+        ),
+        migrations.AlterField(
+            model_name='emp_published_books',
+            name='pyear',
+            field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
+        ),
+        migrations.AlterField(
+            model_name='emp_research_papers',
+            name='year',
+            field=models.CharField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], max_length=10, null=True),
+        ),
+    ]

FusionIIIT/applications/online_cms/admin.py

@@ -11,6 +11,7 @@
 
 admin.site.register(Quiz)
 
+admin.site.register(Topics)
 
 admin.site.register(QuizQuestion)
 

FusionIIIT/applications/online_cms/urls.py

@@ -38,7 +38,7 @@
         views.edit_quiz_topic, name='edit_quiz_topic'),
     url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/(?P<quiz_id>[0-9]+)/add_question_topic$',
         views.add_question_topicwise, name='add_question_topicwise'),
-    url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/(?P<quiz_id>[0-9]+)/add_questions_to_quiz$',
+    url(r'^(?P<course_id>[0-9]+?)/(?P<quiz_id>[0-9]+)/add_questions_to_quiz$',
         views.add_questions_to_quiz, name='add_questions_to_quiz'),
     url(
         r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/(?P<quiz_code>[0-9]+)/(?P<topic_id>[0-9]+)/remove_quiz_question$',
@@ -53,15 +53,19 @@
         name='remove_quiz'),
     url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/remove_bank$', views.remove_bank,
         name='remove_bank'),
+    url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/remove_topic$', views.remove_topic,
+        name='remove_topic'),
     url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/create_bank$', views.create_bank,
         name='create_bank'),
+    url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/create_topic$', views.create_topic,
+        name='create_topic'),
     url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/(?P<qb_code>[0-9]+)/(?P<topic_id>[0-9]+)$',
         views.edit_qb_topics, name='edit_qb_topics'),
-    url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/(?P<qb_code>[0-9]+)/(?P<topic_id>[0-9]+)/add_question$',
+    url(r'^(?P<course_id>[0-9]+?)/(?P<qb_code>[0-9]+)/(?P<topic_id>[0-9]+)/add_question$',
         views.add_question, name='add_question'),
     url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/(?P<qb_code>[0-9]+)/(?P<topic_id>[0-9]+)/remove_question$',
         views.remove_question, name='remove_question'),
     url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/edit_bank/(?P<qb_code>[0-9]+)$',
         views.edit_bank, name='edit_bank'),
     url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/attendance$', views.submit_attendance,
-        name='submit_attendance')]
+        name='submit_attendance'),]