legacy-projects-ispt/ispt4.0_laravel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update switch language and update portfolio

Browse Source
This commit is contained in:
ygbanzato 2023-11-27 16:29:41 +00:00
parent 8789ee8fdb
commit dbd3063868
15 changed files with 249 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/userController.php
View File

@ -25,7 +25,11 @@ class userController extends Controller
{
public function EditProfile(Request $request)
{
// dd($request);
// Verifica se um arquivo foi enviado e se o tamanho é maior que 70 KB
if ($request->hasFile('user_logo') && $request->file('user_logo')->getSize() > 71680) {
return back()->with('danger', 'O tamanho da imagem não deve ser maior que 70KB, valores não alteradas.');
}
$messages = [
'user_logo.max' => 'O tamanho da imagem não deve ser maior que 70KB.',
];
@ -38,6 +42,8 @@ public function EditProfile(Request $request)
'nif' => 'required',
], $messages);
// dd($messages);
$user = User::find($request->userID);
if ($request->hasFile('user_logo')) {

BIN
public/user_logos/1696761654.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
public/user_logos/1701100033.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

2
resources/lang/en/messages.php
View File

@ -118,7 +118,7 @@
'email_address' => 'Email address',
'user_type' => 'User type',
'mobile_phone' => 'Mobile phone',
'account_creation_date' => 'account_creation_date'
'account_creation_date' => 'Account creation date'
],
'edit_profile' => [
'edit_profile'=> 'Edit profile',

3
resources/lang/pt/messages.php
View File

@ -118,9 +118,10 @@
'account_creation_date' => 'Conta Criada em'
],
'edit_profile' => [
'edit_profile' => 'Editar Perfil',
'update_your_logo' => 'Actualizar o seu logótipo',
'image' => 'Imagem',
'full_name'=> 'Nome e Apelido',
'full_name' => 'Nome e Apelido',
'nif' => 'Nif',
'email_address' => 'Email',
'mobile_phone' => 'Telemóvel',

8
resources/views/Admin/CrudUsers/listCompany.blade.php
View File

@ -11,12 +11,12 @@
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1 class="text-light">Empresas</h1>
<h1 class="text-light">{{__('messages.users_listUsers.top_view_part.companies')}}</h1>
</div>
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item active">Administração</li>
<li class="breadcrumb-item active">Empresas</li>
<li class="breadcrumb-item active">{{__('messages.users_listUsers.top_view_part.administration')}}</li>
<li class="breadcrumb-item active">{{__('messages.users_listUsers.top_view_part.companies')}}</li>
</ol>
</div>
</div>
@ -27,7 +27,7 @@
<div class="container-fluid">
<div class="card-light">
<div class="card-header">
<h3 class="card-title">Tabela Empresas</h3>
<h3 class="card-title">{{__('messages.users_listUsers.top_view_part.companies_table')}}</h3>
</div>
{{-- ./card-header --}}
<div class="card-body">

26
resources/views/Admin/CrudUsers/listUsers.blade.php
View File

@ -11,12 +11,12 @@
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1 class="text-light">Empresas</h1>
<h1 class="text-light">{{__('messages.users_listUsers.top_view_part.companies')}}</h1>
</div>
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item active">Administração</li>
<li class="breadcrumb-item active">Empresas</li>
<li class="breadcrumb-item active">{{__('messages.users_listUsers.top_view_part.administration')}}</li>
<li class="breadcrumb-item active">{{__('messages.users_listUsers.top_view_part.companies')}}</li>
</ol>
</div>
</div>
@ -27,7 +27,7 @@
<div class="container-fluid">
<div class="card-light">
<div class="card-header">
<h3 class="card-title">Tabela Utilizadores</h3>
<h3 class="card-title">{{__('messages.users_listUsers.top_view_part.users_table')}}</h3>
</div>
<!-- /.card-header -->
<div class="card-body">
@ -35,12 +35,12 @@
<table class="table table-hover text-nowrap" id="TableReceiveAllUsers">
<thead>
<tr>
<th>ID</th>
<th>Nome</th>
<th>Email</th>
<th>Tipo de Utilizador</th>
<th>Ações</th>
</tr>Empresas
<th>{{__('messages.portfolio.users_table.id')}}</th>
<th>{{__('messages.portfolio.users_table.name')}}</th>
<th>{{__('messages.portfolio.users_table.email')}}</th>
<th>{{__('messages.portfolio.users_table.user_type')}}</th>
<th>{{__('messages.portfolio.users_table.actions.actions')}}</th>
</tr>
</thead>
<tbody>
@foreach ($users as $user)
@ -59,12 +59,12 @@ class="actions-btn btn btn-light circle ">
<a href="{{ route('users.Show', ['id' => $user->user_id]) }}"
class="dropdown-item text-light">
<i class="fa-solid fa-eye text-light"></i>
Detalhes
{{__('messages.portfolio.users_table.actions.details')}}
</a>
<a href="{{ route('users.edit', ['id' => $user->user_id]) }}"
class="dropdown-item text-light">
<i class="fa-solid fa-edit text-light"></i>
Editar
{{__('messages.portfolio.users_table.actions.edit')}}
</a>
<form action="{{ route('users.destroy', $user) }}" method="POST"
onsubmit="return confirm('Are you sure you want to delete this user?');"
@ -73,7 +73,7 @@ class="dropdown-item text-light">
@method('DELETE')
<button type="submit" class="dropdown-item text-danger">
<i class="fa-solid fa-trash-alt text-danger"></i>
Excluir
{{__('messages.portfolio.users_table.actions.delete')}}
</button>
</form>
</div>

77
resources/views/Admin/DataManagement/manageassets.blade.php
View File

@ -6,12 +6,12 @@
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1 class="text-light">Gestão de ativos</h1>
<h1 class="text-light">{{ __('messages.portfolio.top_view_part.management_assets') }}</h1>
</div>
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item active">Portefólio</li>
<li class="breadcrumb-item active">Gerir ativos</li>
<li class="breadcrumb-item active">{{ __('messages.portfolio.top_view_part.portfolio') }}</li>
<li class="breadcrumb-item active">{{ __('messages.portfolio.top_view_part.managing_assets') }}</li>
</ol>
</div><!-- /.col -->
</div>
@ -28,13 +28,12 @@
<form>
<div class="row">
<div class="col-sm-6" id="buttonCreateAssets">
<a href="#" type="button" class="btn btn-block bg-gradient-primary btn-lg">Criar
ativos</a>
<a href="#" type="button"
class="btn btn-block bg-gradient-primary btn-lg">{{ __('messages.portfolio.change_buttons.create_assets') }}</a>
</div>
<div class="col-sm-6" id="buttonAssetsTable">
<a href="#" type="button" class="btn btn-block bg-gradient-primary btn-lg">Tabela de
Ativos</a>
<a href="#" type="button"
class="btn btn-block bg-gradient-primary btn-lg">{{ __('messages.portfolio.change_buttons.asset_table') }}</a>
</div>
</div>
</form>
@ -43,23 +42,22 @@
<div class="card-light" id="cardAssetsTable">
<div class="card-header">
<h3 class="card-title">Tabela de Ativos</h3>
<h3 class="card-title">{{ __('messages.portfolio.change_buttons.asset_table') }}</h3>
</div>
<!-- /.card-header -->
<div class="card-body">
<div class="table-responsive">
<table class="table table-hover text-nowrap" id="assetsTable">
<table class="table table-bordered table-striped" id="showProjectEquipment">
<thead>
<tr>
<th>ID</th>
<th>Tag</th>
<th>Tipo Equipamento</th>
<th>Fábricas</th>
<th>Descrição Equipamento</th>
<th>Fabrica</th>
<th>Tipo</th>
<th>Ações</th>
</tr>
</thead>
<tbody>
{{-- <tbody>
@foreach ($equipments as $equipment)
<tr>
<td>{{ $equipment->equipment_tag }}</td>
@ -69,8 +67,51 @@
<td>Ações</td>
</tr>
@endforeach
</tbody>
</tbody> --}}
</table>
<script>
$(document).ready(function() {
var numberProject = $('#receiveNumberProject').val();
$('#showProjectEquipment').DataTable({
processing: true,
serverSide: true,
ajax: {
url: '{{ route('getDataEquipment') }}',
type: 'GET',
data: {
'numberProject': numberProject
}
},
columns: [{
data: 'equipment_id',
name: 'equipment_id'
},
{
data: 'equipment_tag',
name: 'equipment_tag'
},
{
data: 'unit_id',
name: 'unit_id'
},
{
data: 'equipment_type_id',
name: 'equipment_type_id'
},
{
data: 'action',
name: 'action',
orderable: false,
searchable: false
},
],
});
});
</script>
</div>
<!-- /.card -->
</div>
@ -79,9 +120,9 @@
</div>
{{-- ./cardAssetsTable --}}
<div class="card card-primary" id="cardCreateAssets">
{{-- <div class="card card-primary" id="cardCreateAssets">
</div>
</div> --}}
</div>
</div>

31
resources/views/Admin/index.blade.php
View File

@ -32,11 +32,11 @@
<div class="card-header info-box bg-secondary">
<span class="info-box-icon"><i class="fas fa-file-edit"></i></span>
<div class="info-box-content">
<span class="info-box-text">Em planeamento</span>
<span class="info-box-text">{{ __('messages.dashboard.planning.description') }}</span>
<span
class="info-box-number">{{ $CompanyProject->where('order_project', 1)->count() }}</span>
<span class="progress-description">
Em planeamento de 2023
{{ __('messages.dashboard.planning.text') }}
</span>
</div>
<!-- /.info-box-content -->
@ -48,7 +48,8 @@ class="info-box-number">{{ $CompanyProject->where('order_project', 1)->count() }
@if ($project->order_project == 1)
<div class="card card-secondary card-outline">
<div class="card-header">
<h5 class="progress-description" >{{ $project->company_project_description }}</h5>
<h5 class="progress-description">{{ $project->company_project_description }}
</h5>
<div class="card-tools">
<a href="{{ route('test2', ['id' => $project->company_projects_id]) }}"
class="btn btn-tool">
@ -71,12 +72,12 @@ class="btn btn-tool">
<span class="info-box-icon"><i class="fas fa-file"></i></span>
<div class="info-box-content">
<span class="info-box-text">Preparadas</span>
<span
class="info-box-number">{{ $CompanyProject->where('order_project', 2)->count() }}</span>
<span class="info-box-text">{{ __('messages.dashboard.prepared.description') }}
</span>
<span class="info-box-number">{{ $CompanyProject->where('order_project', 2)->count() }}
</span>
<span class="progress-description">
Aguardam o início da obra.
{{ __('messages.dashboard.prepared.text') }}
</span>
</div>
<!-- /.info-box-content -->
@ -88,7 +89,8 @@ class="info-box-number">{{ $CompanyProject->where('order_project', 2)->count() }
@if ($project->order_project == 2)
<div class="card card-secondary card-outline">
<div class="card-header">
<h5 class="progress-description">{{ $project->company_project_description }}</h5>
<h5 class="progress-description">{{ $project->company_project_description }}
</h5>
<div class="card-tools">
<a href="{{ route('preparedProject', ['ProjectId' => $project->company_projects_id]) }}"
class="btn btn-tool">
@ -111,11 +113,11 @@ class="btn btn-tool">
<span class="info-box-icon"><i class="fas fa-file-alt"></i></span>
<div class="info-box-content">
<span class="info-box-text">Em execução</span>
<span class="info-box-text">{{__('messages.dashboard.on_going.description')}}</span>
<span
class="info-box-number">{{ $CompanyProject->where('order_project', 3)->count() }}</span>
<span class="progress-description">
Obras em curso.
{{__('messages.dashboard.on_going.text')}}
</span>
</div>
<!-- /.info-box-content -->
@ -127,7 +129,8 @@ class="info-box-number">{{ $CompanyProject->where('order_project', 3)->count() }
@if ($project->order_project == 3)
<div class="card card-secondary card-outline">
<div class="card-header">
<h5 class="progress-description">{{ $project->company_project_description }}</h5>
<h5 class="progress-description">{{ $project->company_project_description }}
</h5>
<div class="card-tools">
<a href="{{ route('ExecutionProject', ['ProjectId' => $project->company_projects_id]) }}"
class="btn btn-tool">
@ -150,11 +153,11 @@ class="btn btn-tool">
<span class="info-box-icon"><i class="fas fa-check-circle"></i></span>
<div class="info-box-content">
<span class="info-box-text">Concluídas</span>
<span class="info-box-text">{{__('messages.dashboard.finished.description')}}</span>
<span
class="info-box-number">{{ $CompanyProject->where('order_project', 4)->count() }}</span>
<span class="progress-description">
Últimas obras de 2023
{{__('messages.dashboard.finished.text')}}
</span>
</div>
<!-- /.info-box-content -->

102
resources/views/Admin/profile.blade.php
View File

@ -14,7 +14,20 @@
</script>
@endif
@if ($errors->any())
@if (session('danger'))
<div class="alert alert-success" role="alert" id="alert-message-success" style="transition: opacity 1s;">
{{ session('danger') }}
</div>
<script>
setTimeout(function() {
$('#alert-message-success').fadeOut('slow', function() {
$(this).remove();
});
}, 5000); // A mensagem desaparecerá após 5 segundos
</script>
@endif
{{-- @if ($errors->any())
<div id="errorAlert" class="alert alert-danger">
<ul>
@foreach ($errors->all() as $error)
@ -31,8 +44,7 @@
}, 5000); // A mensagem desaparecerá após 5 segundos
});
</script>
@endif
@endif --}}
<section class="content">
@ -40,19 +52,18 @@
<div class="row justify-content-center">
<div class="col-md-12">
<!-- Card box User Profile -->
<br><br>
<section class="section profile">
<section class="section profile mt-4">
<div class="row">
<div class="col-xl-4">
<div class="col-xl-5 mb-3">
<div class="card">
<div class="card h-100 ">
<div class="card-body profile-card pt-4 d-flex flex-column align-items-center">
<!--If the user has a linked image, it is shown in the profile, if not it returns a standard ISPT 4.0 image -->
<img class="img-circle elevation-2 imgProfile"
src="{{ asset('user_logos/' . ($user->user_logo ?? 'logoISPT4.0.jpg')) }}"
alt="User Logo">
<h2>{{ $user->user_name }}</h2>
<h2 class="mt-3">{{ $user->user_name }}</h2>
<h3>{{ $user->userType->type_user }}</h3>
</div>
@ -60,59 +71,65 @@
</div>
<div class="col-xl-8">
<div class="col-xl-7 mb-3">
<div class="card">
<div class="card h-100">
<div class="card-body pt-3">
<!-- Bordered Tabs -->
<ul class="nav nav-tabs nav-tabs-bordered">
<li class="nav-item">
<button class="nav-link active" data-bs-toggle="tab"
data-bs-target="#profile-overview">Perfil</button>
data-bs-target="#profile-overview">{{ __('messages.profile.show_profile.profile') }}</button>
</li>
<li class="nav-item">
<button class="nav-link" data-bs-toggle="tab"
data-bs-target="#profile-edit">Editar Perfil</button>
data-bs-target="#profile-edit">{{ __('messages.profile.edit_profile.edit_profile') }}
</li>
</ul>
<div class="tab-content pt-2">
<div class="tab-pane fade show active profile-overview" id="profile-overview">
<div class="tab-pane fade show active profile-overview pt-5" id="profile-overview">
<div class="row">
<div class="col-lg-3 col-md-4 label ">Nome e Apelido </div>
<div class="col-lg-9 col-md-8">{{ $user->user_name }}</div>
<label class="col-lg-3 col-md-4 ">
{{ __('messages.profile.show_profile.full_name') }} </label>
<div class="col-lg-9 col-md-8 text-center mb-2">{{ $user->user_name }}</div>
</div>
<div class="row">
<div class="col-lg-3 col-md-4 label">Nif </div>
<div class="col-lg-9 col-md-8">{{ $user->user_nif }}</div>
<label class="col-lg-3 col-md-4">
{{ __('messages.profile.show_profile.nif') }} </label>
<div class="col-lg-9 col-md-8 text-center mb-2">{{ $user->user_nif }}</div>
</div>
<div class="row">
<div class="col-lg-3 col-md-4 label">Email </div>
<div class="col-lg-9 col-md-8">{{ $user->email }}</div>
<label class="col-lg-3 col-md-4">
{{ __('messages.profile.show_profile.email_address') }} </label>
<div class="col-lg-9 col-md-8 text-center mb-2">{{ $user->email }}</div>
</div>
<div class="row">
<div class="col-lg-3 col-md-4 label">Tipo de utilizador </div>
<div class="col-lg-9 col-md-8">{{ $user->type_users }}</div>
<label class="col-lg-3 col-md-4">
{{ __('messages.profile.show_profile.user_type') }} </label>
<div class="col-lg-9 col-md-8 text-center mb-2">{{ $user->userType->type_user }}</div>
</div>
<div class="row">
<div class="col-lg-3 col-md-4 label">Telemóvel </div>
<div class="col-lg-9 col-md-8">{{ $user->user_phone }}</div>
<label class="col-lg-3 col-md-4">
{{ __('messages.profile.show_profile.mobile_phone') }} </label>
<div class="col-lg-9 col-md-8 text-center mb-2">{{ $user->user_phone }}</div>
</div>
<div class="row">
<div class="col-lg-3 col-md-4 label">Conta Criada em </div>
<div class="col-lg-9 col-md-8">{{ $user->created_at }}</div>
<label class="col-lg-3 col-md-4">
{{ __('messages.profile.show_profile.account_creation_date') }}
</label>
<div class="col-lg-9 col-md-8 text-center mb-2">{{ $user->created_at }}</div>
</div>
</div>
<div class="tab-pane fade profile-edit pt-3" id="profile-edit">
@ -124,19 +141,21 @@
<input type="hidden" name="userID" value="{{ $user->user_id }}">
<div class="row mb-3">
<label for="user_logo"
class="col-md-4 col-lg-3 form-label">Actualizar o seu logótipo.
<label for="user_logo" class="col-md-4 col-lg-3 form-label">
{{ __('messages.profile.edit_profile.update_your_logo') }}
:</label>
<div class="custom-file col-md-8 col-lg-9">
<input type="file" class="custom-file-input" id="user_logo"
name="user_logo" accept="image/*">
<label class="custom-file-label" for="customFile">Imagem : (200/250px)x(200/250px)</label>
<label class="custom-file-label" for="customFile">
{{ __('messages.profile.edit_profile.image') }} :
(200/250px)x(200/250px)</label>
</div>
</div>
<div class="row mb-3">
<label for="fullName" class="col-md-4 col-lg-3 col-form-label">Nome
e Apelido</label>
<label for="fullName" class="col-md-4 col-lg-3 col-form-label">
{{ __('messages.profile.edit_profile.full_name') }}</label>
<div class="col-md-8 col-lg-9">
<input type="text" class="form-control" id="fullName"
name="fullName" value="{{ $user->user_name }}" required>
@ -144,8 +163,8 @@ class="col-md-4 col-lg-3 form-label">Actualizar o seu logótipo.
</div>
<div class="row mb-3">
<label for="about"
class="col-md-4 col-lg-3 col-form-label">Nif</label>
<label for="about" class="col-md-4 col-lg-3 col-form-label">
{{ __('messages.profile.edit_profile.nif') }}</label>
<div class="col-md-8 col-lg-9">
<input type="text" class="form-control" id="nif"
name="nif" value="{{ $user->user_nif }}" required>
@ -153,18 +172,17 @@ class="col-md-4 col-lg-3 col-form-label">Nif</label>
</div>
<div class="row mb-3">
<label for="company"
class="col-md-4 col-lg-3 col-form-label">Email</label>
<label for="company" class="col-md-4 col-lg-3 col-form-label">
{{ __('messages.profile.edit_profile.email_address') }}</label>
<div class="col-md-8 col-lg-9">
<input type="text" class="form-control" id="email"
name="email" value="{{ $user->email }}" required>
</div>
</div>
<div class="row mb-3">
<label for="Country"
class="col-md-4 col-lg-3 col-form-label">Telemóvel</label>
<label for="Country" class="col-md-4 col-lg-3 col-form-label">
{{ __('messages.profile.edit_profile.mobile_phone') }}</label>
<div class="col-md-8 col-lg-9">
<input type="text" class="form-control" id="phone"
name="phone" value="{{ $user->user_phone }}">
@ -173,7 +191,7 @@ class="col-md-4 col-lg-3 col-form-label">Telemóvel</label>
<div class="float-right">
<button type="submit" class="btn btn-primary">Guardar</button>
<button type="submit" class="btn btn-primary">{{ __('messages.buttons.save') }}</button>
</div>
</form><!-- End Profile Edit Form -->
@ -185,7 +203,7 @@ class="col-md-4 col-lg-3 col-form-label">Telemóvel</label>
</div>
</div>
</div>
{{-- col-xl-8 --}}
{{-- col-xl-7 --}}
</div>
</section>

