From c4214f20d40b123ab1e2ea9e03bbfe0bcd6e1d38 Mon Sep 17 00:00:00 2001 From: Max Ehrlicher-Schmidt Date: Mon, 30 Nov 2020 15:25:00 +0100 Subject: [PATCH] Update schema --- .../fragments/engagement.graphql | 6 +- .../table-overview.component.html | 34 ++-- .../table-overview.component.scss | 12 +- src/generated/graphql.schema.json | 152 +++++------------- src/generated/graphql.ts | 43 +++-- 5 files changed, 87 insertions(+), 160 deletions(-) diff --git a/src/app/graphqlOperations/fragments/engagement.graphql b/src/app/graphqlOperations/fragments/engagement.graphql index ba879ab..6f96b75 100644 --- a/src/app/graphqlOperations/fragments/engagement.graphql +++ b/src/app/graphqlOperations/fragments/engagement.graphql @@ -3,8 +3,10 @@ fragment EngagementFieldsForBikePage on Engagement { engagementType { ...EngagementTypeFields } - from - to + dateRange { + from + to + } participant { ...ParticipantFieldsForBikePage } diff --git a/src/app/pages/table-overview/table-overview.component.html b/src/app/pages/table-overview/table-overview.component.html index 31235fc..f400e59 100644 --- a/src/app/pages/table-overview/table-overview.component.html +++ b/src/app/pages/table-overview/table-overview.component.html @@ -2,25 +2,25 @@
- Lastenräder - Beteiligte - Ausleihstationen - Tabelle 4 + Lastenräder + Beteiligte + Standorte + Tabelle 4
- - Equipmenttypen - Equipment - Tabelle 8 - Tabelle 9 - Tabelle 10 - Tabelle 11 - Tabelle 12 - Tabelle 13 - Tabelle 14 - Tabelle 15 - Tabelle 16 - Tabelle 17 + + Equipmenttypen + Equipment + Zeitscheiben + Tabelle 9 + Tabelle 10 + Tabelle 11 + Tabelle 12 + Tabelle 13 + Tabelle 14 + Tabelle 15 + Tabelle 16 + Tabelle 17
diff --git a/src/app/pages/table-overview/table-overview.component.scss b/src/app/pages/table-overview/table-overview.component.scss index c42a930..76d2043 100644 --- a/src/app/pages/table-overview/table-overview.component.scss +++ b/src/app/pages/table-overview/table-overview.component.scss @@ -1,12 +1,12 @@ mat-grid-tile { - background: gray; - cursor: pointer; - } + cursor: pointer; + background: grey; +} -.grid-list-spacer{ +.grid-list-spacer { margin: 15px; } -.big-list{ +.big-list { margin-bottom: 30px; -} \ No newline at end of file +} diff --git a/src/generated/graphql.schema.json b/src/generated/graphql.schema.json index 29fd6be..66a4b45 100644 --- a/src/generated/graphql.schema.json +++ b/src/generated/graphql.schema.json @@ -153,13 +153,9 @@ "description": null, "args": [], "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "Int", - "ofType": null - } + "kind": "SCALAR", + "name": "Int", + "ofType": null }, "isDeprecated": false, "deprecationReason": null @@ -169,13 +165,9 @@ "description": "Safety is a custom type, that stores information about security features.\nTODO: Should this be called Security?", "args": [], "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "OBJECT", - "name": "Security", - "ofType": null - } + "kind": "OBJECT", + "name": "Security", + "ofType": null }, "isDeprecated": false, "deprecationReason": null @@ -630,13 +622,9 @@ "name": "modelName", "description": null, "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "String", - "ofType": null - } + "kind": "SCALAR", + "name": "String", + "ofType": null }, "defaultValue": null }, @@ -644,13 +632,9 @@ "name": "numberOfWheels", "description": null, "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "Int", - "ofType": null - } + "kind": "SCALAR", + "name": "Int", + "ofType": null }, "defaultValue": null }, @@ -658,13 +642,9 @@ "name": "forCargo", "description": null, "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "Boolean", - "ofType": null - } + "kind": "SCALAR", + "name": "Boolean", + "ofType": null }, "defaultValue": null }, @@ -672,13 +652,9 @@ "name": "forChildren", "description": null, "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "Boolean", - "ofType": null - } + "kind": "SCALAR", + "name": "Boolean", + "ofType": null }, "defaultValue": null }, @@ -686,13 +662,9 @@ "name": "numberOfChildren", "description": null, "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "Int", - "ofType": null - } + "kind": "SCALAR", + "name": "Int", + "ofType": null }, "defaultValue": null }, @@ -700,13 +672,9 @@ "name": "security", "description": "Safety is a custom type, that stores information about security features.", "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "INPUT_OBJECT", - "name": "SecurityCreateInput", - "ofType": null - } + "kind": "INPUT_OBJECT", + "name": "SecurityCreateInput", + "ofType": null }, "defaultValue": null }, @@ -2085,13 +2053,9 @@ "description": null, "args": [], "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "String", - "ofType": null - } + "kind": "SCALAR", + "name": "String", + "ofType": null }, "isDeprecated": false, "deprecationReason": null @@ -2160,13 +2124,9 @@ "name": "frameNumber", "description": null, "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "String", - "ofType": null - } + "kind": "SCALAR", + "name": "String", + "ofType": null }, "defaultValue": null }, @@ -3666,33 +3626,21 @@ "deprecationReason": null }, { - "name": "from", + "name": "dateRange", "description": null, "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "SCALAR", - "name": "Date", + "kind": "OBJECT", + "name": "DateRange", "ofType": null } }, "isDeprecated": false, "deprecationReason": null }, - { - "name": "to", - "description": null, - "args": [], - "type": { - "kind": "SCALAR", - "name": "Date", - "ofType": null - }, - "isDeprecated": false, - "deprecationReason": null - }, { "name": "participant", "description": null, @@ -3808,21 +3756,11 @@ "defaultValue": null }, { - "name": "from", - "description": "will use CURRENT_DATE if not set", - "type": { - "kind": "SCALAR", - "name": "Date", - "ofType": null - }, - "defaultValue": null - }, - { - "name": "to", - "description": "will use infinit if not set", + "name": "dateRange", + "description": null, "type": { - "kind": "SCALAR", - "name": "Date", + "kind": "INPUT_OBJECT", + "name": "DateRangeInput", "ofType": null }, "defaultValue": null @@ -3891,21 +3829,11 @@ "defaultValue": null }, { - "name": "from", - "description": null, - "type": { - "kind": "SCALAR", - "name": "Date", - "ofType": null - }, - "defaultValue": null - }, - { - "name": "to", + "name": "dateRange", "description": null, "type": { - "kind": "SCALAR", - "name": "Date", + "kind": "INPUT_OBJECT", + "name": "DateRangeInput", "ofType": null }, "defaultValue": null diff --git a/src/generated/graphql.ts b/src/generated/graphql.ts index d6a4957..75bd538 100644 --- a/src/generated/graphql.ts +++ b/src/generated/graphql.ts @@ -43,12 +43,12 @@ export type CargoBike = { numberOfWheels?: Maybe; forCargo?: Maybe; forChildren?: Maybe; - numberOfChildren: Scalars['Int']; + numberOfChildren?: Maybe; /** * Safety is a custom type, that stores information about security features. * TODO: Should this be called Security? */ - security: Security; + security?: Maybe; /** Does not refer to an extra table in the database. */ technicalEquipment?: Maybe; /** Does not refer to an extra table in the database. */ @@ -113,13 +113,13 @@ export type CargoBikeCreateInput = { group: Group; name: Scalars['String']; state?: Maybe; - modelName: Scalars['String']; - numberOfWheels: Scalars['Int']; - forCargo: Scalars['Boolean']; - forChildren: Scalars['Boolean']; - numberOfChildren: Scalars['Int']; + modelName?: Maybe; + numberOfWheels?: Maybe; + forCargo?: Maybe; + forChildren?: Maybe; + numberOfChildren?: Maybe; /** Safety is a custom type, that stores information about security features. */ - security: SecurityCreateInput; + security?: Maybe; /** Does not refer to an extra table in the database. */ technicalEquipment?: Maybe; /** Does not refer to an extra table in the database. */ @@ -356,7 +356,7 @@ export type TechnicalEquipmentUpdateInput = { */ export type Security = { __typename?: 'Security'; - frameNumber: Scalars['String']; + frameNumber?: Maybe; keyNumberFrameLock?: Maybe; keyNumberAXAChain?: Maybe; policeCoding?: Maybe; @@ -364,7 +364,7 @@ export type Security = { }; export type SecurityCreateInput = { - frameNumber: Scalars['String']; + frameNumber?: Maybe; keyNumberFrameLock?: Maybe; keyNumberAXAChain?: Maybe; policeCoding?: Maybe; @@ -547,8 +547,7 @@ export type Engagement = { __typename?: 'Engagement'; id: Scalars['ID']; engagementType: EngagementType; - from: Scalars['Date']; - to?: Maybe; + dateRange: DateRange; participant: Participant; cargoBike: CargoBike; isLocked: Scalars['Boolean']; @@ -560,10 +559,7 @@ export type Engagement = { export type EngagementCreateInput = { engagementTypeId: Scalars['ID']; - /** will use CURRENT_DATE if not set */ - from?: Maybe; - /** will use infinit if not set */ - to?: Maybe; + dateRange?: Maybe; participantId: Scalars['ID']; cargoBikeId: Scalars['ID']; }; @@ -571,8 +567,7 @@ export type EngagementCreateInput = { export type EngagementUpdateInput = { id: Scalars['ID']; engagementTypeId?: Maybe; - from?: Maybe; - to?: Maybe; + dateRange?: Maybe; participantId?: Maybe; cargoBikeId?: Maybe; keepLock?: Maybe; @@ -1961,7 +1956,7 @@ export type DeleteEquipmentTypeMutation = { __typename?: 'Mutation', deleteEquip export type AddressFieldsFragment = { __typename?: 'Address', street: string, number: string, zip: string }; -export type CargoBikeFieldsForTableFragment = { __typename?: 'CargoBike', id: string, group?: Maybe, name: string, modelName?: Maybe, numberOfChildren: number, numberOfWheels?: Maybe, forCargo?: Maybe, forChildren?: Maybe, stickerBikeNameState?: Maybe, note?: Maybe, isLocked: boolean, isLockedByMe: boolean, lockedBy?: Maybe, lockedUntil?: Maybe, insuranceData?: Maybe<{ __typename?: 'InsuranceData', billing?: Maybe, hasFixedRate?: Maybe, name?: Maybe, benefactor?: Maybe, noPnP?: Maybe, maintenanceResponsible?: Maybe, maintenanceBenefactor?: Maybe, maintenanceAgreement?: Maybe, fixedRate?: Maybe, projectAllowance?: Maybe, notes?: Maybe }>, dimensionsAndLoad?: Maybe<{ __typename?: 'DimensionsAndLoad', bikeLength?: Maybe, bikeWeight?: Maybe, bikeHeight?: Maybe, bikeWidth?: Maybe, hasCoverBox?: Maybe, lockable?: Maybe, maxWeightBox?: Maybe, maxWeightLuggageRack?: Maybe, maxWeightTotal?: Maybe, boxHeightRange?: Maybe<{ __typename?: 'NumRange', max?: Maybe, min?: Maybe }>, boxLengthRange?: Maybe<{ __typename?: 'NumRange', min?: Maybe, max?: Maybe }>, boxWidthRange?: Maybe<{ __typename?: 'NumRange', min?: Maybe, max?: Maybe }> }>, security: { __typename?: 'Security', frameNumber: string, adfcCoding?: Maybe, keyNumberAXAChain?: Maybe, keyNumberFrameLock?: Maybe, policeCoding?: Maybe }, technicalEquipment?: Maybe<{ __typename?: 'TechnicalEquipment', bicycleShift?: Maybe, isEBike?: Maybe, hasLightSystem?: Maybe, specialFeatures?: Maybe }>, taxes?: Maybe<{ __typename?: 'Taxes', costCenter?: Maybe, organisationArea?: Maybe }>, provider?: Maybe<( +export type CargoBikeFieldsForTableFragment = { __typename?: 'CargoBike', id: string, group?: Maybe, name: string, modelName?: Maybe, numberOfChildren?: Maybe, numberOfWheels?: Maybe, forCargo?: Maybe, forChildren?: Maybe, stickerBikeNameState?: Maybe, note?: Maybe, isLocked: boolean, isLockedByMe: boolean, lockedBy?: Maybe, lockedUntil?: Maybe, insuranceData?: Maybe<{ __typename?: 'InsuranceData', billing?: Maybe, hasFixedRate?: Maybe, name?: Maybe, benefactor?: Maybe, noPnP?: Maybe, maintenanceResponsible?: Maybe, maintenanceBenefactor?: Maybe, maintenanceAgreement?: Maybe, fixedRate?: Maybe, projectAllowance?: Maybe, notes?: Maybe }>, dimensionsAndLoad?: Maybe<{ __typename?: 'DimensionsAndLoad', bikeLength?: Maybe, bikeWeight?: Maybe, bikeHeight?: Maybe, bikeWidth?: Maybe, hasCoverBox?: Maybe, lockable?: Maybe, maxWeightBox?: Maybe, maxWeightLuggageRack?: Maybe, maxWeightTotal?: Maybe, boxHeightRange?: Maybe<{ __typename?: 'NumRange', max?: Maybe, min?: Maybe }>, boxLengthRange?: Maybe<{ __typename?: 'NumRange', min?: Maybe, max?: Maybe }>, boxWidthRange?: Maybe<{ __typename?: 'NumRange', min?: Maybe, max?: Maybe }> }>, security?: Maybe<{ __typename?: 'Security', frameNumber?: Maybe, adfcCoding?: Maybe, keyNumberAXAChain?: Maybe, keyNumberFrameLock?: Maybe, policeCoding?: Maybe }>, technicalEquipment?: Maybe<{ __typename?: 'TechnicalEquipment', bicycleShift?: Maybe, isEBike?: Maybe, hasLightSystem?: Maybe, specialFeatures?: Maybe }>, taxes?: Maybe<{ __typename?: 'Taxes', costCenter?: Maybe, organisationArea?: Maybe }>, provider?: Maybe<( { __typename?: 'Provider' } & ProviderFieldsGeneralFragment )>, lendingStation?: Maybe<( @@ -2007,10 +2002,10 @@ export type ContactInformationFieldsFragment = { __typename?: 'ContactInformatio & PersonFieldsFragment ) }; -export type EngagementFieldsForBikePageFragment = { __typename?: 'Engagement', id: string, from: any, to?: Maybe, isLocked: boolean, isLockedByMe: boolean, lockedBy?: Maybe, lockedUntil?: Maybe, engagementType: ( +export type EngagementFieldsForBikePageFragment = { __typename?: 'Engagement', id: string, isLocked: boolean, isLockedByMe: boolean, lockedBy?: Maybe, lockedUntil?: Maybe, engagementType: ( { __typename?: 'EngagementType' } & EngagementTypeFieldsFragment - ), participant: ( + ), dateRange: { __typename?: 'DateRange', from: any, to?: Maybe }, participant: ( { __typename?: 'Participant' } & ParticipantFieldsForBikePageFragment ) }; @@ -2373,8 +2368,10 @@ export const EngagementFieldsForBikePageFragmentDoc = gql` engagementType { ...EngagementTypeFields } - from - to + dateRange { + from + to + } participant { ...ParticipantFieldsForBikePage }