dave/calorie-counter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

Implement creating food

Browse Source
This commit is contained in:
PhatPhuckDave
2024-08-09 21:20:02 +02:00
parent db34fe039e
commit d9ae2e1ab3
10 changed files with 171 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app.go
View File

@@ -28,7 +28,6 @@ func (a *App) GetFood() WailsFood {
}
return WailsFood{Data: data, Success: true}
}
func (a *App) CreateFood(food Food) WailsFood1 {
data, err := foodService.Create(food)
if err != nil {
@@ -36,7 +35,6 @@ func (a *App) CreateFood(food Food) WailsFood1 {
}
return WailsFood1{Data: data, Success: true}
}
func (a *App) UpdateFood(food Food) WailsFood1 {
data, err := foodService.Update(food)
if err != nil {
@@ -45,6 +43,14 @@ func (a *App) UpdateFood(food Food) WailsFood1 {
return WailsFood1{Data: data, Success: true}
}
func (a *App) GetLastPer100(name string) WailsPer100 {
data, err := foodService.GetLastPer100(name)
if err != nil {
return WailsPer100{Success: false, Error: err.Error()}
}
return WailsPer100{Data: data, Success: true}
}
// region settings
func (a *App) GetSettings() settings {
return Settings

15
foodservice.go
View File

@@ -56,6 +56,21 @@ func (s *FoodService) GetRecent() ([]Food, error) {
return res, nil
}
func (s *FoodService) GetLastPer100(name string) (float32, error) {
if s.db == nil || !s.db.Ready {
return 0, fmt.Errorf("cannot get last per100, db is nil or is not ready")
}
row := s.db.readConn.QueryRow("SELECT per100 FROM food WHERE food like ? ORDER BY rowid DESC LIMIT 1", name+"%")
var per100 float32
err := row.Scan(&per100)
if err != nil {
return 0, fmt.Errorf("error scanning row: %v", err)
}
return per100, nil
}
func (s *FoodService) Create(food Food) (Food, error) {
if s.db == nil || !s.db.Ready {
return food, fmt.Errorf("cannot create food, db is nil or is not ready")

2
frontend/src/App.svelte
View File

@@ -1,8 +1,10 @@
<script lang="ts">
import Header from "$lib/components/Header.svelte";
import Router from "$lib/router/Router.svelte";
import { Toaster } from 'svelte-sonner'
</script>
<Toaster />
<template>
<Header />
<main class="flex-1">

16
frontend/src/lib/components/Energy/Energy.svelte
View File

@@ -1,8 +1,24 @@
<script lang="ts">
import { foodStore } from "$lib/store/FoodStore";
import FoodTable from "./Food/FoodTable.svelte";
// Fuck this hacky shit
// Svelte won't re-render FoodTable when using the store directly
// It won't do it when using a variable and subscribing to the store
// It won't do it when reassigning the store
// Not when pushing unshifting the store
// This is the only thing that works
// Hacky ass shit
let forceUpdate = false;
foodStore.subscribe(() => {
forceUpdate = !forceUpdate;
});
</script>
<template>
{#if forceUpdate}
<FoodTable items={$foodStore} />
{:else}
<FoodTable items={$foodStore} />
{/if}
</template>

127
frontend/src/lib/components/Energy/Food/EmptyFoodComp.svelte
View File

@@ -1,95 +1,110 @@
<!-- <script lang="ts">
import { type Food, FoodService } from '$lib/database/food'
import { toast } from 'svelte-sonner'
import type { Err } from '$lib/types'
import { foodStore } from '$lib/store/energy/foodStore'
import { RefreshStores } from '$lib/utils'
<script lang="ts">
import { toast } from "svelte-sonner";
import { main } from "$wails/models";
import { CreateFood, GetLastPer100 } from "$wails/main/App";
import { foodStore } from "$lib/store/FoodStore";
let item: Food = {
food: '',
let item: main.Food = {
food: "",
amount: 0,
description: ''
}
let name: string = ''
let amount: string = ''
let description: string = ''
let per100: string = ''
let per100Edited: boolean = false
let per100Element: HTMLTableCellElement
description: "",
rowid: 0,
date: "",
per100: 0,
energy: 0,
};
let name: string = "";
let amount: string = "";
let description: string = "";
let per100: string = "";
let per100Edited: boolean = false;
let per100Element: HTMLTableCellElement;
async function update(event: KeyboardEvent & { currentTarget: (EventTarget & HTMLTableCellElement) }) {
name = name.trim()
amount = amount.trim()
description = description.trim()
per100 = per100.trim()
async function update(event: KeyboardEvent & { currentTarget: EventTarget & HTMLTableCellElement }) {
name = name.trim();
amount = amount.trim();
description = description.trim();
per100 = per100.trim();
if (!per100Edited && event.currentTarget === per100Element)
per100Edited = true
if (!per100Edited && event.currentTarget === per100Element) per100Edited = true;
if (event.key == 'Enter') {
event.preventDefault()
item.food = name
item.description = description
item.amount = parseInt(amount)
item.per100 = parseInt(per100)
if (event.key == "Enter") {
event.preventDefault();
item.food = name;
item.description = description;
item.amount = parseInt(amount);
item.per100 = parseInt(per100);
const [dbFood, err]: [Food, Err] = await FoodService.Create(item)
name = ''
amount = ''
const res = await CreateFood(item);
name = "";
amount = "";
// description = ''
per100 = ''
per100Edited = false
per100 = "";
per100Edited = false;
if (err) {
toast.error(err)
return
if (!res.success) {
toast.error(`failed to create item with error ${res.error}`);
return;
}
RefreshStores()
foodStore.update((value) => {
const updatedValue = [res.data, ...value];
console.log("Updated items:", updatedValue.length);
return updatedValue;
});
}
if (!per100Edited)
FoodService.GetLatestPer100(name.trim()).then((res) => {
if (res[1])
// toast.error(res[1])
return
per100 = res[0].toString()
})
GetLastPer100(name.trim()).then((res) => {
if (res.success) {
per100 = res.data.toString();
}
});
}
</script>
<template>
<tr class="border-b border-gray-200 dark:border-gray-700 text-lg font-bold">
<th class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap bg-gray-50 dark:text-white dark:bg-gray-800"
scope="row">
<th
class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap bg-gray-50 dark:text-white dark:bg-gray-800"
scope="row"
>
</th>
<td bind:innerText={name}
<td
bind:innerText={name}
class:border-[3px]={!name}
class:border-red-600={!name}
class="px-6 py-4 overflow-hidden"
contenteditable="true"
autofocus
on:keydown={update}>
on:keydown={update}
>
</td>
<td bind:innerText={description}
<td
bind:innerText={description}
class="px-6 py-4 bg-gray-50 dark:bg-gray-800 overflow-hidden"
contenteditable="true"
on:keydown={update}>
on:keydown={update}
>
</td>
<td bind:innerText={amount}
<td
bind:innerText={amount}
class:border-[3px]={!amount}
class:border-red-600={!amount}
class="px-6 py-4 overflow-hidden"
contenteditable="true"
on:keydown={update}>
on:keydown={update}
>
</td>
<td bind:this={per100Element}
<td
bind:this={per100Element}
bind:innerText={per100}
class="px-6 py-4 bg-gray-50 dark:bg-gray-800 overflow-hidden"
class:border-[3px]={!per100}
class:border-orange-600={!per100}
contenteditable="true"
on:keydown={update}>
on:keydown={update}
>
</td>
</tr>
</template> -->
</template>

9
frontend/src/lib/components/Energy/Food/FoodTable.svelte
View File

@@ -8,11 +8,13 @@
let minCal = 1e5;
let maxCal = 0;
$: {
for (let item of items) {
if (!item.energy) continue;
if (item.energy > maxCal) maxCal = item.energy;
if (item.energy < minCal) minCal = item.energy;
}
}
const start = "#99ff99";
const end = "#ff9999";
@@ -72,7 +74,12 @@
<tbody>
<EmptyFoodComp />
{#each items as f}
<FoodComp item="{f}" energyColor="{lerp(f)}" nameColor="{getNameColor(f)}" dateColor="{getDateColor(f)}" />
<FoodComp
item={f}
energyColor={lerp(f)}
nameColor={getNameColor(f)}
dateColor={getDateColor(f)}
/>
{/each}
</tbody>
</table>

2
frontend/wailsjs/go/main/App.d.ts vendored
View File

@@ -6,6 +6,8 @@ export function CreateFood(arg1:main.Food):Promise<main.WailsFood1>;
export function GetFood():Promise<main.WailsFood>;
export function GetLastPer100(arg1:string):Promise<main.WailsPer100>;
export function GetSettings():Promise<main.settings>;
export function SetSetting(arg1:string,arg2:any):Promise<main.settings>;

4
frontend/wailsjs/go/main/App.js
View File

@@ -10,6 +10,10 @@ export function GetFood() {
return window['go']['main']['App']['GetFood']();
}
export function GetLastPer100(arg1) {
return window['go']['main']['App']['GetLastPer100'](arg1);
}
export function GetSettings() {
return window['go']['main']['App']['GetSettings']();
}

16
frontend/wailsjs/go/models.ts
View File

@@ -92,6 +92,22 @@ export namespace main {
return a;
}
}
export class WailsPer100 {
data: number;
success: boolean;
error?: string;
static createFrom(source: any = {}) {
return new WailsPer100(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.data = source["data"];
this.success = source["success"];
this.error = source["error"];
}
}
export class settings {
foodDaysLookback: number;
foodAggregatedDaysLookback: number;

6
wailstypes.go
View File

@@ -20,7 +20,11 @@ type (
Success bool `json:"success"`
Error string `json:"error,omitempty"`
}
WailsPer100 struct {
Data float32 `json:"data"`
Success bool `json:"success"`
Error string `json:"error,omitempty"`
}
WailsAggregateFood struct {
Data []AggregatedFood `json:"data"`
Success bool `json:"success"`