ss

1 year ago · 508b793f50
parent f6cd02ed01
commit 508b793f50
68 changed files with 33 additions and 11 deletions
--- a/osinaweb/db.sqlite3
+++ b/osinaweb/db.sqlite3
--- a/osinaweb/osinacore/pycache/models.cpython-310.pyc
+++ b/osinaweb/osinacore/pycache/models.cpython-310.pyc
--- a/osinaweb/osinacore/pycache/views.cpython-310.pyc
+++ b/osinaweb/osinacore/pycache/views.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0001_initial.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0001_initial.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0003_milestone.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0003_milestone.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0004_epic.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0004_epic.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0005_staffprofile_image.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0005_staffprofile_image.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0006_note.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0006_note.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0007_project_project_id_alter_project_status.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0007_project_project_id_alter_project_status.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0008_alter_project_project_id.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0008_alter_project_project_id.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0009_alter_project_project_id.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0009_alter_project_project_id.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0010_remove_note_date.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0010_remove_note_date.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0012_projectrequirement.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0012_projectrequirement.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0013_projectfile.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0013_projectfile.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0014_alter_projectfile_file.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0014_alter_projectfile_file.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0015_projectcredentials.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0015_projectcredentials.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0016_rename_projectcredentials_projectcredential.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0016_rename_projectcredentials_projectcredential.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0018_epic_status.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0018_epic_status.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0020_task.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0020_task.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0021_alter_customerprofile_business_and_more.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0021_alter_customerprofile_business_and_more.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0022_customerprofile_customer_id.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0022_customerprofile_customer_id.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0023_task_assigned_to.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0023_task_assigned_to.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0024_task_task_id.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0024_task_task_id.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0025_status.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0025_status.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0026_remove_status_user_status_staff.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0026_remove_status_user_status_staff.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0027_alter_status_staff.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0027_alter_status_staff.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0028_remove_projecttype_color.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0028_remove_projecttype_color.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0029_alter_reference_date.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0029_alter_reference_date.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0030_tag.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0030_tag.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0031_alter_staffprofile_image.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0031_alter_staffprofile_image.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0032_point.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0032_point.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0034_alter_point_date_completed_and_more.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0034_alter_point_date_completed_and_more.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0035_business_business_id.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0035_business_business_id.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0036_staffposition_alter_staffprofile_position.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0036_staffposition_alter_staffprofile_position.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0037_remove_staffprofile_position.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0037_remove_staffprofile_position.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0038_staffprofile_staff_position.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0038_staffprofile_staff_position.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0039_alter_staffprofile_staff_position.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0039_alter_staffprofile_staff_position.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0040_staffprofile_staff_id.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0040_staffprofile_staff_id.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0041_dailyreport.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0041_dailyreport.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0042_remove_customerprofile_email_and_more.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0042_remove_customerprofile_email_and_more.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0043_businesstype.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0043_businesstype.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0044_remove_business_business_type.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0044_remove_business_business_type.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0045_business_type.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0045_business_type.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0046_task_requirement.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0046_task_requirement.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0047_task_status_date.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0047_task_status_date.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0048_alter_customerprofile_business.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0048_alter_customerprofile_business.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0049_alter_customerprofile_business.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0049_alter_customerprofile_business.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0050_projectrequirement_added_by_projectrequirement_date.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0050_projectrequirement_added_by_projectrequirement_date.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0051_alter_task_requirement.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0051_alter_task_requirement.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0052_note_project.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0052_note_project.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0053_pointactivity.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0053_pointactivity.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0054_remove_point_date_completed_and_more.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0054_remove_point_date_completed_and_more.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0055_alter_point_status.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0055_alter_point_status.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0056_alter_pointactivity_end_time.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0056_alter_pointactivity_end_time.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/0058_remove_point_total_time_hours_and_more.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/0058_remove_point_total_time_hours_and_more.cpython-310.pyc
--- a/osinaweb/osinacore/migrations/pycache/init.cpython-310.pyc
+++ b/osinaweb/osinacore/migrations/pycache/init.cpython-310.pyc
--- a/osinaweb/osinacore/models.py
+++ b/osinaweb/osinacore/models.py
@ -4,7 +4,7 @@ from colorfield.fields import ColorField
 from datetime import datetime
 from django.db.models import Max
 from django.utils import timezone
-from django.db.models import Sum
+from django.db.models import Sum, F
 from datetime import timedelta


@ -267,7 +267,13 @@ class Point(models.Model):
            ongoing_total_time_timedelta += current_time_aware - start_time_aware

        # Calculate the total time for completed activities
