Merge pull request #33 from Sashi20/development

Add model to display schedule details

6 files changed, 49 insertions, 315 deletions

diff --git a/static/website/templates/home.html b/static/website/templates/home.html
index c35c91b..f2016cd 100644
--- a/static/website/templates/home.html
+++ b/static/website/templates/home.html
@@ -370,320 +370,21 @@ It provides a unique opportunity to discuss about the latest trends on Scientifi
             </div>
     </section>
 
-    <!-- <section id="schedule" class="section schedule" style="font-weight: 400;">
+    {% if tentative_schedule.display_schedule_table %}       
+        {{ tentative_schedule.schedule_table | safe }}
+    {% else %}
+    <section id="schedule" class="section schedule">
         <div class="container">
             <div class="row">
-                <div class="col-md-12">
-                    <h3 class="section-title">Tentative Schedule</h3>
-                </div>
+            <h3 class="section-title">Tentative Schedule</h3>
+            <div class="col-md-12">
+                <p><strong>Schedule will be announced soon</strong></p>
             </div>
-            <div class="row">
-                <div class="col-md-12 col-sm-12">
-  <ul class="nav nav-tabs">
-    <li class="active"><a data-toggle="tab" href="#day1">29 Nov 2019</a></li>
-    <li><a data-toggle="tab" href="#day2">30 Nov 2019</a></li>
-  </ul>
-
-  <div class="tab-content">
-    <div id="day1" class="tab-pane fade in active">
-      <center><h3>Day 1 - Workshops</h3></center>
-      <table class="table table-bordered">
-        <tr style="font-weight: bold;">
-            <td>
-            Time
-            </td>
-            <td>
-            Basic Track 
-            </td>
-            <td>
-            Advanced Track
-            </td>
-        </tr>
-        <tr style="background-color: #ceab6a;font-weight: bold;">
-          <td>
-          08:30 AM - 09:00 AM
-          </td>
-          <td colspan="2" align="center">
-          REGISTRATION / BREAKFAST
-          </td>
-        </tr>
-        <tr>
-          <td style="font-weight: bold;">
-          09:00 AM - 10:55 AM
-          </td>
-          <td>
-          Free and Open Source libraries of Python for Geo spatial Analysis and 
-Visualisation(Maps and Satellite imageries) <br>- Nishadh KA, Powsiya H
-          </td>
-          <td>
-          Demystifying optimizers used in deep learning <br>- Falak Shah, Jayendra Parmar
-          </td>
-        </tr>
-        <tr style="background-color: #ceab6a;font-weight: bold;">
-          <td>
-          10:55 AM - 11:05 AM
-          </td>
-          <td colspan="2" align="center">
-          TEA
-          </td>
-        </tr>
-        <tr>
-            <td style="font-weight: bold;">
-            11:05 AM - 01:00 PM
-            </td>
-            <td>
-            Deployment automation for Data Scientists <br>- Dhavan Vaidya
-            </td>
-            <td>
-            Time Series analysis in Python<br> - Ramanathan R, Gurram Poorna Prudhvi
-            </td>
-        </tr>
-        <tr style="background-color: #ceab6a;font-weight: bold;">
-          <td>
-          01:00 PM - 02:00 PM
-          </td>
-          <td colspan="2" align="center">
-          LUNCH
-          </td>
-        </tr>
-        <tr>
-            <td style="font-weight: bold;">
-            02:00 PM - 03:55 PM
-            </td>
-            <td>
-             Introduction to Python - Basics to plotting a graph<br>- Dr. Ajith Kumar
-            </td>
-            <td>
-            Deploying Machine Learning Models at the Edge <br>- Ankit Mahato
-            </td>
-        </tr>
-        <tr style="background-color: #ceab6a;font-weight: bold;">
-          <td style="font-weight: bold;">
-          03:55 PM - 04:05 PM
-          </td>
-          <td colspan="2" align="center">
-          TEA
-          </td>
-        </tr>
-        <tr>
-            <td style="font-weight: bold;">
-            04:05 PM - 06:00 PM
-            </td>
-            <td>
-            Playing PubG on Big Data <br><br>- Rushikesh Satish Jachak, Purva Padmakar Chaudhari
-            </td>
-            <td>
-            An Introduction to Concurrency in Python Programming Language <br>- Tanmoy Bandyopadhyay
-            </td>
-        </tr>
-      </table>
-    </div>
-    <div id="day2" class="tab-pane fade">
-      <center><h3>Day 2 - Conference</h3></center>
-      <table class="table-bordered table table-responsive table-striped">
-    <tr style="font-weight: bold;">
-        <td>
-            Time
-        </td>
-        <td>
-            Session
-        </td>
-    </tr>      
-    <tr style="background-color: #ceab6a;">
-        <td>
-           <strong> 08:30 AM - 09:25 AM</strong>
-        </td>
-        <td>
-           <strong> BREAKFAST/REGISTRATION</strong>
-        </td>
-    </tr>      
-    <tr>
-        <td>
-           <strong> 09:25 AM - 09:35 AM</strong>
-        </td>
-        <td>
-            Inauguration
-        </td>
-    </tr>      
-        
-    <tr>
-        <td>
-            <strong>09:35 AM - 09:55 AM</strong>
-        </td>
-        <td>
-            Feature Extraction of Audio for Machine Learning Applications <br>- Amitosh Swain Mahapatra
-        </td>
-    </tr>   
-    <tr>
-    <td>
-      <strong>09:55 AM - 10:15 AM</strong>
-    </td>
-    <td>
-      Animating Math using manim and Vpython <br>- Purusharth Saxena, Sharanya Achut
-    </td>
-  </tr>    
-  <tr>
-    <td>
-      <strong>10:15 AM - 11:15 AM</strong>
-    </td>
-    <td>
-      <strong>Keynote: Best Practices and Resources for Scientific Computing<br>
-      - Dr. Kathryn D. Huff</strong>
-    </td>
-  </tr> 
-  <tr style="background-color: #ceab6a;">
-      <td>
-          <strong>11:15 AM - 11:40 AM</strong>
-      </td>
-      <td>
-         <strong>TEA </strong>
-      </td>
-  </tr>
-  <tr>
-      <td>
-        <strong> 11:40 AM - 12:00 PM </strong>
-      </td>
-      <td>
-          Spam filtering on forums: A synthetic oversampling based approach for imbalanced data classification <br>- Pratik Ratadiya, Rahul Moorthy
-      </td>
-  </tr>
-  <tr>
-      <td>
-        <strong> 12:00 PM - 12:20 PM </strong>
-      </td>
-      <td>
-          Python as First Programming Language : A Study <br>- Devji Chhanga
-      </td>
-  </tr>
-  <tr>
-      <td>
-        <strong> 12:20 PM - 12:40 PM </strong>
-      </td>
-      <td>
-          Analysis of Quantum Game Theoretic Models with a Python simulator <br>- Indranil Ghosh
-      </td>
-  </tr>
-  <tr>
-      <td>
-        <strong> 12:40 PM - 01:00 PM </strong>
-      </td>
-      <td>
-          Implementation of Multi Agent System for Computation over Cipher Text for Internet of Things <br>- Gajendra Deshpande, Shrirang Kulkarni
-      </td>
-  </tr>
-  <tr style="background-color: #ceab6a;">
-      <td>
-         <strong> 01:00 PM - 02:30 AM</strong>
-      </td>
-      <td>
-        <strong> LUNCH </strong>
-      </td>
-  </tr>
-  <tr>
-      <td>
-          <strong>02:30 PM - 03:00 PM</strong>
-      </td>
-      <td>
-          Lightning Talks
-      </td>
-  </tr>
-  <tr>
-      <td>
-         <strong> 03:00 PM - 03:15 PM</strong>
-      </td>
-      <td>
-          Project Gandhi : Exploring Gandhi's Writings through Text Mining <br>- Devji Chhanga, Xitij Shukla
-      </td>
-  </tr>
-  <tr>
-      <td>
-          <strong>03:15 PM - 03:30 PM</strong>
-      </td>
-      <td>
-          PySpark and PyArrow : The Magical Story <br>- Ritu Chawla Mehra
-      </td>
-  </tr>
-  <tr style="background-color: #ceab6a;">
-      <td>
-          <strong>03:30 PM - 03:50 PM</strong>
-      </td>
-      <td>
-          TEA
-      </td>
-  </tr>
-  <tr>
-      <td>
-          <strong>03:50 PM - 04:20 PM</strong>
-      </td>
-      <td>
-          <strong>Invited Talk: Python for Education <br>- Dr. Ajith Kumar </strong>
-      </td>
-  </tr>
-  <tr>
-      <td>
-          <strong>04:20 PM - 04:35 PM</strong>
-      </td>
-      <td>
-          Effective Teaching of Mathematics using Python <br>- Nitin Bhuyyar
-      </td>
-  </tr>
-  <tr>
-      <td>
-          <strong>04:35 PM - 04:50 PM</strong>
-      </td>
-      <td>
-          PyDicom :- A Toolkit for Biomedical Image Processing <br>- Purva Padmakar Chaudhari, Rushikesh Satish Jachak
-      </td>
-  </tr>
-  <tr>
-      <td>
-          <strong>04:50 PM - 05:05 PM</strong>
-      </td>
-      <td>
-          Casting Py-Light on Abstractive Text Summarization using Pytorch <br>- Mustafa Qazi, Devyani Sudhir Kulkarni
-      </td>
-  </tr>
-  <tr>
-      <td>
-         <strong> 05:05 PM - 05:20 PM</strong>
-      </td>
-      <td>
-          Bitcoin Price Prediction using Python Deep Learning <br>- Priyanka Hiranandani
-      </td>
-  </tr>
-  <tr>
-      <td>
-          <strong>05:20 PM - 05:35 PM</strong>
-      </td>
-      <td>
-          Unified and Portable Parallel Data Processing using Apache Beam <br>- Mukul Arora          
-      </td>
-  </tr>
-  <tr>
-      <td>
-         <strong> 05:35 PM - 05:50 PM</strong>
-      </td>
-      <td>
-          A Python Approach to Factorial Design of Experiments <br>- Xitij Shukla
-      </td>
-  </tr>
-  <tr style="background-color: #ceab6a;">
-      <td>
-         <strong> 05:50 PM - 06:00 PM</strong>
-      </td>
-      <td>
-          <strong>Closing</strong>
-      </td>
-  </tr>
-</table>
-
-    </div>
-    </div>
-  </div>
-
-                </div>
             </div>