28
resources/views/Templates/templateAdmin.blade.php
View File

@ -214,14 +214,18 @@ class="fas fa-bars"></i></a>
<!-- Right navbar links -->
<ul class="navbar-nav ml-auto">
<form id="language-form" action="{{ route('language.switch') }}" method="post">
<ul class="navbar-nav ml-auto align-items-center">
<li class="nav-item my-2">
<form id="language-form" action="{{ route('language.switch') }}" method="post"
class="form-inline">
@csrf
<select name="locale" onchange="this.form.submit()">
<select class="custom-select" name="locale" onchange="this.form.submit()">
<option value="en" {{ app()->getLocale() == 'en' ? 'selected' : '' }}>English</option>
<option value="pt" {{ app()->getLocale() == 'pt' ? 'selected' : '' }}>Português</option>
<option value="pt" {{ app()->getLocale() == 'pt' ? 'selected' : '' }}>Português
</option>
</select>
</form>
</li>
<li class="nav-item">
<a class="nav-link" data-widget="fullscreen" href="#" role="button">
<i class="fas fa-expand-arrows-alt"></i>
@ -268,13 +272,13 @@ class="d-block">{{ Auth::user()->userType?->type_user }}</a>
<li class="nav-item">
<a href="{{ route('home') }}" class="nav-link active">
<i class="nav-icon fas fa-tachometer-alt"></i>
<p> Dashboard </p>
<p> {{ __('messages.dashboard.dashboard') }} </p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('createProject') }}" class="nav-link">
<i class="nav-icon fas fa-helmet-safety"></i>
<p> Criar obra </p>
<p> {{ __('messages.createProject.create_project') }} </p>
</a>
</li>
@ -292,7 +296,7 @@ class="d-block">{{ Auth::user()->userType?->type_user }}</a>
<li class="nav-item">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-briefcase"></i>
<p> Portefólio
<p> {{ __('messages.portfolio.top_view_part.portfolio') }}
<i class="fas fa-angle-left right"></i>
</p>
</a>
@ -300,7 +304,7 @@ class="d-block">{{ Auth::user()->userType?->type_user }}</a>
<li class="nav-item">
<a href="{{ route('manageAssets') }}" class="nav-link">
<i class="fa-solid fa-file-edit"></i>
<p> Gerir Ativos</p>
<p> {{ __('messages.portfolio.top_view_part.management_assets') }}</p>
</a>
</li>
</ul>
@ -310,7 +314,7 @@ class="d-block">{{ Auth::user()->userType?->type_user }}</a>
<li class="nav-item">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-gear"></i>
<p> Administração
<p> {{ __('messages.users_listUsers.top_view_part.administration') }}
<i class="fas fa-angle-left right"></i>
</p>
</a>
@ -318,19 +322,19 @@ class="d-block">{{ Auth::user()->userType?->type_user }}</a>
<li class="nav-item">
<a href="{{ route('users.list') }}" class="nav-link">
<i class="fa-solid fa-users"></i>
<p>Utilizadores</p>
<p>{{ __('messages.users_listUsers.users') }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('users.company') }}" class="nav-link">
<i class="fa-solid fa-house-user"></i>
<p>Clientes</p>
<p>{{ __('messages.users_listUsers.companies') }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('CreateUsers') }}" class="nav-link">
<i class="nav-icon fas fa-gear"></i>
<p> Criar Utilizadores </p>
<p>{{ __('messages.users_listUsers.create_users') }}</p>
</a>
</li>
</ul>

