Compare commits

...

4 Commits

Author SHA1 Message Date
Felipe Coutinho
a2ce7f1283 chore: preparar versão 2.7.11 2026-06-28 19:48:56 -03:00
Felipe Coutinho
f3c3d98aeb feat: agrupar lançamentos por data 2026-06-28 19:48:39 -03:00
Felipe Coutinho
24709ec232 style: compactar checkboxes 2026-06-28 19:48:29 -03:00
Felipe Coutinho
2fd94118f2 fix: corrigir seleção de data nos lançamentos 2026-06-28 19:48:25 -03:00
24 changed files with 3300 additions and 62 deletions

View File

@@ -5,6 +5,23 @@ Todas as mudanças notáveis deste projeto serão documentadas neste arquivo.
O formato é baseado em [Keep a Changelog](https://keepachangelog.com/pt-BR/1.1.0/), O formato é baseado em [Keep a Changelog](https://keepachangelog.com/pt-BR/1.1.0/),
e este projeto adere ao [Versionamento Semântico](https://semver.org/lang/pt-BR/). e este projeto adere ao [Versionamento Semântico](https://semver.org/lang/pt-BR/).
## [2.7.11] - 2026-06-28
Esta atualização melhora a leitura diária dos lançamentos e deixa a nova visualização opcional, mantendo a possibilidade de voltar ao formato anterior quando a lista agrupada não for a melhor escolha para o usuário.
### Adicionado
- Preferências: nova opção `Agrupar por data` em Ajustes > Preferências > Lançamentos para alternar entre a lista agrupada por data e a visualização anterior.
- Lançamentos: a lista agora pode exibir uma barra de data por grupo no formato `TER, 26 JUN 2026`, reunindo os lançamentos daquele dia.
### Alterado
- Lançamentos: quando o agrupamento por data está ativo, os cards e linhas deixam de repetir a data em cada item, reduzindo ruído visual e mantendo vencimentos de boleto como informação do lançamento.
- Lançamentos: a preferência de agrupamento por data é aplicada nas listagens principais, extratos de conta, faturas de cartão, detalhes de pessoa e detalhes de categoria.
- Interface: checkboxes passam a usar um visual mais compacto.
- Documentação: o README agora cita o agrupamento por data entre as opções de personalização.
### Corrigido
- Lançamentos: o seletor de data em modais de criação e edição volta a aceitar a data selecionada no calendário.
## [2.7.10] - 2026-06-27 ## [2.7.10] - 2026-06-27
Esta versão ajusta a experiência de leitura dos lançamentos parcelados após antecipações, permitindo esconder parcelas já liquidadas por antecipação sem perder o histórico quando ele ainda for necessário. Esta versão ajusta a experiência de leitura dos lançamentos parcelados após antecipações, permitindo esconder parcelas já liquidadas por antecipação sem perder o histórico quando ele ainda for necessário.

View File

@@ -10,7 +10,7 @@
> **Não há versão online hospedada.** Você precisa clonar o repositório e rodar localmente ou no seu próprio servidor. > **Não há versão online hospedada.** Você precisa clonar o repositório e rodar localmente ou no seu próprio servidor.
[![Version](https://img.shields.io/badge/version-2.7.10-blue?style=flat-square)](CHANGELOG.md) [![Version](https://img.shields.io/badge/version-2.7.11-blue?style=flat-square)](CHANGELOG.md)
[![Next.js](https://img.shields.io/badge/Next.js-black?style=flat-square&logo=next.js)](https://nextjs.org/) [![Next.js](https://img.shields.io/badge/Next.js-black?style=flat-square&logo=next.js)](https://nextjs.org/)
[![TypeScript](https://img.shields.io/badge/TypeScript-blue?style=flat-square&logo=typescript)](https://www.typescriptlang.org/) [![TypeScript](https://img.shields.io/badge/TypeScript-blue?style=flat-square&logo=typescript)](https://www.typescriptlang.org/)
[![PostgreSQL](https://img.shields.io/badge/PostgreSQL-blue?style=flat-square&logo=postgresql)](https://www.postgresql.org/) [![PostgreSQL](https://img.shields.io/badge/PostgreSQL-blue?style=flat-square&logo=postgresql)](https://www.postgresql.org/)
@@ -89,7 +89,7 @@ A ideia é simples: ter um lugar onde consigo ver todas as minhas contas, cartõ
<img src="./public/images/companion-preview-light.webp" alt="OpenMonetis Companion" width="300" height="600" /> <img src="./public/images/companion-preview-light.webp" alt="OpenMonetis Companion" width="300" height="600" />
</p> </p>
⚙️ **Personalização** — Tema dark/light, modo privacidade, ordem das colunas, exibição de anotações, tamanho máximo de anexos, resumo opcional no modal de lançamento e changelog visual para acompanhar as novidades do app. ⚙️ **Personalização** — Tema dark/light, modo privacidade, ordem das colunas, agrupamento por data em lançamentos, exibição de anotações, tamanho máximo de anexos, resumo opcional no modal de lançamento e changelog visual para acompanhar as novidades do app.
### Stack técnica ### Stack técnica
@@ -628,8 +628,8 @@ Antes de começar, leia o [`CLAUDE.md`](CLAUDE.md) — ele documenta a arquitetu
As validações rodam em pull requests e em cada push na `main`. A publicação só começa quando uma tag SemVer aponta para um commit validado e a versão da tag corresponde ao `package.json` e ao `CHANGELOG.md`. As validações rodam em pull requests e em cada push na `main`. A publicação só começa quando uma tag SemVer aponta para um commit validado e a versão da tag corresponde ao `package.json` e ao `CHANGELOG.md`.
```bash ```bash
git tag -a v2.7.10 -m "v2.7.10" git tag -a v2.7.11 -m "v2.7.11"
git push origin v2.7.10 git push origin v2.7.11
``` ```
O workflow da tag valida o código, publica as imagens Docker versionadas e `latest` e, somente depois, cria a GitHub Release com as notas do changelog. O workflow da tag valida o código, publica as imagens Docker versionadas e `latest` e, somente depois, cria a GitHub Release com as notas do changelog.

View File

@@ -0,0 +1 @@
ALTER TABLE "preferencias_usuario" ADD COLUMN "agrupar_lancamentos_por_data" boolean DEFAULT true NOT NULL;

File diff suppressed because it is too large Load Diff

View File

@@ -225,6 +225,13 @@
"when": 1782569103402, "when": 1782569103402,
"tag": "0032_bumpy_spencer_smythe", "tag": "0032_bumpy_spencer_smythe",
"breakpoints": true "breakpoints": true
},
{
"idx": 33,
"version": "7",
"when": 1782685465530,
"tag": "0033_demonic_supreme_intelligence",
"breakpoints": true
} }
] ]
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "openmonetis", "name": "openmonetis",
"version": "2.7.10", "version": "2.7.11",
"private": true, "private": true,
"packageManager": "pnpm@11.1.3", "packageManager": "pnpm@11.1.3",
"scripts": { "scripts": {

View File

@@ -235,6 +235,9 @@ export default async function Page({ params, searchParams }: PageProps) {
)} )}
noteAsColumn={userPreferences?.statementNoteAsColumn ?? false} noteAsColumn={userPreferences?.statementNoteAsColumn ?? false}
columnOrder={userPreferences?.transactionsColumnOrder ?? null} columnOrder={userPreferences?.transactionsColumnOrder ?? null}
groupTransactionsByDate={
userPreferences?.groupTransactionsByDate ?? true
}
attachmentMaxSizeMb={userPreferences?.attachmentMaxSizeMb ?? 50} attachmentMaxSizeMb={userPreferences?.attachmentMaxSizeMb ?? 50}
/> />
</section> </section>

View File

@@ -212,6 +212,9 @@ export default async function Page({ params, searchParams }: PageProps) {
allowCreate allowCreate
noteAsColumn={userPreferences?.statementNoteAsColumn ?? false} noteAsColumn={userPreferences?.statementNoteAsColumn ?? false}
columnOrder={userPreferences?.transactionsColumnOrder ?? null} columnOrder={userPreferences?.transactionsColumnOrder ?? null}
groupTransactionsByDate={
userPreferences?.groupTransactionsByDate ?? true
}
attachmentMaxSizeMb={userPreferences?.attachmentMaxSizeMb ?? 50} attachmentMaxSizeMb={userPreferences?.attachmentMaxSizeMb ?? 50}
defaultCardId={card.id} defaultCardId={card.id}
defaultPaymentMethod="Cartão de crédito" defaultPaymentMethod="Cartão de crédito"

View File

@@ -105,6 +105,9 @@ export default async function Page({ params, searchParams }: PageProps) {
allowCreate={true} allowCreate={true}
noteAsColumn={userPreferences?.statementNoteAsColumn ?? false} noteAsColumn={userPreferences?.statementNoteAsColumn ?? false}
columnOrder={userPreferences?.transactionsColumnOrder ?? null} columnOrder={userPreferences?.transactionsColumnOrder ?? null}
groupTransactionsByDate={
userPreferences?.groupTransactionsByDate ?? true
}
attachmentMaxSizeMb={userPreferences?.attachmentMaxSizeMb ?? 50} attachmentMaxSizeMb={userPreferences?.attachmentMaxSizeMb ?? 50}
/> />
</main> </main>

View File

@@ -408,6 +408,9 @@ export default async function Page({ params, searchParams }: PageProps) {
allowCreate={canEdit} allowCreate={canEdit}
noteAsColumn={userPreferences?.statementNoteAsColumn ?? false} noteAsColumn={userPreferences?.statementNoteAsColumn ?? false}
columnOrder={userPreferences?.transactionsColumnOrder ?? null} columnOrder={userPreferences?.transactionsColumnOrder ?? null}
groupTransactionsByDate={
userPreferences?.groupTransactionsByDate ?? true
}
attachmentMaxSizeMb={userPreferences?.attachmentMaxSizeMb ?? 50} attachmentMaxSizeMb={userPreferences?.attachmentMaxSizeMb ?? 50}
importPayerOptions={loggedUserOptionSets?.payerOptions} importPayerOptions={loggedUserOptionSets?.payerOptions}
importSplitPayerOptions={ importSplitPayerOptions={

View File

@@ -85,6 +85,9 @@ export default async function Page() {
showTransactionSummary={ showTransactionSummary={
userPreferences?.showTransactionSummary ?? true userPreferences?.showTransactionSummary ?? true
} }
groupTransactionsByDate={
userPreferences?.groupTransactionsByDate ?? true
}
hideAnticipatedInstallments={ hideAnticipatedInstallments={
userPreferences?.hideAnticipatedInstallments ?? false userPreferences?.hideAnticipatedInstallments ?? false
} }

View File

@@ -114,6 +114,9 @@ export default async function Page({ searchParams }: PageProps) {
}} }}
noteAsColumn={userPreferences?.statementNoteAsColumn ?? false} noteAsColumn={userPreferences?.statementNoteAsColumn ?? false}
columnOrder={userPreferences?.transactionsColumnOrder ?? null} columnOrder={userPreferences?.transactionsColumnOrder ?? null}
groupTransactionsByDate={
userPreferences?.groupTransactionsByDate ?? true
}
attachmentMaxSizeMb={userPreferences?.attachmentMaxSizeMb ?? 50} attachmentMaxSizeMb={userPreferences?.attachmentMaxSizeMb ?? 50}
/> />
</LogoPrefetchProvider> </LogoPrefetchProvider>

View File

@@ -157,6 +157,9 @@ export const userPreferences = pgTable("preferencias_usuario", {
showTransactionSummary: boolean("mostrar_resumo_lancamento") showTransactionSummary: boolean("mostrar_resumo_lancamento")
.notNull() .notNull()
.default(true), .default(true),
groupTransactionsByDate: boolean("agrupar_lancamentos_por_data")
.notNull()
.default(true),
hideAnticipatedInstallments: boolean("ocultar_parcelas_antecipadas") hideAnticipatedInstallments: boolean("ocultar_parcelas_antecipadas")
.notNull() .notNull()
.default(false), .default(false),

View File

@@ -69,6 +69,7 @@ const updatePreferencesSchema = z.object({
transactionsColumnOrder: z.array(z.string()).nullable(), transactionsColumnOrder: z.array(z.string()).nullable(),
attachmentMaxSizeMb: z.number().int().min(1).max(100), attachmentMaxSizeMb: z.number().int().min(1).max(100),
showTransactionSummary: z.boolean(), showTransactionSummary: z.boolean(),
groupTransactionsByDate: z.boolean(),
hideAnticipatedInstallments: z.boolean(), hideAnticipatedInstallments: z.boolean(),
}); });
@@ -585,6 +586,7 @@ export async function updatePreferencesAction(
transactionsColumnOrder: validated.transactionsColumnOrder, transactionsColumnOrder: validated.transactionsColumnOrder,
attachmentMaxSizeMb: validated.attachmentMaxSizeMb, attachmentMaxSizeMb: validated.attachmentMaxSizeMb,
showTransactionSummary: validated.showTransactionSummary, showTransactionSummary: validated.showTransactionSummary,
groupTransactionsByDate: validated.groupTransactionsByDate,
hideAnticipatedInstallments: validated.hideAnticipatedInstallments, hideAnticipatedInstallments: validated.hideAnticipatedInstallments,
updatedAt: new Date(), updatedAt: new Date(),
}) })
@@ -597,6 +599,7 @@ export async function updatePreferencesAction(
transactionsColumnOrder: validated.transactionsColumnOrder, transactionsColumnOrder: validated.transactionsColumnOrder,
attachmentMaxSizeMb: validated.attachmentMaxSizeMb, attachmentMaxSizeMb: validated.attachmentMaxSizeMb,
showTransactionSummary: validated.showTransactionSummary, showTransactionSummary: validated.showTransactionSummary,
groupTransactionsByDate: validated.groupTransactionsByDate,
hideAnticipatedInstallments: validated.hideAnticipatedInstallments, hideAnticipatedInstallments: validated.hideAnticipatedInstallments,
}); });
} }

