From 24302430287106d1f380d28b5ef51c27e48b6cb6 Mon Sep 17 00:00:00 2001
From: Simon Giesel <simongiesel@gmail.com>
Date: Tue, 18 Jul 2023 19:08:21 +0200
Subject: [PATCH] feat(webapp): change wage to daily in wording, add max value
 for bank input and allow admin to get realtime updates in bank view again

---
 webapp/package.json                           |  2 +-
 .../components/atoms/AtomCurrencyInput.vue    | 12 +++----
 .../molecules/MoleculeDataTable.vue           |  2 +-
 .../molecules/MoleculeInputModal.vue          |  1 +
 webapp/src/components/views/ViewBank.vue      | 31 +++++++++++++------
 webapp/src/components/views/ViewEmployer.vue  |  4 +--
 .../src/components/views/ViewStatePortal.vue  |  4 +--
 7 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 1581996..2a6ddac 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -2,7 +2,7 @@
   "name": "hgoe-sas",
   "private": true,
   "author": "Simon Giesel",
-  "version": "1.3.2",
+  "version": "1.3.6",
   "scripts": {
     "dev": "vite",
     "build": "vue-tsc --noEmit && vite build",
diff --git a/webapp/src/components/atoms/AtomCurrencyInput.vue b/webapp/src/components/atoms/AtomCurrencyInput.vue
index f078ebc..9eb11f7 100644
--- a/webapp/src/components/atoms/AtomCurrencyInput.vue
+++ b/webapp/src/components/atoms/AtomCurrencyInput.vue
@@ -5,8 +5,8 @@
       type="number"
       class="input w-full border-primary text-right"
       :class="{
-        'pr-[5.5rem]': !perHour,
-        'pr-[7rem]': perHour,
+        'pr-[5.5rem]': !perDay,
+        'pr-[8rem]': perDay,
         '!border-error': error,
       }"
       step="1"
@@ -19,10 +19,10 @@
       :class="{
         '-mt-3': !suffixMargin,
         'mt-[-0.625rem]': suffixMargin,
-        'ml-[-5.5rem]': !perHour,
-        'ml-[-7rem]': perHour,
+        'ml-[-5.5rem]': !perDay,
+        'ml-[-8rem]': perDay,
       }"
-    >,00 Batzen{{ perHour ? ' / h' : '' }}</span>
+    >,00 Batzen{{ perDay ? ' / Tag' : '' }}</span>
   </div>
 </template>
 