20
resources/views/email/pendingUsers.blade.php
View File

@ -11,13 +11,12 @@
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1 class="text-light">Criar Utilizadores</h1>
<h1 class="text-light">{{__('messages.pendingUsers.create_users')}}</h1>
</div>
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item active">Administração
</li>
<li class="breadcrumb-item active"><a href="{{ route('CreateUsers') }}">Criar Utilizadores</a></li>
<li class="breadcrumb-item active">{{__('messages.pendingUsers.administration')}}</li>
<li class="breadcrumb-item active"><a href="{{ route('CreateUsers') }}">{{__('messages.pendingUsers.create_users')}}</a></li>
</ol>
</div>
</div>
@ -30,7 +29,7 @@
<div class="card-light">
<div class="card-header">
<h3 class="card-title mb-0">Enviar Formulário:</h3>
<h3 class="card-title mb-0">{{__('messages.pendingUsers.submit_form')}}</h3>
</div>
<div class="card-body">
@ -51,7 +50,7 @@
</div>
</div>
<div class="col-sm-4 text-center">
<button type="submit" class="btn btn-light">Enviar</button>
<button type="submit" class="btn btn-light">{{__('messages.pendingUsers.submit')}}</button>
</div>
</div>
</form>
@ -62,7 +61,8 @@
<div class="card-light">
<div class="card-header">
<h2 class="card-title">Utilizadores Pendentes :</h2>
<h2 class="card-title">{{__('messages.pendingUsers.pending_users')}}:</h2>
</div>
<div class="card-body">
<div class="table-responsive">
@ -70,9 +70,9 @@
id="tableReceiveAllPendingUsers">
<thead class="text-center">
<tr>
<th>Nome</th>
<th>Email</th>
<th>Verificar</th>
<th>{{__('messages.pendingUsers.table_pending_user.name')}}</th>
<th>{{__('messages.pendingUsers.table_pending_user.email')}}</th>
<th>{{__('messages.pendingUsers.table_pending_user.verify')}}</th>
</tr>
</thead>
<tbody class="text-center">

