ustable version 0.0.8 + polishing

Author: JustMrNone

PunchClock/__pycache__/models.cpython-313.pyc

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.1 on 2025-05-15 06:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('PunchClock', '0014_companysettings_company_logo'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='timeentry',
+            name='segment_index',
+            field=models.IntegerField(default=0, help_text='Index of this segment for multi-segment workdays'),
+        ),
+        migrations.AddField(
+            model_name='timeentry',
+            name='session_id',
+            field=models.CharField(blank=True, help_text='Client-side session ID to prevent manipulation', max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='timeentry',
+            name='session_verified',
+            field=models.BooleanField(default=False, help_text='Whether the session has been verified on the server'),
+        ),
+    ]

PunchClock/migrations/0015_timeentry_segment_index_timeentry_session_id_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.5
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('PunchClock', '0015_timeentry_segment_index_timeentry_session_id_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='timeentry',
+            name='entry_type',
+            field=models.CharField(
+                choices=[
+                    ('Regular Work Hours', 'Regular Work Hours'),
+                    ('Overtime', 'Overtime'),
+                    ('Meeting', 'Meeting'),
+                    ('Training', 'Training'),
+                    ('Other', 'Other'),
+                ],
+                default='Regular Work Hours',
+                max_length=50
+            ),
+        ),
+    ]

PunchClock/migrations/0016_timeentry_entry_type.py

@@ -28,12 +28,22 @@ class TimeEntry(models.Model):
     start_time = models.TimeField()
     end_time = models.TimeField(null=True, blank=True)
     total_hours = models.DecimalField(max_digits=5, decimal_places=2, default=0)
+    entry_type = models.CharField(max_length=50, default='Regular Work Hours', 
+                               choices=[('Regular Work Hours', 'Regular Work Hours'),
+                                      ('Overtime', 'Overtime'),
+                                      ('Meeting', 'Meeting'),
+                                      ('Training', 'Training'),
+                                      ('Other', 'Other')])
     status = models.CharField(max_length=20, default='pending', 
                             choices=[('pending', 'Pending'),
                                    ('approved', 'Approved'),
                                    ('rejected', 'Rejected')])
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
+    # Added fields for better tracking
+    session_id = models.CharField(max_length=100, null=True, blank=True, help_text="Client-side session ID to prevent manipulation")
+    session_verified = models.BooleanField(default=False, help_text="Whether the session has been verified on the server")
+    segment_index = models.IntegerField(default=0, help_text="Index of this segment for multi-segment workdays")
 
     class Meta:
         ordering = ['-date', '-start_time']
@@ -47,15 +57,15 @@ def save(self, *args, **kwargs):
             # Handle overnight shifts
             if end_dt < start_dt:
                 end_dt += timedelta(days=1)
-            
-            # Calculate duration in hours
+              # Calculate duration in hours
             duration = end_dt - start_dt
             self.total_hours = round(duration.total_seconds() / 3600, 2)
 
         super().save(*args, **kwargs)
-
+        
     @classmethod
     def get_weekly_hours(cls, employee, date=None):
+        """Get total hours worked in the current week, aggregating all segments."""
         if date is None:
             date = timezone.now().date()
 
@@ -65,27 +75,54 @@ def get_weekly_hours(cls, employee, date=None):
 
         entries = cls.objects.filter(
             employee=employee,
-            date__range=[week_start, week_end]
+            date__range=[week_start, week_end],
+            session_verified=True  # Only count verified sessions
         )
         return sum(float(entry.total_hours) for entry in entries)
 
     @classmethod
     def get_daily_average(cls, employee, days=30):
+        """Calculate true daily average over the past X days, considering all segments."""
         end_date = timezone.now().date()
         start_date = end_date - timedelta(days=days)
 
         entries = cls.objects.filter(
             employee=employee,
-            date__range=[start_date, end_date]
+            date__range=[start_date, end_date],
+            session_verified=True  # Only count verified sessions
         )
 
         if not entries:
             return 0
 
-        total_hours = sum(float(entry.total_hours) for entry in entries)
-        working_days = entries.values('date').distinct().count()
+        # Group by date and sum hours for each day
+        date_hours = {}
+        for entry in entries:
+            date_str = entry.date.strftime('%Y-%m-%d')
+            if date_str not in date_hours:
+                date_hours[date_str] = 0
+            date_hours[date_str] += float(entry.total_hours)
 
-        return round(total_hours / working_days, 2) if working_days > 0 else 0
+        # Calculate average using only days with entries
+        working_days = len(date_hours)
+        if working_days == 0:
+            return 0
+        
+        total_hours = sum(date_hours.values())
+        return round(total_hours / working_days, 2)
+        
+    @classmethod
+    def get_today_hours(cls, employee):
+        """Calculate total hours worked today across all segments."""
+        today = timezone.now().date()
+        
+        entries = cls.objects.filter(
+            employee=employee,
+            date=today,
+            session_verified=True  # Only count verified sessions
+        )
+        
+        return sum(float(entry.total_hours) for entry in entries)
 
 class PersonalNote(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)