From 5562075a9597c95942f61fd17a13d7ed25a84280 Mon Sep 17 00:00:00 2001
From: gus17 <gustavopantoja.ap@gmail.com>
Date: Thu, 6 Apr 2023 17:47:31 -0300
Subject: [PATCH] =?UTF-8?q?git=20commit=20-m=20"IN-7=20corre=C3=A7=C3=A3o?=
=?UTF-8?q?=20na=20view=20de=20import"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/ConsignatariaController.php | 5 +-
app/Imports/ConsignatariaImport.php | 14 +-
config/adminlte.php | 4 +
.../views/consignatarias/import.blade.php | 113 ++-------------
resources/views/contratos/import.blade.php | 134 ++++++++++++++++++
routes/web.php | 4 +-
6 files changed, 171 insertions(+), 103 deletions(-)
create mode 100644 resources/views/contratos/import.blade.php
diff --git a/app/Http/Controllers/ConsignatariaController.php b/app/Http/Controllers/ConsignatariaController.php
index 391ed04..2d9c625 100644
--- a/app/Http/Controllers/ConsignatariaController.php
+++ b/app/Http/Controllers/ConsignatariaController.php
@@ -84,8 +84,11 @@ public function destroy(Consignataria $consignataria)
public function import(Request $request)
{
$file = $request->file('file');
+ $consignatariaImport = new ConsignatariaImport($request->consignataria);
- Excel::import(new ConsignatariaImport(), $file);
+
+ //Excel::import($pessoaImport, $file);
+ Excel::import($consignatariaImport, $file);
return redirect()->back();
}
diff --git a/app/Imports/ConsignatariaImport.php b/app/Imports/ConsignatariaImport.php
index 2051f94..0400189 100644
--- a/app/Imports/ConsignatariaImport.php
+++ b/app/Imports/ConsignatariaImport.php
@@ -19,13 +19,25 @@ class ConsignatariaImport implements ToModel, WithHeadingRow, WithChunkReading,
*
* @return \Illuminate\Database\Eloquent\Model|null
*/
+
+ protected $consignante_id;
+
+
+ public function __construct($consignante_id)
+ {
+
+ $this->consignante_id = $consignante_id;
+ }
+
+
public function model(array $row)
{
// dd($row);
- $busca = str_replace(['"', '='], '', $row['="nm_consignataria"']);
+
+ $busca = str_replace(['"', '='], '', $row[$this->consignante_id]);
// dd($busca);
if (!empty($busca)) {
diff --git a/config/adminlte.php b/config/adminlte.php
index f577913..3ab66f8 100644
--- a/config/adminlte.php
+++ b/config/adminlte.php
@@ -336,6 +336,10 @@
'text' => 'Migrações',
'icon' => 'fas fa-fw fa-cogs',
'submenu' => [
+ [
+ 'text' => 'Consignatarias',
+ 'url' => 'consignataria/import',
+ ],
[
'text' => 'Pessoas/Servidores',
'url' => 'pessoa/import',
diff --git a/resources/views/consignatarias/import.blade.php b/resources/views/consignatarias/import.blade.php
index 75ccf55..b13e0b5 100644
--- a/resources/views/consignatarias/import.blade.php
+++ b/resources/views/consignatarias/import.blade.php
@@ -1,107 +1,29 @@
@extends('adminlte::page')
-@section('title', 'Consignatarias')
+@section('title', 'Dashboard')
@section('content_header')
- <h1>Migração Contratos Bancos</h1>
+ <h1>Importar Consignatarias</h1>
@stop
@section('content')
-
<div class="container">
<div class="card">
+ <div class="card-header">
+ <h3 class="card-title">Migrar com Arquivo</h3>
+ </div>
<div class="card-body">
- <form action="{{route('contratos.bancos')}}" method="post" enctype="multipart/form-data">
+ <form action="{{route('consignataria.import')}}" method="post" enctype="multipart/form-data">
@csrf
<div class="form-group">
- <label for="">Consignataris</label>
- <select class="form-control bancos" name="consignataria_id" id="bancos">
- @forelse($consignatarias as $consignataria)
- <option value="{{$consignataria->id}}">{{$consignataria->name}}</option>
-
- @empty
- @endforelse
- </select>
-
- </div>
-
- <div class="form-group">
- <label for="">Arquivo</label>
+ <label>Arquivo</label>
<input class="form-control" type="file" name="file">
</div>
- <div class="form-group">
- <label>Coluna com Nomes</label>
- <input class="form-control" type="text" name="nome">
- </div>
- <div class="form-group">
- <label>Coluna com CPF</label>
- <input class="form-control" type="text" name="cpf">
- </div>
- <div class="form-group">
- <label>Coluna com Matriculas</label>
- <input class="form-control" type="text" name="matricula">
- </div>
- <div class="form-group">
- <label>Coluna com Valor Parcela</label>
- <input class="form-control" type="text" name="valor_parcela">
- </div>
- <div class="form-group">
- <label>Coluna com N Parcela</label>
- <input class="form-control" type="text" name="parcela_atual">
- </div>
-
- <div class="form-group">
- <label>Coluna com Cod Verba</label>
- <input class="form-control" type="text" name="cod_verba">
- </div>
- <div class="form-group">
- <label>Coluna com Prazo Total</label>
- <input class="form-control" type="text" name="prazo_total">
- </div>
-
- <div class="form-group">
- <label>Coluna com N° Contrato</label>
- <input class="form-control" type="text" name="n_contrato">
- </div>
-
- <div class="form-group">
- <label>Coluna com Data de Efetivação</label>
- <input class="form-control" type="text" name="data_efetivacao">
- </div>
-
-
- <div class="form-group">
- <label>Coluna com Data Primeiro desconto</label>
- <input class="form-control" type="text" name="data_primeiro_desconto">
- </div>
-
- <div class="form-group">
- <label>Coluna com Data Ultimo desconto</label>
- <input class="form-control" type="text" name="data_ultimo_desconto">
- </div>
-
<div class="form-group">
- <label>Coluna com Valor Liberado</label>
- <input class="form-control" type="text" name="valor_liberado">
+ <label>Coluna com Consignatarias</label>
+ <input class="form-control" type="text" name="consignataria">
</div>
-
- <div class="form-group">
- <label>Coluna com Valor Total Financiado</label>
- <input class="form-control" type="text" name="valor_financiado">
- </div>
-
- <div class="form-group">
- <label>Coluna com Valor Total Devedor</label>
- <input class="form-control" type="text" name="total_saldo_devedor">
- </div>
-
- <div class="form-group">
- <label>Coluna com Prazo Remanescente</label>
- <input class="form-control" type="text" name="prazo_remanescente">
- </div>
-
-
<div class="form-group">
<button class="btn btn-success">Carregar</button>
</div>
@@ -109,26 +31,19 @@
</form>
</div>
</div>
-
</div>
-
+
+
+
+
@stop
@section('css')
- <link rel="stylesheet" href="/css/admin_custom.css">
+
@stop
@section('plugins.Datatables', true)
-@section('plugins.Select2', true)
@section('js')
- <script> console.log('Hi!'); </script>
-
- <script>
- $(document).ready(function () {
- $('#consignatarias').DataTable();
- $('#bancos').select2();
- });
- </script>
@stop
diff --git a/resources/views/contratos/import.blade.php b/resources/views/contratos/import.blade.php
new file mode 100644
index 0000000..75ccf55
--- /dev/null
+++ b/resources/views/contratos/import.blade.php
@@ -0,0 +1,134 @@
+@extends('adminlte::page')
+
+@section('title', 'Consignatarias')
+
+@section('content_header')
+ <h1>Migração Contratos Bancos</h1>
+@stop
+
+@section('content')
+
+ <div class="container">
+ <div class="card">
+ <div class="card-body">
+ <form action="{{route('contratos.bancos')}}" method="post" enctype="multipart/form-data">
+ @csrf
+ <div class="form-group">
+ <label for="">Consignataris</label>
+ <select class="form-control bancos" name="consignataria_id" id="bancos">
+ @forelse($consignatarias as $consignataria)
+ <option value="{{$consignataria->id}}">{{$consignataria->name}}</option>
+
+ @empty
+ @endforelse
+ </select>
+
+ </div>
+
+ <div class="form-group">
+ <label for="">Arquivo</label>
+ <input class="form-control" type="file" name="file">
+ </div>
+ <div class="form-group">
+ <label>Coluna com Nomes</label>
+ <input class="form-control" type="text" name="nome">
+ </div>
+ <div class="form-group">
+ <label>Coluna com CPF</label>
+ <input class="form-control" type="text" name="cpf">
+ </div>
+ <div class="form-group">
+ <label>Coluna com Matriculas</label>
+ <input class="form-control" type="text" name="matricula">
+ </div>
+ <div class="form-group">
+ <label>Coluna com Valor Parcela</label>
+ <input class="form-control" type="text" name="valor_parcela">
+ </div>
+ <div class="form-group">
+ <label>Coluna com N Parcela</label>
+ <input class="form-control" type="text" name="parcela_atual">
+ </div>
+
+ <div class="form-group">
+ <label>Coluna com Cod Verba</label>
+ <input class="form-control" type="text" name="cod_verba">
+ </div>
+ <div class="form-group">
+ <label>Coluna com Prazo Total</label>
+ <input class="form-control" type="text" name="prazo_total">
+ </div>
+
+ <div class="form-group">
+ <label>Coluna com N° Contrato</label>
+ <input class="form-control" type="text" name="n_contrato">
+ </div>
+
+ <div class="form-group">
+ <label>Coluna com Data de Efetivação</label>
+ <input class="form-control" type="text" name="data_efetivacao">
+ </div>
+
+
+ <div class="form-group">
+ <label>Coluna com Data Primeiro desconto</label>
+ <input class="form-control" type="text" name="data_primeiro_desconto">
+ </div>
+
+ <div class="form-group">
+ <label>Coluna com Data Ultimo desconto</label>
+ <input class="form-control" type="text" name="data_ultimo_desconto">
+ </div>
+
+
+ <div class="form-group">
+ <label>Coluna com Valor Liberado</label>
+ <input class="form-control" type="text" name="valor_liberado">
+ </div>
+
+ <div class="form-group">
+ <label>Coluna com Valor Total Financiado</label>
+ <input class="form-control" type="text" name="valor_financiado">
+ </div>
+
+ <div class="form-group">
+ <label>Coluna com Valor Total Devedor</label>
+ <input class="form-control" type="text" name="total_saldo_devedor">
+ </div>
+
+ <div class="form-group">
+ <label>Coluna com Prazo Remanescente</label>
+ <input class="form-control" type="text" name="prazo_remanescente">
+ </div>
+
+
+ <div class="form-group">
+ <button class="btn btn-success">Carregar</button>
+ </div>
+
+ </form>
+ </div>
+ </div>
+
+ </div>
+
+@stop
+
+@section('css')
+ <link rel="stylesheet" href="/css/admin_custom.css">
+@stop
+@section('plugins.Datatables', true)
+@section('plugins.Select2', true)
+
+
+@section('js')
+ <script> console.log('Hi!'); </script>
+
+ <script>
+ $(document).ready(function () {
+
+ $('#consignatarias').DataTable();
+ $('#bancos').select2();
+ });
+ </script>
+@stop
diff --git a/routes/web.php b/routes/web.php
index 08f54f2..d6ff083 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -31,7 +31,7 @@
Route::resource('contratos', \App\Http\Controllers\ContratoController::class)->middleware('auth');
Route::post('contrato-import', [\App\Http\Controllers\ContratoController::class, 'import'])->name('contrato.import');
Route::get('consignatarias/{id}/validadas', [\App\Http\Controllers\ConsignatariaController::class, 'validada'])->name('consignataria.validada');
-Route::get('consignataria/import', [\App\Http\Controllers\ConsignatariaController::class, 'create_import'])->name('consignataria.import');
+Route::get('consignataria/import', [\App\Http\Controllers\ConsignatariaController::class, 'create_import'])->name('consignataria.index');
Route::get('consignatarias/{id}/nao-validadas', [\App\Http\Controllers\ConsignatariaController::class, 'naovalidada'])->name('consignataria.naovalidada');
Route::get('consignatarias/{id}/contratos_sem_pessoa', [\App\Http\Controllers\ConsignatariaController::class, 'sem_pessoa'])->name('consignataria.sem_pessoa');
Route::get('consignatarias/{id}/contratos_sem_servidor', [\App\Http\Controllers\ConsignatariaController::class, 'sem_servidor'])->name('consignataria.sem_servidor');
@@ -85,4 +85,4 @@
Route::get('/ajax-modal/{id}', [\App\Http\Controllers\ContratoController::class, 'modal'])->name('ajax.modal');
-Route::post('importar-consignatarias', [\App\Http\Controllers\ConsignatariaController::class, 'import'])->name('importar-consignatarias');
+Route::post('importar-consignatarias', [\App\Http\Controllers\ConsignatariaController::class, 'import'])->name('consignataria.import');
--
GitLab