-    </section> -->
+        </div>
+    </section>
+    {% endif %}
+
 
     <section id="venue" class="section venue">
         <div class="container">
diff --git a/static/website/templates/navbar.html b/static/website/templates/navbar.html
index a3f4452..1f98a10 100644
--- a/static/website/templates/navbar.html
+++ b/static/website/templates/navbar.html
@@ -31,8 +31,8 @@
                     <li><a data-scroll href="{{SITE_URL}}/#speakers">Speakers</a></li>
                     <li><a data-scroll href="{{SITE_URL}}/#registration">Register</a></li>
                     <li><a data-scroll href="{{SITE_URL}}/#contribution">CFP</a></li>
-                    <!-- <li><a data-scroll href="{{SITE_URL}}/#schedule">Schedule</a></li>
-                    <li><a data-scroll href="{{SITE_URL}}/#instructions">Instructions</a></li>
+                    <li><a data-scroll href="{{SITE_URL}}/#schedule">Schedule</a></li>
+                    <!--<li><a data-scroll href="{{SITE_URL}}/#instructions">Instructions</a></li>
                     <li><a data-scroll href="{{SITE_URL}}/#sponsor">Sponsor</a></li> -->
                     <!-- <li><a data-scroll href="{{SITE_URL}}/#faq">FAQ</a></li> -->
                     <li><a data-scroll href="{{SITE_URL}}/#photos">Photos</a></li>
