Skip to content

split stats and flushes loading #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2024
Merged

split stats and flushes loading #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions pwa/flush/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ func (r *RegisterContainer) Render() app.UI {
type RootContainer struct {
app.Compo
buttonUpdate
Stats app.UI
FlushList app.UI
}

Expand All @@ -104,15 +105,21 @@ func (b *RootContainer) OnMount(ctx app.Context) {
app.Window().GetElementByID("about-container").Set("className", "invisible fixed")
ShowLoading("flushes-loading")
ctx.Async(func() {
stats, err := StatsDiv(ctx)
result := GetFlushesFromOID(ctx)
ctx.Dispatch(func(ctx app.Context) {
if err != nil {
ShowErrorDiv(ctx, err, 2)
return
}
defer Hide("flushes-loading")
if result == nil {
ShowErrorDiv(ctx, errors.New("Error while fetching flushes"), 2)
return
}
app.Window().GetElementByID("hidden-hello").Set("innerHTML", "hello!")
b.SetList(result)
b.Stats = stats
var isEmpty string
ctx.GetState("no-flushes", &isEmpty)
log.Println("no-flushes: ", isEmpty)
Expand Down Expand Up @@ -151,6 +158,7 @@ func (b *RootContainer) Render() app.UI {
).ID("root-buttons-container").Class(InviCss),
app.P().Text("Tracked flushes:").Class("py-2"),
&LoadingWidget{id: "flushes-loading"},
b.Stats,
b.FlushList,
app.Div().Body(
&b.buttonUpdate,
Expand Down Expand Up @@ -559,20 +567,6 @@ func FlushTable(flushes []Flush, ctx app.Context) app.UI {
).Class("flex flex-col p-4 border-1 shadow-lg rounded-lg").ID("div-"+flush.ID),
)
}
stats, err := GetStats(ctx)
if err != nil {
ShowErrorDiv(ctx, err, 3)
return app.Div()
}
statsDiv := app.Div().Body(
app.P().Text("Total flushes: "+strconv.Itoa(stats.FlushCount)),
app.P().Text("Total time: "+strconv.Itoa(stats.TotalTime)+" minutes"),
app.P().Text("Mean time: "+strconv.Itoa(stats.MeanTime)+" minutes"),
app.P().Text("Mean rating: "+strconv.Itoa(stats.MeanRating)),
app.P().Text("Times with phone used: "+strconv.Itoa(stats.PhoneUsedCount)),
app.P().Text("Percent with phone used: "+strconv.Itoa(stats.PercentPhoneUsed)+"%"),
).Class("flex flex-col p-4 border-1 shadow-lg rounded-lg font-bold")
divs = append([]app.UI{statsDiv}, divs...)
return app.Div().Body(divs...)
}

Expand Down Expand Up @@ -987,3 +981,19 @@ func (b *BurgerMenuButton) OnClick(ctx app.Context, e app.Event) {
app.Window().GetElementByID("root-buttons-container").Set("className", RootButtonsCss)
}
}

func StatsDiv(ctx app.Context) (app.UI, error) {
stats, err := GetStats(ctx)
if err != nil {
return nil, err
}
return app.Div().Body(
app.P().Text("Total flushes: "+strconv.Itoa(stats.FlushCount)),
app.P().Text("Total time: "+strconv.Itoa(stats.TotalTime)+" minutes"),
app.P().Text("Mean time: "+strconv.Itoa(stats.MeanTime)+" minutes"),
app.P().Text("Mean rating: "+strconv.Itoa(stats.MeanRating)),
app.P().Text("Times with phone used: "+strconv.Itoa(stats.PhoneUsedCount)),
app.P().Text("Percent with phone used: "+strconv.Itoa(stats.PercentPhoneUsed)+"%"),
).Class("flex flex-col p-4 border-1 shadow-lg rounded-lg font-bold"),
nil
}
Loading