refactor: update ESLint configuration and improve Svelte component structure
- Added .eslintcache to .gitignore for better cache management. - Enhanced ESLint configuration to ignore specific directories and files for cleaner linting. - Updated Svelte components to use unique keys in loops for improved performance and maintainability. - Cleaned up imports and standardized formatting across various components for better code clarity. - Resolved merge conflicts in multiple Svelte files to ensure consistent functionality.
This commit is contained in:
@@ -1278,13 +1278,8 @@
|
||||
</div>
|
||||
{:else}
|
||||
<div class="overflow-x-auto">
|
||||
<table class="table-zebra table">
|
||||
<<<<<<< HEAD
|
||||
<thead>
|
||||
<tr>
|
||||
<table class="table-zebra table">
|
||||
<thead class="bg-base-200/60">
|
||||
<tr class="text-base-content/70 text-sm tracking-wide uppercase">
|
||||
<tr class="text-base-content/70 text-sm tracking-wide uppercase">
|
||||
<th>Funcionário</th>
|
||||
<th>Time</th>
|
||||
@@ -1295,11 +1290,7 @@
|
||||
<th>Solicitado em</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<<<<<<< HEAD
|
||||
{#each solicitacoesFiltradas as solicitacao}
|
||||
<tbody>
|
||||
{#each solicitacoesFiltradas as solicitacao (solicitacao._id)}
|
||||
{#each solicitacoesFiltradas as solicitacao (solicitacao._id)}
|
||||
<tr>
|
||||
<td>
|
||||
@@ -1329,27 +1320,15 @@
|
||||
{/if}
|
||||
</td>
|
||||
<td>{solicitacao.anoReferencia}</td>
|
||||
<td>{solicitacao.periodos.length} período(s)</td>
|
||||
<<<<<<< HEAD
|
||||
<td class="font-bold"
|
||||
>{solicitacao.periodos.reduce((acc: number, p: any) => acc + p.diasCorridos, 0)}
|
||||
dias</td
|
||||
<td>{solicitacao.periodos.length} período(s)</td>
|
||||
<td class="text-base-content font-bold"
|
||||
>{totalDiasSolicitacao(solicitacao)} dia(s)</td
|
||||
>{totalDiasSolicitacao(solicitacao)} dia(s)</td
|
||||
>
|
||||
<td>
|
||||
<div class={`badge ${getStatusBadge(solicitacao.status)}`}>
|
||||
{getStatusTexto(solicitacao.status)}
|
||||
</div>
|
||||
</td>
|
||||
<<<<<<< HEAD
|
||||
<td class="text-xs"
|
||||
>{new Date(solicitacao._creationTime).toLocaleDateString('pt-BR')}</td
|
||||
>
|
||||
</td>
|
||||
<td class="text-xs">{formatarData(solicitacao._creationTime)}</td>
|
||||
<td class="text-xs">{formatarData(solicitacao._creationTime)}</td>
|
||||
</tr>
|
||||
{/each}
|
||||
@@ -1358,9 +1337,6 @@
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
</div>
|
||||
<!-- Visualizações e Relatórios -->
|
||||
<div class="mb-6 space-y-6" bind:this={chartContainer}>
|
||||
@@ -1746,7 +1722,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
<footer
|
||||
|
||||
Reference in New Issue
Block a user