@@ -34,7 +34,7 @@ const error = ref(false);
 
 const props = withDefaults(defineProps<{
   suffixMargin?: boolean,
-  perHour?: boolean,
+  perDay?: boolean,
   min?: number,
   max?: number,
   value?: number,
diff --git a/webapp/src/components/molecules/MoleculeDataTable.vue b/webapp/src/components/molecules/MoleculeDataTable.vue
index 90dbc91..3574991 100644
--- a/webapp/src/components/molecules/MoleculeDataTable.vue
+++ b/webapp/src/components/molecules/MoleculeDataTable.vue
@@ -89,7 +89,7 @@
               <AtomCurrencyInput
                 v-model="entry.wage"
                 suffix-margin
-                per-hour
+                per-day
                 class="min-w-[11rem]"
                 :min="settings.minWage / 100"
                 :max="settings.maxWage / 100"
diff --git a/webapp/src/components/molecules/MoleculeInputModal.vue b/webapp/src/components/molecules/MoleculeInputModal.vue
index a36913e..29c4320 100644
--- a/webapp/src/components/molecules/MoleculeInputModal.vue
+++ b/webapp/src/components/molecules/MoleculeInputModal.vue
@@ -10,6 +10,7 @@
       <AtomCurrencyInput
         v-model="amount"
         class="w-4/12"
+        :max="1000"
         @keyup.esc="modal?.close()"
       />
     </div>
diff --git a/webapp/src/components/views/ViewBank.vue b/webapp/src/components/views/ViewBank.vue
index f059821..38a1d22 100644
--- a/webapp/src/components/views/ViewBank.vue
+++ b/webapp/src/components/views/ViewBank.vue
@@ -1,6 +1,6 @@
 <template>
   <MoleculeBankerAuthDialog
-    v-if="!isBanker && !AuthService.isAdmin()"
+    v-if="!isBanker"
   />
   <div v-else>
     <div
@@ -201,6 +201,7 @@ function getBalance(): number {
 
 async function handleDeposit(amount: string) {
   const amountNumber = parseInt(amount);
+  if(amountNumber > 1000) { return; }
   if(!isNaN(amountNumber) && account.value) {
     await BankService.addTransaction(account.value.id, amountNumber, TransactionType.DEPOSIT);
   } else if(!isNaN(amountNumber) && company.value) {
@@ -210,7 +211,8 @@ async function handleDeposit(amount: string) {
 
 async function handleWithdraw(amount: string) {
   const amountNumber = parseInt(amount);
-  if(parseInt(amount) * 100 <= getBalance()) {
+  if(amountNumber > 1000) { return; }
+  if(amountNumber * 100 <= getBalance()) {
     if(!isNaN(amountNumber) && account.value) {
       // TODO: add max amount to input field and display custom error message
       await BankService.addTransaction(account.value.id, -amountNumber, TransactionType.WITHDRAW);
@@ -252,23 +254,34 @@ function handleRealtimeUpdates(transactionSubscription: RecordSubscription<Trans
 
 onMounted(async () => {
   isBanker.value = AuthService.isBanker();
+  isBanker.value = AuthService.isAdmin();
 });
 
 useEventBus<boolean>('isBanker').on(state => (isBanker.value = state));
+useEventBus<boolean>('isAdmin').on(state => (isBanker.value = state));
 
-onUnmounted(() => {
+onUnmounted(destroyRealtime);
+
+async function init() {
+  if(!subscription.value) {
+    subscription.value = await BankService.subscribeToTransactionChanges(handleRealtimeUpdates);
+  }
+  if(!companySubscription.value) {
+    companySubscription.value = await BankService.subscribeToCompanyTransactionChanges(handleRealtimeUpdates);
+  }
+  settings.value = await SettingsService.getSettings();
+}
+
+function destroyRealtime() {
   subscription.value?.();
   companySubscription.value?.();
-});
+}
 
 watch(isBanker, async (newValue) => {
   if(newValue) {
-    subscription.value = await BankService.subscribeToTransactionChanges(handleRealtimeUpdates);
-    companySubscription.value = await BankService.subscribeToCompanyTransactionChanges(handleRealtimeUpdates);
-    settings.value = await SettingsService.getSettings();
+    await init();
   } else {
-    subscription.value?.();
-    companySubscription.value?.();
+    destroyRealtime();
   }
 });
 </script>
diff --git a/webapp/src/components/views/ViewEmployer.vue b/webapp/src/components/views/ViewEmployer.vue
index e2c1b1b..c6fb62c 100644
--- a/webapp/src/components/views/ViewEmployer.vue
+++ b/webapp/src/components/views/ViewEmployer.vue
@@ -77,12 +77,12 @@
       >
         <div class="stat place-items-center">
           <div class="stat-title">Aktueller Mindestlohn</div>
-          <div class="stat-value">{{ CurrencyService.toString(settings.minWage, false) }} / h</div>
+          <div class="stat-value">{{ CurrencyService.toString(settings.minWage, false) }} / Tag</div>
           <div class="stat-desc">Batzen</div>
         </div>
         <div class="stat place-items-center">
           <div class="stat-title">Aktueller Maximallohn</div>
-          <div class="stat-value">{{ CurrencyService.toString(settings.maxWage, false) }} / h</div>
+          <div class="stat-value">{{ CurrencyService.toString(settings.maxWage, false) }} / Tag</div>
           <div class="stat-desc">Batzen</div>
         </div>
       </div>
diff --git a/webapp/src/components/views/ViewStatePortal.vue b/webapp/src/components/views/ViewStatePortal.vue
index 237ac08..6a57a47 100644
--- a/webapp/src/components/views/ViewStatePortal.vue
+++ b/webapp/src/components/views/ViewStatePortal.vue
@@ -11,7 +11,7 @@
             <AtomCurrencyInput
               v-model="minWage"
               class="w-2/4"
-              per-hour
+              per-day
             />
           </div>
           <div class="flex place-items-center justify-between">
@@ -26,7 +26,7 @@
             <AtomCurrencyInput
               v-model="maxWage"
               :min="minWage"
-              per-hour
+              per-day
               class="w-2/4"
             />
           </div>