-        completed_total_time_timedelta = self.pointactivity_set.filter(end_time__isnull=False).aggregate(total_time=Sum(models.F('end_time') - models.F('start_time')))['total_time']
+        completed_total_time_timedelta = self.pointactivity_set.filter(end_time__isnull=False).aggregate(
+            total_time=Sum(F('end_time') - F('start_time'))
+        )['total_time']
+
+        # Handle the case when there are no ongoing or completed activities
+        if not ongoing_activities.exists() and completed_total_time_timedelta is None:
+            return 0, 0, 0

        # Add the total times together
        total_time_timedelta = ongoing_total_time_timedelta + (completed_total_time_timedelta or timedelta())
--- a/osinaweb/osinacore/views.py
+++ b/osinaweb/osinacore/views.py
@ -1874,6 +1874,8 @@ def mark_point_paused(request, point_id, task_id):



+from datetime import datetime
+
@login_required
 def mark_point_completed(request, point_id, task_id):
    task = get_object_or_404(Task, id=task_id)
@ -1881,22 +1883,31 @@ def mark_point_completed(request, point_id, task_id):
    point.status = 'Completed'
    current_datetime = datetime.now()

-
    point.save()

+   
    last_activity = PointActivity.objects.filter(point=point).last()
-    last_activity.end_time =  datetime.now()
-    last_activity.save()
+    if last_activity:
+        last_activity.end_time = datetime.now()
+        last_activity.save()

+    total_time = point.total_time()
+    formatted_time = ""
+    if total_time[0] > 0:
+        formatted_time += f"{total_time[0]}{'hr' if total_time[0] == 1 else 'hrs'}"
+    if total_time[1] > 0:
+        formatted_time += f" {total_time[1]}{'min' if total_time[1] == 1 else 'mins'}"
+    if total_time[2] > 0:
+        formatted_time += f" {total_time[2]}{'sec' if total_time[2] == 1 else 'secs'}"

    status_text = f'{point.text} - Completed'
+    if formatted_time:
+        status_text += f' in {formatted_time}'
+
    status = Status(text=status_text, date=current_datetime.date(), time=current_datetime.strftime("%I:%M %p"), staff=request.user.staffprofile)
    status.save()

-
-
    task_id_str = task.task_id
-
    showpoints_url = reverse('showpoints', args=[task_id_str])
    return HttpResponseRedirect(showpoints_url)

--- a/osinaweb/osinaweb/pycache/urls.cpython-310.pyc
+++ b/osinaweb/osinaweb/pycache/urls.cpython-310.pyc
--- a/osinaweb/templates/popup_modals/showpoints-modal.html
+++ b/osinaweb/templates/popup_modals/showpoints-modal.html
@ -16,7 +16,7 @@

 <body>
    <div id="hiddenContent">
-        <h1 class="text-slate-800 text-2xl font-semibold text-center mb-1">Points</h1>
+        <h1 class="text-slate-800 text-2xl font-semibold text-center mb-4">Points</h1>

        <div class="flex flex-col gap-5">
            {% for point in points %}
@ -61,7 +61,7 @@
                        </a>
                        {% endif %}

-                        {% if not point.status == 'Completed' and not point.status == 'Paused'  %}
+                        {% if not point.status == 'Completed' and not point.status == 'Paused' %}
                        <a href="{% url 'mark_point_completed' point.id task.id %}">
                            <button
                                class="w-[40px] h-[40px] rounded-full bg-transparent shadow-md text-white border border-white flex justify-center items-center hover:scale-105 transition-transform duration-300">
--- a/osinaweb/templates/recent-activities.html
+++ b/osinaweb/templates/recent-activities.html
@ -32,7 +32,11 @@

        <!-- Status -->
        <div class="w-full">
-            <p class="text-sm text-gray-500">{{latest.status.text}}</p>
+            {% if "Completed" in latest.status.text %}
+            <p class="text-sm text-green-700">{{latest.status.text}}</p>
+            {% else %}
+            <p class="text-sm text-grey-500">{{latest.status.text}}</p>
+            {% endif %}
        </div>

        <!-- Add comment section -->
--- a/osinaweb/templates/user-recent-activities.html
+++ b/osinaweb/templates/user-recent-activities.html
@ -30,6 +30,7 @@

        <!-- Status -->
        <div class="w-full">
+            
            <p class="text-sm text-gray-500">{{latest.status.text}}</p>
        </div>