diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/SqlData/Sal_T_Approval.sql b/api/src/Sozsoft.Platform.DbMigrator/Seeds/SqlData/Sal_T_Approval.xsql similarity index 100% rename from api/src/Sozsoft.Platform.DbMigrator/Seeds/SqlData/Sal_T_Approval.sql rename to api/src/Sozsoft.Platform.DbMigrator/Seeds/SqlData/Sal_T_Approval.xsql diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/WizardData/202606071923_Approval.json b/api/src/Sozsoft.Platform.DbMigrator/Seeds/WizardData/202606071923_Approval.xjson similarity index 100% rename from api/src/Sozsoft.Platform.DbMigrator/Seeds/WizardData/202606071923_Approval.json rename to api/src/Sozsoft.Platform.DbMigrator/Seeds/WizardData/202606071923_Approval.xjson diff --git a/ui/src/views/admin/hr/OrgChart.tsx b/ui/src/views/admin/hr/OrgChart.tsx index f32fca2..b20af0b 100644 --- a/ui/src/views/admin/hr/OrgChart.tsx +++ b/ui/src/views/admin/hr/OrgChart.tsx @@ -11,6 +11,7 @@ import { FaFileImage, } from 'react-icons/fa' import { Helmet } from 'react-helmet' +import { AnimatePresence } from 'framer-motion' import { getOrgChartDepartments, getOrgChartJobPositions, @@ -24,6 +25,7 @@ import { useCurrentMenuIcon } from '@/utils/hooks/useCurrentMenuIcon' import { Avatar } from '@/components/ui' import { AVATAR_URL } from '@/constants/app.constant' import { useStoreState } from '@/store' +import UserProfileCard from '@/views/intranet/SocialWall/UserProfileCard' type ViewMode = 'department' | 'jobPosition' @@ -337,7 +339,18 @@ function buildEdges(tree: TreeNode[]): EdgeLink[] { return edges } -function UserAvatar({ user, tenantId }: { user: OrgChartUserDto; tenantId?: string }) { +function UserAvatar({ + user, + tenantId, + title, + department, +}: { + user: OrgChartUserDto + tenantId?: string + title: string + department?: string +}) { + const [showUserCard, setShowUserCard] = useState(false) const initials = (user.fullName || user.userName || '?') .split(' ') .map((w) => w[0]?.toUpperCase() ?? '') @@ -347,15 +360,37 @@ function UserAvatar({ user, tenantId }: { user: OrgChartUserDto; tenantId?: stri const src = AVATAR_URL(user.id, tenantId) return ( - setShowUserCard(true)} + onMouseLeave={() => setShowUserCard(false)} > - {initials} - + + {initials} + + + {showUserCard && ( + + )} + + ) } @@ -501,7 +536,12 @@ function OrgChartNode({
{node.users.map((user) => (
- + {user.fullName || user.userName}