@hed-hog/operations 0.0.306 → 0.0.310

package/hedhog/frontend/app/_components/system-user-select-with-create.tsx.ejs

@@ -1,5 +1,6 @@
 'use client';
 
+import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
 import { Button } from '@/components/ui/button';
 import {
   Command,
@@ -26,11 +27,12 @@ import {
 import { useApp } from '@hed-hog/next-app-provider';
 import { Check, ChevronsUpDown, Plus, X } from 'lucide-react';
 import { useTranslations } from 'next-intl';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 export type SystemUserOption = {
   id: number;
   name: string;
+  photoId?: number | null;
 };
 
 type SystemUserSelectWithCreateProps = {
@@ -50,7 +52,7 @@ type SystemUserSelectWithCreateProps = {
 
 type UserListPayload = {
   paginate: {
-    data: Array<{ id: number; name: string | null }>;
+    data: Array<{ id: number; name: string | null; photo_id?: number | null }>;
     total: number;
     lastPage: number;
     page: number;
@@ -83,12 +85,36 @@ function parseUserListResponse(payload: UserListPayload): {
   hasMore: boolean;
 } {
   const raw = payload?.paginate?.data ?? [];
-  const items = raw.map((u) => ({ id: u.id, name: u.name || `#${u.id}` }));
+  const items = raw.map((u) => ({
+    id: u.id,
+    name: u.name || `#${u.id}`,
+    photoId: u.photo_id ?? null,
+  }));
   const hasMore =
     (payload?.paginate?.page ?? 1) < (payload?.paginate?.lastPage ?? 1);
   return { items, hasMore };
 }
 
+function getUserPhotoUrl(photoId?: number | null) {
+  return typeof photoId === 'number' && photoId > 0
+    ? `${process.env.NEXT_PUBLIC_API_BASE_URL}/file/open/${photoId}`
+    : undefined;
+}
+
+function getInitials(value?: string | null) {
+  const parts = String(value ?? '')
+    .trim()
+    .split(/\s+/)
+    .filter(Boolean)
+    .slice(0, 2);
+
+  if (!parts.length) {
+    return '??';
+  }
+
+  return parts.map((part) => part[0]?.toUpperCase() ?? '').join('');
+}
+
 export function SystemUserSelectWithCreate({
   label,
   value,
@@ -132,56 +158,55 @@ export function SystemUserSelectWithCreate({
     return () => clearTimeout(timeout);
   }, [search]);
 
-  const loadOwnerOptions = async (
-    page: number,
-    searchTerm: string,
-    reset: boolean
-  ) => {
-    const requestId = requestIdRef.current + 1;
-    requestIdRef.current = requestId;
-
-    if (reset) {
-      setIsLoadingOptions(true);
-    } else {
-      setIsLoadingMoreOptions(true);
-    }
-
-    try {
-      const params = new URLSearchParams();
-      params.set('page', String(page));
-      params.set('pageSize', String(PAGE_SIZE));
+  const loadOwnerOptions = useCallback(
+    async (page: number, searchTerm: string, reset: boolean) => {
+      const requestId = requestIdRef.current + 1;
+      requestIdRef.current = requestId;
 
-      const normalizedSearch = searchTerm.trim();
-      if (normalizedSearch) {
-        params.set('search', normalizedSearch);
+      if (reset) {
+        setIsLoadingOptions(true);
+      } else {
+        setIsLoadingMoreOptions(true);
       }
 
-      const response = await request<UserListPayload>({
-        url: `/user?${params.toString()}`,
-        method: 'GET',
-      });
+      try {
+        const params = new URLSearchParams();
+        params.set('page', String(page));
+        params.set('pageSize', String(PAGE_SIZE));
 
-      if (requestIdRef.current !== requestId) {
-        return;
-      }
+        const normalizedSearch = searchTerm.trim();
+        if (normalizedSearch) {
+          params.set('search', normalizedSearch);
+        }
 
-      const parsed = parseUserListResponse(response.data);
-      setCurrentPage(page);
-      setHasMore(parsed.hasMore);
-      setRemoteOptions((current) =>
-        reset ? parsed.items : mergeOptions(current, parsed.items)
-      );
-    } finally {
-      if (requestIdRef.current === requestId) {
-        setIsLoadingOptions(false);
-        setIsLoadingMoreOptions(false);
+        const response = await request<UserListPayload>({
+          url: `/user?${params.toString()}`,
+          method: 'GET',
+        });
+
+        if (requestIdRef.current !== requestId) {
+          return;
+        }
+
+        const parsed = parseUserListResponse(response.data);
+        setCurrentPage(page);
+        setHasMore(parsed.hasMore);
+        setRemoteOptions((current) =>
+          reset ? parsed.items : mergeOptions(current, parsed.items)
+        );
+      } finally {
+        if (requestIdRef.current === requestId) {
+          setIsLoadingOptions(false);
+          setIsLoadingMoreOptions(false);
+        }
       }
-    }
-  };
+    },
+    [request]
+  );
 
   useEffect(() => {
     void loadOwnerOptions(1, debouncedSearch, true);
-  }, [debouncedSearch]);
+  }, [debouncedSearch, loadOwnerOptions]);
 
   useEffect(() => {
     const normalizedValue = value.trim();
@@ -213,13 +238,14 @@ export function SystemUserSelectWithCreate({
         }
 
         const rawUser = response.data as
-          | { id?: number; name?: string | null }
+          | { id?: number; name?: string | null; photo_id?: number | null }
           | undefined;
         const resolvedOption =
           rawUser?.id && String(rawUser.id) === normalizedValue
             ? {
                 id: rawUser.id,
                 name: rawUser.name || `#${rawUser.id}`,
+                photoId: rawUser.photo_id ?? null,
               }
             : null;
 
@@ -232,6 +258,7 @@ export function SystemUserSelectWithCreate({
         setSelectedValueOption({
           id: Number(normalizedValue),
           name: `#${normalizedValue}`,
+          photoId: null,
         });
       })
       .catch(() => {
@@ -239,6 +266,7 @@ export function SystemUserSelectWithCreate({
           setSelectedValueOption({
             id: Number(normalizedValue),
             name: `#${normalizedValue}`,
+            photoId: null,
           });
         }
       });
@@ -371,13 +399,26 @@ export function SystemUserSelectWithCreate({
                 type="button"
                 variant="outline"
                 role="combobox"
-                className="h-10 min-w-0 flex-1 justify-between overflow-hidden"
+                className="h-10 min-w-0 flex-1 justify-between gap-2 overflow-hidden"
               >
-                <span className="truncate text-left">
-                  {selectedOption
-                    ? `${selectedOption.name} (#${selectedOption.id})`
-                    : emptyLabel}
-                </span>
+                <div className="flex min-w-0 items-center gap-2">
+                  {selectedOption ? (
+                    <Avatar className="h-7 w-7 shrink-0 border border-border/60 bg-muted">
+                      <AvatarImage
+                        src={getUserPhotoUrl(selectedOption.photoId)}
+                        alt={selectedOption.name}
+                      />
+                      <AvatarFallback className="bg-muted text-[11px] font-semibold text-foreground">
+                        {getInitials(selectedOption.name)}
+                      </AvatarFallback>
+                    </Avatar>
+                  ) : null}
+                  <span className="truncate text-left">
+                    {selectedOption
+                      ? `${selectedOption.name} (#${selectedOption.id})`
+                      : emptyLabel}
+                  </span>
+                </div>
                 <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
               </Button>
             </PopoverTrigger>
@@ -433,6 +474,7 @@ export function SystemUserSelectWithCreate({
                       <CommandItem
                         key={option.id}
                         value={`${option.name} #${option.id}`}
+                        className="gap-2"
                         onSelect={() => {
                           onChange(String(option.id));
                           setOpen(false);
@@ -443,6 +485,15 @@ export function SystemUserSelectWithCreate({
                         ) : (
                           <span className="mr-2 h-4 w-4" />
                         )}
+                        <Avatar className="h-7 w-7 shrink-0 border border-border/60 bg-muted">
+                          <AvatarImage
+                            src={getUserPhotoUrl(option.photoId)}
+                            alt={option.name}
+                          />
+                          <AvatarFallback className="bg-muted text-[11px] font-semibold text-foreground">
+                            {getInitials(option.name)}
+                          </AvatarFallback>
+                        </Avatar>
                         <div className="min-w-0">
                           <div className="truncate">{option.name}</div>
                           <div className="truncate text-xs text-muted-foreground">

package/hedhog/frontend/app/_lib/types.ts.ejs

@@ -67,6 +67,20 @@ export type OperationsCollaborator = {
   pendingScheduleAdjustmentRequests?: number;
 };
 
+export type OperationsCollaboratorStats = {
+  total: number;
+  active: number;
+  onLeave: number;
+  withContracts: number;
+};
+
+export type OperationsContractStats = {
+  total: number;
+  active: number;
+  inactive: number;
+  withFile: number;
+};
+
 export type OperationsDepartment = {
   id: number;
   slug: string;
@@ -182,10 +196,6 @@ export type OperationsContract = {
   accountManagerName?: string | null;
   relatedCollaboratorId?: number | null;
   relatedCollaboratorName?: string | null;
-  contractTemplateId?: number | null;
-  contractTemplateName?: string | null;
-  contractTemplateSlug?: string | null;
-  contractTemplateCode?: string | null;
   mainRelatedPartyName?: string | null;
   originType?: string | null;
   originId?: number | null;
@@ -209,24 +219,6 @@ export type OperationsContract = {
   scheduleSummary?: OperationsWeeklyScheduleDay[];
 };
 
-export type OperationsContractTemplate = {
-  id: number;
-  slug: string;
-  code?: string | null;
-  name: string;
-  description?: string | null;
-  contractCategory?: string | null;
-  contractType?: string | null;
-  billingModel?: string | null;
-  signatureStatus?: string | null;
-  isActive?: boolean;
-  status: string;
-  contentHtml?: string | null;
-  usageCount?: number;
-  createdAt?: string | null;
-  updatedAt?: string | null;
-};
-
 export type OperationsWeeklyScheduleDay = {
   weekday: string;
   isWorkingDay: boolean;
@@ -353,6 +345,10 @@ export type OperationsApproval = {
   scheduleStartDate?: string | null;
   scheduleEndDate?: string | null;
   scheduleReason?: string | null;
+  // enriched detail (returned by GET /operations/approvals/:id)
+  entries?: OperationsTimesheetEntry[];
+  days?: OperationsScheduleAdjustmentDay[];
+  currentSchedule?: OperationsWeeklyScheduleDay[];
 };
 
 export type OperationsTeamOverview = {
@@ -426,7 +422,6 @@ export type OperationsProjectDetails = OperationsProject & {
     roleLabel?: string | null;
     allocationPercent?: number | null;
     weeklyHours?: number | null;
-    isBillable?: boolean;
     startDate?: string | null;
     endDate?: string | null;
     status: string;
@@ -439,7 +434,7 @@ export type OperationsProjectDetails = OperationsProject & {
   };
   operationalIndicators: {
     activeAssignments: number;
-    billableAssignments: number;
+    completedAssignments: number;
     averageAllocation: number;
     totalWeeklyHours: number;
   };

package/hedhog/frontend/app/_lib/utils/format.ts.ejs

@@ -3,14 +3,19 @@ import {
   formatDate as formatDateWithSettings,
 } from '@/lib/format-date';
 
-export const operationsCurrency = new Intl.NumberFormat('en-US', {
-  style: 'currency',
-  currency: 'USD',
-  maximumFractionDigits: 0,
-});
-
-export function formatCurrency(value: number) {
-  return operationsCurrency.format(value);
+export function formatCurrency(
+  value: number,
+  getSettingValue?: ((key: string) => unknown) | null,
+  currentLocaleCode = 'pt-BR'
+) {
+  const currency =
+    (getSettingValue?.('currency') as string | undefined) || 'BRL';
+  const locale = resolveLocale(currentLocaleCode);
+  return new Intl.NumberFormat(locale, {
+    style: 'currency',
+    currency,
+    maximumFractionDigits: 2,
+  }).format(value);
 }
 
 function resolveLocale(currentLocaleCode: string) {
@@ -179,7 +184,7 @@ export function formatDateRange(
     return formatDate(startDate, getSettingValue, currentLocaleCode);
   }
 
-  return `${formatDate(startDate, getSettingValue, currentLocaleCode)} to ${formatDate(endDate, getSettingValue, currentLocaleCode)}`;
+  return `${formatDate(startDate, getSettingValue, currentLocaleCode)} - ${formatDate(endDate, getSettingValue, currentLocaleCode)}`;
 }
 
 export function getStatusBadgeClass(value?: string | null) {