diff --git a/website/admin.py b/website/admin.py
index 85a4b7e..119dc07 100644
--- a/website/admin.py
+++ b/website/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import CFP, RegistrationDetail, Proposal
+from .models import CFP, RegistrationDetail, Proposal, TentativeSchedule
 
 class CFPAdmin(admin.ModelAdmin):
 	list_display = ['start_date','end_date','date_of_announcement']
@@ -10,6 +10,11 @@ class RegistrationDetailAdmin(admin.ModelAdmin):
 class ProposalAdmin(admin.ModelAdmin):
 	list_display = ['title', 'email', 'phone']
 
+class TentativeScheduleAdmin(admin.ModelAdmin):
+	list_display = ['schedule_table']
+		
+
 admin.site.register(CFP, CFPAdmin)
 admin.site.register(RegistrationDetail, RegistrationDetailAdmin)
 admin.site.register(Proposal, ProposalAdmin)
+admin.site.register(TentativeSchedule, TentativeScheduleAdmin)
diff --git a/website/migrations/0004_tentativeschedule.py b/website/migrations/0004_tentativeschedule.py
new file mode 100644
index 0000000..d9b9a6c
--- /dev/null
+++ b/website/migrations/0004_tentativeschedule.py
@@ -0,0 +1,21 @@
+# Generated by Django 2.2.4 on 2019-11-08 06:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0003_auto_20190919_1231'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TentativeSchedule',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('schedule_table', models.TextField(blank=True, null=True)),
+                ('display_schedule_table', models.BooleanField(default=True)),
+            ],
+        ),
+    ]
diff --git a/website/models.py b/website/models.py
index a0f9015..e50864e 100644
--- a/website/models.py
+++ b/website/models.py
@@ -162,3 +162,8 @@ class RegistrationDetail(models.Model):
     registration_ticket = models.CharField(max_length=100, blank=True, null=True)
     registration_description = models.TextField(max_length=500, blank= True, null= True)
     display_registration_type = models.BooleanField(default = True)
+
+class TentativeSchedule(models.Model):
+    schedule_table = models.TextField(blank=True, null= True)
+    display_schedule_table = models.BooleanField(default = True)
+        
\ No newline at end of file
diff --git a/website/views.py b/website/views.py
index cef071a..aded8a5 100644
--- a/website/views.py
+++ b/website/views.py
@@ -12,7 +12,7 @@ from django.views.decorators.csrf import (csrf_exempt, csrf_protect,
                                           requires_csrf_token)
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
-from website.models import Proposal, Comments, Ratings, CFP, RegistrationDetail
+from website.models import Proposal, Comments, Ratings, CFP, RegistrationDetail, TentativeSchedule
 
 from website.forms import (ProposalForm, UserRegisterForm, UserRegistrationForm,
                            UserLoginForm, WorkshopForm)  # ,ContactForm
@@ -42,8 +42,10 @@ def index(request):
     context = {}
     registration_details = RegistrationDetail.objects.all()
     context['registration_details'] = registration_details
-    cfp_dates = CFP.objects.get(id=1)
+    cfp_dates = CFP.objects.first()
     context['cfp_dates'] = cfp_dates
+    tentative_schedule = TentativeSchedule.objects.first()
+    context['tentative_schedule'] = tentative_schedule
     template = loader.get_template('index.html')
     return HttpResponse(template.render(context, request))