Hacker-Software/opencrm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added extra field kwh at m3, expand cost field to 10 komma, added maloid,counter add dialog, auto set unit

Browse Source
This commit is contained in:
duffyduck
2026-02-05 20:34:45 +01:00
parent af2f444a24
commit b281801cdb
22 changed files with 329 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/node_modules/.prisma/client/edge.js
Generated Vendored
+5 -3
View File
File diff suppressed because one or more lines are too long
backend/node_modules/.prisma/client/index-browser.js
Generated Vendored
+2
View File
@@ -466,7 +466,9 @@ exports.Prisma.EnergyContractDetailsScalarFieldEnum = {
id: 'id',
contractId: 'contractId',
meterId: 'meterId',
maloId: 'maloId',
annualConsumption: 'annualConsumption',
annualConsumptionKwh: 'annualConsumptionKwh',
basePrice: 'basePrice',
unitPrice: 'unitPrice',
bonus: 'bonus',
backend/node_modules/.prisma/client/index.d.ts
Generated Vendored
+82
View File
@@ -29799,6 +29799,7 @@ export namespace Prisma {
contractId: number | null
meterId: number | null
annualConsumption: number | null
annualConsumptionKwh: number | null
basePrice: number | null
unitPrice: number | null
bonus: number | null
@@ -29809,6 +29810,7 @@ export namespace Prisma {
contractId: number | null
meterId: number | null
annualConsumption: number | null
annualConsumptionKwh: number | null
basePrice: number | null
unitPrice: number | null
bonus: number | null
@@ -29818,7 +29820,9 @@ export namespace Prisma {
id: number | null
contractId: number | null
meterId: number | null
maloId: string | null
annualConsumption: number | null
annualConsumptionKwh: number | null
basePrice: number | null
unitPrice: number | null
bonus: number | null
@@ -29830,7 +29834,9 @@ export namespace Prisma {
id: number | null
contractId: number | null
meterId: number | null
maloId: string | null
annualConsumption: number | null
annualConsumptionKwh: number | null
basePrice: number | null
unitPrice: number | null
bonus: number | null
@@ -29842,7 +29848,9 @@ export namespace Prisma {
id: number
contractId: number
meterId: number
maloId: number
annualConsumption: number
annualConsumptionKwh: number
basePrice: number
unitPrice: number
bonus: number
@@ -29857,6 +29865,7 @@ export namespace Prisma {
contractId?: true
meterId?: true
annualConsumption?: true
annualConsumptionKwh?: true
basePrice?: true
unitPrice?: true
bonus?: true
@@ -29867,6 +29876,7 @@ export namespace Prisma {
contractId?: true
meterId?: true
annualConsumption?: true
annualConsumptionKwh?: true
basePrice?: true
unitPrice?: true
bonus?: true
@@ -29876,7 +29886,9 @@ export namespace Prisma {
id?: true
contractId?: true
meterId?: true
maloId?: true
annualConsumption?: true
annualConsumptionKwh?: true
basePrice?: true
unitPrice?: true
bonus?: true
@@ -29888,7 +29900,9 @@ export namespace Prisma {
id?: true
contractId?: true
meterId?: true
maloId?: true
annualConsumption?: true
annualConsumptionKwh?: true
basePrice?: true
unitPrice?: true
bonus?: true
@@ -29900,7 +29914,9 @@ export namespace Prisma {
id?: true
contractId?: true
meterId?: true
maloId?: true
annualConsumption?: true
annualConsumptionKwh?: true
basePrice?: true
unitPrice?: true
bonus?: true
@@ -29999,7 +30015,9 @@ export namespace Prisma {
id: number
contractId: number
meterId: number | null
maloId: string | null
annualConsumption: number | null
annualConsumptionKwh: number | null
basePrice: number | null
unitPrice: number | null
bonus: number | null
@@ -30030,7 +30048,9 @@ export namespace Prisma {
id?: boolean
contractId?: boolean
meterId?: boolean
maloId?: boolean
annualConsumption?: boolean
annualConsumptionKwh?: boolean
basePrice?: boolean
unitPrice?: boolean
bonus?: boolean
@@ -30045,7 +30065,9 @@ export namespace Prisma {
id?: boolean
contractId?: boolean
meterId?: boolean
maloId?: boolean
annualConsumption?: boolean
annualConsumptionKwh?: boolean
basePrice?: boolean
unitPrice?: boolean
bonus?: boolean
@@ -30068,7 +30090,9 @@ export namespace Prisma {
id: number
contractId: number
meterId: number | null
maloId: string | null
annualConsumption: number | null
annualConsumptionKwh: number | null
basePrice: number | null
unitPrice: number | null
bonus: number | null
@@ -30448,7 +30472,9 @@ export namespace Prisma {
readonly id: FieldRef<"EnergyContractDetails", 'Int'>
readonly contractId: FieldRef<"EnergyContractDetails", 'Int'>
readonly meterId: FieldRef<"EnergyContractDetails", 'Int'>
readonly maloId: FieldRef<"EnergyContractDetails", 'String'>
readonly annualConsumption: FieldRef<"EnergyContractDetails", 'Float'>
readonly annualConsumptionKwh: FieldRef<"EnergyContractDetails", 'Float'>
readonly basePrice: FieldRef<"EnergyContractDetails", 'Float'>
readonly unitPrice: FieldRef<"EnergyContractDetails", 'Float'>
readonly bonus: FieldRef<"EnergyContractDetails", 'Float'>
@@ -37094,7 +37120,9 @@ export namespace Prisma {
id: 'id',
contractId: 'contractId',
meterId: 'meterId',
maloId: 'maloId',
annualConsumption: 'annualConsumption',
annualConsumptionKwh: 'annualConsumptionKwh',
basePrice: 'basePrice',
unitPrice: 'unitPrice',
bonus: 'bonus',
@@ -39601,7 +39629,9 @@ export namespace Prisma {
id?: IntFilter<"EnergyContractDetails"> | number
contractId?: IntFilter<"EnergyContractDetails"> | number
meterId?: IntNullableFilter<"EnergyContractDetails"> | number | null
maloId?: StringNullableFilter<"EnergyContractDetails"> | string | null
annualConsumption?: FloatNullableFilter<"EnergyContractDetails"> | number | null
annualConsumptionKwh?: FloatNullableFilter<"EnergyContractDetails"> | number | null
basePrice?: FloatNullableFilter<"EnergyContractDetails"> | number | null
unitPrice?: FloatNullableFilter<"EnergyContractDetails"> | number | null
bonus?: FloatNullableFilter<"EnergyContractDetails"> | number | null
@@ -39615,7 +39645,9 @@ export namespace Prisma {
id?: SortOrder
contractId?: SortOrder
meterId?: SortOrderInput | SortOrder
maloId?: SortOrderInput | SortOrder
annualConsumption?: SortOrderInput | SortOrder
annualConsumptionKwh?: SortOrderInput | SortOrder
basePrice?: SortOrderInput | SortOrder
unitPrice?: SortOrderInput | SortOrder
bonus?: SortOrderInput | SortOrder
@@ -39632,7 +39664,9 @@ export namespace Prisma {
OR?: EnergyContractDetailsWhereInput[]
NOT?: EnergyContractDetailsWhereInput | EnergyContractDetailsWhereInput[]
meterId?: IntNullableFilter<"EnergyContractDetails"> | number | null
maloId?: StringNullableFilter<"EnergyContractDetails"> | string | null
annualConsumption?: FloatNullableFilter<"EnergyContractDetails"> | number | null
annualConsumptionKwh?: FloatNullableFilter<"EnergyContractDetails"> | number | null
basePrice?: FloatNullableFilter<"EnergyContractDetails"> | number | null
unitPrice?: FloatNullableFilter<"EnergyContractDetails"> | number | null
bonus?: FloatNullableFilter<"EnergyContractDetails"> | number | null
@@ -39646,7 +39680,9 @@ export namespace Prisma {
id?: SortOrder
contractId?: SortOrder
meterId?: SortOrderInput | SortOrder
maloId?: SortOrderInput | SortOrder
annualConsumption?: SortOrderInput | SortOrder
annualConsumptionKwh?: SortOrderInput | SortOrder
basePrice?: SortOrderInput | SortOrder
unitPrice?: SortOrderInput | SortOrder
bonus?: SortOrderInput | SortOrder
@@ -39666,7 +39702,9 @@ export namespace Prisma {
id?: IntWithAggregatesFilter<"EnergyContractDetails"> | number
contractId?: IntWithAggregatesFilter<"EnergyContractDetails"> | number
meterId?: IntNullableWithAggregatesFilter<"EnergyContractDetails"> | number | null
maloId?: StringNullableWithAggregatesFilter<"EnergyContractDetails"> | string | null
annualConsumption?: FloatNullableWithAggregatesFilter<"EnergyContractDetails"> | number | null
annualConsumptionKwh?: FloatNullableWithAggregatesFilter<"EnergyContractDetails"> | number | null
basePrice?: FloatNullableWithAggregatesFilter<"EnergyContractDetails"> | number | null
unitPrice?: FloatNullableWithAggregatesFilter<"EnergyContractDetails"> | number | null
bonus?: FloatNullableWithAggregatesFilter<"EnergyContractDetails"> | number | null
@@ -42588,7 +42626,9 @@ export namespace Prisma {
}
export type EnergyContractDetailsCreateInput = {
maloId?: string | null
annualConsumption?: number | null
annualConsumptionKwh?: number | null
basePrice?: number | null
unitPrice?: number | null
bonus?: number | null
@@ -42602,7 +42642,9 @@ export namespace Prisma {
id?: number
contractId: number
meterId?: number | null
maloId?: string | null
annualConsumption?: number | null
annualConsumptionKwh?: number | null
basePrice?: number | null
unitPrice?: number | null
bonus?: number | null
@@ -42611,7 +42653,9 @@ export namespace Prisma {
}
export type EnergyContractDetailsUpdateInput = {
maloId?: NullableStringFieldUpdateOperationsInput | string | null
annualConsumption?: NullableFloatFieldUpdateOperationsInput | number | null
annualConsumptionKwh?: NullableFloatFieldUpdateOperationsInput | number | null
basePrice?: NullableFloatFieldUpdateOperationsInput | number | null
unitPrice?: NullableFloatFieldUpdateOperationsInput | number | null
bonus?: NullableFloatFieldUpdateOperationsInput | number | null
@@ -42625,7 +42669,9 @@ export namespace Prisma {
id?: IntFieldUpdateOperationsInput | number
contractId?: IntFieldUpdateOperationsInput | number
meterId?: NullableIntFieldUpdateOperationsInput | number | null
maloId?: NullableStringFieldUpdateOperationsInput | string | null
annualConsumption?: NullableFloatFieldUpdateOperationsInput | number | null
annualConsumptionKwh?: NullableFloatFieldUpdateOperationsInput | number | null
basePrice?: NullableFloatFieldUpdateOperationsInput | number | null
unitPrice?: NullableFloatFieldUpdateOperationsInput | number | null
bonus?: NullableFloatFieldUpdateOperationsInput | number | null
@@ -42637,7 +42683,9 @@ export namespace Prisma {
id?: number
contractId: number
meterId?: number | null
maloId?: string | null
annualConsumption?: number | null
annualConsumptionKwh?: number | null
basePrice?: number | null
unitPrice?: number | null
bonus?: number | null
@@ -42646,7 +42694,9 @@ export namespace Prisma {
}
export type EnergyContractDetailsUpdateManyMutationInput = {
maloId?: NullableStringFieldUpdateOperationsInput | string | null
annualConsumption?: NullableFloatFieldUpdateOperationsInput | number | null
annualConsumptionKwh?: NullableFloatFieldUpdateOperationsInput | number | null
basePrice?: NullableFloatFieldUpdateOperationsInput | number | null
unitPrice?: NullableFloatFieldUpdateOperationsInput | number | null
bonus?: NullableFloatFieldUpdateOperationsInput | number | null
@@ -42658,7 +42708,9 @@ export namespace Prisma {
id?: IntFieldUpdateOperationsInput | number
contractId?: IntFieldUpdateOperationsInput | number
meterId?: NullableIntFieldUpdateOperationsInput | number | null
maloId?: NullableStringFieldUpdateOperationsInput | string | null
annualConsumption?: NullableFloatFieldUpdateOperationsInput | number | null
annualConsumptionKwh?: NullableFloatFieldUpdateOperationsInput | number | null
basePrice?: NullableFloatFieldUpdateOperationsInput | number | null
unitPrice?: NullableFloatFieldUpdateOperationsInput | number | null
bonus?: NullableFloatFieldUpdateOperationsInput | number | null
@@ -45200,7 +45252,9 @@ export namespace Prisma {
id?: SortOrder
contractId?: SortOrder
meterId?: SortOrder
maloId?: SortOrder
annualConsumption?: SortOrder
annualConsumptionKwh?: SortOrder
basePrice?: SortOrder
unitPrice?: SortOrder
bonus?: SortOrder
@@ -45213,6 +45267,7 @@ export namespace Prisma {
contractId?: SortOrder
meterId?: SortOrder
annualConsumption?: SortOrder
annualConsumptionKwh?: SortOrder
basePrice?: SortOrder
unitPrice?: SortOrder
bonus?: SortOrder
@@ -45222,7 +45277,9 @@ export namespace Prisma {
id?: SortOrder
contractId?: SortOrder
meterId?: SortOrder
maloId?: SortOrder
annualConsumption?: SortOrder
annualConsumptionKwh?: SortOrder
basePrice?: SortOrder
unitPrice?: SortOrder
bonus?: SortOrder
@@ -45234,7 +45291,9 @@ export namespace Prisma {
id?: SortOrder
contractId?: SortOrder
meterId?: SortOrder
maloId?: SortOrder
annualConsumption?: SortOrder
annualConsumptionKwh?: SortOrder
basePrice?: SortOrder
unitPrice?: SortOrder
bonus?: SortOrder
@@ -45247,6 +45306,7 @@ export namespace Prisma {
contractId?: SortOrder
meterId?: SortOrder
annualConsumption?: SortOrder
annualConsumptionKwh?: SortOrder
basePrice?: SortOrder
unitPrice?: SortOrder
bonus?: SortOrder
@@ -51546,7 +51606,9 @@ export namespace Prisma {
}
export type EnergyContractDetailsCreateWithoutMeterInput = {
maloId?: string | null
annualConsumption?: number | null
annualConsumptionKwh?: number | null
basePrice?: number | null
unitPrice?: number | null
bonus?: number | null
@@ -51558,7 +51620,9 @@ export namespace Prisma {
export type EnergyContractDetailsUncheckedCreateWithoutMeterInput = {
id?: number
contractId: number
maloId?: string | null
annualConsumption?: number | null
annualConsumptionKwh?: number | null
basePrice?: number | null
unitPrice?: number | null
bonus?: number | null
@@ -51712,7 +51776,9 @@ export namespace Prisma {
id?: IntFilter<"EnergyContractDetails"> | number
contractId?: IntFilter<"EnergyContractDetails"> | number
meterId?: IntNullableFilter<"EnergyContractDetails"> | number | null
maloId?: StringNullableFilter<"EnergyContractDetails"> | string | null
annualConsumption?: FloatNullableFilter<"EnergyContractDetails"> | number | null
annualConsumptionKwh?: FloatNullableFilter<"EnergyContractDetails"> | number | null
basePrice?: FloatNullableFilter<"EnergyContractDetails"> | number | null
unitPrice?: FloatNullableFilter<"EnergyContractDetails"> | number | null
bonus?: FloatNullableFilter<"EnergyContractDetails"> | number | null
@@ -53222,7 +53288,9 @@ export namespace Prisma {
}
export type EnergyContractDetailsCreateWithoutContractInput = {
maloId?: string | null
annualConsumption?: number | null
annualConsumptionKwh?: number | null
basePrice?: number | null
unitPrice?: number | null
bonus?: number | null
@@ -53234,7 +53302,9 @@ export namespace Prisma {
export type EnergyContractDetailsUncheckedCreateWithoutContractInput = {
id?: number
meterId?: number | null
maloId?: string | null
annualConsumption?: number | null
annualConsumptionKwh?: number | null
basePrice?: number | null
unitPrice?: number | null
bonus?: number | null
@@ -54153,7 +54223,9 @@ export namespace Prisma {
}
export type EnergyContractDetailsUpdateWithoutContractInput = {
maloId?: NullableStringFieldUpdateOperationsInput | string | null
annualConsumption?: NullableFloatFieldUpdateOperationsInput | number | null
annualConsumptionKwh?: NullableFloatFieldUpdateOperationsInput | number | null
basePrice?: NullableFloatFieldUpdateOperationsInput | number | null
unitPrice?: NullableFloatFieldUpdateOperationsInput | number | null
bonus?: NullableFloatFieldUpdateOperationsInput | number | null
@@ -54165,7 +54237,9 @@ export namespace Prisma {
export type EnergyContractDetailsUncheckedUpdateWithoutContractInput = {
id?: IntFieldUpdateOperationsInput | number
meterId?: NullableIntFieldUpdateOperationsInput | number | null
maloId?: NullableStringFieldUpdateOperationsInput | string | null
annualConsumption?: NullableFloatFieldUpdateOperationsInput | number | null
annualConsumptionKwh?: NullableFloatFieldUpdateOperationsInput | number | null
basePrice?: NullableFloatFieldUpdateOperationsInput | number | null
unitPrice?: NullableFloatFieldUpdateOperationsInput | number | null
bonus?: NullableFloatFieldUpdateOperationsInput | number | null
@@ -57619,7 +57693,9 @@ export namespace Prisma {
export type EnergyContractDetailsCreateManyMeterInput = {
id?: number
contractId: number
maloId?: string | null
annualConsumption?: number | null
annualConsumptionKwh?: number | null
basePrice?: number | null
unitPrice?: number | null
bonus?: number | null
@@ -57654,7 +57730,9 @@ export namespace Prisma {
}
export type EnergyContractDetailsUpdateWithoutMeterInput = {
maloId?: NullableStringFieldUpdateOperationsInput | string | null
annualConsumption?: NullableFloatFieldUpdateOperationsInput | number | null
annualConsumptionKwh?: NullableFloatFieldUpdateOperationsInput | number | null
basePrice?: NullableFloatFieldUpdateOperationsInput | number | null
unitPrice?: NullableFloatFieldUpdateOperationsInput | number | null
bonus?: NullableFloatFieldUpdateOperationsInput | number | null
@@ -57666,7 +57744,9 @@ export namespace Prisma {
export type EnergyContractDetailsUncheckedUpdateWithoutMeterInput = {
id?: IntFieldUpdateOperationsInput | number
contractId?: IntFieldUpdateOperationsInput | number
maloId?: NullableStringFieldUpdateOperationsInput | string | null
annualConsumption?: NullableFloatFieldUpdateOperationsInput | number | null
annualConsumptionKwh?: NullableFloatFieldUpdateOperationsInput | number | null
basePrice?: NullableFloatFieldUpdateOperationsInput | number | null
unitPrice?: NullableFloatFieldUpdateOperationsInput | number | null
bonus?: NullableFloatFieldUpdateOperationsInput | number | null
@@ -57677,7 +57757,9 @@ export namespace Prisma {
export type EnergyContractDetailsUncheckedUpdateManyWithoutMeterInput = {
id?: IntFieldUpdateOperationsInput | number
contractId?: IntFieldUpdateOperationsInput | number
maloId?: NullableStringFieldUpdateOperationsInput | string | null
annualConsumption?: NullableFloatFieldUpdateOperationsInput | number | null
annualConsumptionKwh?: NullableFloatFieldUpdateOperationsInput | number | null
basePrice?: NullableFloatFieldUpdateOperationsInput | number | null
unitPrice?: NullableFloatFieldUpdateOperationsInput | number | null
bonus?: NullableFloatFieldUpdateOperationsInput | number | null
backend/node_modules/.prisma/client/index.js
Generated Vendored
+5 -3
View File
File diff suppressed because one or more lines are too long
backend/node_modules/.prisma/client/package.json
Generated Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
{
"name": "prisma-client-5918fcf1a24d6a26f6b4fad7137d1ae3a684231bfa7340820c473996737deea6",
"name": "prisma-client-86f9a11dd446473e587830adde1df64246ce246e4602839fa2ced48c6aa2f902",
"main": "index.js",
"types": "index.d.ts",
"browser": "index-browser.js",
backend/node_modules/.prisma/client/schema.prisma
Generated Vendored
+5 -3
View File
@@ -602,9 +602,11 @@ model EnergyContractDetails {
contract Contract @relation(fields: [contractId], references: [id], onDelete: Cascade)
meterId Int?
meter Meter? @relation(fields: [meterId], references: [id])
annualConsumption Float?
basePrice Float?
unitPrice Float?
maloId String? // Marktlokations-ID
annualConsumption Float? // kWh für Strom, m³ für Gas
annualConsumptionKwh Float? // kWh für Gas (zusätzlich zu m³)
basePrice Float? // €/Monat
unitPrice Float? // €/kWh (Arbeitspreis)
bonus Float?
previousProviderName String?
previousCustomerNumber String?
backend/node_modules/.prisma/client/wasm.js
Generated Vendored
+2
View File
@@ -466,7 +466,9 @@ exports.Prisma.EnergyContractDetailsScalarFieldEnum = {
id: 'id',
contractId: 'contractId',
meterId: 'meterId',
maloId: 'maloId',
annualConsumption: 'annualConsumption',
annualConsumptionKwh: 'annualConsumptionKwh',
basePrice: 'basePrice',
unitPrice: 'unitPrice',
bonus: 'bonus',