Merge pull request 'v0.1.4: minor fix' (#7) from dev into main

Reviewed-on: #7

TimeDispatcher/settings.py

@@ -17,7 +17,7 @@ from dotenv import load_dotenv
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-APP_VERSION = "0.1.2"
+APP_VERSION = "0.1.4"
 
 load_dotenv(BASE_DIR / ".env")
 

dispatcher/migrations/0011_alter_project_parent.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.5 on 2025-04-23 20:09
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dispatcher', '0010_realsagexhours_unique_monthly_sagex'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='project',
+            name='parent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dispatcher.parent'),
+        ),
+    ]

dispatcher/models.py

@@ -15,7 +15,8 @@ class Project(models.Model):
     parent = models.ForeignKey(
         Parent,
         on_delete=models.CASCADE,
-        null=True
+        null=True,
+        blank=True
     )
     name = models.CharField(max_length=256)
 

dispatcher/static/table.js

@@ -229,7 +229,9 @@ class Table {
                     durations[i] = hours
                     total += hours
                     parentDurations[i] += hours
-                    this.dailyTotals[i] += hours
+                    if (parent.is_productive) {
+                        this.dailyTotals[i] += hours
+                    }
                 })
                 return {
                     id: project.id,
@@ -239,18 +241,20 @@ class Table {
                 }
             })
 
-            this.addProject(
-                parent.id,
-                parent.name,
-                parent.project_num,
-                parentDurations.map(v => v === 0 ? "" : v),
-                true,
-                parent.is_productive
-            )
+            if (parentDurations.reduce((a, b) => a + b, 0) !== 0) {
+                this.addProject(
+                    parent.id,
+                    parent.name,
+                    parent.project_num,
+                    parentDurations.map(v => v === 0 ? "" : v),
+                    true,
+                    parent.is_productive
+                )
 
-            projects.filter(p => p.total !== 0).forEach(project => {
-                this.addProject(project.id, project.name, "", project.durations)
-            })
+                projects.filter(p => p.total !== 0).forEach(project => {
+                    this.addProject(project.id, project.name, "", project.durations)
+                })
+            }
         })
         this.updateTotals()
     }

templates/table.html

@@ -64,7 +64,7 @@
             </tr>
             <tr class="day-dates"></tr>
             <tr class="day-totals">
-                <th colspan="2">TOTAL</th>
+                <th colspan="2">Total Productive</th>
             </tr>
         </tbody>
     </table>