From 142518c4f8a5dbb8c3f8ed9ea0b3c44cd2dc13df Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Sat, 4 Mar 2023 10:00:30 +0700 Subject: [PATCH] Flip elapsed time --- mm.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm.py b/mm.py index ec53168..7628f73 100644 --- a/mm.py +++ b/mm.py @@ -89,7 +89,7 @@ def get_all_wells(): cursor = conn.cursor() cursor.execute(""" - SELECT resource_well.id,name,supply FROM resource_well + SELECT resource_well.id,name,supply FROM resource_well INNER JOIN resource ON resource.id = resource_well.resource_id INNER JOIN staking_source ON staking_source.id = resource_well.source_id WHERE staking_source.user_id = ?; @@ -227,7 +227,7 @@ def claim(staking_event_id): (well_id,)) supply = cursor.fetchone()[0] claim_amount = claim_amount if supply >= claim_amount else supply - print(claim_amount) + cursor.execute(""" UPDATE resource_well SET supply = supply - ? WHERE resource_well.id = ? """, (claim_amount, well_id)) @@ -372,7 +372,7 @@ def draw_moons(): for source_id,(ts,wells,stakes) in world.staking_sources.items(): im.image(world.moon_img_tex_id, 240, 200) - im.push_id(f"Destroy{id}") + im.push_id(f"Destroy{source_id}") if im.button("Destroy"): destroy(source_id) im.pop_id() @@ -400,9 +400,8 @@ def draw_moons(): for stake_id,(well_id,invId,amount,dur,start) in stakes.items(): start_time = parse(start) now = datetime.datetime.utcnow().replace(microsecond=0) - elapsed = now - start_time - remaining = start_time + datetime.timedelta(minutes=dur) - now btn_txt = f"Claim {amount} {world.wells[well_id][0].capitalize()}" + elapsed = now - start_time if elapsed > datetime.timedelta(minutes=dur): im.push_id(f"Claim{stake_id}") if im.button(btn_txt): @@ -410,6 +409,7 @@ def draw_moons(): im.pop_id() im.text(f"Finished {elapsed} ago") else: + remaining = start_time + datetime.timedelta(minutes=dur) - now im.text_disabled(btn_txt) im.text(f"{remaining} left")