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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aligned Service History & Transaction History in Asset Details #6382

Merged
merged 5 commits into from
Oct 9, 2023
Merged

Aligned Service History & Transaction History in Asset Details #6382

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8fc261d
Aligned Service History & Transaction History in Asset Details
GokulramGHV Oct 2, 2023
f859a1e
aliged moved on and edit properly
GokulramGHV Oct 6, 2023
a028958
Merge branch 'develop' into fix-issue-6362
GokulramGHV Oct 6, 2023
d4f86a0
Merge branch 'develop' into fix-issue-6362
nihal467 Oct 8, 2023
cbe6ee9
Merge branch 'develop' into fix-issue-6362
GokulramGHV Oct 9, 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
20 changes: 10 additions & 10 deletions src/Components/Assets/AssetManage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,18 +164,18 @@ const AssetManage = (props: AssetManageProps) => {
{transaction.from_location.name}
</span>
</td>
<td className="whitespace-nowrap px-6 py-4 text-left text-sm leading-5 text-gray-500">
<td className="whitespace-nowrap px-6 py-4 text-center text-sm leading-5 text-gray-500">
<span className="font-medium text-gray-900">
{transaction.to_location.name}
</span>
</td>
<td className="whitespace-nowrap px-6 py-4 text-left text-sm leading-5 text-gray-500">
<td className="whitespace-nowrap px-6 py-4 text-center text-sm leading-5 text-gray-500">
<span className="font-medium text-gray-900">
{transaction.performed_by.first_name}{" "}
{transaction.performed_by.last_name}
</span>
</td>
<td className="whitespace-nowrap px-6 py-4 text-left text-sm leading-5 text-gray-500">
<td className="whitespace-nowrap px-6 py-4 text-right text-sm leading-5 text-gray-500">
<span className="font-medium text-gray-900">
{formatDateTime(transaction.modified_date)}
</span>
Expand All @@ -202,7 +202,7 @@ const AssetManage = (props: AssetManageProps) => {
setServiceDetails(
services.map((service: AssetService) => (
<tr key={`service_id_${service.id}`}>
<td className="whitespace-nowrap px-6 py-4 text-center text-sm leading-5 text-gray-500">
<td className="whitespace-nowrap px-6 py-4 text-left text-sm leading-5 text-gray-500">
<span className="font-medium text-gray-900">
{dayjs(service.serviced_on).format("DD MMM YYYY")}
</span>
Expand All @@ -229,7 +229,7 @@ const AssetManage = (props: AssetManageProps) => {
)}
</span>
</td>
<td className="gap-4 whitespace-nowrap px-6 py-4 text-left text-sm leading-5">
<td className="gap-4 whitespace-nowrap px-6 py-4 text-right text-sm leading-5">
<ButtonV2
id="edit-service-history"
authorizeFor={NonReadOnlyUsers}
Expand Down Expand Up @@ -525,7 +525,7 @@ const AssetManage = (props: AssetManageProps) => {
<table className="min-w-full divide-y divide-gray-200">
<thead>
<tr>
<th className="bg-gray-50 px-6 py-3 text-center text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
<th className="bg-gray-50 px-6 py-3 text-left text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
Serviced on
</th>
<th className="bg-gray-50 px-6 py-3 text-center text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
Expand All @@ -537,7 +537,7 @@ const AssetManage = (props: AssetManageProps) => {
<th className="bg-gray-50 px-6 py-3 text-center text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
Last Updated
</th>
<th className="bg-gray-50 px-6 py-3 text-center text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
<th className="relative right-10 bg-gray-50 px-6 py-3 text-right text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
Edit
</th>
</tr>
Expand All @@ -558,13 +558,13 @@ const AssetManage = (props: AssetManageProps) => {
<th className="bg-gray-50 px-6 py-3 text-left text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
Moved from
</th>
<th className="bg-gray-50 px-6 py-3 text-left text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
<th className="bg-gray-50 px-6 py-3 text-center text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
Moved to
</th>
<th className="bg-gray-50 px-6 py-3 text-left text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
<th className="bg-gray-50 px-6 py-3 text-center text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
Moved By
</th>
<th className="bg-gray-50 px-6 py-3 text-left text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
<th className="relative right-5 bg-gray-50 px-6 py-3 text-right text-xs font-medium uppercase leading-4 tracking-wider text-gray-500">
Moved On
</th>
</tr>
Expand Down
Loading