View File

@@ -43,6 +43,7 @@ interface PreferencesFormProps {
transactionsColumnOrder: string[] | null; transactionsColumnOrder: string[] | null;
attachmentMaxSizeMb: number; attachmentMaxSizeMb: number;
showTransactionSummary: boolean; showTransactionSummary: boolean;
groupTransactionsByDate: boolean;
hideAnticipatedInstallments: boolean; hideAnticipatedInstallments: boolean;
} }
@@ -88,6 +89,7 @@ export function PreferencesForm({
transactionsColumnOrder: initialColumnOrder, transactionsColumnOrder: initialColumnOrder,
attachmentMaxSizeMb: initialAttachmentMaxSizeMb, attachmentMaxSizeMb: initialAttachmentMaxSizeMb,
showTransactionSummary: initialShowTransactionSummary, showTransactionSummary: initialShowTransactionSummary,
groupTransactionsByDate: initialGroupTransactionsByDate,
hideAnticipatedInstallments: initialHideAnticipatedInstallments, hideAnticipatedInstallments: initialHideAnticipatedInstallments,
}: PreferencesFormProps) { }: PreferencesFormProps) {
const router = useRouter(); const router = useRouter();
@@ -111,6 +113,9 @@ export function PreferencesForm({
const [showTransactionSummary, setShowTransactionSummary] = useState( const [showTransactionSummary, setShowTransactionSummary] = useState(
initialShowTransactionSummary, initialShowTransactionSummary,
); );
const [groupTransactionsByDate, setGroupTransactionsByDate] = useState(
initialGroupTransactionsByDate,
);
const [hideAnticipatedInstallments, setHideAnticipatedInstallments] = const [hideAnticipatedInstallments, setHideAnticipatedInstallments] =
useState(initialHideAnticipatedInstallments); useState(initialHideAnticipatedInstallments);
@@ -139,6 +144,7 @@ export function PreferencesForm({
transactionsColumnOrder: columnOrder, transactionsColumnOrder: columnOrder,
attachmentMaxSizeMb, attachmentMaxSizeMb,
showTransactionSummary, showTransactionSummary,
groupTransactionsByDate,
hideAnticipatedInstallments, hideAnticipatedInstallments,
}); });
@@ -203,6 +209,26 @@ export function PreferencesForm({
<Separator /> <Separator />
<section className="flex items-center justify-between max-w-md gap-4">
<div className="space-y-2">
<Label htmlFor="group-transactions-by-date" className="text-sm">
Agrupar por data
</Label>
<p className="text-sm text-muted-foreground">
Mostra uma barra de data acima dos lançamentos daquele dia. Quando
desativado, a data volta a aparecer em cada lançamento.
</p>
</div>
<Switch
id="group-transactions-by-date"
checked={groupTransactionsByDate}
onCheckedChange={setGroupTransactionsByDate}
disabled={isPending}
/>
</section>
<Separator />
<section className="flex items-center justify-between max-w-md gap-4"> <section className="flex items-center justify-between max-w-md gap-4">
<div className="space-y-2"> <div className="space-y-2">
<Label htmlFor="hide-anticipated-installments" className="text-sm"> <Label htmlFor="hide-anticipated-installments" className="text-sm">

View File

@@ -7,6 +7,7 @@ interface UserPreferences {
transactionsColumnOrder: string[] | null; transactionsColumnOrder: string[] | null;
attachmentMaxSizeMb: number; attachmentMaxSizeMb: number;
showTransactionSummary: boolean; showTransactionSummary: boolean;
groupTransactionsByDate: boolean;
hideAnticipatedInstallments: boolean; hideAnticipatedInstallments: boolean;
} }
@@ -37,6 +38,7 @@ export async function fetchUserPreferences(
transactionsColumnOrder: schema.userPreferences.transactionsColumnOrder, transactionsColumnOrder: schema.userPreferences.transactionsColumnOrder,
attachmentMaxSizeMb: schema.userPreferences.attachmentMaxSizeMb, attachmentMaxSizeMb: schema.userPreferences.attachmentMaxSizeMb,
showTransactionSummary: schema.userPreferences.showTransactionSummary, showTransactionSummary: schema.userPreferences.showTransactionSummary,
groupTransactionsByDate: schema.userPreferences.groupTransactionsByDate,
hideAnticipatedInstallments: hideAnticipatedInstallments:
schema.userPreferences.hideAnticipatedInstallments, schema.userPreferences.hideAnticipatedInstallments,
}) })

