diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 116fc0c5..a2b7f7c5 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc index ce531a9f..4541d350 100644 Binary files a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc differ diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc index 021515d6..adc921fa 100644 Binary files a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/osinacore/add/views.py b/osinaweb/osinacore/add/views.py index 5e10a75a..1d493c42 100644 --- a/osinaweb/osinacore/add/views.py +++ b/osinaweb/osinacore/add/views.py @@ -541,7 +541,7 @@ def add_daily_report(request): dailyreport.save() status_text = f'Added my daily report.' - status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile) + status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, type='Daily Report', type_id=dailyreport.id) status.save() return redirect('dailyreports') diff --git a/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc index f2415a90..61a5a701 100644 Binary files a/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/osinacore/edit/views.py b/osinaweb/osinacore/edit/views.py index e4dd7c4b..d69fcebd 100644 --- a/osinaweb/osinacore/edit/views.py +++ b/osinaweb/osinacore/edit/views.py @@ -477,11 +477,11 @@ def mark_point_working_on_task_page(request, point_id, task_id): if PointActivity.objects.filter(point=point).count() == 1: status_text = f'Started Working On: {point.text}' - status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, task=point.task) + status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, type='Task', type_id=point.task) status.save() else: status_text = f'Resumed Working On: {point.text}' - status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, task=point.task) + status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, type='Task', type_id=point.task) status.save() @@ -505,7 +505,7 @@ def mark_point_paused(request, point_id, task_id): last_activity.save() status_text = f'{point.text} - Paused' - status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, task=point.task) + status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, type='Task', type_id=point.task) status.save() @@ -531,7 +531,7 @@ def mark_point_paused_task_page(request, point_id, task_id): last_activity.save() status_text = f'{point.text} - Paused' - status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, task=point.task) + status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, type='Task', type_id=point.task) status.save() @@ -569,7 +569,7 @@ def mark_point_completed(request, point_id, task_id): if formatted_time: status_text += f' in {formatted_time}' - status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, task=point.task) + status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, type='Task', type_id=point.task) status.save() task_id_str = task.task_id @@ -610,7 +610,7 @@ def mark_point_completed_task_page(request, point_id, task_id): if formatted_time: status_text += f' in {formatted_time}' - status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, task=point.task) + status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, type='Task', type_id=point.task) status.save() return redirect('detailed-task', task_id=task.task_id) diff --git a/osinaweb/osinacore/migrations/0109_remove_status_task.py b/osinaweb/osinacore/migrations/0109_remove_status_task.py new file mode 100644 index 00000000..e426ca12 --- /dev/null +++ b/osinaweb/osinacore/migrations/0109_remove_status_task.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.5 on 2024-12-26 14:57 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('osinacore', '0108_status_type_status_type_id'), + ] + + operations = [ + migrations.RemoveField( + model_name='status', + name='task', + ), + ] diff --git a/osinaweb/osinacore/migrations/__pycache__/0109_remove_status_task.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0109_remove_status_task.cpython-310.pyc new file mode 100644 index 00000000..4cf0959a Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0109_remove_status_task.cpython-310.pyc differ diff --git a/osinaweb/osinacore/models.py b/osinaweb/osinacore/models.py index 3b958cfb..e10ff5e1 100644 --- a/osinaweb/osinacore/models.py +++ b/osinaweb/osinacore/models.py @@ -431,7 +431,6 @@ class Status(models.Model): staff = models.ForeignKey(StaffProfile, on_delete=models.CASCADE, null=True,blank=True, related_name='staff') type = models.CharField(max_length=200, choices=TYPE_CHOICES, null=True, blank=True) type_id = models.IntegerField(null=True, blank=True) - task = models.ForeignKey(Task, on_delete=models.SET_NULL ,null=True, blank=True, related_name='reference_task') date_time = models.DateTimeField(null=True, blank=True) def __str__(self): return self.text diff --git a/osinaweb/osinacore/templates/details_templates/partials/new-status-activity.html b/osinaweb/osinacore/templates/details_templates/partials/new-status-activity.html index 53e97501..f49c08c7 100644 --- a/osinaweb/osinacore/templates/details_templates/partials/new-status-activity.html +++ b/osinaweb/osinacore/templates/details_templates/partials/new-status-activity.html @@ -177,10 +177,14 @@
{{status.text}}
- {% if status.task.project %} - + {% if status.type and status.type_id %} +{{status.task.project}}
+ {% elif status.type == 'Daily Report' %} +View Daily Report
+ {% endif %} diff --git a/osinaweb/osinacore/templates/details_templates/partials/recent-activities.html b/osinaweb/osinacore/templates/details_templates/partials/recent-activities.html index 8d8b8a45..8142a321 100644 --- a/osinaweb/osinacore/templates/details_templates/partials/recent-activities.html +++ b/osinaweb/osinacore/templates/details_templates/partials/recent-activities.html @@ -168,10 +168,14 @@{{status.text}}
- {% if status.task.project %} - + {% if status.type and status.type_id %} +{{status.task.project}}
+ {% elif status.type == 'Daily Report' %} +View Daily Report
+ {% endif %}