Merge branch 'dev'
# Conflicts: # backend/src/app.ts # backend/src/db/schema.ts # backend/src/queues/adoptionReportQueue.ts # backend/src/reports/adoptionReport.ts # backend/src/reports/adoptionReportJob.ts # backend/src/repositories/birdRepository.ts # backend/src/types.ts # frontend/src/App.tsx # frontend/src/index.css
This commit is contained in:
commit
3ba6410972
19 files changed
+2150
-992
No files matched your search
@@ -101,6 +101,8 @@ export type BirdRow = {
|
||||
motivators: string | null;
|
||||
demotivators: string | null;
|
||||
favorite_snack: string | null;
|
||||
location_label: string | null;
|
||||
location_details: Record<string, unknown> | null;
|
||||
vet_clinic_name: string | null;
|
||||
vet_clinic_address: string | null;
|
||||
vet_account_number: string | null;
|
||||
@@ -174,6 +176,26 @@ export type BirdTransferCodeRow = {
|
||||
created_at: string;
|
||||
};
|
||||
|
||||
export type BirdTimelineEventType = 'profile_created' | 'transferred' | 'location_updated' | 'owner_changed' | 'manual_note';
|
||||
|
||||
export type BirdTimelineEventRow = {
|
||||
id: string;
|
||||
bird_id: string;
|
||||
event_type: BirdTimelineEventType;
|
||||
from_workspace_id: number | null;
|
||||
to_workspace_id: number | null;
|
||||
from_workspace_name: string | null;
|
||||
to_workspace_name: string | null;
|
||||
from_owner_email: string | null;
|
||||
to_owner_email: string | null;
|
||||
location_label: string | null;
|
||||
location_details: Record<string, unknown> | null;
|
||||
note: string | null;
|
||||
event_date: string;
|
||||
created_by_user_id: string | null;
|
||||
created_at: string;
|
||||
};
|
||||
|
||||
export type WeightRow = {
|
||||
id: string;
|
||||
bird_id: string;
|
||||
|
||||
Reference in new issue
Block a user