corrected some typos

pull/14/head
leonnicolas 4 years ago
parent e1e2302a1a
commit b3877664b9
No known key found for this signature in database
GPG Key ID: 088D0743E2B65C07

@ -15,7 +15,7 @@ import { Equipment } from './model/Equipment';
import { LendingStation } from './model/LendingStation'; import { LendingStation } from './model/LendingStation';
import { TimeFrame } from './model/TimeFrame'; import { TimeFrame } from './model/TimeFrame';
import { Participant } from './model/Participant'; import { Participant } from './model/Participant';
import { Organization } from './model/Organization'; import { Organisation } from './model/Organisation';
import { Provider } from './model/Provider'; import { Provider } from './model/Provider';
import { Engagement } from './model/Engagement'; import { Engagement } from './model/Engagement';
import { Workshop } from './model/Workshop'; import { Workshop } from './model/Workshop';
@ -69,7 +69,7 @@ createConnection({
Equipment, Equipment,
LendingStation, LendingStation,
TimeFrame, TimeFrame,
Organization, Organisation,
Participant, Participant,
Provider, Provider,
Engagement, Engagement,

@ -32,7 +32,7 @@ export class Engagement {
roleCoordinator: boolean; roleCoordinator: boolean;
@Column() @Column()
roleEmployeADFC: boolean; roleEmployeeADFC: boolean;
@Column() @Column()
roleMentor: boolean; roleMentor: boolean;

@ -14,15 +14,15 @@ export class InsuranceData {
noPnP: string; noPnP: string;
@Column() @Column()
maintananceResponsible: string; maintenanceResponsible: string;
@Column() @Column()
maintananceBenefactor: string; maintenanceBenefactor: string;
@Column({ @Column({
nullable: true nullable: true
}) })
maintananceAgreement: string; maintenanceAgreement: string;
@Column({ @Column({
nullable: true nullable: true

@ -1,7 +1,7 @@
import { Entity, PrimaryGeneratedColumn, Column, ManyToMany, JoinTable, OneToMany, ManyToOne } from 'typeorm'; import { Entity, PrimaryGeneratedColumn, Column, ManyToMany, JoinTable, OneToMany, ManyToOne } from 'typeorm';
import { TimeFrame } from './TimeFrame'; import { TimeFrame } from './TimeFrame';
import { CargoBike } from './CargoBike'; import { CargoBike } from './CargoBike';
import { Organization } from './Organization'; import { Organisation } from './Organisation';
import { Address } from './Provider'; import { Address } from './Provider';
import { ContactPerson } from './ContactPerson'; import { ContactPerson } from './ContactPerson';
@ -46,6 +46,6 @@ export class LendingStation {
}) })
cargoBikes: CargoBike[]; cargoBikes: CargoBike[];
@ManyToOne(type => Organization, organization => organization.lendingStations) @ManyToOne(type => Organisation, organization => organization.lendingStations)
organization: Organization; organization: Organisation;
} }

@ -3,7 +3,7 @@ import { LendingStation } from './LendingStation';
import { Address, Provider } from './Provider'; import { Address, Provider } from './Provider';
@Entity() @Entity()
export class Organization { export class Organisation {
@PrimaryGeneratedColumn() @PrimaryGeneratedColumn()
id: number; id: number;
@ -19,7 +19,7 @@ export class Organization {
@Column({ @Column({
nullable: true nullable: true
}) })
registerdAt: string; registeredAt: string;
@Column({ @Column({
nullable: true nullable: true

@ -5,7 +5,7 @@ import { CargoBike } from './CargoBike';
import { ContactInformation } from './ContactInformation'; import { ContactInformation } from './ContactInformation';
import { ContactPerson } from './ContactPerson'; import { ContactPerson } from './ContactPerson';
import { LendingStation } from './LendingStation'; import { LendingStation } from './LendingStation';
import { Organization } from './Organization'; import { Organisation } from './Organisation';
export class Address { export class Address {
@Column() @Column()
@ -31,7 +31,7 @@ export class Provider {
@Column({ @Column({
nullable: false nullable: false
}) })
formularName: String; formName: String;
@OneToMany(type => ContactPerson, contactPerson => contactPerson.provider, { @OneToMany(type => ContactPerson, contactPerson => contactPerson.provider, {
nullable: true nullable: true
@ -44,8 +44,8 @@ export class Provider {
@Column() @Column()
isPrivatePerson: boolean; isPrivatePerson: boolean;
@OneToOne(type => Organization, organization => organization.provider, { @OneToOne(type => Organisation, organization => organization.provider, {
nullable: true nullable: true
}) })
organization: Organization; organization: Organisation;
} }

@ -20,15 +20,15 @@ type CargoBike {
numberOfChildren: Int! numberOfChildren: Int!
""" """
Safety is a custom type, that stores information about security features. Safety is a custom type, that stores information about security features.
TODO: Should this be calles Security? TODO: Should this be called Security?
""" """
security: Security! security: Security!
""" """
Does not refere to an extra table in the database. Does not refer to an extra table in the database.
""" """
technicalEquipment: TechnicalEquipment technicalEquipment: TechnicalEquipment
""" """
Does not refere to an extra table in the database. Does not refer to an extra table in the database.
""" """
dimensionsAndLoad: DimensionsAndLoad! dimensionsAndLoad: DimensionsAndLoad!
bikeEvents: [BikeEvent] bikeEvents: [BikeEvent]
@ -62,15 +62,15 @@ input CargoBikeCreateInput {
numberOfChildren: Int! numberOfChildren: Int!
""" """
Safety is a custom type, that stores information about security features. Safety is a custom type, that stores information about security features.
TODO: Should this be calles Security? TODO: Should this be called Security?
""" """
security: SecurityCreateInput! security: SecurityCreateInput!
""" """
Does not refere to an extra table in the database. Does not refer to an extra table in the database.
""" """
technicalEquipment: TechnicalEquipmentCreateInput! technicalEquipment: TechnicalEquipmentCreateInput!
""" """
Does not refere to an extra table in the database. Does not refer to an extra table in the database.
""" """
dimensionsAndLoad: DimensionsAndLoadCreateInput! dimensionsAndLoad: DimensionsAndLoadCreateInput!
"Refers to equipment that is not unique. See kommentierte info tabelle -> Fragen -> Frage 2" "Refers to equipment that is not unique. See kommentierte info tabelle -> Fragen -> Frage 2"
@ -97,15 +97,15 @@ input CargoBikeUpdateInput {
numberOfChildren: Int numberOfChildren: Int
""" """
Safety is a custom type, that stores information about security features. Safety is a custom type, that stores information about security features.
TODO: Should this be calles Security? TODO: Should this be called Security?
""" """
security: SecurityUpdateInput security: SecurityUpdateInput
""" """
Does not refere to an extra table in the database. Does not refer to an extra table in the database.
""" """
technicalEquipment: TechnicalEquipmentUpdateInput technicalEquipment: TechnicalEquipmentUpdateInput
""" """
Does not refere to an extra table in the database. Does not refer to an extra table in the database.
""" """
dimensionsAndLoad: DimensionsAndLoadUpdateInput dimensionsAndLoad: DimensionsAndLoadUpdateInput
"Refers to equipment that is not unique. See kommentierte info tabelle -> Fragen -> Frage 2" "Refers to equipment that is not unique. See kommentierte info tabelle -> Fragen -> Frage 2"
@ -123,16 +123,16 @@ input CargoBikeUpdateInput {
type InsuranceData { type InsuranceData {
""" """
Eventuelly, this field will become an enum or a seperate data table and user can choose from a pool of insurance companies. Eventuelly, this field will become an enum or a separate data table and user can choose from a pool of insurance companies.
""" """
name: String! name: String!
benefactor: String! benefactor: String!
billing: String! billing: String!
noPnP: String! noPnP: String!
"eg. Anbieter, flotte, eigenleistung" "eg. Anbieter, flotte, eigenleistung"
maintananceResponsible: String! maintenanceResponsible: String!
maintananceBenefactor: String! maintenanceBenefactor: String!
maintananceAgreement: String maintenanceAgreement: String
hasFixedRate: Boolean! hasFixedRate: Boolean!
fixedRate: Float fixedRate: Float
"Projektzuschuss" "Projektzuschuss"
@ -142,16 +142,16 @@ type InsuranceData {
input InsuranceDataCreateInput { input InsuranceDataCreateInput {
""" """
Eventuelly, this field will become an enum or a seperate data table and user can choose from a pool of insurance companies. Eventually, this field will become an enum or a separate data table and user can choose from a pool of insurance companies.
""" """
name: String! name: String!
benefactor: String! benefactor: String!
billing: String! billing: String!
noPnP: String! noPnP: String!
"eg. Anbieter, flotte, eigenleistung" "eg. Anbieter, flotte, eigenleistung"
maintananceResponsible: String! maintenanceResponsible: String!
maintananceBenefactor: String! maintenanceBenefactor: String!
maintananceAgreement: String maintenanceAgreement: String
hasFixedRate: Boolean! hasFixedRate: Boolean!
fixedRate: Float fixedRate: Float
"Projektzuschuss" "Projektzuschuss"
@ -161,16 +161,16 @@ input InsuranceDataCreateInput {
input InsuranceDataUpdateInput { input InsuranceDataUpdateInput {
""" """
Eventuelly, this field will become an enum or a seperate data table and user can choose from a pool of insurance companies. Eventually, this field will become an enum or a separate data table and user can choose from a pool of insurance companies.
""" """
name: String name: String
benefactor: String benefactor: String
billing: String billing: String
noPnP: String noPnP: String
"eg. Anbieter, flotte, eigenleistung" "eg. Anbieter, flotte, eigenleistung"
maintananceResponsible: String maintenanceResponsible: String
maintananceBenefactor: String maintenanceBenefactor: String
maintananceAgreement: String maintenanceAgreement: String
hasFixedRate: Boolean hasFixedRate: Boolean
fixedRate: Float fixedRate: Float
"Projektzuschuss" "Projektzuschuss"
@ -211,14 +211,7 @@ type Participant {
memberADFC: Boolean! memberADFC: Boolean!
locationZIPs: [String] locationZIPs: [String]
memberCoreTeam: Boolean! memberCoreTeam: Boolean!
roleCoordinator: Boolean!
roleEmployeADFC: Boolean!
"""
Wahr, wenn die Person Pate ist.
"""
roleMentor: Boolean!
roleAmbulance: Boolean!
roleBringer: Boolean!
"Date of workshop to become Mentor dt. Pate" "Date of workshop to become Mentor dt. Pate"
workshopMentor: Date workshopMentor: Date
"Date of last Erste Hilfe Kurs?" "Date of last Erste Hilfe Kurs?"
@ -261,7 +254,7 @@ type Engagement {
participant: Participant participant: Participant
cargoBike: CargoBike cargoBike: CargoBike
roleCoordinator: Boolean! roleCoordinator: Boolean!
roleEmployeADFC: Boolean! roleEmployeeADFC: Boolean!
""" """
Wahr, wenn die Person Pate ist. Wahr, wenn die Person Pate ist.
""" """
@ -276,7 +269,7 @@ input EngagementCreateInput {
participantId: ID! participantId: ID!
cargoBikeId: ID! cargoBikeId: ID!
roleCoordinator: Boolean! roleCoordinator: Boolean!
roleEmployeADFC: Boolean! roleEmployeeADFC: Boolean!
""" """
Wahr, wenn die Person Pate ist. Wahr, wenn die Person Pate ist.
""" """
@ -506,10 +499,10 @@ enum StickerBikeNameState {
UNKNOWN UNKNOWN
} }
"(dt. Anbieter) bezieht sich auf die Benziehung einer Person oder Organisation zum Lastenrad" "(dt. Anbieter) bezieht sich auf die Beziehung einer Person oder Organisation zum Lastenrad"
type Provider { type Provider {
id: ID! id: ID!
formularName: String formName: String
contactPersons: [ContactInformation]! contactPersons: [ContactInformation]!
isPrivatePerson: Boolean! isPrivatePerson: Boolean!
organisation: Organisation organisation: Organisation
@ -518,7 +511,7 @@ type Provider {
"(dt. Anbieter)" "(dt. Anbieter)"
input ProviderCreateInput { input ProviderCreateInput {
formularName: String! formName: String!
"i think it makes more sense to create Provider and then add new ContactPersons" "i think it makes more sense to create Provider and then add new ContactPersons"
contactPersonIds: [ID]! contactPersonIds: [ID]!
isPrivatePerson: Boolean! isPrivatePerson: Boolean!
@ -595,7 +588,7 @@ type Organisation {
"If Club, at what court registered" "If Club, at what court registered"
registeredAt: String registeredAt: String
provider: Provider provider: Provider
otherdata: String otherData: String
} }
"(dt. Standort)" "(dt. Standort)"
@ -607,7 +600,7 @@ type LendingStation {
timeFrames: [TimeFrame]! timeFrames: [TimeFrame]!
loanPeriods: LoanPeriods loanPeriods: LoanPeriods
cargoBikes: [CargoBike] cargoBikes: [CargoBike]
"Totola Amount of cargoBikes currently assigned to the lending station" "Total amount of cargoBikes currently assigned to the lending station"
numCargoBikes: Int! numCargoBikes: Int!
} }
@ -662,7 +655,7 @@ type TimeFrame {
id: ID! id: ID!
"format YYYY-MM-dd" "format YYYY-MM-dd"
from: Date! from: Date!
"formmat YYYY-MM-dd" "format YYYY-MM-dd"
to: Date to: Date
note: String note: String
lendingStation: LendingStation! lendingStation: LendingStation!
@ -706,7 +699,7 @@ input AddressUpdateInput {
} }
type Query { type Query {
"Will (evetually) return all properties of cargo bike" "Will (eventually) return all properties of cargo bike"
cargoBikeById(id:ID!): CargoBike cargoBikeById(id:ID!): CargoBike
"returns cargoBikes ordered by name ascending, relations are not loaded, use cargoBikeById instead" "returns cargoBikes ordered by name ascending, relations are not loaded, use cargoBikeById instead"
cargoBikes(offset: Int!, limit: Int!): [CargoBike]! cargoBikes(offset: Int!, limit: Int!): [CargoBike]!
@ -717,7 +710,7 @@ type Query {
"equipment by id, will return null if id not found" "equipment by id, will return null if id not found"
equipmentById(id: ID!): Equipment equipmentById(id: ID!): Equipment
providers(offset: Int!, limit: Int!): [Provider]! providers(offset: Int!, limit: Int!): [Provider]!
"particcipant by id" "participant by id"
participantById(id:ID!): Participant participantById(id:ID!): Participant
"p" "p"
participants(offset: Int!, limit: Int!): [ Participant]! participants(offset: Int!, limit: Int!): [ Participant]!
@ -742,14 +735,14 @@ type Mutation {
createEquipment(equipment: EquipmentCreateInput!): Equipment! createEquipment(equipment: EquipmentCreateInput!): Equipment!
"lock equipment returns true if bike is not locked or if it doesnt exist" "lock equipment returns true if bike is not locked or if it doesnt exist"
lockEquipmentById(id: ID!): Equipment! lockEquipmentById(id: ID!): Equipment!
"unlock Equopment, returns true if Bike does not exist" "unlock Equipment, returns true if Bike does not exist"
unlockEquipment(id: ID!): Boolean! unlockEquipment(id: ID!): Boolean!
"update Equipment, returns updated equipment. CargoBike will be null, if cargoBikeId is not set. Pass null for cargoBikeIs to delete the relation" "update Equipment, returns updated equipment. CargoBike will be null, if cargoBikeId is not set. Pass null for cargoBikeIs to delete the relation"
updateEquipment(equipment: EquipmentUpdateInput!): Equipment! updateEquipment(equipment: EquipmentUpdateInput!): Equipment!
"creates new lendingStation and returns lendingStation with new ID" "creates new lendingStation and returns lendingStation with new ID"
createLendingStation(lendingStation: LendingStationCreateInput): LendingStation! createLendingStation(lendingStation: LendingStationCreateInput): LendingStation!
"updates lendingStation of given ID with supplied fields and returns updated lendingStation" "updates lendingStation of given ID with supplied fields and returns updated lendingStation"
updateLendingStation(lendingstation: LendingStationUpdateInput!): LendingStation! updateLendingStation(lendingStation: LendingStationUpdateInput!): LendingStation!
createTimeFrame(timeFrame: TimeFrameCreateInput!): TimeFrame! createTimeFrame(timeFrame: TimeFrameCreateInput!): TimeFrame!
"creates new BikeEvent" "creates new BikeEvent"
createBikeEvent(bikeEvent: BikeEventCreateInput): BikeEvent! createBikeEvent(bikeEvent: BikeEventCreateInput): BikeEvent!
@ -759,7 +752,7 @@ type Mutation {
createContactInformation(contactInformation: ContactInformationCreateInput!): ContactInformation! createContactInformation(contactInformation: ContactInformationCreateInput!): ContactInformation!
"create Engagement" "create Engagement"
createEngagement(engagement: EngagementCreateInput): Engagement! createEngagement(engagement: EngagementCreateInput): Engagement!
"createContacPerson ,return null if contactInformationId does not exist" "createContactPerson ,return null if contactInformationId does not exist"
createContactPerson(contactPerson: ContactPersonCreateInput): ContactPerson createContactPerson(contactPerson: ContactPersonCreateInput): ContactPerson
updateContactPerson(contactPerson: ContactPersonUpdateInput): ContactPerson updateContactPerson(contactPerson: ContactPersonUpdateInput): ContactPerson
"create Provider, if cargoBikeIds or contactPersonIds are not valid, provider will still be created" "create Provider, if cargoBikeIds or contactPersonIds are not valid, provider will still be created"

Loading…
Cancel
Save