TobiasH/itender
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix seconds

Browse Source 
Took 6 minutes
This commit is contained in:
Tobias Hopp 2022-11-28 11:35:33 +01:00
parent a84857a010
commit 925facd3f3
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/iTender.ts
View File

@ -119,6 +119,10 @@ export class iTender {
job.drink = drink job.drink = drink
job.amounts = amounts as { ingredient: IIngredient, amount: number, container: IContainer }[]; job.amounts = amounts as { ingredient: IIngredient, amount: number, container: IContainer }[];
if( job.estimatedTime < 0.5 )
{
job.estimatedTime = 1;
}
await job.save() await job.save()
resolve(job); resolve(job);
@ -145,7 +149,7 @@ export class iTender {
} catch (e) { } catch (e) {
if (isPI()) { if (isPI()) {
log("[ERROR] GPIO I/O Error " + e); log("[ERROR] GPIO I/O Error " + e);
iTender.cancelFill(); await iTender.cancelFill();
return; return;
} else { } else {
log("[WARNING] GPIO I/O Error, but it's normal cause you are not on raspberry"); log("[WARNING] GPIO I/O Error, but it's normal cause you are not on raspberry");
@ -173,7 +177,7 @@ export class iTender {
} catch (e) { } catch (e) {
if (isPI()) { if (isPI()) {
log("[ERROR] GPIO I/O Error " + e); log("[ERROR] GPIO I/O Error " + e);
iTender.cancelFill(); await iTender.cancelFill();
return; return;
} else { } else {
log("[WARNING] GPIO I/O Error, but it's normal cause you are not on raspberry"); log("[WARNING] GPIO I/O Error, but it's normal cause you are not on raspberry");
@ -196,7 +200,8 @@ export class iTender {
job.successful = true; job.successful = true;
await job.save(); await job.save();
mixLog("Job successful"); mixLog("Job successful");
iTender.setStatus(iTenderStatus.READY); setTimeout( () => iTender.setStatus(iTenderStatus.READY), 3000 )
}, 500); }, 500);
} }

4
src/web/WebWebSocketHandler.ts
View File

@ -63,7 +63,7 @@ export class WebWebSocketHandler {
case iTenderStatus.READY: { case iTenderStatus.READY: {
Modal.close("start"); Modal.close("start");
Modal.close("setup"); Modal.close("setup");
//Modal.close("fill"); Modal.close("fill");
Modal.close("download"); Modal.close("download");
if (WebHandler.currentPane != Pane.MENU) if (WebHandler.currentPane != Pane.MENU)
WebHandler.openPane(Pane.MAIN); WebHandler.openPane(Pane.MAIN);
@ -193,7 +193,7 @@ export class WebWebSocketHandler {
cancelBtn.onclick = () => { cancelBtn.onclick = () => {
modal.close(); modal.close();
} }
setTimeout(() => modal.close(), 1000 * 4.5); //setTimeout(() => modal.close(), 1000 * 4.5);
}, job.estimatedTime * 1000); }, job.estimatedTime * 1000);
}); });
}); });