List all sessions in allsessions page (#193)

tapaswenipathak · web-flow · commit c8ff23d9d195 · 2018-12-23T20:09:32.000+05:30
* list all chat sessions

* migration and fixes

* aah migrations issues
diff --git a/.DS_Store b/.DS_Store
diff --git a/oshc/main/admin.py b/oshc/main/admin.py
@@ -7,7 +7,7 @@
 
 
 class chatSessionAdmin(admin.ModelAdmin):
-    list_display = ('title', 'start_date')
+    list_display = ('name', 'start_date')
 
 
 class journeyAdmin(admin.ModelAdmin):
diff --git a/oshc/main/migrations/0001_initial.py b/oshc/main/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.2 on 2017-10-09 13:36
+# Generated by Django 1.11.6 on 2017-11-26 12:05
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -15,44 +15,34 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='chatSession',
             fields=[
-                ('id',
-                 models.AutoField(
-                     auto_created=True,
-                     primary_key=True,
-                     serialize=False,
-                     verbose_name='ID')),
-                ('title',
-                 models.CharField(help_text='Session title', max_length=128)),
-                ('profile_name',
-                 models.CharField(
-                     help_text="The person's name", max_length=128)),
-                ('profile_url',
-                 models.URLField(help_text="The Url of the person's website")),
-                ('description',
-                 models.TextField(help_text='Session details',
-                                  max_length=512)),
+
+                ('id', models.AutoField(auto_created=True, primary_key=True,
+                       serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text='Session title',
+                         max_length=128)),
+                ('profile_name', models.CharField(help_text="The person's name",
+                                                  max_length=128)),
+                ('profile_url', models.URLField(help_text="The Url of the " +
+                                                           "person's website")),
+                ('description', models.TextField(help_text='Session details',
+                                                 max_length=512)),
                 ('start_date', models.DateTimeField()),
                 ('end_date', models.DateTimeField()),
-                ('register_url',
-                 models.URLField(help_text='URL for the event registration')),
+                ('link', models.URLField(help_text='Chat session URL')),
             ],
         ),
         migrations.CreateModel(
             name='Contest',
             fields=[
-                ('id',
-                 models.AutoField(
-                     auto_created=True,
-                     primary_key=True,
-                     serialize=False,
-                     verbose_name='ID')),
-                ('name',
-                 models.CharField(help_text='Contest name', max_length=128)),
-                ('link',
-                 models.URLField(help_text="URL of the contest's website")),
-                ('description',
-                 models.TextField(
-                     help_text='Contest details', max_length=512, null=True)),
+
+                ('id', models.AutoField(auto_created=True, primary_key=True,
+                                        serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text='Contest name',
+                                          max_length=128)),
+                ('link', models.URLField(help_text="URL of the contest's " +
+                                                   "website")),
+                ('description', models.TextField(help_text='Contest details',
+                                                 max_length=512, null=True)),
                 ('start_date', models.DateField(null=True)),
                 ('end_date', models.DateField(null=True)),
                 ('approved', models.BooleanField(default=False)),
diff --git a/oshc/main/models.py b/oshc/main/models.py
@@ -5,17 +5,19 @@
 
 
 class chatSession(models.Model):
-    title = models.CharField(max_length=128, help_text="Session title")
-    profile_name = models.CharField(
-        max_length=128, help_text="The person's name")
+<<<<<<< issue1
+    name = models.CharField(max_length=128, help_text="Session title")
+    link = models.URLField(help_text="Chat session URL")
+    profile_name = models.CharField(max_length=128,
+                                    help_text="The person's name")
     profile_url = models.URLField(help_text="The Url of the person's website")
     description = models.TextField(max_length=512, help_text="Session details")
     start_date = models.DateTimeField()
     end_date = models.DateTimeField()
-    register_url = models.URLField(help_text="URL for the event registration")
+    link = models.URLField(help_text="Chat session URL")
 
     def __str__(self):
-        return self.title
+        return self.name
 
 
 class Contest(models.Model):
diff --git a/oshc/main/templates/base.html b/oshc/main/templates/base.html
@@ -28,8 +28,8 @@
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Sessions <span class="caret"></span></a>
             <ul class="dropdown-menu" role="menu">
-              <li><a href="https://www.youtube.com/channel/UC1_IAby-9me3iICtxuiDL5Q/videos" target="_blank">View Session</a></li>
-              <li><a href="{% url 'request_session' %}">Request a Session</a></li>
+							<li><a href="{% url 'chat_sessions' %}" target="_blank">View Session</a></li>
+              <li><a href="{% url 'request_session' %}" target="_blank">Request a Session</a></li>
             </ul>
           </li>
           <li><a href="https://github.com/OpenSourceHelpCommunity" target="_blank">Resources</a></li>
diff --git a/oshc/main/templates/chatsessions.html b/oshc/main/templates/chatsessions.html
@@ -0,0 +1,36 @@
+{% extends 'base.html' %}
+{% load static %}
+{% block content %}
+<style>
+h3 {
+    text-align: center;
+}
+span
+{
+    display: block;
+}
+</style>
+<section class="main-section">
+	<div class="container">
+            <h3>Open Source Contributors Chat Sessions</h3>
+            <div class="container-fluid">
+                <div class="row">
+                    {% for chat_session in chat_session_list %}
+                        {% if chat_session.approved %}
+                            <div class="col-lg-4">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" style="background-color: #0275d8;color:white">{{chat_session.name}}</div>
+                                    <div class="panel-body">
+																			<span><i class="fa fa-youtube"></i> <a href="{{chat_session.link}}">{{chat_session.link}}</a></span>
+                                        <span><i class="fa fa-clock-o"></i> {{chat_session.start_date}}</span>
+                                        <span><i class="fa fa-info-circle"></i> {{chat_session.description}}</span>
+                                    </div>
+                                </div>
+                            </div>
+                        {% endif %}
+                    {% endfor %}
+                </div>
+            </div>
+	</div>
+</section>
+{% endblock %}
diff --git a/oshc/main/urls.py b/oshc/main/urls.py
@@ -8,6 +8,7 @@
     url(r'^contest_new/', views.contest_new, name="contest_new"),
     url(r'^add_contest/', views.add_contest, name="add_contest"),
     url(r'^submit_contest/', views.submit_contest, name="submit_contest"),
+    url(r'^chatsessions/', views.chat_sessions, name="chat_sessions"),
     url(r'^journey/', views.journey, name="journey"),
     url(r'^jobs/', views.jobs, name="jobs"),
 ]
diff --git a/oshc/main/views.py b/oshc/main/views.py
@@ -5,9 +5,9 @@
 
 
 def home(request):
-    session_list = chatSession.objects.order_by('start_date')[:3]
-    context_dict = {'chatSession': session_list}
-    return render(request, 'index.html', context=context_dict)
+    # chat_session_list = chatSessions.objects.order_by('start_date')[:3]
+    # context_dict = {'chatSessions': chat_session_list}
+    return render(request, 'index.html')
 
 
 def request_session(request):
@@ -41,11 +41,21 @@ def add_contest(request):
 def submit_contest(request):
     return render(request, 'contest_submission.html')
 
+def chat_sessions(request):
+    chat_session_list = chatSession.objects.all()
+    return render(request, 'chatsessions.html',
+                  context={'chat_session_list': chat_session_list})
+
+
+def handler404(request):
+    response = render_to_response('404.html', {},
+                                  context_instance=RequestContext(request))
+    response.status_code = 404
+    return response
 
 def journey(request):
     journey_list = Journey.objects.order_by('start_date')
     return render(request, 'journey.html', context={'Journey': journey_list})
-
-
+  
 def jobs(request):
     return render(request, 'jobs.html')
diff --git a/oshc/oshc/settings.py b/oshc/oshc/settings.py
@@ -21,7 +21,7 @@
 SECRET_KEY = 'x1-pogt0-b5owbgq0=ui02-4v)bba!bg&1m8_$)8-&13(907qf'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = os.getenv("DEBUG", False)
+DEBUG = os.getenv("DEBUG", True)
 
 ALLOWED_HOSTS = ['*']
 

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`url(r'^contest_new/', views.contest_new, name="contest_new"),`
`9`	`9`	`url(r'^add_contest/', views.add_contest, name="add_contest"),`
`10`	`10`	`url(r'^submit_contest/', views.submit_contest, name="submit_contest"),`
	`11`	`+ url(r'^chatsessions/', views.chat_sessions, name="chat_sessions"),`
`11`	`12`	`url(r'^journey/', views.journey, name="journey"),`
`12`	`13`	`url(r'^jobs/', views.jobs, name="jobs"),`
`13`	`14`	`]`