Browse Source

Correção de bugs

master
guilherme guia 1 year ago
parent
commit
7f0538ac3c
  1. 14
      app/Http/Controllers/AgentesController.php
  2. 16
      app/Http/Controllers/ConfigAtendimentoController.php
  3. 6
      app/Http/Controllers/DashboardController.php
  4. 5
      app/Http/Controllers/EmpresaController.php
  5. 20
      app/Http/Controllers/FilasController.php
  6. 45
      app/Http/Controllers/PausasController.php
  7. 56
      app/Http/Controllers/ProfileController.php
  8. 7
      app/Http/Controllers/RedirectController.php
  9. 1
      app/Http/Controllers/RedirectOptionController.php
  10. 15
      app/Http/Controllers/RelatoriosController.php
  11. 23
      app/Http/Controllers/SystemMessageController.php
  12. 2
      app/Http/Requests/ProfileUpdateRequest.php
  13. 2
      app/Models/NumberChanel.php
  14. 5
      resources/views/admin/agentesLogados.blade.php
  15. 7
      resources/views/admin/pausas.blade.php
  16. 24
      resources/views/auth/login.blade.php
  17. 6
      resources/views/profile/partials/update-profile-information-form.blade.php
  18. 1
      routes/web.php

14
app/Http/Controllers/AgentesController.php

@ -105,7 +105,6 @@ class AgentesController extends Controller
}
}
public function edit($id)
{
if (empty($id)) {
@ -113,8 +112,6 @@ class AgentesController extends Controller
}
$userData = Agentes::find($id);
$response = [
'status' => true,
'data' => $userData
@ -123,8 +120,6 @@ class AgentesController extends Controller
return response()->json($response);
}
public function destroy($id)
{
if (empty($id)) {
@ -138,17 +133,14 @@ class AgentesController extends Controller
return redirect('users')->with('status', 'desativado com sucesso');
}
public function update(Request $request, $id)
{
$request->validate([
"nome" => ['required'],
"status" => ['required'],
]);
if (empty($id) || empty($request->nome)) {
return redirect('users');
}
@ -160,14 +152,10 @@ class AgentesController extends Controller
->get()
->first();
if ($agente_matricula->matricula != $request->matricula) {
$isMatriculaRegister = Agentes::where('matricula', $request->matricula)->get()->count();
if ($isMatriculaRegister > 0) {
return redirect('/users/editar/' . $id)->with('status', ' matricula vinculada com outro agente');
}
@ -186,8 +174,6 @@ class AgentesController extends Controller
]);
}
return redirect('users')->with('status', 'atualizado com sucesso');
}
}

16
app/Http/Controllers/ConfigAtendimentoController.php

@ -7,28 +7,17 @@ use Illuminate\Http\Request;
class ConfigAtendimentoController extends Controller
{
/**
* Display a listing of the resource.
*/
public function index()
{
$user = auth()->user();
$id_empresa = $user->empresa->first()->id;
$configAtendimento = ConfigAtendimento::where('id_empresa', $id_empresa)->first();
return view('admin.configs', compact('configAtendimento'));
}
/**
* Show the form for creating a new resource.
*/
public function create(Request $request)
{
//
$request->validate([
"qtde_atendimento" => ['required'],
"timeout_cliente" => ['required'],
@ -36,13 +25,10 @@ class ConfigAtendimentoController extends Controller
"id_empresa" => ['required']
]);
if (empty($request->qtde_atendimento) || empty($request->timeout_cliente) || empty($request->timeout_agente) || empty($request->id_empresa)) {
return redirect('configs');
}
ConfigAtendimento::where('id_empresa', '=', $request->id_empresa)
->update([
"quantidade_simutaneo" => $request->qtde_atendimento,
@ -52,6 +38,4 @@ class ConfigAtendimentoController extends Controller
return redirect('configs');
}
}

6
app/Http/Controllers/DashboardController.php

@ -34,9 +34,9 @@ class DashboardController extends Controller
$atendimentosStatusData = DB::table('usuarios as u')
->join('usuario_empresa as ue', 'ue.id_usuario', '=', 'u.id')
->join('eventos_atendimento as ea', 'ea.id_usuario', '=', 'u.id')
->select('b.evento', DB::raw('count(b.evento) as qtde_usados'))
->where('a.id_empresa', $id_empresa)
->groupBy('b.evento')
->select('ea.evento', DB::raw('count(ea.evento) as qtde_usados'))
->where('ue.id_empresa', $id_empresa)
->groupBy('ea.evento')
->get();
$filasMaisUsadas = DB::table('queues as q')

5
app/Http/Controllers/EmpresaController.php

@ -20,7 +20,6 @@ class EmpresaController extends Controller
return view('admin.empresas', compact('empresas'));
}
public function store(Request $request)
{
if (Gate::denies('is_permission')) {
@ -63,7 +62,6 @@ class EmpresaController extends Controller
return response()->json($response);
}
public function update(Request $request, $id)
{
if (!$id) {
@ -95,11 +93,8 @@ class EmpresaController extends Controller
'email' => $request->email,
'cnpj' => $cnpjSemMascara,
]);
}
return redirect()->back()->with('status', 'Atualizado com sucesso');
}
}

