diff --git a/src/renderer/components/outMenu.vue b/src/renderer/components/outMenu.vue index 7a4cbab..409f510 100644 --- a/src/renderer/components/outMenu.vue +++ b/src/renderer/components/outMenu.vue @@ -84,10 +84,10 @@ -
+
Are you sure you want to submit?
-
+

@@ -95,6 +95,17 @@
+
+ +

Warning: Battery {{ battery.slice(0, 2) }}.{{ battery.slice(2, 4) }} + is + already signed out!

+

Are you sure you want to proceed?

+
+
Submit
+ Revert +
+

{{ signOutMessage }}

@@ -118,6 +129,7 @@ const rintRange: number[] = [0, 999]; const socLength: number[] = [1, 3]; const rintLength: number = 3; + let str: Ref = ref(""); let progression: Ref = ref(0); let battery: Ref = ref(""); @@ -127,14 +139,28 @@ let warn: Ref = ref(false); let warnReason: Ref = ref(""); let submitted: Ref = ref(false); let signOutMessage: Ref = ref(""); +let submitWarn: Ref = ref(false); +let submitWarnMessage: Ref = ref(""); +async function submitButton() { + progression.value++; + const isOut = await isSignedOut(battery.value); + if (isOut == true) { + submitWarn.value = true; + submitWarnMessage.value = `Warning: Battery ${battery.value} is already signed out! Are you sure you want to proceed?`; + return; + } else { + submit(); + } +} async function submit() { + submitWarn.value = false; submitted.value = true; const success: boolean = await signOut(battery.value, soc.value, rint.value); if (success) { - signOutMessage.value = "Successfully signed out!"; + signOutMessage.value = "Successfully signed Out!"; } else { - signOutMessage.value = "Failed to sign out!"; + signOutMessage.value = "Failed to sign Out!"; } setTimeout(() => { navigateTo("/") @@ -256,8 +282,53 @@ function checkRange() { return true; } } +async function isSignedOut(batteryNumber: string): Promise { + const latestLog = await getLatest(batteryNumber); + if (typeof latestLog != 'boolean') { + if (latestLog == null) { + return false; + } else { + return latestLog.out; + } + } else { + return true; + } +}