View File

@@ -82,6 +82,7 @@ interface TransactionsPageProps {
allowCreate?: boolean; allowCreate?: boolean;
noteAsColumn?: boolean; noteAsColumn?: boolean;
columnOrder?: string[] | null; columnOrder?: string[] | null;
groupTransactionsByDate?: boolean;
defaultCardId?: string | null; defaultCardId?: string | null;
defaultPaymentMethod?: string | null; defaultPaymentMethod?: string | null;
lockCardSelection?: boolean; lockCardSelection?: boolean;
@@ -119,6 +120,7 @@ export function TransactionsPage({
allowCreate = true, allowCreate = true,
noteAsColumn = false, noteAsColumn = false,
columnOrder = null, columnOrder = null,
groupTransactionsByDate = true,
defaultCardId, defaultCardId,
defaultPaymentMethod, defaultPaymentMethod,
lockCardSelection, lockCardSelection,
@@ -745,6 +747,7 @@ export function TransactionsPage({
currentUserId={currentUserId} currentUserId={currentUserId}
noteAsColumn={noteAsColumn} noteAsColumn={noteAsColumn}
columnOrder={columnOrder} columnOrder={columnOrder}
groupTransactionsByDate={groupTransactionsByDate}
payerFilterOptions={payerFilterOptions} payerFilterOptions={payerFilterOptions}
categoryFilterOptions={categoryFilterOptions} categoryFilterOptions={categoryFilterOptions}
accountCardFilterOptions={accountCardFilterOptions} accountCardFilterOptions={accountCardFilterOptions}

View File

@@ -51,6 +51,7 @@ type BuildColumnsArgs = {
onConvertToRecurring?: (item: TransactionItem) => void; onConvertToRecurring?: (item: TransactionItem) => void;
isSettlementLoading: (id: string) => boolean; isSettlementLoading: (id: string) => boolean;
showActions: boolean; showActions: boolean;
showDateGroups: boolean;
columnOrder?: string[] | null; columnOrder?: string[] | null;
}; };
@@ -115,6 +116,7 @@ function buildColumns({
onConvertToRecurring, onConvertToRecurring,
isSettlementLoading, isSettlementLoading,
showActions, showActions,
showDateGroups,
}: BuildColumnsArgs): ColumnDef<TransactionItem>[] { }: BuildColumnsArgs): ColumnDef<TransactionItem>[] {
const noop = () => undefined; const noop = () => undefined;
const handleEdit = onEdit ?? noop; const handleEdit = onEdit ?? noop;
@@ -194,12 +196,14 @@ function buildColumns({
<span className="flex items-center gap-2"> <span className="flex items-center gap-2">
<EstablishmentLogo name={name} size={32} /> <EstablishmentLogo name={name} size={32} />
<span className="flex flex-col py-0.5"> <span className="flex flex-col py-0.5">
{showDateGroups ? null : (
<span className="text-xs text-muted-foreground flex items-center gap-2"> <span className="text-xs text-muted-foreground flex items-center gap-2">
{formatDate(purchaseDate)} {formatDate(purchaseDate)}
{dueDateLabel ? ( {dueDateLabel ? (
<span className="text-primary">{dueDateLabel}</span> <span className="text-primary">{dueDateLabel}</span>
) : null} ) : null}
</span> </span>
)}
<span className="flex items-center gap-1"> <span className="flex items-center gap-1">
<Tooltip> <Tooltip>
<TooltipTrigger asChild> <TooltipTrigger asChild>
@@ -254,6 +258,15 @@ function buildColumns({
</Badge> </Badge>
) : null} ) : null}
{showDateGroups && dueDateLabel ? (
<Badge
variant="outline"
className="px-2 text-xs text-primary"
>
{dueDateLabel}
</Badge>
) : null}
{isAnticipated && ( {isAnticipated && (
<Tooltip> <Tooltip>
<TooltipTrigger asChild> <TooltipTrigger asChild>

View File

@@ -20,7 +20,7 @@ import {
TooltipContent, TooltipContent,
TooltipTrigger, TooltipTrigger,
} from "@/shared/components/ui/tooltip"; } from "@/shared/components/ui/tooltip";
import { formatDate } from "@/shared/utils/date"; import { formatDate, formatDateGroupLabel } from "@/shared/utils/date";
import { getConditionIcon, getPaymentMethodIcon } from "@/shared/utils/icons"; import { getConditionIcon, getPaymentMethodIcon } from "@/shared/utils/icons";
import { cn } from "@/shared/utils/ui"; import { cn } from "@/shared/utils/ui";
import type { TransactionItem } from "../types"; import type { TransactionItem } from "../types";
@@ -43,6 +43,7 @@ type TransactionsMobileListProps = {
onConvertToRecurring?: (item: TransactionItem) => void; onConvertToRecurring?: (item: TransactionItem) => void;
isSettlementLoading: (id: string) => boolean; isSettlementLoading: (id: string) => boolean;
showActions?: boolean; showActions?: boolean;
showDateGroups?: boolean;
}; };
export function TransactionsMobileList({ export function TransactionsMobileList({
@@ -61,7 +62,27 @@ export function TransactionsMobileList({
onConvertToRecurring, onConvertToRecurring,
isSettlementLoading, isSettlementLoading,
showActions = true, showActions = true,
showDateGroups = true,
}: TransactionsMobileListProps) { }: TransactionsMobileListProps) {
const groups = data.reduce<
Array<{ date: string; label: string; items: TransactionItem[] }>
>((acc, item) => {
const date = item.purchaseDate?.slice(0, 10) ?? "";
const existingGroup = acc.find((group) => group.date === date);
if (existingGroup) {
existingGroup.items.push(item);
return acc;
}
acc.push({
date,
label: formatDateGroupLabel(item.purchaseDate),
items: [item],
});
return acc;
}, []);
if (!showDateGroups) {
return ( return (
<div className="space-y-3 md:hidden"> <div className="space-y-3 md:hidden">
{data.map((item) => ( {data.map((item) => (
@@ -82,14 +103,54 @@ export function TransactionsMobileList({
onConvertToRecurring={onConvertToRecurring} onConvertToRecurring={onConvertToRecurring}
isSettlementLoading={isSettlementLoading} isSettlementLoading={isSettlementLoading}
showActions={showActions} showActions={showActions}
showDate
/> />
))} ))}
</div> </div>
); );
} }
return (
<div className="space-y-4 md:hidden">
{groups.map((group, groupIndex) => (
<section
key={`${group.date || group.label}-${groupIndex}`}
className="space-y-2"
>
<div className="rounded-md border bg-muted/60 px-3 py-1.5 text-xs font-semibold tracking-wide text-muted-foreground">
{group.label}
</div>
<div className="space-y-3">
{group.items.map((item) => (
<TransactionMobileCard
key={item.id}
item={item}
currentUserId={currentUserId}
onEdit={onEdit}
onCopy={onCopy}
onImport={onImport}
onConfirmDelete={onConfirmDelete}
onViewDetails={onViewDetails}
onRefund={onRefund}
onToggleSettlement={onToggleSettlement}
onAnticipate={onAnticipate}
onViewAnticipationHistory={onViewAnticipationHistory}
onConvertToInstallment={onConvertToInstallment}
onConvertToRecurring={onConvertToRecurring}
isSettlementLoading={isSettlementLoading}
showActions={showActions}
/>
))}
</div>
</section>
))}
</div>
);
}
type TransactionMobileCardProps = Omit<TransactionsMobileListProps, "data"> & { type TransactionMobileCardProps = Omit<TransactionsMobileListProps, "data"> & {
item: TransactionItem; item: TransactionItem;
showDate?: boolean;
}; };
function TransactionMobileCard({ function TransactionMobileCard({
@@ -108,6 +169,7 @@ function TransactionMobileCard({
onConvertToRecurring, onConvertToRecurring,
isSettlementLoading, isSettlementLoading,
showActions = true, showActions = true,
showDate = false,
}: TransactionMobileCardProps) { }: TransactionMobileCardProps) {
const installmentBadge = const installmentBadge =
item.currentInstallment && item.installmentCount item.currentInstallment && item.installmentCount
@@ -156,10 +218,12 @@ function TransactionMobileCard({
{item.name} {item.name}
</h3> </h3>
<div className="mt-1 flex min-w-0 flex-wrap items-center gap-x-2 gap-y-1 text-xs text-muted-foreground"> <div className="mt-1 flex min-w-0 flex-wrap items-center gap-x-2 gap-y-1 text-xs text-muted-foreground">
{showDate ? (
<span className="inline-flex items-center gap-1"> <span className="inline-flex items-center gap-1">
<RiCalendarEventLine className="size-3.5" aria-hidden /> <RiCalendarEventLine className="size-3.5" aria-hidden />
{formatDate(item.purchaseDate)} {formatDate(item.purchaseDate)}
</span> </span>
) : null}
{dueDateLabel ? ( {dueDateLabel ? (
<span className="font-medium text-primary"> <span className="font-medium text-primary">
{dueDateLabel} {dueDateLabel}

View File

@@ -9,13 +9,14 @@ import {
getCoreRowModel, getCoreRowModel,
getPaginationRowModel, getPaginationRowModel,
getSortedRowModel, getSortedRowModel,
type Row,
type RowSelectionState, type RowSelectionState,
type SortingState, type SortingState,
useReactTable, useReactTable,
type VisibilityState, type VisibilityState,
} from "@tanstack/react-table"; } from "@tanstack/react-table";
import { usePathname, useRouter, useSearchParams } from "next/navigation"; import { usePathname, useRouter, useSearchParams } from "next/navigation";
import { type ReactNode, useMemo, useState } from "react"; import { Fragment, type ReactNode, useMemo, useState } from "react";
import type { import type {
TransactionsExportContext, TransactionsExportContext,
TransactionsPaginationState, TransactionsPaginationState,
@@ -37,6 +38,7 @@ import {
TooltipProvider, TooltipProvider,
TooltipTrigger, TooltipTrigger,
} from "@/shared/components/ui/tooltip"; } from "@/shared/components/ui/tooltip";
import { formatDateGroupLabel } from "@/shared/utils/date";
import { cn } from "@/shared/utils/ui"; import { cn } from "@/shared/utils/ui";
import { TransactionsExport } from "../transactions-export"; import { TransactionsExport } from "../transactions-export";
import type { import type {
@@ -79,6 +81,7 @@ type TransactionsTableProps = {
isSettlementLoading?: (id: string) => boolean; isSettlementLoading?: (id: string) => boolean;
showActions?: boolean; showActions?: boolean;
showFilters?: boolean; showFilters?: boolean;
groupTransactionsByDate?: boolean;
}; };
export function TransactionsTable({ export function TransactionsTable({
@@ -110,6 +113,7 @@ export function TransactionsTable({
isSettlementLoading, isSettlementLoading,
showActions = true, showActions = true,
showFilters = true, showFilters = true,
groupTransactionsByDate = true,
}: TransactionsTableProps) { }: TransactionsTableProps) {
const router = useRouter(); const router = useRouter();
const pathname = usePathname(); const pathname = usePathname();
@@ -145,12 +149,14 @@ export function TransactionsTable({
onViewAnticipationHistory, onViewAnticipationHistory,
isSettlementLoading: isSettlementLoading ?? (() => false), isSettlementLoading: isSettlementLoading ?? (() => false),
showActions, showActions,
showDateGroups: groupTransactionsByDate,
columnOrder: columnOrderPreference, columnOrder: columnOrderPreference,
}), }),
[ [
currentUserId, currentUserId,
noteAsColumn, noteAsColumn,
columnOrderPreference, columnOrderPreference,
groupTransactionsByDate,
onEdit, onEdit,
onCopy, onCopy,
onImport, onImport,
@@ -191,6 +197,24 @@ export function TransactionsTable({
const rowModel = table.getRowModel(); const rowModel = table.getRowModel();
const hasRows = rowModel.rows.length > 0; const hasRows = rowModel.rows.length > 0;
const groupedRows = rowModel.rows.reduce<
Array<{ date: string; label: string; rows: Row<TransactionItem>[] }>
>((acc, row) => {
const date = row.original.purchaseDate?.slice(0, 10) ?? "";
const existingGroup = acc.find((group) => group.date === date);
if (existingGroup) {
existingGroup.rows.push(row);
return acc;
}
acc.push({
date,
label: formatDateGroupLabel(row.original.purchaseDate),
rows: [row],
});
return acc;
}, []);
const visibleColumnCount = table.getVisibleLeafColumns().length;
const totalRows = isServerPaginated const totalRows = isServerPaginated
? (serverPagination?.totalItems ?? 0) ? (serverPagination?.totalItems ?? 0)
: table.getCoreRowModel().rows.length; : table.getCoreRowModel().rows.length;
@@ -275,6 +299,25 @@ export function TransactionsTable({
const showTopControls = const showTopControls =
Boolean(createSlot) || Boolean(onMassAdd) || showFilters; Boolean(createSlot) || Boolean(onMassAdd) || showFilters;
const renderTransactionRow = (row: Row<TransactionItem>) => (
<TableRow
key={row.id}
className={cn(
row.original.paymentMethod === "Boleto" &&
row.original.dueDate &&
!row.original.isSettled &&
new Date(row.original.dueDate) < new Date()
? "bg-destructive/3 hover:bg-destructive/5"
: undefined,
)}
>
{row.getVisibleCells().map((cell) => (
<TableCell key={cell.id}>
{flexRender(cell.column.columnDef.cell, cell.getContext())}
</TableCell>
))}
</TableRow>
);
return ( return (
<TooltipProvider> <TooltipProvider>
@@ -366,7 +409,7 @@ export function TransactionsTable({
) : null} ) : null}
<Card className="py-2"> <Card className="py-2">
<CardContent className="px-2 py-4 sm:px-4"> <CardContent className="px-2 sm:px-4">
{hasRows ? ( {hasRows ? (
<> <>
<TransactionsMobileList <TransactionsMobileList
@@ -383,6 +426,7 @@ export function TransactionsTable({
onViewAnticipationHistory={onViewAnticipationHistory} onViewAnticipationHistory={onViewAnticipationHistory}
isSettlementLoading={isSettlementLoading ?? (() => false)} isSettlementLoading={isSettlementLoading ?? (() => false)}
showActions={showActions} showActions={showActions}
showDateGroups={groupTransactionsByDate}
/> />
<div className="hidden overflow-x-auto md:block"> <div className="hidden overflow-x-auto md:block">
@@ -407,28 +451,23 @@ export function TransactionsTable({
))} ))}
</TableHeader> </TableHeader>
<TableBody> <TableBody>
{rowModel.rows.map((row) => ( {groupTransactionsByDate
<TableRow ? groupedRows.map((group, groupIndex) => (
key={row.id} <Fragment
className={cn( key={`${group.date || group.label}-${groupIndex}`}
row.original.paymentMethod === "Boleto" &&
row.original.dueDate &&
!row.original.isSettled &&
new Date(row.original.dueDate) < new Date()
? "bg-destructive/3 hover:bg-destructive/5"
: undefined,
)}
> >
{row.getVisibleCells().map((cell) => ( <TableRow className="border-y bg-muted/40 hover:bg-muted/60">
<TableCell key={cell.id}> <TableCell
{flexRender( colSpan={visibleColumnCount}
cell.column.columnDef.cell, className="h-9 px-3 py-2 text-xs font-semibold text-muted-foreground"
cell.getContext(), >
)} {group.label}
</TableCell> </TableCell>
))}
</TableRow> </TableRow>
))} {group.rows.map(renderTransactionRow)}
</Fragment>
))
: rowModel.rows.map(renderTransactionRow)}
</TableBody> </TableBody>
</Table> </Table>
</div> </div>

View File

@@ -197,6 +197,7 @@ function CalendarDayButton({
return ( return (
<Button <Button
ref={ref} ref={ref}
type="button"
variant="ghost" variant="ghost"
size="icon" size="icon"
data-day={day.date.toLocaleDateString()} data-day={day.date.toLocaleDateString()}

View File

@@ -13,7 +13,7 @@ function Checkbox({
<CheckboxPrimitive.Root <CheckboxPrimitive.Root
data-slot="checkbox" data-slot="checkbox"
className={cn( className={cn(
"peer border-input dark:bg-input/30 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary data-[state=indeterminate]:bg-primary data-[state=indeterminate]:text-primary-foreground data-[state=indeterminate]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-lg border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50", "peer border-input dark:bg-input/40 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary data-[state=indeterminate]:bg-primary data-[state=indeterminate]:text-primary-foreground data-[state=indeterminate]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-3.5 shrink-0 rounded border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
className, className,
)} )}
{...props} {...props}

View File

@@ -148,7 +148,7 @@ export function DatePicker({
required={required} required={required}
disabled={disabled} disabled={disabled}
/> />
<Popover open={open} onOpenChange={setOpen}> <Popover modal open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild> <PopoverTrigger asChild>
<Button <Button
type="button" type="button"

View File

@@ -331,6 +331,45 @@ export function formatDate(value: string | Date | null | undefined): string {
.replace(" de", ""); .replace(" de", "");
} }
/**
* Formats a date-only value as a compact group label.
* @example
* formatDateGroupLabel("2026-06-26") // "SEX, 26 JUN 2026"
*/
export function formatDateGroupLabel(
value: string | Date | null | undefined,
): string {
const dateString = toDateOnlyString(value);
if (!dateString) {
return "—";
}
const parsed = parseUtcDateString(dateString);
if (!parsed) {
return "—";
}
const parts = new Intl.DateTimeFormat("pt-BR", {
weekday: "short",
day: "2-digit",
month: "short",
year: "numeric",
timeZone: "UTC",
}).formatToParts(parsed);
const weekday = parts.find((part) => part.type === "weekday")?.value;
const day = parts.find((part) => part.type === "day")?.value;
const month = parts.find((part) => part.type === "month")?.value;
const year = parts.find((part) => part.type === "year")?.value;
if (!weekday || !day || !month || !year) {
return "—";
}
return `${weekday.replace(".", "").toUpperCase()}, ${day} ${month
.replace(".", "")
.toUpperCase()} ${year}`;
}
/** /**
* Formats a date-only value (YYYY-MM-DD) using UTC to preserve the civil day * Formats a date-only value (YYYY-MM-DD) using UTC to preserve the civil day
*/ */