20
app/Http/Controllers/FilasController.php

@ -13,8 +13,6 @@ class FilasController extends Controller
public function index(Request $request)
{
$selected = (object) ['isSelected' => false, 'isAtivo' => 'ativo'];
// $filas = filas::where('is_ativa', true)->get();
$filas = filas::class;
$user = auth()->user();
@ -31,7 +29,6 @@ class FilasController extends Controller
$filas = $filas::where('is_ativa', true);
}
if ($request->pesquisa) {
$pesquisa = strtolower($request->pesquisa);
@ -45,13 +42,11 @@ class FilasController extends Controller
public function create(Request $request)
{
$request->validate([
'nome' => ['string', 'required'],
'motivo' => ['required']
]);
$is_ativa = $request->motivo === 'on' ? true : false;
if (empty($request->nome)) {
@ -62,8 +57,6 @@ class FilasController extends Controller
return redirect('filas')->with('status', 'Fila já cadastrada');
}
// se tornar reativo
$user = auth()->user();
$id_empresa = $user->empresa->first()->id;
@ -74,11 +67,9 @@ class FilasController extends Controller
'is_ativa' => $is_ativa
]);
return redirect('filas')->with('status', 'Fila cadastrada');
}
public function edit($id)
{
@ -87,7 +78,6 @@ class FilasController extends Controller
}
$setor = Filas::find($id);
$response = [
'data' => $setor,
];
@ -97,8 +87,6 @@ class FilasController extends Controller
public function update(Request $request, $id)
{
if (empty($id)) {
return redirect('filas');
}
@ -112,13 +100,11 @@ class FilasController extends Controller
'status' => ['required']
]);
$isFilaRegister = Filas::select('nome')
->where('id', $id)
->get()
->first();
$is_ativa = $request->status === 'on' ? true : false;
if ($isFilaRegister->nome != strtoupper($request->nome)) {
@ -141,24 +127,18 @@ class FilasController extends Controller
return redirect('filas')->with('status', 'Fila Editada');
}
public function destroy($id)
{
$pesquisa = Filas::where('id', '=', $id);
$setor = $pesquisa->get();
$rowCount = $setor->count();
if ($rowCount > 0) {
$pesquisa->update([
'is_ativa' => false
]);
}
// filas::where('id', '=', $id)->delete();
return redirect('filas')->with('status', 'Fila desativada');
}
}

45
app/Http/Controllers/PausasController.php

