diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3c1b123..6bb73a5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Maven uses: stCarolas/setup-maven@v5 with: - maven-version: 3.9.6 + maven-version: 3.9.8 - name: Maven version run: mvn -version - name: Build with Maven diff --git a/src/main/frontend/src/app/component/expense/add-expense/add-expense.component.html b/src/main/frontend/src/app/component/expense/add-expense/add-expense.component.html index 878c20d..acee1f2 100644 --- a/src/main/frontend/src/app/component/expense/add-expense/add-expense.component.html +++ b/src/main/frontend/src/app/component/expense/add-expense/add-expense.component.html @@ -31,7 +31,7 @@

{{ editMode ? 'Edytowanie wydatku' : 'Dodawanie wydatku' }} id="amount" matInput (blur)="sanitizeInput(amountField.value)" - type="text"> + type="number"> @if (form.controls['amount'].errors?.['invalidAmount']) { Kwota w formacie xxx.xx } diff --git a/src/main/frontend/src/app/component/expense/add-expense/add-expense.component.scss b/src/main/frontend/src/app/component/expense/add-expense/add-expense.component.scss index cf56f62..89469db 100644 --- a/src/main/frontend/src/app/component/expense/add-expense/add-expense.component.scss +++ b/src/main/frontend/src/app/component/expense/add-expense/add-expense.component.scss @@ -75,4 +75,15 @@ .warning-text { color: red; font-size: 11px; +} + +//chowanie strzaƂeczek od inputu +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/src/main/resources/data.sql b/src/main/resources/data.sql index 09ab473..4c62d45 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -1,19 +1,16 @@ -INSERT INTO komornik.users (id, avatar, mail, username, password, is_verified) -VALUES (1, null, 'a@a.pl', 'a', '$2a$10$rgTJrdROc5a0MJiTmSU8qewdi6Ro2elGZf6Rmuc5/rl6nam3P3z.S', true), - (2, null, 'aa@aa.pl', 'aa', '$2a$10$rgTJrdROc5a0MJiTmSU8qewdi6Ro2elGZf6Rmuc5/rl6nam3P3z.S', true), - (3, null, 'aaa@a.pl', 'aaa', '$2a$10$rgTJrdROc5a0MJiTmSU8qewdi6Ro2elGZf6Rmuc5/rl6nam3P3z.S', true), - (4, null, 'aaaa@a.pl', 'aaaa', '$2a$10$rgTJrdROc5a0MJiTmSU8qewdi6Ro2elGZf6Rmuc5/rl6nam3P3z.S', true); -INSERT INTO komornik.categories (id, category_name) -VALUES (1, 'kategoria'), - (2, 'drugaKategoriaaa'); -INSERT INTO komornik.groups (id, default_currency, description, group_name) -VALUES (1, 'PLN', 'komornik grupa', 'grupa'), - (2, 'PLN', null, 'drugaKategoriaaa'); +INSERT INTO komornik.users (id, avatar, mail, username, password, is_verified, created_date) +VALUES (1, null, 'a@a.pl', 'Janis', '$2a$10$rgTJrdROc5a0MJiTmSU8qewdi6Ro2elGZf6Rmuc5/rl6nam3P3z.S', true, now()), + (2, null, 'aa@aa.pl', 'Misiek', '$2a$10$rgTJrdROc5a0MJiTmSU8qewdi6Ro2elGZf6Rmuc5/rl6nam3P3z.S', true, now()), + (3, null, 'aaa@a.pl', 'Seba', '$2a$10$rgTJrdROc5a0MJiTmSU8qewdi6Ro2elGZf6Rmuc5/rl6nam3P3z.S', true, now()); +INSERT INTO komornik.categories (id, category_name, created_date) +VALUES (1, 'general', now()); +INSERT INTO komornik.groups (id, default_currency, description, group_name, created_date) +VALUES (1, 'PLN', 'dolomity', 'dolomity', now()), + (2, 'PLN', null, 'testowa', now()); INSERT INTO komornik.user_x_group (group_id, user_id) VALUES (1, 1), (1, 2), (1, 3), - (1, 4), (2, 1), (2, 2), (2, 3);