Commit 62d4ab61 authored by Marcos Albano's avatar Marcos Albano 💬

Modificacao nos campos de usuario

parent 002a729d
...@@ -13,7 +13,7 @@ class UserController extends Controller ...@@ -13,7 +13,7 @@ class UserController extends Controller
{ {
private $route = 'users'; private $route = 'users';
private $paginate = 10; private $paginate = 10;
private $search = ['name', 'email']; private $search = ['nome', 'email', 'sobrenome'];
private $model; private $model;
public function __construct(UserRepositoryInterface $model) public function __construct(UserRepositoryInterface $model)
...@@ -27,7 +27,10 @@ class UserController extends Controller ...@@ -27,7 +27,10 @@ class UserController extends Controller
*/ */
public function index(Request $request) public function index(Request $request)
{ {
$columnList = ['id' => '#', 'name' => trans('agendamento.name'), 'email' => trans('agendamento.email')]; $columnList = ['id' => '#', 'nome' => trans('agendamento.name'), 'email' => trans('agendamento.email'),
'cpf' => trans('agendamento.cpf'), 'sobrenome' => trans('agendamento.sobrenome'), 'telefone' => trans('agendamento.telefone'),
'data_nascimento' => trans('agendamento.data_nascimento')];
$page = trans('agendamento.user_list'); $page = trans('agendamento.user_list');
$search = ""; $search = "";
...@@ -40,9 +43,6 @@ class UserController extends Controller ...@@ -40,9 +43,6 @@ class UserController extends Controller
$routeName = $this->route; $routeName = $this->route;
//$request->session()->flash('msg', 'Olá Alert');
//$request->session()->flash('status', 'success'); // success error notification
$breadcrumb = [ $breadcrumb = [
(object) ['url' => route('home'), 'title' => trans('agendamento.home')], (object) ['url' => route('home'), 'title' => trans('agendamento.home')],
(object) ['url' => '', 'title' => trans('agendamento.list', ['page' => $page])], (object) ['url' => '', 'title' => trans('agendamento.list', ['page' => $page])],
...@@ -87,11 +87,11 @@ class UserController extends Controller ...@@ -87,11 +87,11 @@ class UserController extends Controller
Validator::make($data, [ Validator::make($data, [
'name' => 'required|string|max:255', 'name' => 'required|string|max:255',
'sobrenome' => 'required|string',
'email' => 'required|string|email|max:255|unique:users', 'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed', 'password' => 'required|string|min:6|confirmed',
'cpf' => 'required|string|min:11', 'cpf' => 'required|string|min:11',
'telefone' => 'required|string|min:11', 'telefone' => 'required|string|min:11',
'nome_mae' => 'required|string',
'data_nascimento' => 'required', 'data_nascimento' => 'required',
]); ]);
...@@ -186,11 +186,11 @@ class UserController extends Controller ...@@ -186,11 +186,11 @@ class UserController extends Controller
Validator::make($data, [ Validator::make($data, [
'name' => 'required|string|max:255', 'name' => 'required|string|max:255',
'sobrenome' => 'required|string',
'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users')->ignore($id)], 'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users')->ignore($id)],
'password' => 'sometimes|required|string|min:6|confirmed', 'password' => 'sometimes|required|string|min:6|confirmed',
'cpf' => 'required|string|min:11', 'cpf' => 'required|string|min:11',
'telefone' => 'required|string|min:11', 'telefone' => 'required|string|min:11',
'nome_mae' => 'required|string',
'data_nascimento' => 'required', 'data_nascimento' => 'required',
]); ]);
......
...@@ -16,7 +16,7 @@ class User extends Authenticatable ...@@ -16,7 +16,7 @@ class User extends Authenticatable
* @var array * @var array
*/ */
protected $fillable = [ protected $fillable = [
'name', 'email', 'password', 'nome', 'email', 'password','cpf', 'sobrenome', 'telefone','data_nascimento',
]; ];
/** /**
......
...@@ -51,4 +51,7 @@ return [ ...@@ -51,4 +51,7 @@ return [
'data'=>'Date', 'data'=>'Date',
'hora'=>'Hour', 'hora'=>'Hour',
'nome_mae'=>'Mother', 'nome_mae'=>'Mother',
'data_nascimento'=>'Date of birth',
'telefone'=>'Phone',
'sobrenome'=>'Surname',
]; ];
...@@ -49,4 +49,7 @@ return [ ...@@ -49,4 +49,7 @@ return [
'data'=>'Data', 'data'=>'Data',
'hora'=>'Hora', 'hora'=>'Hora',
'nome_mae'=>'Mãe', 'nome_mae'=>'Mãe',
'data_nascimento'=>'Data de nascimento',
'telefone'=>'Telefone',
'sobrenome'=>'Sobrenome',
]; ];
\ No newline at end of file
<div class="row"> <div class="row">
<div class="form-group col-6"> <div class="form-group col-6">
<label for="name">{{ __('agendamento.name') }}</label> <label for="nome">{{ __('agendamento.name') }}</label>
<input type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') ?? ($register->name ?? '')}}"> <input type="text" class="form-control{{ $errors->has('nome') ? ' is-invalid' : '' }}" name="nome" value="{{ old('nome') ?? ($register->nome ?? '')}}">
@if ($errors->has('name')) @if ($errors->has('nome'))
<span class="invalid-feedback" role="alert"> <span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('name') }}</strong> <strong>{{ $errors->first('nome') }}</strong>
</span>
@endif
</div>
<div class="form-group col-6">
<label for="sobrenome">{{ __('agendamento.sobrenome') }}</label>
<input type="text" class="form-control{{ $errors->has('sobrenome') ? ' is-invalid' : '' }}" name="sobrenome" value="{{ old('sobrenome') ?? ($register->sobrenome ?? '')}}">
@if ($errors->has('sobrenome'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('sobrenome') }}</strong>
</span> </span>
@endif @endif
</div> </div>
<div class="form-group col-6"> <div class="form-group col-6">
<label for="email">{{ __('agendamento.email') }}</label> <label for="email">{{ __('agendamento.email') }}</label>
<input type="mail" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') ?? ($register->email ?? '')}}"> <input type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') ?? ($register->email ?? '')}}">
@if ($errors->has('email')) @if ($errors->has('email'))
<span class="invalid-feedback" role="alert"> <span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('email') }}</strong> <strong>{{ $errors->first('email') }}</strong>
</span> </span>
@endif @endif
</div> </div>
<div class="form-group col-6">
<label for="cpf">{{ __('agendamento.cpf') }}</label>
<input type="text" class="form-control{{ $errors->has('cpf') ? ' is-invalid' : '' }}" name="cpf" value="{{ old('cpf') ?? ($register->cpf ?? '')}}">
@if ($errors->has('cpf'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('cpf') }}</strong>
</span>
@endif
</div>
<div class="form-group col-6">
<label for="telefone">{{ __('agendamento.telefone') }}</label>
<input type="text" class="form-control{{ $errors->has('telefone') ? ' is-invalid' : '' }}" name="telefone" value="{{ old('telefone') ?? ($register->telefone ?? '')}}">
@if ($errors->has('telefone'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('telefone') }}</strong>
</span>
@endif
</div>
<div class="form-group col-6">
<label for="data_nascimento">{{ __('agendamento.data_nascimento') }}</label>
<input type="text" class="form-control{{ $errors->has('data_nascimento') ? ' is-invalid' : '' }}" name="data_nascimento" value="{{ old('data_nascimento') ?? ($register->data_nascimento ?? '')}}">
@if ($errors->has('data_nascimento'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('data_nascimento') }}</strong>
</span>
@endif
</div>
<div class="form-group col-6"> <div class="form-group col-6">
<label for="password">{{ __('agendamento.password') }}</label> <label for="password">{{ __('agendamento.password') }}</label>
<input type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" value=""> <input type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" value="">
......
...@@ -35,6 +35,12 @@ ...@@ -35,6 +35,12 @@
<p class="card-text">@lang('agendamento.create_or_edit')</p> <p class="card-text">@lang('agendamento.create_or_edit')</p>
</div> </div>
</div> </div>
<div style="cursor: pointer" onclick="window.location = '{{route('agendamentos.index')}}'" class="card text-white bg-warning mb-3" style="max-width: 18rem;">
<div class="card-header">@lang('agendamento.list', ['page'=>__('agendamento.agendamento_list')])</div>
<div class="card-body">
<p class="card-text">@lang('agendamento.create_or_edit')</p>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment