zaid.marzguioui/myeasycms-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'
Some checks failed
Workflow / ⚫️ Test (push) Has been cancelled
Details
Workflow / ʦ TypeScript (push) Has been cancelled
Details

Browse Source 
# Conflicts:
#	docker-compose.yml
This commit is contained in:
T. Zehetbauer
2026-04-01 13:30:00 +02:00
parent 98afe6aa5f 5294cfab61
commit 2a9d543ee4
5 changed files with 77 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
packages/features/fischerei/src/server/api.ts
View File

@@ -98,18 +98,18 @@ export function createFischereiApi(client: SupabaseClient<Database>) {
.insert({
account_id: input.accountId,
name: input.name,
short_name: input.shortName,
short_name: input.shortName || null,
water_type: input.waterType,
description: input.description,
description: input.description || null,
surface_area_ha: input.surfaceAreaHa,
length_m: input.lengthM,
width_m: input.widthM,
avg_depth_m: input.avgDepthM,
max_depth_m: input.maxDepthM,
outflow: input.outflow,
location: input.location,
outflow: input.outflow || null,
location: input.location || null,
classification_order: input.classificationOrder,
county: input.county,
county: input.county || null,
geo_lat: input.geoLat,
geo_lng: input.geoLng,
lfv_number: input.lfvNumber,
@@ -298,17 +298,17 @@ export function createFischereiApi(client: SupabaseClient<Database>) {
.insert({
account_id: input.accountId,
name: input.name,
name_latin: input.nameLatin,
name_local: input.nameLocal,
name_latin: input.nameLatin || null,
name_local: input.nameLocal || null,
is_active: input.isActive,
max_age_years: input.maxAgeYears,
max_weight_kg: input.maxWeightKg,
max_length_cm: input.maxLengthCm,
protected_min_size_cm: input.protectedMinSizeCm,
protection_period_start: input.protectionPeriodStart,
protection_period_end: input.protectionPeriodEnd,
spawning_season_start: input.spawningSeasonStart,
spawning_season_end: input.spawningSeasonEnd,
protection_period_start: input.protectionPeriodStart || null,
protection_period_end: input.protectionPeriodEnd || null,
spawning_season_start: input.spawningSeasonStart || null,
spawning_season_end: input.spawningSeasonEnd || null,
has_special_spawning_season: input.hasSpecialSpawningSeason,
k_factor_avg: input.kFactorAvg,
k_factor_min: input.kFactorMin,
@@ -408,8 +408,8 @@ export function createFischereiApi(client: SupabaseClient<Database>) {
water_id: input.waterId,
species_id: input.speciesId,
min_size_cm: input.minSizeCm,
protection_period_start: input.protectionPeriodStart,
protection_period_end: input.protectionPeriodEnd,
protection_period_start: input.protectionPeriodStart || null,
protection_period_end: input.protectionPeriodEnd || null,
max_catch_per_day: input.maxCatchPerDay,
max_catch_per_year: input.maxCatchPerYear,
},
@@ -480,13 +480,13 @@ export function createFischereiApi(client: SupabaseClient<Database>) {
account_id: input.accountId,
water_id: input.waterId,
species_id: input.speciesId,
stocking_date: input.stockingDate,
stocking_date: input.stockingDate || null,
quantity: input.quantity,
weight_kg: input.weightKg,
age_class: input.ageClass,
cost_euros: input.costEuros,
supplier_id: input.supplierId,
remarks: input.remarks,
remarks: input.remarks || null,
created_by: userId,
updated_by: userId,
})
@@ -589,11 +589,11 @@ export function createFischereiApi(client: SupabaseClient<Database>) {
account_id: input.accountId,
water_id: input.waterId,
lessor_name: input.lessorName,
lessor_address: input.lessorAddress,
lessor_phone: input.lessorPhone,
lessor_email: input.lessorEmail,
start_date: input.startDate,
end_date: input.endDate,
lessor_address: input.lessorAddress || null,
lessor_phone: input.lessorPhone || null,
lessor_email: input.lessorEmail || null,
start_date: input.startDate || null,
end_date: input.endDate || null,
duration_years: input.durationYears,
initial_amount: input.initialAmount,
fixed_annual_increase: input.fixedAnnualIncrease,
@@ -728,14 +728,14 @@ export function createFischereiApi(client: SupabaseClient<Database>) {
member_id: input.memberId,
year: input.year,
member_name: input.memberName,
member_birth_date: input.memberBirthDate,
member_birth_date: input.memberBirthDate || null,
fishing_days_count: input.fishingDaysCount,
card_numbers: input.cardNumbers,
is_fly_fisher: input.isFlyFisher,
is_hejfish: input.isHejfish,
is_empty: input.isEmpty,
not_fished: input.notFished,
remarks: input.remarks,
remarks: input.remarks || null,
created_by: userId,
updated_by: userId,
})
@@ -859,7 +859,7 @@ export function createFischereiApi(client: SupabaseClient<Database>) {
species_id: input.speciesId,
water_id: input.waterId,
member_id: input.memberId,
catch_date: input.catchDate,
catch_date: input.catchDate || null,
quantity: input.quantity,
length_cm: input.lengthCm,
weight_g: input.weightG,
@@ -871,7 +871,7 @@ export function createFischereiApi(client: SupabaseClient<Database>) {
competition_id: input.competitionId,
competition_participant_id: input.competitionParticipantId,
permit_id: input.permitId,
remarks: input.remarks,
remarks: input.remarks || null,
})
.select()
.single();