From dbb30369af5ab4eb0ac39a6069d89252c0b13d83 Mon Sep 17 00:00:00 2001 From: leonnicolas Date: Fri, 11 Dec 2020 11:26:33 +0100 Subject: [PATCH] lendingStation: add remarks --- src/model/LendingStation.ts | 11 +++++++++++ src/schema/type-defs.ts | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/src/model/LendingStation.ts b/src/model/LendingStation.ts index 9df1441..24e6c9d 100644 --- a/src/model/LendingStation.ts +++ b/src/model/LendingStation.ts @@ -40,6 +40,12 @@ export class LoanPeriod { }) generalRemark: string; + @Column({ + nullable: true, + type: 'text' + }) + holidays: string; + /** * validity for loanPeriods */ @@ -120,6 +126,11 @@ export class LendingStation implements Lockable { }) organisationId: number; + @Column({ + nullable: true + }) + remark: string; + @Column({ nullable: true, type: 'timestamp' diff --git a/src/schema/type-defs.ts b/src/schema/type-defs.ts index 46a4678..8c2a4a8 100644 --- a/src/schema/type-defs.ts +++ b/src/schema/type-defs.ts @@ -876,6 +876,7 @@ export default gql` "Total amount of cargoBikes currently assigned to the lending station" numCargoBikes: Int! organisation: Organisation + remark: String isLocked: Boolean! isLockedByMe: Boolean! "null if not locked by other user" @@ -893,6 +894,7 @@ export default gql` address: AddressCreateInput! loanPeriod: LoanPeriodInput organisationId: ID + remark: String } """ @@ -906,6 +908,7 @@ export default gql` address: AddressUpdateInput loanPeriod: LoanPeriodInput organisationId: ID + remark: String keepLock: Boolean } @@ -914,6 +917,7 @@ export default gql` """ type LoanPeriod { generalRemark: String + holidays: String mo: String tu: String we: String @@ -928,6 +932,7 @@ export default gql` """ input LoanPeriodInput { generalRemark: String + holidays: String mo: String tu: String we: String