Skip to content

Commit 2088aed

Browse files
alecostawebalecostaweb
authored
Ajustes
Ajustes
2 parents 713266f + 314b268 commit 2088aed

7 files changed

Lines changed: 25 additions & 23 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ npm-debug.log
1414
yarn-error.log
1515
/.idea
1616
/.vscode
17-
public/vendor
17+
/public/vendor
1818

1919
*~
2020
*.swp
@@ -23,4 +23,4 @@ public/vendor
2323
Dockerfile.custom
2424
php.ini
2525

26-
/.ddev
26+

‎app/Http/Controllers/PessoaController.php‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ public function show(Request $request, $codpes = "my")
132132
$registros = Registro::where("created_at", ">=", $in)
133133
->where("created_at", "<=", $out)
134134
->where("codpes", "=", $pessoa["codpes"])
135+
->orderBy("created_at", "asc")
135136
->get();
136137

137138
// Totalizador
@@ -142,7 +143,13 @@ public function show(Request $request, $codpes = "my")
142143
} else {
143144
$arrayTotal = explode(" ", $total);
144145
$total_horas = $arrayTotal[0];
146+
if (empty($arrayTotal[3])) {
147+
$arrayTotal[2] = 'e';
148+
$arrayTotal[3] = '0';
149+
$arrayTotal[4] = 'minutos';
150+
}
145151
$total_minutos = $arrayTotal[3];
152+
// dd($arrayTotal);
146153
}
147154
$carga_horaria_semanal = (!Grupo::getGroup($pessoa['codpes'])) ? 0 : Grupo::getGroup($pessoa['codpes'])->carga_horaria;
148155
$quantidade_dias_uteis = Util::contarDiasUteis(request()->in, request()->out);
@@ -164,17 +171,20 @@ public function show(Request $request, $codpes = "my")
164171
$horas = intdiv($diff, 60);
165172
$minutos = $diff % 60;
166173

174+
$horas = ($horas < 0) ? $horas * -1 : $horas;
175+
$minutos = ($minutos < 0) ? $minutos * -1 : $minutos;
176+
167177
// Exibir em formato hh:mm
168178
$saldo = "$horas horas e $minutos minutos";
169-
179+
170180
$totalizador = [
171181
'carga_horaria_semanal' => $carga_horaria_semanal, # inteiro (horas)
172182
'quantidade_dias_uteis' => $quantidade_dias_uteis, # inteiro (dias)
173183
'quantidade_dias_registrados' => $quantidade_dias_registrados, # inteiro (dias)
174184
'carga_horaria_total' => $carga_horaria_total, # inteiro (horas)
175185
'total_registrado' => $total_resgistrado, # string (hh horas e mm minutos)
176186
'saldo' => $saldo, # string (hh horas e mm minutos)
177-
];
187+
];
178188

