-
Notifications
You must be signed in to change notification settings - Fork 516
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
Abdm M3 #6487
Closed
Closed
Abdm M3 #6487
Changes from 24 commits
Commits
Show all changes
34 commits
Select commit
Hold shift + click to select a range
399e33c
added create consent functionality
khavinshankar d4fd2d6
renamed patient_health_id to patient_abha
khavinshankar 33666c6
added abdm tab in consultation dashboard
khavinshankar 2e020bd
Merge branch 'develop' into abdm-m3
khavinshankar 6cb1bfe
fix abdm consultation tab
khavinshankar 11cb15e
show health information
khavinshankar ce2432f
ui improvements
khavinshankar e631138
added patient id verification in fetch abdm records form
khavinshankar 08edcac
fixed phone number parsing issue while linking abha number
khavinshankar deea512
change proxy url
khavinshankar 9aba833
show deny status in the consent request
khavinshankar b253950
upgraded hi-profiles package
khavinshankar 9f171d6
added consent requests table for facilities in abdm
khavinshankar 3d83d6d
consolidated multiple view artefact buttons into one
khavinshankar c7d3048
added consent granted on time in abdm facility records
khavinshankar fda359d
temp: use artefact 1's data
khavinshankar a874b9b
temp: update index
khavinshankar b888268
fixed consent status
khavinshankar b3d0f5a
Trigger Build.
khavinshankar 971d819
Merge branch 'develop' of github.com:coronasafe/care_fe into abdm-m3
khavinshankar b040ea0
recreated package-lock.json (#7069)
khavinshankar f6e0923
show notification when health id registration fails
khavinshankar 1fe1674
Merge branch 'develop' into abdm-m3
khavinshankar cfe5488
Merge branch 'develop' into abdm-m3
nihal467 5dccc81
Merge branch 'develop' into abdm-m3
khavinshankar 76b436f
Merge branch 'develop' into abdm-m3
nihal467 cd94fa7
Update netlify.toml
khavinshankar ed138bd
Trigger Build
khavinshankar bfcc535
Merge branch 'abdm-m3' of github.com:coronasafe/care_fe into abdm-m3
khavinshankar fe3aadc
merge develop with abdm-m3
khavinshankar c85eb20
revert auto formatted styles
khavinshankar bbf35b4
fixed a typo in styles
khavinshankar e4efed7
updated the proxy
khavinshankar 5c3c156
Merge branch 'abdm-m3' of github.com:coronasafe/care_fe into abdm-m3
khavinshankar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
import { Link } from "raviger"; | ||
import routes from "../../Redux/api"; | ||
import useQuery from "../../Utils/request/useQuery"; | ||
import { formatDateTime } from "../../Utils/utils"; | ||
import Loading from "../Common/Loading"; | ||
import Page from "../Common/components/Page"; | ||
|
||
interface IProps { | ||
facilityId: string; | ||
} | ||
|
||
const TableHeads = [ | ||
"Patient", | ||
"Status", | ||
"Created On", | ||
"Consent Granted On", | ||
// "Requested By", | ||
"Health Information Range", | ||
"Expires On", | ||
"HI Profiles", | ||
]; | ||
|
||
export default function ABDMFacilityRecords({ facilityId }: IProps) { | ||
const { data: consentsResult, loading } = useQuery(routes.listConsents, { | ||
query: { facility: facilityId, ordering: "-created_date" }, | ||
}); | ||
|
||
if (loading) { | ||
return <Loading />; | ||
} | ||
|
||
return ( | ||
<Page title="Patient Consent List"> | ||
<div className="px-4 sm:px-6 lg:px-8"> | ||
<div className="sm:flex sm:items-center"></div> | ||
<div className="mt-8 flow-root"> | ||
<div className="-mx-4 -my-2 overflow-x-auto sm:-mx-6 lg:-mx-8"> | ||
<div className="inline-block min-w-full py-2 align-middle sm:px-6 lg:px-8"> | ||
{/* eslint-disable-next-line tailwindcss/migration-from-tailwind-2 */} | ||
<div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 sm:rounded-lg"> | ||
<table className="min-w-full table-fixed divide-y divide-gray-300"> | ||
<thead className="bg-gray-50"> | ||
<tr> | ||
{TableHeads.map((head) => ( | ||
<th | ||
scope="col" | ||
className="px-3 py-3.5 text-center text-sm font-semibold text-gray-900" | ||
> | ||
{head} | ||
</th> | ||
))} | ||
<th | ||
scope="col" | ||
className="sticky right-0 top-0 py-3.5 pl-3 pr-4 sm:pr-6" | ||
> | ||
<span className="sr-only">View</span> | ||
</th> | ||
</tr> | ||
</thead> | ||
<tbody className="divide-y divide-gray-200 bg-white"> | ||
{consentsResult?.results.map((consent) => ( | ||
<tr key={consent.id}> | ||
<td className="px-3 py-4 text-center text-sm"> | ||
{consent.patient_abha_object?.name} | ||
<p className="text-gray-600"> | ||
({consent.patient_abha}) | ||
</p> | ||
</td> | ||
|
||
<td className="px-3 py-4 text-center text-sm capitalize"> | ||
{new Date( | ||
consent.consent_artefacts?.[0]?.expiry ?? | ||
consent.expiry | ||
) < new Date() | ||
? "EXPIRED" | ||
: consent.consent_artefacts?.[0]?.status ?? | ||
consent.status} | ||
</td> | ||
|
||
<td className="px-3 py-4 text-center text-sm"> | ||
{formatDateTime(consent.created_date)} | ||
</td> | ||
|
||
<td className="px-3 py-4 text-center text-sm"> | ||
{consent.consent_artefacts.length | ||
? formatDateTime( | ||
consent.consent_artefacts[0].created_date | ||
) | ||
: "-"} | ||
</td> | ||
|
||
{/* <td className="px-3 py-4 text-center text-sm"> | ||
{`${consent.requester?.first_name} ${consent.requester?.last_name}`.trim()} | ||
<p className="text-gray-600"> | ||
({consent.requester.username}) | ||
</p> | ||
</td> */} | ||
|
||
<td className="px-3 py-4 text-center text-sm"> | ||
{formatDateTime( | ||
consent.consent_artefacts?.[0]?.from_time ?? | ||
consent.from_time | ||
)}{" "} | ||
<br /> | ||
{formatDateTime( | ||
consent.consent_artefacts?.[0]?.to_time ?? | ||
consent.to_time | ||
)} | ||
</td> | ||
|
||
<td className="px-3 py-4 text-center text-sm"> | ||
{formatDateTime( | ||
consent.consent_artefacts?.[0]?.expiry ?? | ||
consent.expiry | ||
)} | ||
</td> | ||
|
||
<td className="px-3 py-4 text-center text-sm"> | ||
<div className="flex flex-wrap items-center justify-center"> | ||
{( | ||
consent.consent_artefacts?.[0]?.hi_types ?? | ||
consent.hi_types | ||
)?.map((hiType) => ( | ||
<span className="mb-2 mr-2 rounded-full bg-gray-100 px-2 py-1 text-xs font-medium text-gray-600"> | ||
{hiType} | ||
</span> | ||
))} | ||
</div> | ||
</td> | ||
|
||
<td className="sticky right-0 whitespace-nowrap bg-white py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6"> | ||
<div className="flex flex-col items-center justify-center gap-2"> | ||
{(consent.consent_artefacts?.[0]?.status ?? | ||
consent.status) === "GRANTED" && | ||
new Date( | ||
consent.consent_artefacts?.[0]?.expiry ?? | ||
consent.expiry | ||
) > new Date() ? ( | ||
<Link | ||
key={consent.id} | ||
href={`/abdm/health-information/${consent.id}`} | ||
className={ | ||
"cursor-pointer text-primary-600 hover:text-primary-900" | ||
} | ||
> | ||
View | ||
</Link> | ||
) : ( | ||
<p className="cursor-not-allowed text-gray-600 opacity-70 "> | ||
View | ||
</p> | ||
)} | ||
</div> | ||
</td> | ||
</tr> | ||
))} | ||
</tbody> | ||
</table> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</Page> | ||
); | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems to be unintentional, could you revert this change?