Skip to content

Commit

Permalink
Revamped resource and shifting boards to the KanbanBoard component an…
Browse files Browse the repository at this point in the history
…d removed react-dnd (#8713)
  • Loading branch information
shivankacker authored Oct 13, 2024
1 parent 31c41ae commit ed3be2b
Show file tree
Hide file tree
Showing 12 changed files with 667 additions and 938 deletions.
167 changes: 73 additions & 94 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"@googlemaps/react-wrapper": "^1.1.35",
"@googlemaps/typescript-guards": "^2.0.3",
"@headlessui/react": "^2.1.2",
"@hello-pangea/dnd": "^17.0.0",
"@pnotify/core": "^5.2.0",
"@pnotify/mobile": "^5.2.0",
"@radix-ui/react-icons": "^1.3.0",
Expand Down Expand Up @@ -77,9 +78,6 @@
"raviger": "^4.1.2",
"react": "18.3.1",
"react-copy-to-clipboard": "^5.1.0",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dnd-scrolling": "^1.3.8",
"react-dom": "18.3.1",
"react-google-recaptcha": "^3.1.0",
"react-i18next": "^15.0.2",
Expand Down
51 changes: 50 additions & 1 deletion src/Components/Facility/models.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
ConsultationSuggestionValue,
DISCHARGE_REASONS,
PATIENT_NOTES_THREADS,
SHIFTING_CHOICES_PEACETIME,
UserRole,
} from "../../Common/constants";
import { FeatureFlag } from "../../Utils/featureFlags";
Expand All @@ -15,12 +16,13 @@ import {
DailyRoundsModel,
FacilityNameModel,
FileUploadModel,
PatientModel,
} from "../Patient/models";
import { EncounterSymptom } from "../Symptoms/types";
import { UserBareMinimum, UserModel } from "../Users/models";
import { InvestigationType } from "../Common/prescription-builder/InvestigationBuilder";
import { ProcedureType } from "../Common/prescription-builder/ProcedureBuilder";
import { RouteToFacility } from "../Common/RouteToFacilitySelect";
import { UserBareMinimum } from "../Users/models";

export interface LocalBodyModel {
id: number;
Expand Down Expand Up @@ -676,3 +678,50 @@ export type PatientTransferResponse = {
date_of_birth: string;
facility_object: BaseFacilityModel;
};

export interface ShiftingModel {
assigned_facility: string;
assigned_facility_external: string | null;
assigned_facility_object: FacilityModel;
created_date: string;
emergency: boolean;
external_id: string;
id: string;
modified_date: string;
origin_facility_object: FacilityModel;
patient: string;
patient_object: PatientModel;
shifting_approving_facility_object: FacilityModel | null;
status: (typeof SHIFTING_CHOICES_PEACETIME)[number]["text"];
assigned_to_object?: UserModel;
}

export interface ResourceModel {
approving_facility: string | null;
approving_facility_object: FacilityModel | null;
assigned_facility: string | null;
assigned_facility_object: FacilityModel | null;
assigned_quantity: number;
assigned_to: string | null;
assigned_to_object: UserModel | null;
category: string;
created_by: number;
created_by_object: UserModel;
created_date: string;
emergency: boolean;
id: string;
is_assigned_to_user: boolean;
last_edited_by: number;
last_edited_by_object: UserModel;
modified_date: string;
origin_facility: string;
origin_facility_object: FacilityModel;
priority: number | null;
reason: string;
refering_facility_contact_name: string;
refering_facility_contact_number: string;
requested_quantity: number;
status: string;
sub_category: string;
title: string;
}
Loading

0 comments on commit ed3be2b

Please sign in to comment.