add task and item filters to goals.

svelte-ui/src/models/goal.ts

@@ -15,6 +15,8 @@ export default interface Goal {
   description: string
   unweighted: boolean
   compositionMode: GoalCompositionMode
+  taskFilter?: string
+  itemFilter?: string
 }
 
 export interface GoalFilter {
@@ -26,10 +28,15 @@ export interface GoalFilter {
 export interface GoalResult extends Goal {
   group: Group
   items: GoalResultItem[]
-  logs: LogResult[]
+  logs: GoalLogResult[]
   completedAmount: number
 }
 
+export interface GoalLogResult extends LogResult {
+  itemCounted: boolean
+  secondaryItemCounted: boolean
+}
+
 interface GoalResultItem extends Item {
   completedAmount: number
 }
@@ -44,6 +51,8 @@ export interface GoalInput {
   description: string
   unweighted: boolean
   compositionMode: string
+  taskFilter?: string
+  itemFilter?: string
 }
 
 export interface GoalUpdate {
@@ -56,4 +65,8 @@ export interface GoalUpdate {
   unweighted?: boolean
   compositionMode?: string
   clearItemId?: boolean
+  taskFilter?: string
+  clearTaskFilter: boolean
+  itemFilter?: string
+  clearItemFilter: boolean
 }

svelte-ui/src/models/log.ts

@@ -21,6 +21,8 @@ export interface LogResult extends Log {
   task: Task
   item: Item
   secondaryItem?: Item
+  itemCounted?: boolean
+  secondaryItemCounted?: boolean
 }
 
 export interface LogInput {