5
resources/views/projectsClients/articulated_2.blade.php
View File

@ -57,6 +57,8 @@
<!-- ./Card-header -->
<div class="card-body">
{{-- Criar Equipamentos Manualmente --}}
<div class="card card-success collapsed-card">
<div class="card-header clickable">
@ -1055,6 +1057,7 @@ class="form-control card_inputs" id="PositionerSerialNumber"
</div>
{{-- Selecionar Equipamentos --}}
<div class="card card-primary collapsed-card">
<div class="card-header clickable">
@ -1130,6 +1133,7 @@ class="form-control card_inputs" id="PositionerSerialNumber"
</div>
</div>
{{-- Importar Formulário --}}
<form action="{{ route('processStep2') }}" method="post" enctype="multipart/form-data">
@csrf
@ -1163,6 +1167,7 @@ class="btn btn-info">Baixar Template</a>
{{-- ./row --}}
</form>
{{-- Pendentes --}}
<div class="row">
<div class="form-group col-sm-4">
<a href='#' data-toggle='modal' data-target='#modal-pedingEquipments'>

75
resources/views/projectsClients/createProject.blade.php
View File

@ -30,7 +30,7 @@
<div class="container-fluid">
<div class="card card-primary" id="CardDetalhes">
<div class="card-header bg-primary text-white">
<h3 class="card-title mb-0">Detalhes da Obra</h3>
<h3 class="card-title mb-0">{{ __('messages.createProject.project_work_details') }}</h3>
</div>
<div class="card-body">
@ -41,34 +41,45 @@
<div class="row">
<div class="form-group col-sm-6">
<label>Descrição da obra <b style="color:red">*</b></label>
<label>{{ __('messages.createProject.project_identification') }}<b
style="color:red">*</b></label>
<input type="text" name="description_project" class="form-control"
placeholder="Descrição da obra;" required>
placeholder="{{ __('messages.createProject.project_identification') }}&hellip;"
required>
</div>
<div class="form-group col-sm-6">
<label>Nº. obra ISPT <b style="color:red">*</b></label>
<label>{{ __('messages.createProject.ispt_project_number') }}<b
style="color:red">*</b></label>
<input type="number" name="n_project_ispt" class="form-control"
placeholder="Nº. obra ISPT&hellip;" required>
</div>
placeholder="{{ __('messages.createProject.ispt_project_number') }}&hellip;"
required>
</div>
</div> <!-- /Row -->
<div class="row">
<div class="form-group col-sm-6">
<label>Responsável obra ISPT <b style="color:red">*</b></label>
<label>{{ __('messages.createProject.ispt_project_manager') }} <b
style="color:red">*</b></label>
<input type="text" name="responsible_project_ispt" class="form-control"
placeholder="Responsável obra ISPT&hellip;" required>
placeholder="{{ __('messages.createProject.ispt_project_manager') }}&hellip;"
required>
</div>
<div class="form-group col-sm-6">
<label>Responsável obra Empresa <b style="color:red">*</b></label>
<label>{{ __('messages.createProject.compan_project_manager') }} <b
style="color:red">*</b></label>
<input type="text" name="responsible_project_company" class="form-control"
placeholder="Responsável obra cliente&hellip;" required>
</div>
placeholder="{{ __('messages.createProject.compan_project_manager') }}&hellip;"
required>
</div>
</div> <!-- /Row -->
<div class="row">
<div class="form-group col-sm-6" id="companyField">
<label>Empresa <b style="color:red">*</b></label>
<label>{{ __('messages.createProject.select_company.contracting_company') }} <b
style="color:red">*</b></label>
<select class="form-control" name="user_id" id="company_select" required>
<option value="">Selecione uma Empresa...</option>
<option>{{ __('messages.createProject.select_plant.plant') }} ...</option>
@foreach ($companies as $company)
<option value="{{ $company->user_id }}">{{ $company->user_name }}</option>
@endforeach
@ -76,47 +87,53 @@
</div>
<div class="form-group col-sm-6" id="installationField" hidden>
<label>Instalação <b style="color:red">*</b></label>
<label>{{ __('messages.createProject.select_plant.plant') }} <b
style="color:red">*</b></label>
<select class="form-control" name="installation_id" id="installationSelect">
<!-- As opções de instalação serão preenchidas dinamicamente -->
</select>
</div>
</div>
</div> <!-- /Row -->
<div class="row" id="new_company_div">
<div class="form-group col-sm-6">
<label>Nova Instalação :</label>
<label>{{ __('messages.createProject.select_plant.new_plant') }} :</label>
<input type="text" id="new_company_name" class="form-control"
name="new_company_name" placeholder="Digite o nome da nova empresa">
name="new_company_name"
placeholder="{{ __('messages.createProject.select_plant.new_plant') }}&hellip;">
</div>
<div class="form-group col-sm-6">
<label>Morada Instalação</label>
<label>{{ __('messages.createProject.select_plant.plant_address') }}</label>
<input type="text" class="form-control" name="new_company_address"
placeholder="Localização...">
</div>
placeholder="{{ __('messages.createProject.select_plant.plant_address') }}&hellip;">
</div>
</div> <!-- /Row -->
<div class="form-group" id="localization_installation_client">
{{-- Verificar esta parte de Code diretamente no Projecto em HTML --}}
{{-- <div class="form-group" id="localization_installation_client">
<label>Morada Instalação</label>
<input type="text" class="form-control" placeholder="Localização" readonly>
</div>
</div> --}}
<div class="row">
<div class="form-group col-sm-6">
<label>Nº. de obra Empresa <b style="color:red">*</b></label>
<label>{{ __('messages.createProject.company_project_number') }}<b
style="color:red">*</b></label>
<input type="number" name="project_company_number" class="form-control"
placeholder="Nº. de obra cliente&hellip;" required>
placeholder="{{ __('messages.createProject.company_project_number') }}&hellip;"
required>
</div>
<!-- Date -->
<div class="form-group col-sm-6">
<label>Datas: <b style="color:red">*</b></label>
<label>{{ __('messages.createProject.project_start_date') }} : <b
style="color:red">*</b></label>
<div class="input-group">
{{-- <div class="input-group-prepend">
<span class="input-group-text">
@ -129,12 +146,13 @@ class="form-control float-right" required>
<!-- /.input group -->
</div>
</div>
<!-- /.card-body -->
</div> <!-- /Row -->
<div class="card-footer">
<div class="float-right">
<button type="submit" class="btn btn-primary">Guardar</button>
<button type="submit"
class="btn btn-primary">{{ __('messages.buttons.save') }}</button>
</div>
</div>
</form>
@ -257,5 +275,4 @@ function addBeforeUnload() {
});
}
</script>
@endsection

1
routes/web.php
View File

@ -112,6 +112,7 @@
Route::get('users/{id}/edit', 'edit')->name('users.edit');
Route::put('users/{user}', 'update')->name('users.update');
Route::delete('users/{user}', 'destroy')->name('users.destroy');
Route::post('editProfile/{id}', 'EditProfile')->name('editProfile');
});