add project to logs, project composition mode to goals and fix unweighted counts for other composition modes.

models/log.go

@@ -62,9 +62,9 @@ type LogUpdate struct {
 
 type LogResult struct {
 	Log
-	Task          *Task `json:"task"`
-	Item          *Item `json:"item"`
-	SecondaryItem *Item `json:"secondaryItem"`
+	Task          *TaskWithProject `json:"task"`
+	Item          *Item            `json:"item"`
+	SecondaryItem *Item            `json:"secondaryItem"`
 }
 
 type LogFilter struct {

models/task.go

@@ -72,6 +72,11 @@ type TaskLink struct {
 	ProjectID string `json:"projectId" db:"project_id"`
 }
 
+type TaskWithProject struct {
+	Task
+	Project *Project `json:"project,omitempty"`
+}
+
 type TaskResult struct {
 	Task
 	Item            *Item    `json:"item"`