179189
return view("pessoas.show", [
180190
"pessoa" => $pessoa,

‎app/Models/Registro.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class Registro extends Model
1414

1515
public static $motivos = [
1616
'Esquecimento',
17+
'Graduação',
1718
'Férias',
1819
'Consulta Médica',
1920
'Licença Médica',

‎resources/views/index.blade.php‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</div>
1515
<ul class="list-group list-group-flush">
1616
@php
17-
$registros = $place->registros->where('created_at', '>=', \Carbon\Carbon::today())->whereNull('motivo');
17+
$registros = $place->registros->where('status', 'válido')->where('created_at', '>=', \Carbon\Carbon::today())->sortBy('created_at');
1818
@endphp
1919
@forelse ($registros as $registro)
2020
<li class="list-group-item">
@@ -24,7 +24,7 @@
2424
<i class="fas fa-sign-in-alt text-success"></i> {{ $registro->created_at->format('H:i') }} (Entrada)
2525
- {{ \Uspdev\Replicado\Pessoa::obterNome($registro->codpes) }}
2626
@elseif ($registro->type == 'out')
27-
<i class="fas fa-sign-in-alt text-danger"></i> {{ $registro->created_at->format('H:i') }} (Saída)
27+
<i class="fas fa-sign-out-alt text-danger"></i> {{ $registro->created_at->format('H:i') }} (Saída)
2828
- {{ \Uspdev\Replicado\Pessoa::obterNome($registro->codpes) }}
2929
@endif
3030

@@ -35,13 +35,6 @@
3535
<i class="fa fa-user-circle fa-lg text-info ml-1"></i>
3636
</a>
3737
@endif
38-
@auth
39-
{{-- Se logado mostrar a foto do registro --}}
40-
<a href="#" data-toggle="modal" data-target="#modalFotoRegistro" title="Mostrar foto do registro"
41-
data-whatever="{{ \Uspdev\Replicado\Pessoa::obterNome($registro->codpes) }}, '/registros/{{ $registro->id }}/picture'">
42-
<i class="fa fa-camera fa-lg text-info ml-1"></i>
43-
</a>
44-
@endauth
4538
</li>
4639
@empty
4740
<li class="list-group-item">

‎resources/views/pessoas/partials/form.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@foreach ($registros as $registro)
2-
<tr @if ($registro->status == 'análise') class="table-warning" @endif>
2+
<tr @if ($registro->status == 'análise') class="table-warning" @elseif ($registro->status == 'inválido') class="table-danger" @endif>
33
<td>
44
@if($registro->type == 'in')
55
<i class="fas fa-sign-in-alt text-success"></i>

‎resources/views/pessoas/partials/totalizador.blade.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22
<table class="table table-sm table-hover">
33
<thead class="table-warning">
44
<tr>
5-
<th colspan="2">Totalizador</th>
5+
<th colspan="2">Totalizador <span class="text-secondary font-italic font-weight-normal" style="font-size: 0.85em;">(no período)</span></th>
66
</tr>
77
</thead>
88
<tbody style="font-size: 0.85em;">
99
<tr>
1010
<td>Jornada semanal <span class="text-secondary font-italic">(horas)</span></td>
1111
<td class="text-right">{{ $totalizador['carga_horaria_semanal'] }}</td>
1212
</tr>
13+
<tr>
14+
<td>Jornada mensal <span class="text-secondary font-italic">(horas)</span></td>
15+
<td class="text-right">{{ $totalizador['carga_horaria_total'] }}</td>
16+
</tr>
1317
<tr>
1418
<td>Dias úteis <span class="text-secondary font-italic">(dias)</span></td>
1519
<td class="text-right">{{ $totalizador['quantidade_dias_uteis'] }}</td>
@@ -18,18 +22,14 @@
1822
<td>Dias registrados <span class="text-secondary font-italic">(dias)</span></td>
1923
<td class="text-right">{{ $totalizador['quantidade_dias_registrados'] }}</td>
2024
</tr>
21-
<tr>
22-
<td>Jornada mensal <span class="text-secondary font-italic">(horas)</span></td>
23-
<td class="text-right">{{ $totalizador['carga_horaria_total'] }}</td>
24-
</tr>
2525
<tr>
2626
<td>Total registrado</td>
2727
<td class="text-right">{{ $totalizador['total_registrado'] }}</td>
2828
</tr>
2929
<tr>
3030
<td>Saldo</td>
31-
<td class="text-right"><span @if ($total < $totalizador['carga_horaria_total']) class="text-danger" @endif>{{ $totalizador['saldo'] }}</span></td>
31+
<td class="text-right"><span @if ($total < $totalizador['carga_horaria_total']) class="text-danger">(-) {{ $totalizador['saldo'] }} @else >(+) {{ $totalizador['saldo'] }} @endif</span></td>
3232
</tr>
3333
</tbody>
3434
</table>
35-
</div>
35+
</div>

‎storage/app/feriados/.gitignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)