Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhanced Resource Page #9768

Open
wants to merge 42 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
5d5dbd8
enhanced-resource-page
manmeetnagii Jan 5, 2025
66126a4
enhanced-resource-page
manmeetnagii Jan 5, 2025
59f2f4c
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
manmeetnagii Jan 7, 2025
e9193ad
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
manmeetnagii Jan 7, 2025
85de07b
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
manmeetnagii Jan 8, 2025
336d4d2
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
manmeetnagii Jan 9, 2025
7f8aab4
enhanced-resource-page
manmeetnagii Jan 9, 2025
baa6957
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
manmeetnagii Jan 10, 2025
774d885
removed console logs
manmeetnagii Jan 10, 2025
f83d81e
stored viewMode to localStorage
manmeetnagii Jan 10, 2025
09429b2
switch to useQuery for all api calls
manmeetnagii Jan 10, 2025
5ed698b
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
manmeetnagii Jan 10, 2025
50d2528
changes for mobile screen
manmeetnagii Jan 10, 2025
93a31c5
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
manmeetnagii Jan 11, 2025
103337d
fix list view layout
manmeetnagii Jan 11, 2025
46e610c
Fixed the count of status
manmeetnagii Jan 11, 2025
82514c4
Fixed the count of status
manmeetnagii Jan 11, 2025
56e4036
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
manmeetnagii Jan 11, 2025
bafcb02
Fixed position of resource cards wrt their status
manmeetnagii Jan 11, 2025
eea4ac6
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
manmeetnagii Jan 11, 2025
076f15b
Merge branch 'develop' into enhanced-resource-page
manmeetnagii Jan 12, 2025
e427ed8
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
manmeetnagii Jan 12, 2025
4965b31
Merge branch 'enhanced-resource-page' of https://github.com/manmeetna…
manmeetnagii Jan 12, 2025
cc5e17a
Resolved conflicts
manmeetnagii Jan 12, 2025
8718369
Resolved conflicts
manmeetnagii Jan 12, 2025
70aad57
Resolved conflicts
manmeetnagii Jan 13, 2025
8d6ac57
Resolved conflicts
manmeetnagii Jan 13, 2025
285df87
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
manmeetnagii Jan 13, 2025
1f3d54d
discard verifyPatient
manmeetnagii Jan 13, 2025
a7018ba
Merge branch 'develop' into enhanced-resource-page
manmeetnagii Jan 13, 2025
434b246
removed patient_creation
manmeetnagii Jan 13, 2025
6651a13
Merge branch 'enhanced-resource-page' of https://github.com/manmeetna…
manmeetnagii Jan 13, 2025
2afa978
removed pageObject/Patient
manmeetnagii Jan 13, 2025
1ca2a07
commit_msg
manmeetnagii Jan 13, 2025
ac882de
commit_msg
manmeetnagii Jan 13, 2025
439d503
commit_msg
manmeetnagii Jan 13, 2025
85ddfb3
Removed cypress
manmeetnagii Jan 13, 2025
8310af6
Delete cypress/e2e/patient_spec/patient_search.cy.ts
manmeetnagii Jan 13, 2025
65dfb14
Delete cypress/pageObject/Patients/PatientSearch.ts
manmeetnagii Jan 13, 2025
82c3ccc
Merge branch 'develop' of https://github.com/manmeetnagii/care_fe int…
manmeetnagii Jan 17, 2025
6758863
absolute imports
manmeetnagii Jan 17, 2025
5e44297
modified exportAction
manmeetnagii Jan 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions public/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1649,6 +1649,7 @@
"select_role": "Select Role",
"select_seven_day_period": "Select a seven day period",
"select_skills": "Select and add some skills",
"select_status": "Select Status",
"select_time": "Select time",
"select_time_slot": "Select time slot",
"select_wards": "Select wards",
Expand Down
12 changes: 2 additions & 10 deletions src/Routers/routes/ResourceRoutes.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
import { Redirect } from "raviger";

import BoardView from "@/components/Resource/ResourceBoard";
import ResourceDetails from "@/components/Resource/ResourceDetails";
import { ResourceDetailsUpdate } from "@/components/Resource/ResourceDetailsUpdate";
import ListView from "@/components/Resource/ResourceList";
import ResourcePage from "@/components/Resource/ResourcePage";

import { AppRoutes } from "@/Routers/AppRouter";

const getDefaultView = () =>
localStorage.getItem("defaultResourceView") === "list" ? "list" : "board";

const ResourceRoutes: AppRoutes = {
"/resource": () => <Redirect to={`/resource/${getDefaultView()}`} />,
"/resource/board": () => <BoardView />,
"/resource/list": () => <ListView />,
"/resource": () => <ResourcePage />,
"/resource/:id": ({ id }) => <ResourceDetails id={id} />,
"/resource/:id/update": ({ id }) => <ResourceDetailsUpdate id={id} />,
};
Expand Down
198 changes: 0 additions & 198 deletions src/components/Kanban/Board.tsx

This file was deleted.

162 changes: 0 additions & 162 deletions src/components/Resource/ResourceBoard.tsx

This file was deleted.

Loading
Loading