mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-25 07:45:47 +00:00
chore: sort activity and employee name
This commit is contained in:
+28
-3
@@ -275,6 +275,13 @@ export function DetailDailyChecklistContent() {
|
|||||||
])
|
])
|
||||||
).values()
|
).values()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
uniqueEmployees.sort((a, b) =>
|
||||||
|
a.name.localeCompare(b.name, undefined, {
|
||||||
|
sensitivity: 'base',
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
setEmployees(uniqueEmployees);
|
setEmployees(uniqueEmployees);
|
||||||
|
|
||||||
// Group data by Phase → Time Type → Activity
|
// Group data by Phase → Time Type → Activity
|
||||||
@@ -779,11 +786,23 @@ export function DetailDailyChecklistContent() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ACTIVITY rows
|
// ACTIVITY rows
|
||||||
timeGroup.activities.forEach((activity, index) => {
|
const activities = timeGroup.activities;
|
||||||
|
|
||||||
|
activities.sort((a, b) =>
|
||||||
|
a.name.localeCompare(b.name, undefined, {
|
||||||
|
sensitivity: 'base',
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
activities.forEach((activity, index) => {
|
||||||
const indentClass = hasMultipleTimeTypes
|
const indentClass = hasMultipleTimeTypes
|
||||||
? 'pl-12'
|
? 'pl-12'
|
||||||
: 'pl-8';
|
: 'pl-8';
|
||||||
|
|
||||||
|
console.log({
|
||||||
|
activity,
|
||||||
|
});
|
||||||
|
|
||||||
rows.push(
|
rows.push(
|
||||||
<tr
|
<tr
|
||||||
key={`activity-${activity.id}-${index}`}
|
key={`activity-${activity.id}-${index}`}
|
||||||
@@ -823,9 +842,15 @@ export function DetailDailyChecklistContent() {
|
|||||||
})}
|
})}
|
||||||
<td className='py-3 px-4'>
|
<td className='py-3 px-4'>
|
||||||
{activity.employees.length > 0 &&
|
{activity.employees.length > 0 &&
|
||||||
activity.employees[0].note ? (
|
activity.employees[
|
||||||
|
activity.employees.length - 1
|
||||||
|
].note ? (
|
||||||
<p className='text-sm text-gray-600'>
|
<p className='text-sm text-gray-600'>
|
||||||
{activity.employees[0].note}
|
{
|
||||||
|
activity.employees[
|
||||||
|
activity.employees.length - 1
|
||||||
|
].note
|
||||||
|
}
|
||||||
</p>
|
</p>
|
||||||
) : (
|
) : (
|
||||||
<p className='text-xs text-gray-400 italic'>
|
<p className='text-xs text-gray-400 italic'>
|
||||||
|
|||||||
Reference in New Issue
Block a user