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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Use relative time for audit log details. #6640

Merged
merged 11 commits into from
Dec 6, 2023
Merged

Use relative time for audit log details. #6640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f7dfbc3
convert time to relative time
AshrafMd-1 Nov 15, 2023
b6e8796
change styling
AshrafMd-1 Nov 16, 2023
dc21f4f
Merge branch 'develop' into Fix-#6638
AshrafMd-1 Nov 16, 2023
0b62cfd
Merge branch 'coronasafe:develop' into Fix-#6638
AshrafMd-1 Nov 26, 2023
36a32dd
Merge branch 'coronasafe:develop' into Fix-#6638
AshrafMd-1 Nov 27, 2023
c32783a
Merge branch 'coronasafe:develop' into Fix-#6638
AshrafMd-1 Nov 27, 2023
720e7a8
Merge branch 'coronasafe:develop' into Fix-#6638
AshrafMd-1 Nov 30, 2023
7255ef0
change margin
AshrafMd-1 Dec 1, 2023
a6f4f11
Merge branch 'coronasafe:develop' into Fix-#6638
AshrafMd-1 Dec 1, 2023
e0778fc
add new classname
AshrafMd-1 Dec 1, 2023
1973b0e
Merge branch 'coronasafe:develop' into Fix-#6638
AshrafMd-1 Dec 3, 2023
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
14 changes: 11 additions & 3 deletions src/CAREUI/display/RecordMeta.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ interface Props {
time?: string;
prefix?: ReactNode;
className?: string;
inlineClassName?: string;
user?: {
first_name: string;
last_name: string;
Expand All @@ -23,7 +24,14 @@ interface Props {
* A generic component to display relative time along with a tooltip and a user
* if provided.
*/
const RecordMeta = ({ time, user, prefix, className, inlineUser }: Props) => {
const RecordMeta = ({
time,
user,
prefix,
className,
inlineClassName,
inlineUser,
}: Props) => {
const isOnline = user && isUserOnline(user);

let child = (
Expand All @@ -47,11 +55,11 @@ const RecordMeta = ({ time, user, prefix, className, inlineUser }: Props) => {

if (prefix || user) {
child = (
<div className="flex items-center gap-1">
<div className={`flex items-center gap-1 ${inlineClassName}`}>
{prefix}
{child}
{user && inlineUser && <span>by</span>}
{user && <CareIcon className="care-l-user" />}
{user && !inlineUser && <CareIcon className="care-l-user" />}
{user && inlineUser && (
<span className="font-medium">{formatName(user)}</span>
)}
Expand Down
27 changes: 12 additions & 15 deletions src/Components/Shifting/ShiftDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,28 +806,25 @@ export default function ShiftDetails(props: { id: string }) {
{t("created")}
</div>
<div className="mt-1 whitespace-pre text-sm leading-5 text-gray-900">
<div className="text-sm">
{data?.created_by_object?.first_name}
{data?.created_by_object?.last_name}
</div>
<div className="text-xs">
{data?.created_date && formatDateTime(data?.created_date)}
</div>
<RecordMeta
time={data?.created_date}
user={data?.created_by_object}
inlineUser={true}
inlineClassName={"flex-wrap justify-center"}
/>
</div>
</div>
<div className="mt-2 lg:mt-0">
<div className="text-sm font-medium leading-5 text-gray-500">
{t("last_edited")}
</div>
<div className="mt-1 whitespace-pre text-sm leading-5 text-gray-900">
<div className="text-sm">
{data?.last_edited_by_object?.first_name}{" "}
{data?.last_edited_by_object?.last_name}
</div>
<div className="text-xs">
{data?.modified_date &&
formatDateTime(data?.modified_date)}
</div>
<RecordMeta
time={data?.modified_date}
user={data?.last_edited_by_object}
inlineUser={true}
inlineClassName={"flex-wrap justify-center"}
/>
</div>
</div>
</div>
Expand Down
Loading