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

Update for List View in Shifting from Gird LayOut to List Layout #8882

Open
wants to merge 26 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
567eaf4
Resloved the UI and Changed GRID 3 cols
AnveshNalimela Oct 22, 2024
c1fa939
Merge branch 'develop' into issue/8832/ui-align
AnveshNalimela Oct 22, 2024
56daa75
Merge branch 'develop' into issue/8832/ui-align
nihal467 Oct 23, 2024
eb78865
Update src/Components/Shifting/ListView.tsx
nihal467 Oct 23, 2024
e6f746f
removed the import
nihal467 Oct 23, 2024
ddea232
Made the UI Redesign in Shifting list view
AnveshNalimela Oct 27, 2024
1bf4645
added i18n translation in List View
AnveshNalimela Oct 30, 2024
8bf77c7
Reset the files
AnveshNalimela Nov 1, 2024
d73e933
Resloved conflicts
AnveshNalimela Nov 1, 2024
8e9ac09
Resloved merge conflicts
AnveshNalimela Nov 1, 2024
9249fc9
added uppercase className and remove translations from other languages
AnveshNalimela Nov 2, 2024
548707a
made view Responsive for sm,md screens
AnveshNalimela Nov 2, 2024
413ff0e
added shiftingModel type and removed any
AnveshNalimela Nov 2, 2024
d39f573
Merge branch 'develop' into issue/8832/ui-align
AnveshNalimela Nov 2, 2024
eee33a0
Merge branch 'develop' into issue/8832/ui-align
AnveshNalimela Nov 4, 2024
fe351b1
Merge branch 'develop' into issue/8832/ui-align
AnveshNalimela Nov 5, 2024
f76311a
Made resposive and aligned patient to left
AnveshNalimela Nov 5, 2024
d8acaba
Update src/Locale/ta.json
AnveshNalimela Nov 5, 2024
b6a5792
Made resposive and aligned patient to left
AnveshNalimela Nov 5, 2024
8737c3f
Made responsive and headings aligned
AnveshNalimela Nov 5, 2024
ef79258
Merge branch 'issue/8832/ui-align' of https://github.com/AnveshNalime…
AnveshNalimela Nov 5, 2024
7838317
Merge branch 'develop' into issue/8832/ui-align
AnveshNalimela Nov 5, 2024
9b042b7
added Removed keys
AnveshNalimela Nov 5, 2024
2cd8c0f
added proper types suggested by coderrabitai
AnveshNalimela Nov 5, 2024
923a3dc
Merge branch 'develop' into issue/8832/ui-align
AnveshNalimela Nov 7, 2024
768f494
after resloved
AnveshNalimela Nov 7, 2024
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 src/Locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@
"consultation_not_filed_description": "Please file a consultation for this patient to continue.",
"consultation_notes": "General Instructions (Advice)",
"consultation_updates": "Consultation updates",
"contact_info": "Contact Info",
"contact_number": "Contact Number",
"contact_person": "Name of Contact Person at Facility",
"contact_person_at_the_facility": "Contact person at the current facility",
Expand Down
2 changes: 1 addition & 1 deletion src/Locale/hi.json
rithviknishad marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -809,4 +809,4 @@
"you_need_at_least_a_location_to_create_an_assest": "संपत्ति बनाने के लिए आपको कम से कम एक स्थान की आवश्यकता होगी।",
"zoom_in": "ज़ूम इन",
"zoom_out": "ज़ूम आउट"
}
}
2 changes: 1 addition & 1 deletion src/Locale/kn.json
Original file line number Diff line number Diff line change
Expand Up @@ -809,4 +809,4 @@
"you_need_at_least_a_location_to_create_an_assest": "ಆಸ್ತಿಯನ್ನು ರಚಿಸಲು ನಿಮಗೆ ಕನಿಷ್ಠ ಸ್ಥಳದ ಅಗತ್ಯವಿದೆ.",
"zoom_in": "ಜೂಮ್ ಇನ್",
"zoom_out": "ಜೂಮ್ ಔಟ್"
}
}
2 changes: 1 addition & 1 deletion src/Locale/ml.json
Original file line number Diff line number Diff line change
Expand Up @@ -809,4 +809,4 @@
"you_need_at_least_a_location_to_create_an_assest": "ഒരു അസസ്‌റ്റ് സൃഷ്‌ടിക്കാൻ നിങ്ങൾക്ക് ഒരു ലൊക്കേഷനെങ്കിലും ആവശ്യമാണ്.",
"zoom_in": "സൂം ഇൻ ചെയ്യുക",
"zoom_out": "സൂം ഔട്ട്"
}
}
6 changes: 2 additions & 4 deletions src/Locale/ta.json
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,5 @@
"working_status": "வேலை நிலை",
"yes": "ஆம்",
"yet_to_be_decided": "இன்னும் முடிவு செய்யப்படவில்லை",
"you_need_at_least_a_location_to_create_an_assest": "ஒரு அசெஸ்ட்டை உருவாக்க குறைந்தபட்சம் ஒரு இருப்பிடமாவது தேவை.",
"zoom_in": "பெரிதாக்கவும்",
"zoom_out": "பெரிதாக்கவும்"
}
AnveshNalimela marked this conversation as resolved.
Show resolved Hide resolved
"zoom_out": "சிறிதாக்கவும்"
}
20 changes: 10 additions & 10 deletions src/components/Resource/ResourceBoard.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import { useState } from "react";
import { navigate } from "raviger";
import ListFilter from "./ResourceFilter";
import { RESOURCE_CHOICES } from "@/common/constants";
import BadgesList from "./ResourceBadges";
import { formatFilter } from "./ResourceCommons";
import useFilters from "@/common/hooks/useFilters";
import { ExportButton } from "@/components/Common/Export";
import ButtonV2 from "@/components/Common/components/ButtonV2";
import Tabs from "@/components/Common/components/Tabs";
import { navigate } from "raviger";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { AdvancedFilterButton } from "../../CAREUI/interactive/FiltersSlideover";
import CareIcon from "../../CAREUI/icons/CareIcon";
import SearchInput from "../Form/SearchInput";
import Tabs from "@/components/Common/components/Tabs";
import request from "../../Utils/request/request";
import { AdvancedFilterButton } from "../../CAREUI/interactive/FiltersSlideover";
import routes from "../../Redux/api";
import KanbanBoard from "../Kanban/Board";
import request from "../../Utils/request/request";
import { ResourceModel } from "../Facility/models";
import SearchInput from "../Form/SearchInput";
import KanbanBoard from "../Kanban/Board";
import BadgesList from "./ResourceBadges";
import { formatFilter } from "./ResourceCommons";
import ListFilter from "./ResourceFilter";

import PageTitle from "@/components/Common/PageTitle";
import ResourceBlock from "./ResourceBlock";
Expand Down
Loading
Loading