@ -6,56 +6,40 @@ use App\Models\Pausas;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate;
use Symfony\Component\VarDumper\Caster\RedisCaster;
class PausasController extends Controller
{
//
public function index(Request $request)
{
$selected = (object) ['isSelected' => false, 'isAtivo' => 'ativo'];
$pausas = Pausas::class;
$is_ativo = $request->situacao === 'on' ? true : false;
$user = auth()->user();
$id_empresa = $user->empresa->first()->id;
if ($request->status) {
$status = $request->status == 'ativo' ? true : false;
$selected = (object) ['isSelected' => true, 'isAtivo' => $request->status];
$pausas = $pausas::where('is_ativo', $status);
} else {
$pausas = $pausas::where('is_ativo', true);
}
if ($request->pesquisa) {
$pesquisa = strtolower($request->pesquisa);
$pausas->where(DB::raw('LOWER(motivos_pausas.motivo)'), 'like', "%$pesquisa%");
}
$pausas = $pausas->where('id_empresa', $id_empresa)->OrderBy('motivo', 'asc')->get();
return view('admin.pausas', compact('pausas', 'selected'));
}
public function create(Request $request)
{
if (Gate::denies('is_permission')) {
return redirect('users');
}
@ -64,7 +48,6 @@ class PausasController extends Controller
return redirect('pausas');
}
$request->validate([
'motivo' => ['string', 'required'],
'situacao' => ['required'],
@ -74,7 +57,6 @@ class PausasController extends Controller
$id_empresa = $user->empresa->first()->id;
$isPausaExists = DB::table('motivos_pausas')->where([
['motivo', strtoupper($request->motivo)],
['id_empresa', $id_empresa]
@ -84,17 +66,14 @@ class PausasController extends Controller
return redirect('pausas')->with('status', 'Pausa já cadastrada');
}
$is_ativo = $request->situacao === 'on' ? true : false;
Pausas::create([
'motivo' => strtoupper($request->motivo),
'id_empresa' => $id_empresa,
'is_ativo' => $is_ativo
]);
return redirect('pausas')->with('status', 'Pausa cadastrada');
}
@ -106,29 +85,23 @@ class PausasController extends Controller
$pausa = Pausas::find($id);
$response = [
'data' => $pausa
];
return response()->json($response);
}
public function update(Request $request, $id)
{
if (empty($id)) {
return redirect('pausas');
}
if (empty($request->motivo) || empty($request->status)) {
return redirect('pausas');
}
$request->validate([
'motivo' => ['string', 'required'],
'status' => ['required'],
@ -141,23 +114,15 @@ class PausasController extends Controller
$is_ativo = $request->status === 'on' ? true : false;
if ($isPausaRegister->motivo != $request->motivo) {
$user = auth()->user();
$id_empresa = $user->empresa->first()->id;
$isPausaExists = DB::table('motivos_pausas')->where([
['motivo', strtoupper($request->motivo)],
['id_empresa', $id_empresa]
])->exists();
if ($isPausaExists) {
return redirect('pausas')->with('status', 'Pausa já cadastrada');
}
@ -173,23 +138,15 @@ class PausasController extends Controller
]);
}
return redirect('pausas')->with('status', 'Pausa atualizada');
}
public function destroy($id)
{
$pesquisa = Pausas::where('id', '=', $id);
$setor = $pesquisa->get();
$rowCount = $setor->count();
if ($rowCount > 0) {
$pesquisa->update([
'is_ativo' => false

56
app/Http/Controllers/ProfileController.php

@ -0,0 +1,56 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\ProfileUpdateRequest;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Redirect;
use Illuminate\View\View;
class ProfileController extends Controller
{
/**
* Display the user's profile form.
*/
public function edit(Request $request): View
{
return view('profile.edit', [
'user' => $request->user(),
]);
}
/**
* Update the user's profile information.
*/
public function update(ProfileUpdateRequest $request): RedirectResponse
{
$request->user()->fill($request->validated());
$request->user()->save();
return Redirect::route('profile.edit')->with('status', 'profile-updated');
}
/**
* Delete the user's account.
*/
public function destroy(Request $request): RedirectResponse
{
$request->validateWithBag('userDeletion', [
'password' => ['required', 'current_password'],
]);
$user = $request->user();
Auth::logout();
$user->delete();
$request->session()->invalidate();
$request->session()->regenerateToken();
return Redirect::to('/');
}
}

7
app/Http/Controllers/RedirectController.php

@ -2,7 +2,7 @@
namespace App\Http\Controllers;
use App\Models\numberChanel;
use App\Models\NumberChannel;
use App\Models\Redirect;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
@ -21,7 +21,7 @@ class RedirectController extends Controller
->where('nc.id_empresa', $id_empresa)
->get();
$numberChannels = numberChanel::where('id_empresa', $id_empresa)->get();
$numberChannels = NumberChannel::where('id_empresa', $id_empresa)->get();
return view('admin.redirects', compact('redirects', 'numberChannels'));
}
@ -69,7 +69,7 @@ class RedirectController extends Controller
$redirectData = Redirect::find($id);
$user = auth()->user();
$id_empresa = $user->empresa->first()->id;
$numberChannels = numberChanel::where('id_empresa', $id_empresa)->get();
$numberChannels = NumberChannel::where('id_empresa', $id_empresa)->get();
$response = [
'data' => [
'status' => true,
@ -96,7 +96,6 @@ class RedirectController extends Controller
'channel' => ['required'],
]);
$status = $request->status === "on" ? true : false;
$initial = $request->initial === "on" ? true : false;

1
app/Http/Controllers/RedirectOptionController.php

@ -88,7 +88,6 @@ class RedirectOptionController extends Controller
private function agent()
{
$user = auth()->user();
$id_empresa = $user->empresa->first()->id;

15
app/Http/Controllers/RelatoriosController.php

@ -11,11 +11,8 @@ use PhpParser\Node\Stmt\Nop;
class RelatoriosController extends Controller
{
//
public function index(Request $request)
{
$filas = Filas::where('is_ativa', true);
$user = auth()->user();
@ -31,27 +28,15 @@ class RelatoriosController extends Controller
return view('admin.relatorios', compact('filas'));
}
public function agentesLogados($id_fila)
{
$user = auth()->user();
$id_empresa = $user->empresa->first()->id;
$fila = Filas::where('id', $id_fila)->where('id_empresa', $id_empresa)->first();
$agentesNaFila = Supervisor::where('fila', $fila->nome)->get();
// SELECT s.nome, COALESCE(COUNT(a.id), 0) AS total_atendimentos
// FROM supervisor as s
// LEFT JOIN atendimento as a ON s.id_usuario = a.id_usuario AND date(a.data_reg) = '2023-04-11'
// where s.fila = 'FALSIFICADA'
// GROUP BY s.id
$agentesNaFila = DB::table('supervisor as s')
->leftJoin('atendimento as a', function ($join) {
$data_atual = date('Y-m-d');

23
app/Http/Controllers/SystemMessageController.php

@ -7,12 +7,8 @@ use Illuminate\Http\Request;
class SystemMessageController extends Controller
{
/**
* Display a listing of the resource.
*/
public function index()
{
// , compact('steps', 'numberChannels')
$user = auth()->user();
$id_empresa = $user->empresa->first()->id;
@ -24,9 +20,6 @@ class SystemMessageController extends Controller
return view('admin.systemMessage', compact('systemMessages'));
}
/**
* Show the form for creating a new resource.
*/
public function create(Request $request)
{
@ -41,14 +34,10 @@ class SystemMessageController extends Controller
'ordem' => ['required']
]);
if (empty($request->texto) || empty($request->momento)) {
return redirect('systemMessage')->with('status', 'erro ao cadastrar system message');
}
SystemMessage::create([
'texto' => $request->texto,
'momento' => $request->momento,
@ -56,7 +45,6 @@ class SystemMessageController extends Controller
'id_empresa' => $id_empresa,
]);
return redirect('systemMessage');
}
@ -76,9 +64,6 @@ class SystemMessageController extends Controller
];
// dd($response);
// echo json_encode($response);
return response()->json($response);
}
public function update(Request $request, $id)
@ -89,13 +74,10 @@ class SystemMessageController extends Controller
"ordem" => ['required'],
]);
if (empty($id) || empty($request->texto) || empty($request->momento)) {
return redirect('systemMessage');
}
SystemMessage::where("id", $id)
->update([
'texto' => $request->texto,
@ -103,20 +85,15 @@ class SystemMessageController extends Controller
'momento' => $request->momento
]);
return redirect('systemMessage')->with('status', 'atualizado com sucesso');
}
public function destroy($id)
{
$pesquisa = SystemMessage::where('id', '=', $id);
$systemMessage = $pesquisa->get();
$rowCount = $systemMessage->count();
if ($rowCount > 0) {
$pesquisa->delete();
}

2
app/Http/Requests/ProfileUpdateRequest.php

@ -16,7 +16,7 @@ class ProfileUpdateRequest extends FormRequest
public function rules(): array
{
return [
'name' => ['string', 'max:255'],
'nome' => ['string', 'max:255'],
'email' => ['email', 'max:255', Rule::unique(User::class)->ignore($this->user()->id)],
];
}

2
app/Models/NumberChanel.php

@ -5,7 +5,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class numberChanel extends Model
class NumberChannel extends Model
{
use HasFactory;

5
resources/views/admin/agentesLogados.blade.php

@ -11,7 +11,7 @@
<h1 class="mb-5 text-gray-900 dark:text-gray-100 text-3xl font-bold text-center">
Agentes na Fila - {{$fila->nome}}
</h1>
<form action="{{route('filas')}}" method="GET" class="flex w-full gap-3 flex-col lg:flex-row ">
<!-- <form action="{{route('filas')}}" method="GET" class="flex w-full gap-3 flex-col lg:flex-row ">
<div class="search bg-white dark:bg-gray-800 rounded px-3 py-1 overflow-hidden">
<i class="fas fa-search dark:text-gray-100"></i>
<input type="text" name="pesquisa" class="border-none bg-transparent focus:ring-transparent
@ -22,8 +22,7 @@
<option value="desativado" selected>Ocupados</option>
</select>
<button class="lg:ml-auto ml-0 bg-blue-900 hover:bg-opacity-90 transition-all text-white py-2 px-6 rounded text-lg overflow-hidden">Pesquisar</button>
</form>
</form> -->
</div>
<div class="body mt-8 overflow-auto rounded-lg shadow bg-gray-50 dark:bg-gray-800">

7
resources/views/admin/pausas.blade.php

@ -29,21 +29,16 @@
@if($selected->isAtivo == 'ativo')
<option value="ativo" selected>Ativos</option>
<option value="desativado">Desativados</option>
@else
<option value="ativo">Ativos</option>
<option value="desativado" selected>Desativados</option>
@endif
@else
<option value="ativo">Ativos</option>
<option value="desativado">Desativados</option>
@endif
</select>
<button class="lg:ml-auto ml-0 bg-gray-700 hover:bg-opacity-90 transition-all text-white py-2 px-6 rounded text-lg overflow-hidden">Pesquisar</button>
<button class="lg:ml-auto ml-0 bg-blue-900 hover:bg-opacity-90 transition-all text-white py-2 px-6 rounded text-lg overflow-hidden">Pesquisar</button>
</form>
</div>

24
resources/views/auth/login.blade.php

@ -6,46 +6,34 @@
<div class="mb-5 mt-3 flex justify-center">
<x-application-logo />
</div>
@csrf
<!-- Email Address -->
<div >
<x-input-label for="email" :value="__('Email: ')" />
<x-text-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus autocomplete="username" placeholder="Digite seu email" />
<x-input-error :messages="$errors->get('email')" class="mt-2" />
</div>
<!-- Password -->
<div class="mt-4">
<x-input-label for="password" :value="__('Senha: ')" />
<x-text-input id="password" class="block mt-1 w-full" type="password" name="password" placeholder="Digite sua senha: " required autocomplete="current-password" />
<x-input-error :messages="$errors->get('password')" class="mt-2" />
</div>
<!-- Remember Me -->
<div class="block mt-4">
{{-- <div class="block mt-4">
<label for="remember_me" class="inline-flex items-center">
<input id="remember_me" type="checkbox" class="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800" name="remember">
<span class="ml-2 text-sm text-gray-600 dark:text-gray-400">{{ __('Remember me') }}</span>
</label>
</div>
<div class="flex flex-col items-center justify-end mt-4">
<button class="bg-loginButton text-white w-full py-2 px-1 rounded mb-3 text-lg">Entrar</button>
</div> --}}
@if (Route::has('password.request'))
<div class="flex flex-col items-center justify-end mt-4 ">
<button class="bg-loginButton text-white w-full py-2 px-1 rounded mb-6 mt-4 text-lg">Entrar</button>
{{-- @if (Route::has('password.request'))
<a class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800 mt-4 mb-4" href="{{ route('password.request') }}">
Esqueceu sua Senha?
</a>
@endif
@endif --}}
</div>
</form>
</x-guest-layout>

6
resources/views/profile/partials/update-profile-information-form.blade.php

@ -18,9 +18,9 @@
@method('patch')
<div>
<x-input-label for="name" :value="__('Nome')" />
<x-text-input id="name" name="name" type="text" class="mt-1 block w-full" :value="old('name', $user->nome)" required autofocus autocomplete="name" />
<x-input-error class="mt-2" :messages="$errors->get('name')" />
<x-input-label for="nome" :value="__('Nome')" />
<x-text-input id="nome" name="nome" type="text" class="mt-1 block w-full" :value="old('nome', $user->nome)" required autofocus autocomplete="nome" />
<x-input-error class="mt-2" :messages="$errors->get('nome')" />
</div>
<div>

1
routes/web.php

@ -84,7 +84,6 @@ Route::middleware(['auth', 'verified'])->group(function () {
Route::middleware('auth')->group(function () {
Route::get('/profile', [ProfileController::class, 'edit'])->name('profile.edit');
Route::patch('/profile', [ProfileController::class, 'update'])->name('profile.update');
Route::delete('/profile', [ProfileController::class, 'destroy'])->name('profile.destroy');
});
require __DIR__ . '/auth.php';

Loading…
Cancel
Save