add new fields to logs and goals.

svelte-ui/src/models/goal.ts

@@ -5,11 +5,14 @@ import type { LogResult } from "./log";
 export default interface Goal {
   id: string
   groupId: string
+  itemId?: string
   startTime: string
   endTime: string
   amount: number
   name: string
   description: string
+  unweighted: boolean
+  compositionMode: string
 }
 
 export interface GoalFilter {
@@ -31,17 +34,24 @@ interface GoalResultItem extends Item {
 
 export interface GoalInput {
   groupId: string
+  itemId: string
   startTime: string | Date
   endTime: string | Date
   amount: number
   name: string
   description: string
+  unweighted: boolean
+  compositionMode: string
 }
 
 export interface GoalUpdate {
+  itemId?: string
   startTime?: string | Date
   endTime?: string | Date
   amount?: number
   name?: string
   description?: string
+  unweighted?: boolean
+  compositionMode?: string
+  clearItemId?: boolean
 }

svelte-ui/src/models/log.ts

@@ -5,11 +5,13 @@ export default interface Log {
   id: string
   taskId: string
   itemId: string
+  itemAmount: number
+  secondaryItemId?: string
+  secondaryItemAmount: number
   loggedTime: string
   description: string
 }
 
-
 export interface LogFilter {
   minTime?: Date
   maxTime?: Date
@@ -18,15 +20,23 @@ export interface LogFilter {
 export interface LogResult extends Log {
   task: Task
   item: Item
+  secondaryItem?: Item
 }
 
 export interface LogInput {
   taskId: string
   loggedTime?: string
   description: string
+  itemAmount: number
+  secondaryItemId?: string
+  secondaryItemAmount?: number
 }
 
 export interface LogUpdate {
   loggedTime?: string
   description?: string
+  itemAmount?: number
+  secondaryItemId?: string
+  secondaryItemAmount?: number
+  clearSecondaryItemId?: boolean
 }