From 06d5101e39e4f60dad21b84e21cc781ad8cdf3a7 Mon Sep 17 00:00:00 2001
From: Flatlogic Bot <support@flatlogic.com>
Date: Wed, 4 Feb 2026 00:53:46 +0000
Subject: [PATCH] Ver 9.1 Calender added

---
 core/__pycache__/views.cpython-311.pyc | Bin 29531 -> 32083 bytes
 core/templates/core/work_log_list.html | 108 ++++++++++++++++++++++++-
 core/views.py                          |  72 ++++++++++++++++-
 3 files changed, 175 insertions(+), 5 deletions(-)

diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc
index a9c72b5e8bcb18fa47e851eea94dd2e582ba8e47..2f4097ce02df1284c4e62a5585a1dc30263bcb38 100644
GIT binary patch
delta 4892
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

delta 2505
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
V`cM<~^wQqz<a2B>!Flb)e*^xJb(R1C

diff --git a/core/templates/core/work_log_list.html b/core/templates/core/work_log_list.html
index 9c17790..955e2af 100644
--- a/core/templates/core/work_log_list.html
+++ b/core/templates/core/work_log_list.html
@@ -11,7 +11,17 @@
                 <h1 class="display-5 mb-2">Work Log History</h1>
                 <p class="lead opacity-75">Filter and review historical daily work logs.</p>
             </div>
-            <div class="d-flex gap-2">
+            <div class="d-flex gap-2 align-items-center">
+                <!-- View Switcher -->
+                <div class="btn-group me-2 shadow-sm" role="group">
+                  <a href="?view=list&worker={{ selected_worker|default:'' }}&team={{ selected_team|default:'' }}&project={{ selected_project|default:'' }}&payment_status={{ selected_payment_status|default:'' }}" class="btn btn-outline-secondary bg-white {% if view_mode != 'calendar' %}active fw-bold{% endif %}">
+                      <i class="bi bi-list-ul"></i> List
+                  </a>
+                  <a href="?view=calendar&worker={{ selected_worker|default:'' }}&team={{ selected_team|default:'' }}&project={{ selected_project|default:'' }}&payment_status={{ selected_payment_status|default:'' }}" class="btn btn-outline-secondary bg-white {% if view_mode == 'calendar' %}active fw-bold{% endif %}">
+                      <i class="bi bi-calendar3"></i> Calendar
+                  </a>
+                </div>
+
                 <a href="{% url 'export_work_log_csv' %}?{{ request.GET.urlencode }}" class="btn btn-outline-secondary shadow-sm border-0 bg-white text-dark">
                     <i class="bi bi-download me-1"></i> Export CSV
                 </a>
@@ -25,6 +35,12 @@
         <div class="card border-0 shadow-sm">
             <div class="card-body p-4">
                 <form method="get" class="row g-3">
+                    <input type="hidden" name="view" value="{{ view_mode }}">
+                    {% if view_mode == 'calendar' %}
+                        <input type="hidden" name="month" value="{{ curr_month }}">
+                        <input type="hidden" name="year" value="{{ curr_year }}">
+                    {% endif %}
+                    
                     <div class="col-md-3">
                         <label class="form-label small text-muted text-uppercase fw-bold">Worker</label>
                         <select name="worker" class="form-select">
@@ -66,7 +82,7 @@
                 </form>
                 {% if selected_worker or selected_team or selected_project or selected_payment_status and selected_payment_status != 'all' %}
                 <div class="mt-3">
-                    <a href="{% url 'work_log_list' %}" class="btn btn-sm btn-link text-decoration-none text-muted">
+                    <a href="{% url 'work_log_list' %}?view={{ view_mode }}" class="btn btn-sm btn-link text-decoration-none text-muted">
                         <i class="bi bi-x-circle"></i> Clear all filters
                     </a>
                 </div>
@@ -77,6 +93,84 @@
 </div>
 
 <div class="container mb-5 mt-n4">
+    {% if view_mode == 'calendar' %}
+    <!-- CALENDAR VIEW -->
+    <div class="d-flex justify-content-between align-items-center mb-3">
+        <h3 class="mb-0 fw-bold">{{ month_name }} {{ curr_year }}</h3>
+        <div class="btn-group shadow-sm">
+            <a href="?view=calendar&month={{ prev_month }}&year={{ prev_year }}&worker={{ selected_worker|default:'' }}&team={{ selected_team|default:'' }}&project={{ selected_project|default:'' }}&payment_status={{ selected_payment_status|default:'' }}" class="btn btn-light border bg-white">
+                <i class="bi bi-chevron-left"></i> Previous
+            </a>
+            <a href="?view=calendar&month={{ next_month }}&year={{ next_year }}&worker={{ selected_worker|default:'' }}&team={{ selected_team|default:'' }}&project={{ selected_project|default:'' }}&payment_status={{ selected_payment_status|default:'' }}" class="btn btn-light border bg-white">
+                Next <i class="bi bi-chevron-right"></i>
+            </a>
+        </div>
+    </div>
+
+    <div class="card shadow-sm border-0">
+        <div class="card-body p-0">
+            <div class="table-responsive">
+                <table class="table table-bordered mb-0 calendar-table" style="table-layout: fixed;">
+                    <thead class="bg-light text-center text-uppercase text-muted small">
+                        <tr>
+                            <th style="width: 14.28%">Mon</th>
+                            <th style="width: 14.28%">Tue</th>
+                            <th style="width: 14.28%">Wed</th>
+                            <th style="width: 14.28%">Thu</th>
+                            <th style="width: 14.28%">Fri</th>
+                            <th style="width: 14.28%">Sat</th>
+                            <th style="width: 14.28%">Sun</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for week in calendar_weeks %}
+                        <tr>
+                            {% for day_info in week %}
+                                <td class="{% if not day_info.is_current_month %}bg-light text-muted bg-opacity-10{% endif %}" style="height: 140px; vertical-align: top; padding: 10px;">
+                                    <div class="d-flex justify-content-between align-items-start mb-2">
+                                        <span class="fw-bold {% if day_info.date == current_time.date %}text-primary bg-primary bg-opacity-10 px-2 rounded-circle{% endif %}">{{ day_info.day }}</span>
+                                        {% if day_info.logs %}
+                                            <span class="badge bg-secondary opacity-50">{{ day_info.logs|length }}</span>
+                                        {% endif %}
+                                    </div>
+                                    <div class="calendar-events" style="max-height: 100px; overflow-y: auto;">
+                                        {% for log in day_info.logs %}
+                                            <div class="mb-1 p-1 rounded border small bg-white shadow-sm" style="font-size: 0.75rem; line-height: 1.2; border-left: 3px solid var(--bs-primary) !important;">
+                                                <div class="fw-bold text-truncate">{{ log.project.name }}</div>
+                                                {% with team=log.workers.first.teams.first %}
+                                                    {% if team %}
+                                                        <div class="text-muted small text-truncate" style="font-size: 0.7rem;">
+                                                            <i class="bi bi-people-fill me-1"></i>{{ team.name }}
+                                                        </div>
+                                                    {% endif %}
+                                                {% endwith %}
+                                                <div class="text-muted text-truncate" title="{{ log.workers.count }} workers">
+                                                    {% if selected_worker %}
+                                                        {{ log.workers.first.name }}
+                                                    {% elif log.workers.count == 1 %}
+                                                         {{ log.workers.first.name }}
+                                                    {% else %}
+                                                        {{ log.workers.count }} workers
+                                                    {% endif %}
+                                                </div>
+                                                {% if log.notes %}
+                                                <!-- Optional: indicator for notes -->
+                                                {% endif %}
+                                            </div>
+                                        {% endfor %}
+                                    </div>
+                                </td>
+                            {% endfor %}
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    
+    {% else %}
+    <!-- LIST VIEW -->
     <div class="card shadow-sm border-0">
         <div class="card-body p-0">
             {% if logs %}
@@ -184,6 +278,7 @@
             {% endif %}
         </div>
     </div>
+    {% endif %}
 </div>
 
 <style>
@@ -191,5 +286,14 @@
     .bg-accent { background-color: var(--bs-accent); }
     .btn-accent { background-color: #ffde59; color: #000; border: none; font-weight: 600; }
     .btn-accent:hover { background-color: #e6c850; }
+    
+    /* Calendar Scrollbar custom */
+    .calendar-events::-webkit-scrollbar {
+        width: 4px;
+    }
+    .calendar-events::-webkit-scrollbar-thumb {
+        background-color: #ccc;
+        border-radius: 4px;
+    }
 </style>
 {% endblock %}
\ No newline at end of file
diff --git a/core/views.py b/core/views.py
index 05ee53e..91a8460 100644
--- a/core/views.py
+++ b/core/views.py
@@ -2,6 +2,8 @@ import os
 import platform
 import json
 import csv
+import calendar
+import datetime
 from django.shortcuts import render, redirect, get_object_or_404
 from django.utils import timezone
 from django.contrib.auth.decorators import login_required
@@ -198,8 +200,9 @@ def work_log_list(request):
     team_id = request.GET.get('team')
     project_id = request.GET.get('project')
     payment_status = request.GET.get('payment_status') # 'paid', 'unpaid', 'all'
+    view_mode = request.GET.get('view', 'list')
     
-    logs = WorkLog.objects.all().prefetch_related('workers', 'project', 'supervisor', 'paid_in').order_by('-date', '-id')
+    logs = WorkLog.objects.all().prefetch_related('workers', 'workers__teams', 'project', 'supervisor', 'paid_in').order_by('-date', '-id')
     
     target_worker = None
     if worker_id:
@@ -232,6 +235,28 @@ def work_log_list(request):
     # Convert to list to attach attributes
     final_logs = []
     total_amount = 0
+
+    # If Calendar View: Filter logs by Month BEFORE iterating to prevent fetching ALL history
+    if view_mode == 'calendar':
+        today = timezone.now().date()
+        try:
+            curr_year = int(request.GET.get('year', today.year))
+            curr_month = int(request.GET.get('month', today.month))
+        except ValueError:
+            curr_year = today.year
+            curr_month = today.month
+            
+        # Bounds safety
+        if curr_month < 1: curr_month = 1; 
+        if curr_month > 12: curr_month = 12;
+
+        # Get range
+        _, num_days = calendar.monthrange(curr_year, curr_month)
+        start_date = datetime.date(curr_year, curr_month, 1)
+        end_date = datetime.date(curr_year, curr_month, num_days)
+        
+        logs = logs.filter(date__range=(start_date, end_date))
+
     for log in logs:
         if target_worker:
             log.display_amount = target_worker.day_rate
@@ -243,7 +268,6 @@ def work_log_list(request):
 
     # Context for filters
     context = {
-        'logs': final_logs,
         'total_amount': total_amount,
         'workers': Worker.objects.filter(is_active=True).order_by('name'),
         'teams': Team.objects.filter(is_active=True).order_by('name'),
@@ -253,7 +277,49 @@ def work_log_list(request):
         'selected_project': int(project_id) if project_id else None,
         'selected_payment_status': payment_status,
         'target_worker': target_worker,
+        'view_mode': view_mode,
     }
+
+    if view_mode == 'calendar':
+        # Group by date for easy lookup in template
+        logs_map = {}
+        for log in final_logs:
+            if log.date not in logs_map:
+                logs_map[log.date] = []
+            logs_map[log.date].append(log)
+            
+        cal = calendar.Calendar(firstweekday=0) # Monday is 0
+        month_dates = cal.monthdatescalendar(curr_year, curr_month)
+        
+        # Prepare structured data for template
+        calendar_weeks = []
+        for week in month_dates:
+            week_data = []
+            for d in week:
+                week_data.append({
+                    'date': d,
+                    'day': d.day,
+                    'is_current_month': d.month == curr_month,
+                    'logs': logs_map.get(d, [])
+                })
+            calendar_weeks.append(week_data)
+        
+        # Nav Links
+        prev_month_date = start_date - datetime.timedelta(days=1)
+        next_month_date = end_date + datetime.timedelta(days=1)
+        
+        context.update({
+            'calendar_weeks': calendar_weeks,
+            'curr_month': curr_month,
+            'curr_year': curr_year,
+            'month_name': calendar.month_name[curr_month],
+            'prev_month': prev_month_date.month,
+            'prev_year': prev_month_date.year,
+            'next_month': next_month_date.month,
+            'next_year': next_month_date.year,
+        })
+    else:
+        context['logs'] = final_logs
     
     return render(request, 'core/work_log_list.html', context)
 
@@ -264,7 +330,7 @@ def export_work_log_csv(request):
     project_id = request.GET.get('project')
     payment_status = request.GET.get('payment_status')
 
-    logs = WorkLog.objects.all().prefetch_related('workers', 'project', 'supervisor', 'paid_in').order_by('-date', '-id')
+    logs = WorkLog.objects.all().prefetch_related('workers', 'workers__teams', 'project', 'supervisor', 'paid_in').order_by('-date', '-id')
 
     target_worker = None
     if worker_id: