Merge branch 'fixing-height-in-intrest-popup' of WrenchBoard/Users-Wrench into master
This commit is contained in:
@@ -52,15 +52,20 @@ export default function FamilyTable({
|
|||||||
task_count,
|
task_count,
|
||||||
family_uid,
|
family_uid,
|
||||||
banner,
|
banner,
|
||||||
|
enable_traking,
|
||||||
}) => {
|
}) => {
|
||||||
// Check for valid dates
|
// Check for valid dates
|
||||||
const addedDate = added ? added.split(" ")[0] : "N/A";
|
const addedDate = added ? added.split(" ")[0] : "N/A";
|
||||||
const loginDate = last_login ? formatDateString(last_login) : "N/A";
|
const loginDate = last_login ? formatDateString(last_login) : "N/A";
|
||||||
|
const key = `family-${family_uid}`; // Assign a unique key
|
||||||
|
|
||||||
|
const trackingStatus =
|
||||||
|
enable_traking === "0" ? "Stopped" : enable_traking === "100" ? "Active" : "";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<tr
|
<tr
|
||||||
className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"
|
className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"
|
||||||
key={family_uid}
|
key={key}
|
||||||
>
|
>
|
||||||
<td className="py-4">
|
<td className="py-4">
|
||||||
<div className="flex space-x-2 items-center w-full">
|
<div className="flex space-x-2 items-center w-full">
|
||||||
@@ -85,6 +90,23 @@ export default function FamilyTable({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
|
<td className="text-center py-4 px-2">
|
||||||
|
<div className="flex space-x-1 items-center justify-center">
|
||||||
|
<span
|
||||||
|
className={`text-base font-medium whitespace-nowrap ${
|
||||||
|
enable_traking === "0"
|
||||||
|
? "text-[#FF0000] dark:text-[#FF6666]"
|
||||||
|
: enable_traking === "100"
|
||||||
|
? "text-[#00A000] dark:text-[#00FF00]"
|
||||||
|
: "text-dark-gray dark:text-white"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
{trackingStatus}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
|
||||||
<td className="text-center py-4 px-2">
|
<td className="text-center py-4 px-2">
|
||||||
<div className="flex space-x-1 items-center justify-center">
|
<div className="flex space-x-1 items-center justify-center">
|
||||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
|
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
|
||||||
@@ -92,6 +114,7 @@ export default function FamilyTable({
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td className="text-right py-4 px-2 flex items-center justify-center">
|
<td className="text-right py-4 px-2 flex items-center justify-center">
|
||||||
<button
|
<button
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
@@ -116,6 +139,8 @@ export default function FamilyTable({
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
console.log(currentFamilyList);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={`update-table w-full h-full p-4 bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] flex flex-col justify-between ${
|
className={`update-table w-full h-full p-4 bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] flex flex-col justify-between ${
|
||||||
@@ -134,6 +159,7 @@ export default function FamilyTable({
|
|||||||
<thead className="sticky top-0">
|
<thead className="sticky top-0">
|
||||||
<tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29] default-border-bottom ">
|
<tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29] default-border-bottom ">
|
||||||
<th className="py-4">Name</th>
|
<th className="py-4">Name</th>
|
||||||
|
<th className="py-4 text-center">Tracking</th>
|
||||||
<th className="py-4 text-center">No of Tasks</th>
|
<th className="py-4 text-center">No of Tasks</th>
|
||||||
<th className="py-4 text-right"></th>
|
<th className="py-4 text-right"></th>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user