From 1e0e6e24b97c7929b52d40496b13d2458aa79a3e Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Jun 2022 21:46:18 +0200 Subject: [PATCH 1/5] locales link german, english navbar --- frontend/src/components/Auth/AuthNavbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Auth/AuthNavbar.vue b/frontend/src/components/Auth/AuthNavbar.vue index 7b3eed0e3..8063dd330 100644 --- a/frontend/src/components/Auth/AuthNavbar.vue +++ b/frontend/src/components/Auth/AuthNavbar.vue @@ -20,7 +20,7 @@ - + {{ $t('auth.navbar.aboutGradido') }} {{ $t('signup') }} From e76817ebdbde036eaad068743d1edff60d704819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= Date: Thu, 9 Jun 2022 22:55:52 +0200 Subject: [PATCH 2/5] column validFrom NOT NULL --- database/migrations/0037-add_contribution_links_table.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/0037-add_contribution_links_table.ts b/database/migrations/0037-add_contribution_links_table.ts index 4d3527ef5..e05bfd5e7 100644 --- a/database/migrations/0037-add_contribution_links_table.ts +++ b/database/migrations/0037-add_contribution_links_table.ts @@ -12,7 +12,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT, \`name\` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, \`decsription\` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - \`valid_from\` datetime NULL, + \`valid_from\` datetime NOT NULL, \`valid_to\` datetime NULL, \`amount\` bigint(20) NOT NULL, \`cycle\` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'ONCE', From 94a48173e0f023b5b1f371678572ef293e5ae52f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= Date: Thu, 9 Jun 2022 23:20:05 +0200 Subject: [PATCH 3/5] remove *.bak files from repo Merge remote-tracking branch 'origin/1920-feature-create-contribution-link-table' into 1920-feature-create-contribution-link-table --- .dbeaver/.credentials-config.json.bak | 2 -- .dbeaver/.data-sources.json.bak | 33 --------------------------- 2 files changed, 35 deletions(-) delete mode 100644 .dbeaver/.credentials-config.json.bak delete mode 100644 .dbeaver/.data-sources.json.bak diff --git a/.dbeaver/.credentials-config.json.bak b/.dbeaver/.credentials-config.json.bak deleted file mode 100644 index 2eca1988d..000000000 --- a/.dbeaver/.credentials-config.json.bak +++ /dev/null @@ -1,2 +0,0 @@ -'U[V$8%kQN, -`W-T3NvU{ɆHK~,DXpX.g/:?B9|GZn>/ \ No newline at end of file diff --git a/.dbeaver/.data-sources.json.bak b/.dbeaver/.data-sources.json.bak deleted file mode 100644 index 7d9528f01..000000000 --- a/.dbeaver/.data-sources.json.bak +++ /dev/null @@ -1,33 +0,0 @@ -{ - "folders": {}, - "connections": { - "mariaDB-1813fbbc7bc-107c0b3aeaeb91ab": { - "provider": "mysql", - "driver": "mariaDB", - "name": "gradido", - "save-password": true, - "read-only": false, - "configuration": { - "host": "localhost", - "port": "3306", - "database": "gradido", - "url": "jdbc:mariadb://localhost:3306/gradido", - "home": "mysql_client", - "type": "dev", - "auth-model": "native", - "handlers": {} - } - } - }, - "connection-types": { - "dev": { - "name": "Development", - "color": "255,255,255", - "description": "Regular development database", - "auto-commit": true, - "confirm-execute": false, - "confirm-data-change": false, - "auto-close-transactions": false - } - } -} \ No newline at end of file From d7ff6446d994735e1468b18979943099fd4ecc00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= Date: Thu, 9 Jun 2022 23:52:40 +0200 Subject: [PATCH 4/5] evaluate nullable columns vs entity --- .../ContributionLinks.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/database/entity/0037-add_contribution_links_table/ContributionLinks.ts b/database/entity/0037-add_contribution_links_table/ContributionLinks.ts index 16500b06b..7b391606f 100644 --- a/database/entity/0037-add_contribution_links_table/ContributionLinks.ts +++ b/database/entity/0037-add_contribution_links_table/ContributionLinks.ts @@ -11,10 +11,10 @@ export class ContributionLinks extends BaseEntity { name: string @Column({ length: 255, nullable: false, collation: 'utf8mb4_unicode_ci' }) - description: string + memo: string - @Column({ name: 'valid_from', type: 'datetime', nullable: true, default: null }) - validFrom: Date | null + @Column({ name: 'valid_from', type: 'datetime', nullable: false }) + validFrom: Date @Column({ name: 'valid_to', type: 'datetime', nullable: true, default: null }) validTo: Date | null @@ -43,7 +43,7 @@ export class ContributionLinks extends BaseEntity { default: null, transformer: DecimalTransformer, }) - maxAmountPerMonth: Decimal + maxAmountPerMonth: Decimal | null @Column({ name: 'total_max_count_of_contribution', @@ -62,7 +62,7 @@ export class ContributionLinks extends BaseEntity { default: null, transformer: DecimalTransformer, }) - maxAccountBalance: Decimal + maxAccountBalance: Decimal | null @Column({ name: 'min_gap_hours', @@ -79,7 +79,7 @@ export class ContributionLinks extends BaseEntity { deletedAt: Date | null @Column({ length: 24, nullable: true, collation: 'utf8mb4_unicode_ci' }) - code: string + code: string | null @Column({ name: 'link_enabled', type: 'boolean', default: true }) linkEnabled: boolean From 8a0147c8117f38d23f3c02b29ff0bf81858370b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= Date: Thu, 9 Jun 2022 23:54:06 +0200 Subject: [PATCH 5/5] shift enum in ticket #1921 --- .../src/graphql/enum/ContributionCycleType.ts | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 backend/src/graphql/enum/ContributionCycleType.ts diff --git a/backend/src/graphql/enum/ContributionCycleType.ts b/backend/src/graphql/enum/ContributionCycleType.ts deleted file mode 100644 index 5fe494a02..000000000 --- a/backend/src/graphql/enum/ContributionCycleType.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { registerEnumType } from 'type-graphql' - -export enum ContributionCycleType { - ONCE = 'once', - HOUR = 'hour', - TWO_HOURS = 'two_hours', - FOUR_HOURS = 'four_hours', - EIGHT_HOURS = 'eight_hours', - HALF_DAY = 'half_day', - DAY = 'day', - TWO_DAYS = 'two_days', - THREE_DAYS = 'three_days', - FOUR_DAYS = 'four_days', - FIVE_DAYS = 'five_days', - SIX_DAYS = 'six_days', - WEEK = 'week', - TWO_WEEKS = 'two_weeks', - MONTH = 'month', - TWO_MONTH = 'two_month', - QUARTER = 'quarter', - HALF_YEAR = 'half_year', - YEAR = 'year', -} - -registerEnumType(ContributionCycleType, { - name: 'ContributionCycleType', // this one is mandatory - description: 'Name of the Type of the ContributionCycle', // this one is optional -})