From a0e0bb5e8a764ae434230151ee1da6bdd3187676 Mon Sep 17 00:00:00 2001 From: Bahugunajii Date: Mon, 3 Jul 2023 22:13:54 +0530 Subject: [PATCH 01/25] added sub-menu for managing working staff type --- .../User/Http/Controllers/UserController.php | 6 + .../js/components/WorkingStaffListing.vue | 149 ++++++++++++++++++ .../User/Resources/assets/js/vueComponents.js | 3 +- .../Resources/views/manage-staff.blade.php | 19 +++ Modules/User/Routes/web.php | 1 + Modules/User/Services/UserService.php | 2 +- resources/views/hr/employees/menu.blade.php | 30 ++-- 7 files changed, 198 insertions(+), 12 deletions(-) create mode 100644 Modules/User/Resources/assets/js/components/WorkingStaffListing.vue create mode 100644 Modules/User/Resources/views/manage-staff.blade.php diff --git a/Modules/User/Http/Controllers/UserController.php b/Modules/User/Http/Controllers/UserController.php index a2f7af7832..dce6390fe9 100644 --- a/Modules/User/Http/Controllers/UserController.php +++ b/Modules/User/Http/Controllers/UserController.php @@ -66,4 +66,10 @@ public function destroy(User $user) $this->authorize('delete', $user); $this->service->delete($user); } + + public function manage(User $user) + { + $users = $this->service->index(); + return view('user::manage-staff', compact('users')); + } } diff --git a/Modules/User/Resources/assets/js/components/WorkingStaffListing.vue b/Modules/User/Resources/assets/js/components/WorkingStaffListing.vue new file mode 100644 index 0000000000..075579024e --- /dev/null +++ b/Modules/User/Resources/assets/js/components/WorkingStaffListing.vue @@ -0,0 +1,149 @@ + + + diff --git a/Modules/User/Resources/assets/js/vueComponents.js b/Modules/User/Resources/assets/js/vueComponents.js index 5a45e93378..02b6429355 100644 --- a/Modules/User/Resources/assets/js/vueComponents.js +++ b/Modules/User/Resources/assets/js/vueComponents.js @@ -2,4 +2,5 @@ Vue.component("user-listing", require("./components/UserListing.vue").default); Vue.component("role-listing", require("./components/RoleListing.vue").default); Vue.component("user-role-update-modal", require("./components/UpdateUserRoleModal.vue").default); Vue.component("user-staff-type-update-modal", require("./components/UpdateUserStaffTypeModal.vue").default); -Vue.component("role-permission-update-modal", require("./components/UpdateRolePermissionModal.vue").default); \ No newline at end of file +Vue.component("role-permission-update-modal", require("./components/UpdateRolePermissionModal.vue").default); +Vue.component("working-staff-listing", require("./components/WorkingStaffListing.vue").default); diff --git a/Modules/User/Resources/views/manage-staff.blade.php b/Modules/User/Resources/views/manage-staff.blade.php new file mode 100644 index 0000000000..42fd51ba51 --- /dev/null +++ b/Modules/User/Resources/views/manage-staff.blade.php @@ -0,0 +1,19 @@ +@extends('user::layouts.master') +@section('content') +
+ @includeWhen(session('success'), 'toast', ['message' => session('success')]) +

User Management

