From c6cc41cce34da463cbacf6ca6e4a54b516cd19e5 Mon Sep 17 00:00:00 2001
From: Flatlogic Bot <support@flatlogic.com>
Date: Tue, 3 Feb 2026 21:39:20 +0000
Subject: [PATCH] Ver 6

---
 core/__pycache__/views.cpython-311.pyc  | Bin 11986 -> 14478 bytes
 core/templates/core/log_attendance.html |  58 ++++++++++++++++-
 core/views.py                           |  82 ++++++++++++++++++++----
 3 files changed, 124 insertions(+), 16 deletions(-)

diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc
index 28f5090ce3e07a17f536338ef935d866e1d8e62e..3209f0bd6d3be225a35547dd8b9f44d0716937f7 100644
GIT binary patch
delta 3416
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
Xfo=!6W0E8flVzgjm89gaM9_Z#BTHMg

delta 1349
zcmZ8h&u<$=6rR~%w&Nc-aq5EY1ShsgwxD7{6IE3x<wxBlkT^;r4v5Cxdbi0sS=-F6
z6Oh(bi+TW5no6UpJyd`=1XaleSqQ-e{(=%J4q+w4l^c;zr3!K2Jr}1=p0uCdeBYaI
z-n_AV<NXKcBVUKZT?FFR+aH-TnQtP;g8W7*@J>P`<Ti0h8MRjEbVa~~-Eu%{2UN6J
zTtmLEYzv#fZ|!Rh>e4SIt_6E}Eg6xR;ZlC}`FLIzx1~)AmGC`|hS2F#R@yuZb@HxI
z^tBaN0IRG-33%=dX2&UUVr`8OT|VePPb!&1H`wpGtnk-*l6}I#9S!RAKJnurDV^7q
zZQr3Hv9rC7wucVz;kJ>TbVWWZ#gBK&+y29*CTU2n_$E0&*^phi9N`hEzw62Ad@<WU
zp$CBIIy7&^8E78`FQXjvbtUlXZtLTaT%UsB?PcS9DHNU5gLj37&r#b2__TV+^=-nS
zw)TfLPt@>?C(Rb-7gXv=b=zQhNR(35vP_4agWde6o^(<bJn2%ESzfneXjXB(%2o_!
z7t40F!fUa_qI$$rEW=r@>I|QaO(DDm;Q39vxTdX|x+mG%n&CxZt<{}nqvDt)%`tQ~
z-6}(|XpLA*!mUw+7ZFAP_~MbF7iJ*wBs|fR^}1EF8QwzmvsbWe7F9p?Ra~tu@t5Pn
z-DiQa{Q&9zgZ~_lCoTYS20r^5{93P&U0>wd<vZ~QzGrv%7e_PxJ)#7%yGN6}oH#MK
z8;WjBe>(k1;d<fY!tb%<o%}Dc%&)P`PAIb%hPsDQem^lFKU7Gxmp_W%ZT^+WQ~4se
z7n`S2vx1^S$_#$9|CoFU(o*xs{@>_19F8ioS5bT&p$Kq~dO~f5VVN3Wb4W)Jo<hKJ
zc;b@bFd3K6AT01d(kW{4f76q46^L4MYG72Rj9+=~J}vXY&{u<NSck`W!Fr{pnL5tK
zW;vv@2<tpHtjP^XuQop%KBXwj$WArCKmH!=L0U~cKC#ux93RS^?Dj+(`dGliK7<)w
z%Z>DTKD%Bj8Mf^O&VEobYK{r-<XhKR#jGsx?{b6G<zCK|KZ7klG$&rVDAHxVbz&}P
zqQ?fp7|iKuo*s=VH(~iF;bWth>AU>f(MNAwKpp4Wnh(S4GHj2b9mDc_giT<c2l&T7
jZdLXAs&Sfq4om!3vNxK4kHu(DA3a0&NC%$gsgvwKn<XNK

diff --git a/core/templates/core/log_attendance.html b/core/templates/core/log_attendance.html
index d6a0089..2b22f30 100644
--- a/core/templates/core/log_attendance.html
+++ b/core/templates/core/log_attendance.html
@@ -15,7 +15,7 @@
     <div class="row justify-content-center">
         <div class="col-lg-8">
             <div class="card p-4 shadow-sm">
-                <form method="post">
+                <form method="post" id="workLogForm">
                     {% csrf_token %}
                     
                     <div class="row mb-4">
@@ -79,6 +79,40 @@
     </div>
 </div>
 
+{% if is_conflict %}
+<!-- Conflict Resolution Modal -->
+<div class="modal fade" id="conflictModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="conflictModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header bg-warning text-dark">
+        <h5 class="modal-title fw-bold" id="conflictModalLabel">
+            Duplicate Logs Detected
+        </h5>
+      </div>
+      <div class="modal-body">
+        <p class="fw-bold">The following workers have already been logged for {{ conflict_date }}:</p>
+        <div class="card bg-light mb-3">
+            <ul class="list-group list-group-flush">
+                {% for worker in conflicting_workers %}
+                    <li class="list-group-item bg-transparent">{{ worker.name }}</li>
+                {% endfor %}
+            </ul>
+        </div>
+        <p>How would you like to proceed?</p>
+        <div class="alert alert-info small mb-0">
+            <strong>Skip:</strong> Log only the new workers. Keep existing logs as they are.<br>
+            <strong>Overwrite:</strong> Remove these workers from previous logs for this date and add them here.
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" onclick="submitConflict('skip')">Skip Duplicate Workers</button>
+        <button type="button" class="btn btn-primary" onclick="submitConflict('overwrite')">Overwrite Existing</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endif %}
+
 <style>
     .hover-shadow:hover {
         box-shadow: 0 4px 12px rgba(0,0,0,0.05);
@@ -105,7 +139,6 @@
                     // Select workers belonging to the team
                     workerIds.forEach(function(id) {
                          // Find the checkbox for this worker ID
-                         // Django form checkboxes usually have name 'workers' and value equal to ID
                          const checkbox = document.querySelector(`input[name="workers"][value="${id}"]`);
                          if (checkbox) {
                              checkbox.checked = true;
@@ -114,6 +147,27 @@
                 }
             });
         }
+
+        // Show conflict modal if it exists
+        const conflictModalEl = document.getElementById('conflictModal');
+        if (conflictModalEl) {
+            var myModal = new bootstrap.Modal(conflictModalEl);
+            myModal.show();
+        }
     });
+
+    function submitConflict(action) {
+        const form = document.getElementById('workLogForm');
+        // Check if input already exists
+        let input = form.querySelector('input[name="conflict_action"]');
+        if (!input) {
+            input = document.createElement('input');
+            input.type = 'hidden';
+            input.name = 'conflict_action';
+            form.appendChild(input);
+        }
+        input.value = action;
+        form.submit();
+    }
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/core/views.py b/core/views.py
index b48e874..c500732 100644
--- a/core/views.py
+++ b/core/views.py
@@ -62,19 +62,7 @@ def home(request):
     return render(request, "core/index.html", context)
 
 def log_attendance(request):
-    if request.method == 'POST':
-        form = WorkLogForm(request.POST, user=request.user)
-        if form.is_valid():
-            work_log = form.save(commit=False)
-            if request.user.is_authenticated:
-                work_log.supervisor = request.user
-            work_log.save()
-            form.save_m2m()
-            return redirect('home')
-    else:
-        form = WorkLogForm(user=request.user if request.user.is_authenticated else None)
-    
-    # Build team workers map for frontend JS
+    # Build team workers map for frontend JS (needed for both GET and POST if re-rendering)
     teams_qs = Team.objects.filter(is_active=True)
     if request.user.is_authenticated and not request.user.is_superuser:
         teams_qs = teams_qs.filter(supervisor=request.user)
@@ -84,6 +72,72 @@ def log_attendance(request):
         # Get active workers for the team
         active_workers = team.workers.filter(is_active=True).values_list('id', flat=True)
         team_workers_map[team.id] = list(active_workers)
+
+    if request.method == 'POST':
+        form = WorkLogForm(request.POST, user=request.user)
+        if form.is_valid():
+            date = form.cleaned_data['date']
+            selected_workers = form.cleaned_data['workers']
+            conflict_action = request.POST.get('conflict_action')
+
+            # Check for existing logs for these workers on this date
+            # We want to find workers who ARE in selected_workers AND have a WorkLog on 'date'
+            conflicting_workers = Worker.objects.filter(
+                work_logs__date=date,
+                id__in=selected_workers.values_list('id', flat=True)
+            ).distinct()
+
+            if conflicting_workers.exists() and not conflict_action:
+                context = {
+                    'form': form,
+                    'team_workers_json': json.dumps(team_workers_map),
+                    'conflicting_workers': conflicting_workers,
+                    'is_conflict': True,
+                    'conflict_date': date,
+                }
+                return render(request, 'core/log_attendance.html', context)
+            
+            # If we are here, either no conflicts or action is chosen
+            workers_to_save = list(selected_workers)
+
+            if conflict_action == 'skip':
+                # Exclude conflicting workers
+                conflicting_ids = conflicting_workers.values_list('id', flat=True)
+                workers_to_save = [w for w in selected_workers if w.id not in conflicting_ids]
+                
+                if not workers_to_save:
+                    messages.warning(request, "No new workers to log (all skipped).")
+                    return redirect('home')
+                
+                messages.success(request, f"Logged {len(workers_to_save)} workers (skipped {conflicting_workers.count()} duplicates).")
+
+            elif conflict_action == 'overwrite':
+                # Remove conflicting workers from their OLD logs
+                for worker in conflicting_workers:
+                    old_logs = WorkLog.objects.filter(date=date, workers=worker)
+                    for log in old_logs:
+                        log.workers.remove(worker)
+                        # Cleanup empty logs
+                        if log.workers.count() == 0:
+                            log.delete()
+                messages.success(request, f"Logged {len(workers_to_save)} workers (overwrote {conflicting_workers.count()} previous entries).")
+            
+            else:
+                 # No conflicts initially
+                 messages.success(request, "Work log saved successfully.")
+
+            # Save the new log
+            work_log = form.save(commit=False)
+            if request.user.is_authenticated:
+                work_log.supervisor = request.user
+            work_log.save()
+            
+            # Manually set workers
+            work_log.workers.set(workers_to_save)
+            
+            return redirect('home')
+    else:
+        form = WorkLogForm(user=request.user if request.user.is_authenticated else None)
     
     context = {
         'form': form,
@@ -240,4 +294,4 @@ def payslip_detail(request, pk):
         'record': record,
         'logs': logs,
     }
-    return render(request, 'core/payslip.html', context)
+    return render(request, 'core/payslip.html', context)
\ No newline at end of file