Offer letter functionality #691

pokhiii · 2018-10-06T08:48:27Z

No description provided.

* new migration offer letter * uploading offer letter and storing path in database * self review and self test functionality * styleci fix

… into 411-offer-letter

…oyee-portal into 411-offer-letter

…oyee-portal into timeline-for-application-round

* billings can now be created from project stage * invoice creation from project screen * final changes * cleanup * removed ajax. will come back later

…oyee-portal into develop merge with base branch

…loyee-portal into check-offer-letter

…oloredcow/employee-portal into 411_approve_modal

…loyee-portal into 411_approve_modal

mohitgusain · 2018-10-06T09:07:21Z

resources/assets/js/app.js

@@ -22,6 +22,21 @@ Vue.component('project-stage-component', require('./components/ProjectStageCompo
 Vue.component('project-stage-billing-component', require('./components/ProjectStageBillingComponent.vue'));
 Vue.component('applicant-round-action-component', require('./components/HR/ApplicantRoundActionComponent.vue'));

+$(document).ready(() => {


why this change?

@mohitgusain this code should be put before document.getElementById('page_hr_applicant_edit')) code block since the alert close button stopped working.

mohitgusain · 2018-10-06T09:08:46Z

resources/views/finance/invoice/edit.blade.php

@@ -14,7 +14,6 @@
        <form action="{{route('invoices.update', $invoice)}}" method="POST" enctype="multipart/form-data" class="form-invoice">
            @csrf
            @method('PATCH')
-


remove extra line.

you mean add extra line. right?

…edCow/employee-portal into offer-letter-functionality

mohitgusain · 2018-10-06T09:10:39Z

resources/views/hr/application/edit.blade.php

@@ -183,7 +182,11 @@
                                if ($loop->last) {
                                    if ($applicationRound->application->status == config('constants.hr.status.sent-for-approval.label')) {
                                        $showFooter = true;
-                                    } elseif (in_array($applicationRound->round_status, [null, config('constants.hr.status.rejected.label')])) {
+                                    }


Follow psr-4 formatting

rathorevaibhav · 2018-10-06T11:16:26Z

app/Mail/HR/SendOfferLetter.php

+     *
+     * @return void
+     */
+    public function __construct(Application $application, $subject, $body)


type-hint all function params.

rathorevaibhav · 2018-10-06T11:19:48Z

app/Models/HR/Application.php

    public function isRejected()
    {
        return $this->status == config('constants.hr.status.rejected.label');
    }
+
+    public function saveOfferLetter(string $filePath)


you can avoid using this since the functionality within is also similar. We can avoid wrapping straightforward things.

rathorevaibhav · 2018-10-06T11:25:03Z

app/Models/HR/ApplicationRound.php

@@ -73,24 +77,67 @@ public function _update($attr)
            case 'send-for-approval':
                $fillable['round_status'] = 'confirmed';
                $application->sendForApproval($attr['send_for_approval_person']);
+
+                ApplicationMeta::create([


It's not good to call one model from another model. Ideally a model's job should be just to interact with the specific resource it's supposed to take care of.

All this application logic like creating meta, sending emails, notifications etc should reside in a controller.

We have opened a new issue to track this #692

rathorevaibhav · 2018-10-06T11:26:58Z

app/Models/HR/ApplicationRound.php

                // The below env call needs to be changed to config after the default
                // credentials bug in the Google API services is resolved.
                $email = $attr['onboard_email'] . '@' . env('GOOGLE_CLIENT_HD');
                $applicant->onboard($email, $attr['onboard_password'], [
                    'designation' => $attr['designation'],
                ]);
+
+                User::create([


This is supposed to happen after a certain event, i.e. when an applicant is onboarded. Ideally we should use Event/Listeners in Laravel. See if model observers can help here.

rathorevaibhav · 2018-10-06T11:36:48Z

resources/views/hr/application/edit.blade.php

@@ -183,10 +182,15 @@
                                if ($loop->last) {
                                    if ($applicationRound->application->status == config('constants.hr.status.sent-for-approval.label')) {


can merge first two if statements using in_array

rathorevaibhav · 2018-10-06T11:39:44Z

resources/views/hr/application/timeline.blade.php

+                        @php
+                            $event = $item['event'];
+                        @endphp
+                        <b><u>{{ date(config('constants.display_date_format'), strtotime($item['date'])) }}</u></b><br>


seems like you need this in all the three cases. Can this go out of the switch statement?

rathorevaibhav · 2018-10-06T11:40:15Z

resources/views/settings/hr/approved.blade.php

@@ -0,0 +1,31 @@
+<div class="card mt-4">
+	<form action="{{ route('setting.hr.update') }}" method="POST">
+


remove extra lines

rathorevaibhav · 2018-10-06T11:42:08Z

resources/views/settings/hr/approved.blade.php

@@ -0,0 +1,31 @@
+<div class="card mt-4">


rename this to approve

rathorevaibhav · 2018-10-06T11:42:17Z

resources/views/settings/hr/index.blade.php

@@ -10,6 +10,7 @@
    @include('settings.hr.applicant-auto-responder')
    @include('settings.hr.applicant-interview-reminder')
    @include('settings.hr.no-show')
+    @include('settings.hr.approved')


rathorevaibhav · 2018-10-06T11:42:59Z

routes/web.php

@@ -62,9 +62,15 @@

        Route::prefix('applications')->namespace('Applications')->group(function () {
            Route::resource('/evaluation', 'EvaluationController')->only(['show', 'update']);
+
+            Route::get('job/{application}/offer-letter', 'JobApplicationController@viewOfferLetter')->name('applications.job.offer-letter');


did you test for all these resources? job, internship and volunteer? If not, please do the first round of self-testing

…edcow/employee-portal into offer-letter-functionality merge with change:::

…edCow/employee-portal into offer-letter-functionality

Abhishek and others added 30 commits August 18, 2018 12:53

input field to upload offer letter

58d36df

pending is now Send-for-approval

63b47d5

send for approval notification

addd706

styleci error solve

7108b84

minute change

7541ebf

styleCI fix

a39e29b

styleCI fix

3729247

StyleCI fix

08c342e

mail body modified

ceca478

styleCi fix

91c8c6a

Style CI fix 2

abc9742

StyleCI 3

3610a2a

StyleCI fixes

bac4d47

send for approval sender. template cleanup.

9998af7

timeline for send to approval

e018aeb

New migration for offer letter (#665)

9d0d037

* new migration offer letter * uploading offer letter and storing path in database * self review and self test functionality * styleci fix

Merge branch 'develop' of https://github.com/coloredcow/employee-portal…

53f5b77

… into 411-offer-letter

Merge branch '411-offer-letter' of https://github.com/coloredcow/empl…

8c6d29a

…oyee-portal into 411-offer-letter

bug fixes in sending mail

08b4dd8

storing event in application meta

bd12e03

Merge branch '411-offer-letter' of https://github.com/coloredcow/empl…

8a4a15d

…oyee-portal into timeline-for-application-round

bug fix

30b80c7

(#660) finance bug (#661)

f29159f

* billings can now be created from project stage * invoice creation from project screen * final changes * cleanup * removed ajax. will come back later

Merge branch 'master' into develop

2a84abe

Merge branch '411-offer-letter' of https://github.com/coloredcow/empl…

dd8625e

…oyee-portal into develop merge with base branch

conducted person bug fix

5d6ec51

approve_model

ef94f39

Merge branch '411_approve_modal' of https://github.com/ColoredCow/emp…

faceb9c

…loyee-portal into check-offer-letter

Merge branch 'timeline-for-application-round' of https://github.com/c…

f5d5fdb

…oloredcow/employee-portal into 411_approve_modal

checked for offer letter

0e18bc9

Satendra-SR and others added 8 commits September 8, 2018 19:07

Merge branch '411_approve_modal' of https://github.com/ColoredCow/emp…

4902f11

…loyee-portal into 411_approve_modal

better names for events

b640a3c

Merge branch '411_approve_modal' of https://github.com/coloredcow/emp…

f18cba5

…loyee-portal into 411_approve_modal

Merge branch '411_approve_modal' of https://github.com/ColoredCow/emp…

bf0c476

…loyee-portal into 411_approve_modal

Merge branch '411_approve_modal' of https://github.com/coloredcow/emp…

d137c23

…loyee-portal into 411_approve_modal

type hinting

e525cfa

Merge branch '411_approve_modal' of https://github.com/ColoredCow/emp…

fb6561b

…loyee-portal into 411_approve_modal

reverting to old commit

e1e69e8

pokhiii requested a review from mohitgusain October 6, 2018 08:48

Merge branch 'develop' into offer-letter-functionality

931664a

mohitgusain reviewed Oct 6, 2018

View reviewed changes

pokhiii added 2 commits October 6, 2018 15:49

self review

4e4e7a8

Merge branch 'offer-letter-functionality' of https://github.com/Color…

1999024

…edCow/employee-portal into offer-letter-functionality

mohitgusain reviewed Oct 6, 2018

View reviewed changes

pokhiii added 2 commits October 6, 2018 15:56

add extra line

e536d33

formatting

1169e36

mohitgusain approved these changes Oct 6, 2018

View reviewed changes

mohitgusain requested a review from rathorevaibhav October 6, 2018 10:41

rathorevaibhav requested changes Oct 6, 2018

View reviewed changes

pokhiii and others added 7 commits October 6, 2018 19:36

changes

88461f0

type-hinting for sendfor approval

162c4f1

Merge branch 'offer-letter-functionality' of https://github.com/color…

b43d4a3

…edcow/employee-portal into offer-letter-functionality merge with change:::

changes made as rremoving extra wrapping

a501045

changes

a79f93c

Merge branch 'offer-letter-functionality' of https://github.com/Color…

1009e28

…edCow/employee-portal into offer-letter-functionality

styleci fix

275aa1f

rathorevaibhav approved these changes Oct 7, 2018

View reviewed changes

rathorevaibhav merged commit db2a658 into develop Oct 7, 2018

rathorevaibhav deleted the offer-letter-functionality branch October 7, 2018 05:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Offer letter functionality #691

Offer letter functionality #691

pokhiii commented Oct 6, 2018

mohitgusain Oct 6, 2018

pokhiii Oct 6, 2018 •

edited

mohitgusain Oct 6, 2018

pokhiii Oct 6, 2018

mohitgusain Oct 6, 2018

rathorevaibhav Oct 6, 2018

rathorevaibhav Oct 6, 2018

rathorevaibhav Oct 6, 2018

pokhiii Oct 6, 2018 •

edited

rathorevaibhav Oct 6, 2018

pokhiii Oct 6, 2018

rathorevaibhav Oct 6, 2018

rathorevaibhav Oct 6, 2018

rathorevaibhav Oct 6, 2018

rathorevaibhav Oct 6, 2018

rathorevaibhav Oct 6, 2018

rathorevaibhav Oct 6, 2018

		@@ -183,10 +182,15 @@
		if ($loop->last) {
		if ($applicationRound->application->status == config('constants.hr.status.sent-for-approval.label')) {

		@@ -0,0 +1,31 @@
		<div class="card mt-4">
		<form action="{{ route('setting.hr.update') }}" method="POST">

Offer letter functionality #691

Offer letter functionality #691

Conversation

pokhiii commented Oct 6, 2018

Choose a reason for hiding this comment

pokhiii Oct 6, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pokhiii Oct 6, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pokhiii Oct 6, 2018 •

edited

pokhiii Oct 6, 2018 •

edited