pair programming

korabo/urls.py

@@ -16,7 +16,7 @@ urlpatterns = [
     path('api/event_division/', EventDivisionView.as_view(), name='event_division'),
     path("", views.index, name="index"),
     path("accounts/", include("django.contrib.auth.urls")),
-    path("event/<int:event_id>", views.event, name="event"),
+    #path("event/<int:event_id>", views.event, name="event"),
-    path('change_password/', views.change_password, name='change_password'),
+    #path('change_password/', views.change_password, name='change_password'),
-    path('password_change_done/', views.password_change_done, name='password_change_done')
+    #path('password_change_done/', views.password_change_done, name='password_change_done')
 ]

web/templates/base.html

@@ -20,9 +20,6 @@
         </div>
         <div style="float:right;">
         <a href="{% url 'index' %}">home</a> |
-        <a href="{% url 'change_password' %}">change password</a> |
-        <a href="{% url 'logout' %}">logout</a> |
-            {% if request.user.is_authenticated %}Hello {{ request.user.username }} {% endif %}
 
         </div>
 
@@ -38,4 +35,4 @@
     </div>
 
 </body>
-</html>
+</html>

web/templates/index.html

@@ -1,26 +1,28 @@
 {% extends 'base.html' %}
 
 {% block content %}
+<div class="container">
+    
+    <div class="accordion">
+        {% for event in events%}
+        <div class="accordion-item">
+            <div class="accordion-item">
+                <h2 class="accordion-header" id="event-{{event.id}}">
+                    <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#event-collapse-{{event.id}}" aria-expanded="true" aria-controls="event-collapse-{{event.id}}">
+                        {{event.name}}
+                    </button>
+                </h2>
+                <div id="event-collapse-{{event.id}}" class="accordion-collapse collapse" aria-labelledby="event-{{event.id}}" data-bs-parent="#accordionExample">
+                    <div class="accordion-body">
+
+                            {{event.description}}
+                    </div>
+                </div>
+            </div>
+        </div>
 
-<table class="table">
-    <thead>
-        <tr>
-            <td>Event Name</td>
-            <td>Already Responded</td>
-            <td>Start Date</td>
-            <td>End Date</td>
-        </tr>
-    </thead>
-    <tbody>
-        {% for event in events %}
-            <tr>
-                <td><a href="{% url 'event' event.id %}">{{event.name}}</a></td>
-                <td>{{event.responses}}</td>
-                <td>{{event.start_date|date:"m/d/Y"}}</td>
-                <td>{{event.end_date|date:"m/d/Y"}}</td>
-            </tr>
         {% endfor %}
-    </tbody>
+    </div>
-</table>
+</div>
 
 {% endblock %}

web/views.py

@@ -1,6 +1,7 @@
 from datetime import timedelta
 from django.contrib.auth import update_session_auth_hash
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth.models import User
 from django.contrib.auth.forms import PasswordChangeForm
 from django.shortcuts import get_object_or_404, redirect, render
 from scripts.bp_deactivate import deactivate
@@ -9,147 +10,10 @@ from web.models import Event, Availability
 
 @login_required()
 def index(request):
-    deactivate()
+    user = User.objects.filter(username='dominic').first()
-    parsed_events = []
-
-    for active_event in Event.objects.filter(active=True).order_by('start_date')[:10]:
-        data = {
-            'id': active_event.id,
-            'name': active_event.name,
-            'start_date': active_event.start_date.date(),
-            'end_date': active_event.end_date.date(),
-            'responses': ', '.join([x.user.username for x in active_event.availability_set.all()])
-        }
-
-        parsed_events.append(data)
 
     context = {
-        'events': parsed_events
+        'events': Event.objects.filter(created_by=user).all()  # TODO: How to determine user?
     }
 
-    return render(request, "index.html", context)
+    return render(request, template_name='index.html', context=context)
-
-
-def change_password(request):
-    if request.method == 'POST':
-        form = PasswordChangeForm(request.user, request.POST)
-        if form.is_valid():
-            user = form.save()
-            update_session_auth_hash(request, user)
-            return redirect('password_change_done')
-    else:
-        form = PasswordChangeForm(request.user)
-    return render(request, 'change-password/change_password.html', {'form': form})
-
-def password_change_done(request):
-    return render(request, 'change-password/password_change_done.html')
-
-
-@login_required()
-def event(request, event_id):
-
-    event = get_object_or_404(Event, pk=event_id)
-
-    if request.method == 'POST':
-        handle_availability_update(event, request)
-        return redirect('event', event_id=event_id)
-
-    elif request.method == 'GET':
-        day_count = (event.end_date - event.start_date).days + 1
-        morning = {}
-        noon = {}
-        night = {}
-        all_availabilities = {}
-        requesting_user_submitted = False
-
-        context = {
-            'event': event,
-            'morning': morning,
-            'noon': noon,
-            'night': night,
-            'user_availability': None,
-            'active_dates': None,
-            'user_responses': 0,
-            'best_days': {},
-            'no_overlap_message': ''
-        }
-
-        user_availability = Availability.objects.filter(event_id=event)
-        if user_availability:
-            for user_avail in user_availability:
-                context['user_responses'] += 1
-
-                for time in user_avail.time_table.get('active', []):
-                    if time not in all_availabilities:
-                        all_availabilities[time] = []
-
-                    all_availabilities[time].append(user_avail.user.username)
-
-                if request.user == user_avail.user:
-                    requesting_user_submitted = True
-                    context['active_dates'] = user_avail.time_table['active']
-
-        context['all_availabilities'] = all_availabilities
-
-        for i in range(day_count):
-            date = event.start_date + timedelta(days=i)
-
-            human_readable_date = date.strftime('%m/%d/%Y %A')
-            for idx, time_period_array in enumerate([morning, noon, night]):
-                date_id = date.strftime(f'%m/%d/%Y %A-{idx}')
-                users = ', '.join(all_availabilities.get(date_id, []))
-
-                if not requesting_user_submitted:
-                    users = ''
-
-                time_period_array[human_readable_date] = (date_id, users)
-
-        if all_availabilities:
-            most_avail = None
-            for day in sorted(all_availabilities, key=lambda k: len(all_availabilities[k]), reverse=True):
-                if not most_avail:
-                    most_avail = len(all_availabilities[day])
-
-                if len(all_availabilities[day]) >= most_avail - 1 and len(all_availabilities[day]) != 1:
-
-                    day_arr = day.split('-')
-                    if day_arr[-1] == '0':
-                        hday = day_arr[0] + ' Morning'
-
-                    if day_arr[-1] == '1':
-                        hday = day_arr[0] + ' Noon'
-
-                    if day_arr[-1] == '2':
-                        hday = day_arr[0] + ' Night'
-
-                    context['best_days'][hday] = ', '.join(all_availabilities[day])
-
-        if not requesting_user_submitted:
-            all_availabilities = {}
-
-        if context['best_days'] == {}:
-            context['no_overlap_message'] = 'There are currently no overlapping times or dates!'
-
-    return render(request, "event.html", context)
-
-def handle_availability_update(event, request):
-    availability_data = {
-        'active': []
-    }
-
-    for date, value in request.POST.items():
-        if date != 'csrfmiddlewaretoken':
-            availability_data['active'].append(date)
-
-    user_availability = Availability.objects.filter(event_id=event).filter(user=request.user)
-    if not user_availability:
-        a = Availability(
-            event_id=event,
-            user=request.user,
-            time_table=availability_data
-        )
-        a.save()
-    else:
-        avail = user_availability[0]
-        avail.time_table = availability_data
-        avail.save()