+ +
+@endsection diff --git a/Modules/User/Routes/web.php b/Modules/User/Routes/web.php index ed19308ce8..d54fd77051 100644 --- a/Modules/User/Routes/web.php +++ b/Modules/User/Routes/web.php @@ -19,6 +19,7 @@ Route::get('roles', 'RolesController@index')->name('user.role-index'); Route::delete('{user}/delete', 'UserController@destroy')->name('user.delete'); Route::put('update-roles', 'UserController@updateUserRoles')->name('user.update-roles'); + Route::get('/manage', 'UserController@manage')->name('user.manage'); Route::post('/add-roles', 'RolesController@addRole')->name('roles.add-roles'); Route::delete('/delete-roles/{role}', 'RolesController@deleteRole')->name('roles.delete'); diff --git a/Modules/User/Services/UserService.php b/Modules/User/Services/UserService.php index 565c896842..3747bc6db7 100644 --- a/Modules/User/Services/UserService.php +++ b/Modules/User/Services/UserService.php @@ -14,7 +14,7 @@ class UserService implements UserServiceContract */ public function index() { - return User::with('roles') + return User::with('roles', 'employee') ->whereNull('deleted_at') ->orderBy('name') ->get(); diff --git a/resources/views/hr/employees/menu.blade.php b/resources/views/hr/employees/menu.blade.php index 0d4f3be93c..5695f00baf 100644 --- a/resources/views/hr/employees/menu.blade.php +++ b/resources/views/hr/employees/menu.blade.php @@ -1,32 +1,42 @@ From 21da5fb1697336f7e88d524628864a6a08545671 Mon Sep 17 00:00:00 2001 From: Bahugunajii Date: Mon, 3 Jul 2023 22:17:54 +0530 Subject: [PATCH 02/25] fixed CI checks --- Modules/User/Http/Controllers/UserController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/User/Http/Controllers/UserController.php b/Modules/User/Http/Controllers/UserController.php index dce6390fe9..ff10ecd106 100644 --- a/Modules/User/Http/Controllers/UserController.php +++ b/Modules/User/Http/Controllers/UserController.php @@ -70,6 +70,7 @@ public function destroy(User $user) public function manage(User $user) { $users = $this->service->index(); + return view('user::manage-staff', compact('users')); } } From b3ab724e73041e0dca66a81ede75debc687a8a4b Mon Sep 17 00:00:00 2001 From: Bahugunajii Date: Mon, 3 Jul 2023 22:39:51 +0530 Subject: [PATCH 03/25] fixed CI checks --- Modules/User/Http/Controllers/UserController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/User/Http/Controllers/UserController.php b/Modules/User/Http/Controllers/UserController.php index ff10ecd106..e626ca31e6 100644 --- a/Modules/User/Http/Controllers/UserController.php +++ b/Modules/User/Http/Controllers/UserController.php @@ -70,7 +70,7 @@ public function destroy(User $user) public function manage(User $user) { $users = $this->service->index(); - + return view('user::manage-staff', compact('users')); } } From 3fb0e68b8f7001599ada1e460877590ea5d4802f Mon Sep 17 00:00:00 2001 From: Bahugunajii Date: Fri, 7 Jul 2023 15:07:04 +0530 Subject: [PATCH 04/25] :sparkles: Add new joinees to portal via google sheets Add new joinees to portal via google sheets --- .../Http/Controllers/EmployeeController.php | 18 +++++++++ Modules/HR/Routes/web.php | 3 ++ .../hr/employees/approve-joinees.blade.php | 40 +++++++++++++++++++ resources/views/hr/employees/menu.blade.php | 4 ++ 4 files changed, 65 insertions(+) create mode 100644 resources/views/hr/employees/approve-joinees.blade.php diff --git a/Modules/HR/Http/Controllers/EmployeeController.php b/Modules/HR/Http/Controllers/EmployeeController.php index 262dd9a1d9..115241d4d6 100644 --- a/Modules/HR/Http/Controllers/EmployeeController.php +++ b/Modules/HR/Http/Controllers/EmployeeController.php @@ -13,6 +13,8 @@ use Modules\HR\Entities\IndividualAssessment; use Modules\HR\Entities\Job; use Modules\Project\Entities\ProjectTeamMember; +use Google_Client; +use Google_Service_Sheets; class EmployeeController extends Controller { @@ -144,4 +146,20 @@ public function updateEmployeeReviewers(Request $request, Employee $employee) return redirect()->back(); } + + public function showApprovalForm() + { + $client = new Google_Client(); + $client->setAuthConfig('E:\Downloads\ninth-nebula-392106-8478ffdda8b1.json'); + $client->addScope(Google_Service_Sheets::SPREADSHEETS_READONLY); + + $service = new Google_Service_Sheets($client); + $spreadsheetId = '1zXy4MPMN0OouU_YlGg-60R535fZk0i_WItTIRRQxubA'; + $range = 'Sheet1!A2:E'; // Assuming data starts from cell A2 and ends at column E + + $response = $service->spreadsheets_values->get($spreadsheetId, $range); + $data = $response->getValues(); + + return view('hr.employees.approve-joinees', ['data' => $data]); + } } diff --git a/Modules/HR/Routes/web.php b/Modules/HR/Routes/web.php index 851fac7e5b..5b85d121c1 100644 --- a/Modules/HR/Routes/web.php +++ b/Modules/HR/Routes/web.php @@ -128,6 +128,9 @@ Route::get('employee-reports', 'EmployeeController@reports')->name('employees.reports'); Route::get('fte-handler/{domain_id}', 'EmployeeController@showFTEdata')->name('employees.alert'); Route::post('/update-reviewers/{employee}', 'EmployeeController@updateEmployeeReviewers')->name('update.employee.reviewers'); + Route::get('/approve-joinees', 'EmployeeController@showApprovalForm')->name('approve.joinees.show'); + Route::post('/approve-joinees', 'EmployeeController@processApprovalForm')->name('approve.joinees'); + Route::resource('requisition', 'RequisitionController') ->only(['index', 'show', 'store']) diff --git a/resources/views/hr/employees/approve-joinees.blade.php b/resources/views/hr/employees/approve-joinees.blade.php new file mode 100644 index 0000000000..336fa341af --- /dev/null +++ b/resources/views/hr/employees/approve-joinees.blade.php @@ -0,0 +1,40 @@ +@extends('layouts.app') + +@section('content') +
+
+ @include('hr.employees.menu') +

+
+

New Joinees

+
+
+
+ @csrf + + + + + + + + + + + + @foreach ($data as $row) + + + + + + + @endforeach + +
NameEmailAccount NumberApprove
{{ $row[0] }}{{ $row[1] }}{{ $row[2] }} + Approve +
+ +
+
+@endsection diff --git a/resources/views/hr/employees/menu.blade.php b/resources/views/hr/employees/menu.blade.php index 0d4f3be93c..4f8b149ce5 100644 --- a/resources/views/hr/employees/menu.blade.php +++ b/resources/views/hr/employees/menu.blade.php @@ -29,4 +29,8 @@
  •  Reports
    • + +
  • +  Approve joinee's +
    • From ba16b017774fe0140e56925e514a4100637385b0 Mon Sep 17 00:00:00 2001 From: Bahugunajii Date: Fri, 7 Jul 2023 15:13:54 +0530 Subject: [PATCH 05/25] :green_heart: Ci check fixes ci check fixes --- Modules/HR/Routes/web.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/HR/Routes/web.php b/Modules/HR/Routes/web.php index 5b85d121c1..67316f6231 100644 --- a/Modules/HR/Routes/web.php +++ b/Modules/HR/Routes/web.php @@ -131,7 +131,6 @@ Route::get('/approve-joinees', 'EmployeeController@showApprovalForm')->name('approve.joinees.show'); Route::post('/approve-joinees', 'EmployeeController@processApprovalForm')->name('approve.joinees'); - Route::resource('requisition', 'RequisitionController') ->only(['index', 'show', 'store']) ->names([ From 86110fbe1715b7f9689490786ee345e974e9a752 Mon Sep 17 00:00:00 2001 From: Bahugunajii Date: Mon, 10 Jul 2023 11:54:34 +0530 Subject: [PATCH 06/25] added approval screen --- .../Http/Controllers/EmployeeController.php | 22 +++++++++++- .../hr/employees/approve-joinees.blade.php | 34 +++++++++++++------ 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/Modules/HR/Http/Controllers/EmployeeController.php b/Modules/HR/Http/Controllers/EmployeeController.php index 115241d4d6..89b8571907 100644 --- a/Modules/HR/Http/Controllers/EmployeeController.php +++ b/Modules/HR/Http/Controllers/EmployeeController.php @@ -15,6 +15,7 @@ use Modules\Project\Entities\ProjectTeamMember; use Google_Client; use Google_Service_Sheets; +use Modules\User\Entities\User; class EmployeeController extends Controller { @@ -149,17 +150,36 @@ public function updateEmployeeReviewers(Request $request, Employee $employee) public function showApprovalForm() { + $client = new Google_Client(); $client->setAuthConfig('E:\Downloads\ninth-nebula-392106-8478ffdda8b1.json'); $client->addScope(Google_Service_Sheets::SPREADSHEETS_READONLY); $service = new Google_Service_Sheets($client); $spreadsheetId = '1zXy4MPMN0OouU_YlGg-60R535fZk0i_WItTIRRQxubA'; - $range = 'Sheet1!A2:E'; // Assuming data starts from cell A2 and ends at column E + $range = 'Sheet1!A2:Z'; // Assuming data starts from cell A2 and ends at column Z $response = $service->spreadsheets_values->get($spreadsheetId, $range); $data = $response->getValues(); return view('hr.employees.approve-joinees', ['data' => $data]); } + + public function processApprovalForm(Request $request) + { + $names = $request->input('full_name'); + $approvals = $request->input('approved'); + + foreach ($approvals as $index => $approval) { + if ($approval == 'approved') { // Check if the checkbox value is 'approved' + // Create new user with the approved data + $user = new User(); + $user->name = $names[$index]; + + $user->save(); + } + } + + return redirect()->back()->with('success', 'Users added successfully'); + } } diff --git a/resources/views/hr/employees/approve-joinees.blade.php b/resources/views/hr/employees/approve-joinees.blade.php index 336fa341af..55b16a8a4d 100644 --- a/resources/views/hr/employees/approve-joinees.blade.php +++ b/resources/views/hr/employees/approve-joinees.blade.php @@ -6,35 +6,49 @@ @include('hr.employees.menu')

    -

    New Joinees

    +

    New Joinee's


    -
    + @csrf - - - + + + @foreach ($data as $row) + @dd($data) - - + + @endforeach
    NameEmailAccount NumberFull NameLast UpdatedSend email to infra Approve
    {{ $row[0] }} {{ $row[1] }}{{ $row[2] }}{{ $row[0] }} Send email - Approve + + + Approve
    - -
    + + + @endsection From 7d31bdb5a1d5d0ecf550c8fd462d4a9d4d4f75b9 Mon Sep 17 00:00:00 2001 From: Bahugunajii Date: Mon, 10 Jul 2023 13:30:04 +0530 Subject: [PATCH 07/25] approve joinee corresponding to their names --- .../Http/Controllers/EmployeeController.php | 19 +++----- .../hr/employees/approve-joinees.blade.php | 46 +++++++++++++------ 2 files changed, 38 insertions(+), 27 deletions(-) diff --git a/Modules/HR/Http/Controllers/EmployeeController.php b/Modules/HR/Http/Controllers/EmployeeController.php index 89b8571907..32005d24e1 100644 --- a/Modules/HR/Http/Controllers/EmployeeController.php +++ b/Modules/HR/Http/Controllers/EmployeeController.php @@ -150,7 +150,7 @@ public function updateEmployeeReviewers(Request $request, Employee $employee) public function showApprovalForm() { - + $client = new Google_Client(); $client->setAuthConfig('E:\Downloads\ninth-nebula-392106-8478ffdda8b1.json'); $client->addScope(Google_Service_Sheets::SPREADSHEETS_READONLY); @@ -167,18 +167,11 @@ public function showApprovalForm() public function processApprovalForm(Request $request) { - $names = $request->input('full_name'); - $approvals = $request->input('approved'); - - foreach ($approvals as $index => $approval) { - if ($approval == 'approved') { // Check if the checkbox value is 'approved' - // Create new user with the approved data - $user = new User(); - $user->name = $names[$index]; - - $user->save(); - } - } + $name = $request->input('full_name'); + $user = new User(); + $user->name = $name; + + $user->save(); return redirect()->back()->with('success', 'Users added successfully'); } diff --git a/resources/views/hr/employees/approve-joinees.blade.php b/resources/views/hr/employees/approve-joinees.blade.php index 55b16a8a4d..68e66e5e21 100644 --- a/resources/views/hr/employees/approve-joinees.blade.php +++ b/resources/views/hr/employees/approve-joinees.blade.php @@ -2,9 +2,9 @@ @section('content')
    -
    - @include('hr.employees.menu') -

    +
    + @include('hr.employees.menu') +

    New Joinee's


    @@ -22,33 +22,51 @@ - @foreach ($data as $row) - @dd($data) + @foreach ($data as $key => $row) {{ $row[1] }} - {{ $row[0] }} - Send email + {{ $row[0] }} + Send email - Approve + + Approve @endforeach - +
    - + @endsection From 42ae6efb73c97617bf6147e78933cfe8519be634 Mon Sep 17 00:00:00 2001 From: Bahugunajii Date: Mon, 10 Jul 2023 14:01:24 +0530 Subject: [PATCH 08/25] ci check fixes --- Modules/HR/Http/Controllers/EmployeeController.php | 2 -- resources/views/hr/employees/approve-joinees.blade.php | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Modules/HR/Http/Controllers/EmployeeController.php b/Modules/HR/Http/Controllers/EmployeeController.php index 32005d24e1..41962d0a43 100644 --- a/Modules/HR/Http/Controllers/EmployeeController.php +++ b/Modules/HR/Http/Controllers/EmployeeController.php @@ -150,7 +150,6 @@ public function updateEmployeeReviewers(Request $request, Employee $employee) public function showApprovalForm() { - $client = new Google_Client(); $client->setAuthConfig('E:\Downloads\ninth-nebula-392106-8478ffdda8b1.json'); $client->addScope(Google_Service_Sheets::SPREADSHEETS_READONLY); @@ -170,7 +169,6 @@ public function processApprovalForm(Request $request) $name = $request->input('full_name'); $user = new User(); $user->name = $name; - $user->save(); return redirect()->back()->with('success', 'Users added successfully'); diff --git a/resources/views/hr/employees/approve-joinees.blade.php b/resources/views/hr/employees/approve-joinees.blade.php index 68e66e5e21..fb009e9705 100644 --- a/resources/views/hr/employees/approve-joinees.blade.php +++ b/resources/views/hr/employees/approve-joinees.blade.php @@ -17,6 +17,7 @@ Full Name Last Updated Send email to infra + Enter new email Approve @@ -27,6 +28,8 @@ {{ $row[1] }} {{ $row[0] }} Send email + + From 362a6c3c1b9772197d63a1f0b844083f8378ee4c Mon Sep 17 00:00:00 2001 From: Akshiteshnaithani Date: Mon, 10 Jul 2023 21:01:42 +0530 Subject: [PATCH 09/25] Mail to InfraTeam --- .../HR/Emails/NewJoinerEmailForInfraTeam.php | 37 +++++++++++++++++++ .../Http/Controllers/EmployeeController.php | 17 +++++++-- .../Resources/views/mail/infra-team.blade.php | 18 +++++++++ Modules/HR/Routes/web.php | 2 + ninth-nebula-392106-8478ffdda8b1.json | 13 +++++++ .../hr/employees/approve-joinees.blade.php | 11 +++++- 6 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 Modules/HR/Emails/NewJoinerEmailForInfraTeam.php create mode 100644 Modules/HR/Resources/views/mail/infra-team.blade.php create mode 100644 ninth-nebula-392106-8478ffdda8b1.json diff --git a/Modules/HR/Emails/NewJoinerEmailForInfraTeam.php b/Modules/HR/Emails/NewJoinerEmailForInfraTeam.php new file mode 100644 index 0000000000..5cc523bf5f --- /dev/null +++ b/Modules/HR/Emails/NewJoinerEmailForInfraTeam.php @@ -0,0 +1,37 @@ +data = $data; + } + + /** + * Build the message. + * + * @return $this + */ + public function build() + { + return $this->from(config('mail.from.address'), config('mail.from.name')) + ->subject('Subject: Request for Email Creation ' .$this->data[1]) + ->to('infrasupport@coloredcow.in') + ->view('hr::mail.infra-team'); + } +} diff --git a/Modules/HR/Http/Controllers/EmployeeController.php b/Modules/HR/Http/Controllers/EmployeeController.php index 41962d0a43..7558b77787 100644 --- a/Modules/HR/Http/Controllers/EmployeeController.php +++ b/Modules/HR/Http/Controllers/EmployeeController.php @@ -3,9 +3,13 @@ namespace Modules\HR\Http\Controllers; use App\Services\EmployeeService; +use Google_Client; +use Google_Service_Sheets; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Http\Request; use Illuminate\Routing\Controller; +use Illuminate\Support\Facades\Mail; +use Modules\HR\Emails\NewJoinerEmailForInfraTeam; use Modules\HR\Entities\Assessment; use Modules\HR\Entities\Employee; use Modules\HR\Entities\HrJobDesignation; @@ -13,8 +17,6 @@ use Modules\HR\Entities\IndividualAssessment; use Modules\HR\Entities\Job; use Modules\Project\Entities\ProjectTeamMember; -use Google_Client; -use Google_Service_Sheets; use Modules\User\Entities\User; class EmployeeController extends Controller @@ -151,7 +153,7 @@ public function updateEmployeeReviewers(Request $request, Employee $employee) public function showApprovalForm() { $client = new Google_Client(); - $client->setAuthConfig('E:\Downloads\ninth-nebula-392106-8478ffdda8b1.json'); + $client->setAuthConfig('C:\xampp\htdocs\portal\ninth-nebula-392106-8478ffdda8b1.json'); $client->addScope(Google_Service_Sheets::SPREADSHEETS_READONLY); $service = new Google_Service_Sheets($client); @@ -173,4 +175,13 @@ public function processApprovalForm(Request $request) return redirect()->back()->with('success', 'Users added successfully'); } + + public function sendMailToInfraTeam(Request $request) + { + $data = $request->input('data'); + + Mail::send(new NewJoinerEmailForInfraTeam($data)); + + return redirect()->back()->with('success', 'Mail sent successfully'); + } } diff --git a/Modules/HR/Resources/views/mail/infra-team.blade.php b/Modules/HR/Resources/views/mail/infra-team.blade.php new file mode 100644 index 0000000000..a76f997986 --- /dev/null +++ b/Modules/HR/Resources/views/mail/infra-team.blade.php @@ -0,0 +1,18 @@ +
    + +

    Dear Infrasupport Team,

    +

    I hope this email finds you well. I am writing to request the creation of an email account for a new employee + {{ $data[1] }} in our organization. +

    +

    If there are any specific forms or documentation required for this process, kindly let me know, and I will + promptly provide the necessary information.

    +
    +

    Thank you for your prompt attention to this matter. Your assistance is greatly appreciated. + Best regards,

    +

    Best regards,

    +

    Mohit Sharma

    +
    diff --git a/Modules/HR/Routes/web.php b/Modules/HR/Routes/web.php index 67316f6231..6b5e32f400 100644 --- a/Modules/HR/Routes/web.php +++ b/Modules/HR/Routes/web.php @@ -130,6 +130,8 @@ Route::post('/update-reviewers/{employee}', 'EmployeeController@updateEmployeeReviewers')->name('update.employee.reviewers'); Route::get('/approve-joinees', 'EmployeeController@showApprovalForm')->name('approve.joinees.show'); Route::post('/approve-joinees', 'EmployeeController@processApprovalForm')->name('approve.joinees'); + Route::GET('/infra-mail', 'EmployeeController@sendMailToInfraTeam')->name('infra.mail'); + Route::resource('requisition', 'RequisitionController') ->only(['index', 'show', 'store']) diff --git a/ninth-nebula-392106-8478ffdda8b1.json b/ninth-nebula-392106-8478ffdda8b1.json new file mode 100644 index 0000000000..b72c831643 --- /dev/null +++ b/ninth-nebula-392106-8478ffdda8b1.json @@ -0,0 +1,13 @@ +{ + "type": "service_account", + "project_id": "ninth-nebula-392106", + "private_key_id": "8478ffdda8b1e31385449eefb87eefdba915e1c1", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD4sngydkbN90p1\nqroq4dBIF/0b3Q/2fWRfBtnFDkDXVfP1OjcrNQjjjqmKS0/PsBshvjBiWwF6kBlz\nBh1N8uaXUhhbrOLyudXsMoqYp5EZfgOkagzRZWwOjbst5dQx2sVcbdyi2kefcSGU\ng2EoV1oHfImnrnFp3eK/7fEKScxFQy5umelxgZAGuoM5hen1q8IvV0NRNEhsVJEP\n4IjHgKb5mjOuZffy/Sl7qkPSrvkiw7goGFUzGb7SPaVp3oK7fdsT7gGCIN+n2J2P\nC/caLKZTAwjPxWSmcBlFmpqT9zlbZwt6o2vfqHWBqKxgPrsQA/4lSqu3Dhc8XXQB\n8nFtaWj9AgMBAAECggEAC8uVi5/0Q/C7UKRfZKKsJb2Zhn8Wf24IDie9hiz8YoCU\nBWjHu0SUxNiV1ImcFSSFmbT/1EWVTUWIJ3fxRaqqr1LR9YfxuNBoKhkyXWlV81V4\nmvPHfHQo5ItqIGDa23h3gHN0RPcN8ZNEilr6BzDjA+4Ve0uSdN9BhP4/vrZF7XAm\nOkHwZfOyDm16U/y54GXDE5IxrpDN2qQPB30WxfX0uRj6PwDv+9DUvX/hj3b82nK9\njFbWJmVwn4Yt6W6Y/f1BJuUYErPkNdWOphkfO5Hd3ib7xHAz3K4e61u/MWiOaFWD\njCvYu3OP80gK/Bv2ESkKoiaSBjshQt9+IvicuUtjwQKBgQD/y7z3qo+0pU05KbKi\nFMdqpN0Y/UjhJGs5v54K8Aag5t9hPF1DZz6wweMhckxJvdRC//ksvrGLe0KLjUrf\neFL/9sKl4Xj7vhyhg/Yl2Y7mRdYuQEtYs04ILwtqv5zG1FKoZrUr6J69IemIqrmU\nRD6hbJ5M2mfC6OQGdy1Q3hvxnQKBgQD45UfxL1QYbqawkfMqVX6HzznDetPfHHco\n0Tv0j0s4RGrnh/v9aeriQE+3I8wjNuFO98998Rv9ue2ZZ1HfBiJ8F0sV70ecN2cQ\nfR+bg1pJMizmzCEUy/B2FouuqvR+ES3pdTcF4oGLuzEQFA66VYrSNXC8Uva8/TS0\nsA8FZ7Pm4QKBgQD0kxMdIwHAUYUisNHR01hQiU21hQfX7QBw+NvdzV4pHlZbHGJ3\n/hGc4+WNp0F2CIEZhrHyrGoJ2VLpJ7F9Ngj2IDRAcvNAkKfDbu89hWTym7eMBYGF\nT/u+K20ZJhh6q6xUw89aKlMMt44ZVFOYhh/0LGy3QuSPIipUXEMB3TyOqQKBgAq/\na+HgV1NOw+fwBX4YfwRCUI4+aZPC2OpsTph675aYbb1dw+XngvsOJ+MSqqgCoKwW\nS2F23eyQ8M+lBIYK78ZIAzgJQyBdzBeML6c5ftaWUhYNTohlXhbbVmDOhQxElaT1\nKNEaPNnZ1X6KPzCQrRPyttGLC5iRnosG5z8mgUBBAoGBAOlLBlLcR2aOuCEo82cj\nqeMYRESNIKuvOQKO8ebfYimsWgqCyZTSZIvnClNj/vUp+BokALXPWT0rHYyT0t8f\nAWl/MRr25ryc5NjEl/7iPMmNI9jPcYk0t4JkMsF0CTxEJLo79Hvmmybi0LkCpOH8\nCBoowuuovBTwVh0mEOwN8aGt\n-----END PRIVATE KEY-----\n", + "client_email": "google-sheets-api@ninth-nebula-392106.iam.gserviceaccount.com", + "client_id": "111979648204663340683", + "auth_uri": "https://accounts.google.com/o/oauth2/auth", + "token_uri": "https://oauth2.googleapis.com/token", + "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", + "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/google-sheets-api%40ninth-nebula-392106.iam.gserviceaccount.com", + "universe_domain": "googleapis.com" +} diff --git a/resources/views/hr/employees/approve-joinees.blade.php b/resources/views/hr/employees/approve-joinees.blade.php index fb009e9705..902d9c511f 100644 --- a/resources/views/hr/employees/approve-joinees.blade.php +++ b/resources/views/hr/employees/approve-joinees.blade.php @@ -27,8 +27,15 @@ {{ $row[1] }} {{ $row[0] }} - Send email - + +
    + @csrf + + + +
    + + From 8b6cf75ea7cb548be45f433e58eafe4b01b1c9ad Mon Sep 17 00:00:00 2001 From: Akshiteshnaithani Date: Tue, 11 Jul 2023 10:54:17 +0530 Subject: [PATCH 10/25] fix CI checks --- .../HR/Emails/NewJoinerEmailForInfraTeam.php | 2 +- Modules/HR/Routes/web.php | 1 - .../js/components/WorkingStaffListing.vue | 256 +++++++++--------- 3 files changed, 129 insertions(+), 130 deletions(-) diff --git a/Modules/HR/Emails/NewJoinerEmailForInfraTeam.php b/Modules/HR/Emails/NewJoinerEmailForInfraTeam.php index 5cc523bf5f..d5594c6696 100644 --- a/Modules/HR/Emails/NewJoinerEmailForInfraTeam.php +++ b/Modules/HR/Emails/NewJoinerEmailForInfraTeam.php @@ -30,7 +30,7 @@ public function __construct($data) public function build() { return $this->from(config('mail.from.address'), config('mail.from.name')) - ->subject('Subject: Request for Email Creation ' .$this->data[1]) + ->subject('Subject: Request for Email Creation ' . $this->data[1]) ->to('infrasupport@coloredcow.in') ->view('hr::mail.infra-team'); } diff --git a/Modules/HR/Routes/web.php b/Modules/HR/Routes/web.php index 6b5e32f400..4ae5f7764b 100644 --- a/Modules/HR/Routes/web.php +++ b/Modules/HR/Routes/web.php @@ -132,7 +132,6 @@ Route::post('/approve-joinees', 'EmployeeController@processApprovalForm')->name('approve.joinees'); Route::GET('/infra-mail', 'EmployeeController@sendMailToInfraTeam')->name('infra.mail'); - Route::resource('requisition', 'RequisitionController') ->only(['index', 'show', 'store']) ->names([ diff --git a/Modules/User/Resources/assets/js/components/WorkingStaffListing.vue b/Modules/User/Resources/assets/js/components/WorkingStaffListing.vue index 075579024e..a08732ec1b 100644 --- a/Modules/User/Resources/assets/js/components/WorkingStaffListing.vue +++ b/Modules/User/Resources/assets/js/components/WorkingStaffListing.vue @@ -1,149 +1,149 @@ From 5319a0911665cd719818e3fb791e7e662f65d439 Mon Sep 17 00:00:00 2001 From: Akshiteshnaithani Date: Tue, 11 Jul 2023 11:13:53 +0530 Subject: [PATCH 11/25] fix CI checks --- .../User/Resources/assets/js/vueComponents.js | 2 -- .../Resources/views/manage-staff.blade.php | 19 ------------------- 2 files changed, 21 deletions(-) delete mode 100644 Modules/User/Resources/views/manage-staff.blade.php diff --git a/Modules/User/Resources/assets/js/vueComponents.js b/Modules/User/Resources/assets/js/vueComponents.js index 02b6429355..91a9ced813 100644 --- a/Modules/User/Resources/assets/js/vueComponents.js +++ b/Modules/User/Resources/assets/js/vueComponents.js @@ -2,5 +2,3 @@ Vue.component("user-listing", require("./components/UserListing.vue").default); Vue.component("role-listing", require("./components/RoleListing.vue").default); Vue.component("user-role-update-modal", require("./components/UpdateUserRoleModal.vue").default); Vue.component("user-staff-type-update-modal", require("./components/UpdateUserStaffTypeModal.vue").default); -Vue.component("role-permission-update-modal", require("./components/UpdateRolePermissionModal.vue").default); -Vue.component("working-staff-listing", require("./components/WorkingStaffListing.vue").default); diff --git a/Modules/User/Resources/views/manage-staff.blade.php b/Modules/User/Resources/views/manage-staff.blade.php deleted file mode 100644 index 42fd51ba51..0000000000 --- a/Modules/User/Resources/views/manage-staff.blade.php +++ /dev/null @@ -1,19 +0,0 @@ -@extends('user::layouts.master') -@section('content') -
    - @includeWhen(session('success'), 'toast', ['message' => session('success')]) -

    User Management

    - -
    -@endsection From 02b695332b009f0d0c87899b97a5c056911bebf0 Mon Sep 17 00:00:00 2001 From: Akshiteshnaithani Date: Tue, 11 Jul 2023 11:16:36 +0530 Subject: [PATCH 12/25] fix CI checks --- resources/views/hr/employees/menu.blade.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/views/hr/employees/menu.blade.php b/resources/views/hr/employees/menu.blade.php index c364cc0a3e..07ce7fe594 100644 --- a/resources/views/hr/employees/menu.blade.php +++ b/resources/views/hr/employees/menu.blade.php @@ -35,11 +35,6 @@ href="{{ route('employees.reports') }}"> Reports -
  • -  Manage working staff -
    • -
  •  Approve joinee's
    • From 7a84343aab949eedcdce0a111f38db8241ccad8a Mon Sep 17 00:00:00 2001 From: Akshiteshnaithani Date: Tue, 11 Jul 2023 11:18:43 +0530 Subject: [PATCH 13/25] fix CI checks --- Modules/User/Routes/web.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/User/Routes/web.php b/Modules/User/Routes/web.php index d54fd77051..ed19308ce8 100644 --- a/Modules/User/Routes/web.php +++ b/Modules/User/Routes/web.php @@ -19,7 +19,6 @@ Route::get('roles', 'RolesController@index')->name('user.role-index'); Route::delete('{user}/delete', 'UserController@destroy')->name('user.delete'); Route::put('update-roles', 'UserController@updateUserRoles')->name('user.update-roles'); - Route::get('/manage', 'UserController@manage')->name('user.manage'); Route::post('/add-roles', 'RolesController@addRole')->name('roles.add-roles'); Route::delete('/delete-roles/{role}', 'RolesController@deleteRole')->name('roles.delete'); From e9659ef2063ed85299c0bc95e533177a87d4e896 Mon Sep 17 00:00:00 2001 From: Akshiteshnaithani Date: Tue, 11 Jul 2023 11:22:53 +0530 Subject: [PATCH 14/25] fix CI checks --- Modules/User/Resources/assets/js/vueComponents.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/User/Resources/assets/js/vueComponents.js b/Modules/User/Resources/assets/js/vueComponents.js index 91a9ced813..0fa0b3515c 100644 --- a/Modules/User/Resources/assets/js/vueComponents.js +++ b/Modules/User/Resources/assets/js/vueComponents.js @@ -2,3 +2,4 @@ Vue.component("user-listing", require("./components/UserListing.vue").default); Vue.component("role-listing", require("./components/RoleListing.vue").default); Vue.component("user-role-update-modal", require("./components/UpdateUserRoleModal.vue").default); Vue.component("user-staff-type-update-modal", require("./components/UpdateUserStaffTypeModal.vue").default); +Vue.component("role-permission-update-modal", require("./components/UpdateRolePermissionModal.vue").default); From b1068535fbec14f8ed4a6bcfc7f4951e298a82f9 Mon Sep 17 00:00:00 2001 From: Bahugunajii Date: Tue, 11 Jul 2023 11:23:21 +0530 Subject: [PATCH 15/25] added changes --- .../Http/Controllers/EmployeeController.php | 2 + .../hr/employees/approve-joinees.blade.php | 45 +++++++++++++------ resources/views/hr/employees/menu.blade.php | 2 +- 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/Modules/HR/Http/Controllers/EmployeeController.php b/Modules/HR/Http/Controllers/EmployeeController.php index 41962d0a43..32adc4236b 100644 --- a/Modules/HR/Http/Controllers/EmployeeController.php +++ b/Modules/HR/Http/Controllers/EmployeeController.php @@ -167,8 +167,10 @@ public function showApprovalForm() public function processApprovalForm(Request $request) { $name = $request->input('full_name'); + $email = $request->input('email'); $user = new User(); $user->name = $name; + $user->email = $email; $user->save(); return redirect()->back()->with('success', 'Users added successfully'); diff --git a/resources/views/hr/employees/approve-joinees.blade.php b/resources/views/hr/employees/approve-joinees.blade.php index fb009e9705..93983f0058 100644 --- a/resources/views/hr/employees/approve-joinees.blade.php +++ b/resources/views/hr/employees/approve-joinees.blade.php @@ -6,7 +6,7 @@ @include('hr.employees.menu')

    -

    New Joinee's

    +

    New Joinees


    @@ -25,15 +25,18 @@ @foreach ($data as $key => $row) - {{ $row[1] }} - {{ $row[0] }} - Send email - + {{ $row[1] }} + {{ $row[0] }} + Send email + + - + - + Approve @@ -45,16 +48,30 @@ @endsection diff --git a/resources/views/hr/employees/menu.blade.php b/resources/views/hr/employees/menu.blade.php index 4f8b149ce5..749c5fcc80 100644 --- a/resources/views/hr/employees/menu.blade.php +++ b/resources/views/hr/employees/menu.blade.php @@ -31,6 +31,6 @@
  • -  Approve joinee's +  Approve joinees
    • From 872c4e06d4330ec0fbfcd41ac537613066342fea Mon Sep 17 00:00:00 2001 From: Akshiteshnaithani Date: Tue, 11 Jul 2023 11:33:00 +0530 Subject: [PATCH 16/25] CI checkfix --- .../User/Http/Controllers/UserController.php | 7 ------ .../User/Resources/assets/js/vueComponents.js | 2 +- resources/views/hr/employees/menu.blade.php | 25 ++++++++----------- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/Modules/User/Http/Controllers/UserController.php b/Modules/User/Http/Controllers/UserController.php index e626ca31e6..a2f7af7832 100644 --- a/Modules/User/Http/Controllers/UserController.php +++ b/Modules/User/Http/Controllers/UserController.php @@ -66,11 +66,4 @@ public function destroy(User $user) $this->authorize('delete', $user); $this->service->delete($user); } - - public function manage(User $user) - { - $users = $this->service->index(); - - return view('user::manage-staff', compact('users')); - } } diff --git a/Modules/User/Resources/assets/js/vueComponents.js b/Modules/User/Resources/assets/js/vueComponents.js index 0fa0b3515c..5a45e93378 100644 --- a/Modules/User/Resources/assets/js/vueComponents.js +++ b/Modules/User/Resources/assets/js/vueComponents.js @@ -2,4 +2,4 @@ Vue.component("user-listing", require("./components/UserListing.vue").default); Vue.component("role-listing", require("./components/RoleListing.vue").default); Vue.component("user-role-update-modal", require("./components/UpdateUserRoleModal.vue").default); Vue.component("user-staff-type-update-modal", require("./components/UpdateUserStaffTypeModal.vue").default); -Vue.component("role-permission-update-modal", require("./components/UpdateRolePermissionModal.vue").default); +Vue.component("role-permission-update-modal", require("./components/UpdateRolePermissionModal.vue").default); \ No newline at end of file diff --git a/resources/views/hr/employees/menu.blade.php b/resources/views/hr/employees/menu.blade.php index 07ce7fe594..4f8b149ce5 100644 --- a/resources/views/hr/employees/menu.blade.php +++ b/resources/views/hr/employees/menu.blade.php @@ -1,38 +1,33 @@
    • @php - $params = array_merge(['name' => 'Employee'], ['status' => 'current']); + $params = array_merge(['name' => 'Employee'], ['status' => 'current']); @endphp -   Employees +   Employees
    • @php - $params = array_merge(['name' => 'Intern'], ['status' => 'current']); + $params = array_merge(['name' => 'Intern'], ['status' => 'current']); @endphp -  Intern +  Intern
    • - @php - $params = array_merge(['name' => 'Contractor'], ['status' => 'current']); + @php + $params = array_merge(['name' => 'Contractor'], ['status' => 'current']); @endphp -  Contractor +  Contractor
    • @php - $params = array_merge(['name' => 'Support Staff'], ['status' => 'current']); + $params = array_merge(['name' => 'Support Staff'], ['status' => 'current']); @endphp -  Support Staff +  Support Staff
    • -  Reports +  Reports
    • From c332dfd30b1918c4f21c645b39a9a14049f1b78c Mon Sep 17 00:00:00 2001 From: Akshiteshnaithani Date: Tue, 11 Jul 2023 16:51:13 +0530 Subject: [PATCH 17/25] Fix the error for frist Employee --- .../HR/Emails/NewJoinerEmailForInfraTeam.php | 2 +- .../Http/Controllers/EmployeeController.php | 7 ++-- .../Resources/views/mail/infra-team.blade.php | 2 +- .../hr/employees/approve-joinees.blade.php | 35 +++++++++++++------ 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/Modules/HR/Emails/NewJoinerEmailForInfraTeam.php b/Modules/HR/Emails/NewJoinerEmailForInfraTeam.php index d5594c6696..67cfe61ea2 100644 --- a/Modules/HR/Emails/NewJoinerEmailForInfraTeam.php +++ b/Modules/HR/Emails/NewJoinerEmailForInfraTeam.php @@ -30,7 +30,7 @@ public function __construct($data) public function build() { return $this->from(config('mail.from.address'), config('mail.from.name')) - ->subject('Subject: Request for Email Creation ' . $this->data[1]) + ->subject('Subject: Request for Email Creation ' . $this->data['name']) ->to('infrasupport@coloredcow.in') ->view('hr::mail.infra-team'); } diff --git a/Modules/HR/Http/Controllers/EmployeeController.php b/Modules/HR/Http/Controllers/EmployeeController.php index 88a7de9fac..ef6eb1ff10 100644 --- a/Modules/HR/Http/Controllers/EmployeeController.php +++ b/Modules/HR/Http/Controllers/EmployeeController.php @@ -180,9 +180,12 @@ public function processApprovalForm(Request $request) public function sendMailToInfraTeam(Request $request) { - $data = $request->input('data'); + $data = [ + 'date' => $request->input('data')['date'], + 'name' => $request->input('data')['name'], + ]; - Mail::send(new NewJoinerEmailForInfraTeam($data)); + Mail::queue(new NewJoinerEmailForInfraTeam($data)); return redirect()->back()->with('success', 'Mail sent successfully'); } diff --git a/Modules/HR/Resources/views/mail/infra-team.blade.php b/Modules/HR/Resources/views/mail/infra-team.blade.php index a76f997986..d59c8352d6 100644 --- a/Modules/HR/Resources/views/mail/infra-team.blade.php +++ b/Modules/HR/Resources/views/mail/infra-team.blade.php @@ -6,7 +6,7 @@

      Dear Infrasupport Team,

      I hope this email finds you well. I am writing to request the creation of an email account for a new employee - {{ $data[1] }} in our organization. + {{ $data['name'] }} in our organization.

      If there are any specific forms or documentation required for this process, kindly let me know, and I will promptly provide the necessary information.

      diff --git a/resources/views/hr/employees/approve-joinees.blade.php b/resources/views/hr/employees/approve-joinees.blade.php index 1b75d0b83c..3d2457dbe0 100644 --- a/resources/views/hr/employees/approve-joinees.blade.php +++ b/resources/views/hr/employees/approve-joinees.blade.php @@ -25,19 +25,17 @@ @foreach ($data as $key => $row) - {{ $row[1] }} - {{ $row[0] }} - - - @csrf - - - - + {{ $row[1] }} + {{ $row[0] }} + + - + + - + + +
      + @csrf + + +