@@ -245,7 +250,6 @@ import AtomCard from '../atoms/AtomCard.vue';
import AtomInput from '../atoms/AtomInput.vue';
import AtomCurrencyInput from '../atoms/AtomCurrencyInput.vue';
import AtomPercentInput from '../atoms/AtomPercentInput.vue';
-import AtomFactorInput from '../atoms/AtomFactorInput.vue';
import OrganismAuthWrapper from '../organisms/OrganismAuthWrapper.vue';
import MoleculeImportDataModal from '../molecules/MoleculeImportDataModal.vue';
import MoleculeErrorModal from '../molecules/MoleculeErrorModal.vue';
@@ -260,7 +264,7 @@ const verifySeedCapitalModal = ref
>();
const errorModal = ref>();
const minWage = ref();
const incomeTax = ref();
-const maxWageFactor = ref();
+const maxWage = ref();
const incomeTaxRecipient = ref();
const radioUrl = ref();
const settings = ref();
@@ -293,7 +297,6 @@ async function importAccounts(file: File): Promise {
grade: grade.trim(),
company: company?.id,
shift: Shifts.NONE,
- wageFactor: 1,
}));
}
if(errors.length) {
@@ -382,18 +385,18 @@ onMounted(async () => {
settings.value = await SettingsService.getSettings();
minWage.value = settings.value.minWage / 100;
incomeTax.value = settings.value.incomeTax;
- maxWageFactor.value = settings.value.maxWageFactor;
+ maxWage.value = settings.value.maxWage / 100;
incomeTaxRecipient.value = settings.value.incomeTaxRecipient;
radioUrl.value = settings.value.radioUrl;
serverTime.value = await DateService.getServerTime();
});
async function saveSettings() {
- if(minWage.value && incomeTax.value && maxWageFactor.value && incomeTaxRecipient.value && radioUrl.value) {
+ if(minWage.value && incomeTax.value && maxWage.value && incomeTaxRecipient.value && radioUrl.value) {
settings.value = await SettingsService.setSettings({
minWage: minWage.value,
incomeTax: incomeTax.value,
- maxWageFactor: maxWageFactor.value,
+ maxWage: maxWage.value,
incomeTaxRecipient: incomeTaxRecipient.value,
radioUrl: radioUrl.value,
});
diff --git a/webapp/src/index.css b/webapp/src/index.css
index bd6213e..079126d 100644
--- a/webapp/src/index.css
+++ b/webapp/src/index.css
@@ -1,3 +1,12 @@
@tailwind base;
@tailwind components;
-@tailwind utilities;
\ No newline at end of file
+@tailwind utilities;
+
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+ -webkit-appearance: none;
+ margin: 0;
+}
+input[type=number] {
+ -moz-appearance: textfield;
+}
\ No newline at end of file
diff --git a/webapp/src/services/account.service.ts b/webapp/src/services/account.service.ts
index 4128396..bc45e85 100644
--- a/webapp/src/services/account.service.ts
+++ b/webapp/src/services/account.service.ts
@@ -30,8 +30,8 @@ export class AccountService {
public static async updateShift(accountId: string, shift: string): Promise {
return COLLECTION.update(accountId, { shift });
}
- public static async updateWage(accountId: string, wageFactor: number): Promise {
- return COLLECTION.update(accountId, { wageFactor });
+ public static async updateWage(accountId: string, wage: number): Promise {
+ return COLLECTION.update(accountId, { wage: wage * 100 });
}
public static async getMissingStudents(): Promise {
return ((await COLLECTION.getFullList()).filter(
diff --git a/webapp/src/services/company.service.ts b/webapp/src/services/company.service.ts
index 00e73ed..e4c46eb 100644
--- a/webapp/src/services/company.service.ts
+++ b/webapp/src/services/company.service.ts
@@ -63,7 +63,7 @@ export class CompanyService {
const settings = await SettingsService.getSettings();
const balance = (await BankService.getCompanyTransactions(company.id)).reduce((acc, transaction) => acc + transaction.amount, 0);
const accounts = (await AccountService.getAccountsByCompanyId(company.id)).filter(account => account.shift == shift);
- const totalWages = accounts.reduce((acc, account) => acc + account.wageFactor * (settings.minWage), 0);
+ const totalWages = accounts.reduce((acc, account) => acc + account.wage, 0);
let taxes = 0;
if(balance >= totalWages) {
await BankService.addTransaction(company.id, -totalWages / 100, `Lohn für ${shift}`, AccountType.COMPANY);
@@ -71,10 +71,10 @@ export class CompanyService {
accounts.forEach(async account => {
promises.push(BankService.addTransaction(
account.id,
- (((account.wageFactor * settings.minWage) * (1 - (settings.incomeTax / 100)))) / 100,
+ ((account.wage * (1 - (settings.incomeTax / 100)))) / 100,
`Lohn für ${shift} bei ${company.name}`,
));
- taxes += (account.wageFactor * settings.minWage) * (settings.incomeTax / 100);
+ taxes += account.wage * (settings.incomeTax / 100);
});
await Promise.all(promises);
await BankService.addTransaction(settings.incomeTaxRecipient,
diff --git a/webapp/src/services/date.service.ts b/webapp/src/services/date.service.ts
index 93a67a8..a741b73 100644
--- a/webapp/src/services/date.service.ts
+++ b/webapp/src/services/date.service.ts
@@ -29,7 +29,6 @@ export class DateService {
}
public static isToday(date: Date): boolean {
this.getServerTime();
- console.log('isToday', date, serverTime);
if(!serverTime) { return false; }
return date.getDate() === serverTime.getDate() &&
date.getMonth() === serverTime.getMonth() &&
diff --git a/webapp/src/services/settings.service.ts b/webapp/src/services/settings.service.ts
index a42acde..a6f4192 100644
--- a/webapp/src/services/settings.service.ts
+++ b/webapp/src/services/settings.service.ts
@@ -9,6 +9,7 @@ export class SettingsService {
}
public static async setSettings(settings: SettingsRecord): Promise {
settings.minWage = settings.minWage * 100;
+ settings.maxWage = settings.maxWage * 100;
// TODO: Enforce maxWageFactor to all account records
return COLLECTION.create(settings);
}
diff --git a/webapp/src/types/pocketbase.types.ts b/webapp/src/types/pocketbase.types.ts
index 331836c..59c0584 100644
--- a/webapp/src/types/pocketbase.types.ts
+++ b/webapp/src/types/pocketbase.types.ts
@@ -43,7 +43,7 @@ export type AccountsRecord = {
lastCheckIn?: IsoDateString
company?: RecordIdString
shift: string
- wageFactor: number
+ wage?: number
}
export type AccountsListRecord = {
@@ -71,7 +71,7 @@ export type SettingsRecord = {
minWage: number
incomeTax: number
incomeTaxRecipient: RecordIdString
- maxWageFactor: number
+ maxWage: number
radioUrl: string
}