Skip to content

Commit d69aa1e

Browse files
Manjari1028Manjari1028
committed
'modification'
1 parent 5094a7c commit d69aa1e

36 files changed

+782
-99
lines changed

‎app/Http/Controllers/AttendanceController.php

+7-2
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,27 @@ public function uploadFile(Request $request)
4848
{
4949
if (Input::hasFile('upload_file')) {
5050
$file = Input::file('upload_file');
51-
$filename = $this->upload->File($file, $request->description, $request->date);
51+
$filename = $this->upload->File($file, $request->description, $request->date);
5252

5353
try {
5454
if($filename) {
5555
$this->attendanceData->Import($filename);
5656
}
5757
} catch(\Exception $e) {
58+
5859
\Session::flash('flash_message1', $e->getMessage());
60+
5961
\Log::info($e->getLine(). ' '. $e->getFile());
6062
return redirect()->back();
6163
}
6264
}
63-
else{
65+
else {
66+
6467
return redirect()->back()->with('flash_message', 'Please choose a file to upload');
6568
}
6669

70+
71+
6772
\Session::flash('flash_message1', 'File successfully Uploaded!');
6873
return redirect()->back();
6974
}

‎app/Http/Controllers/EmpController.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function processEmployee(Request $request)
4444

4545
$user = new User;
4646
$user->name = $request->emp_name;
47-
$user->email = str_replace(' ', '_', $request->emp_name) . '@dipi-ip.com';
47+
$user->email = str_replace(' ', '_', $request->emp_name) . '@sipi-ip.sg';
4848
$user->password = bcrypt('123456');
4949
$user->save();
5050

@@ -282,10 +282,10 @@ public function uploadFile(Request $request)
282282
$rows = $reader->get(['emp_name', 'emp_code', 'emp_status', 'role', 'gender', 'dob', 'doj', 'mob_number', 'qualification', 'emer_number', 'pan_number', 'father_name', 'address', 'permanent_address', 'formalities', 'offer_acceptance', 'prob_period', 'doc', 'department', 'salary', 'account_number', 'bank_name', 'ifsc_code', 'pf_account_number', 'un_number', 'pf_status', 'dor', 'notice_period', 'last_working_day', 'full_final']);
283283

284284
foreach ($rows as $row) {
285-
285+
\Log::info($row->role);
286286
$user = new User;
287287
$user->name = $row->emp_name;
288-
$user->email = str_replace(' ', '_', $row->emp_name) . '@dipi-ip.com';
288+
$user->email = str_replace(' ', '_', $row->emp_name) . '@sipi-ip.sg';
289289
$user->password = bcrypt('123456');
290290
$user->save();
291291

@@ -432,9 +432,12 @@ public function uploadFile(Request $request)
432432
$userRole->role_id = convertRole($row->role);
433433
$userRole->user_id = $user->id;
434434
$userRole->save();
435+
435436
}
437+
return 1;
436438
//return redirect('upload_form');*/
437439
});
440+
438441
}
439442
/*catch (\Exception $e) {
440443
return $e->getMessage();*/

‎app/Http/Controllers/EventController.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function createEvent(Request $request)
3939
$name = $request->name;
4040
$coordinator = $request->coordinator;
4141
$attendees = $request->attendees;
42-
$date = date_format(date_create($request->date), 'd-m-Y H:i');
42+
$date = date_format(date_create($request->date), 'Y-m-d H:i:s');
4343
$message = $request->message;
4444
$event = new Event();
4545
$event->name = $name;
@@ -58,11 +58,11 @@ public function createEvent(Request $request)
5858
$user = User::where('id', $attendee)->first();
5959
$data = ['name' => $name, 'coordinator' => $coordinator->name, 'date' => $date, 'attendee_name' => $user->name];
6060

61-
Mail::send('emails.event', ['data' => $data], function($message) use($user, $coordinator)
61+
/* Mail::send('emails.event', ['data' => $data], function($message) use($user, $coordinator)
6262
{
6363
$message->from($coordinator->email, $coordinator->name);
6464
$message->to($user->email, $user->name)->subject($coordinator->name .' has invited you to an event');
65-
});
65+
});*/
6666
}
6767
//return json_encode('success');
6868
\Session::flash('flash_message', 'event successfully saved!');
@@ -94,7 +94,7 @@ public function createMeeting(Request $request)
9494
$name = $request->name;
9595
$coordinator = $request->coordinator;
9696
$attendees = $request->attendees;
97-
$date = $request->date;
97+
$date = date_format(date_create($request->date), 'Y-m-d H:i:s');
9898
$message = $request->message;
9999

100100
$meeting = new Meeting();
@@ -118,11 +118,11 @@ public function createMeeting(Request $request)
118118

119119
$data = ['name' => $name, 'coordinator' => $coordinator->name, 'date' => $date, 'attendee_name' => $user->name];
120120

121-
Mail::send('emails.meeting', ['data' => $data], function($message) use($user, $coordinator)
121+
/* Mail::send('emails.meeting', ['data' => $data], function($message) use($user, $coordinator)
122122
{
123123
$message->from($coordinator->email, $coordinator->name);
124124
$message->to($user->email, $user->name)->subject($coordinator->name .' has invited you to a meeting');
125-
});
125+
});*/
126126
}
127127

128128
return json_encode('success');

‎app/Http/Controllers/ProjectController.php

+8-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@ class ProjectController extends Controller
1515
{
1616
public function addProject()
1717
{
18-
$clients = User::whereHas('role', function ($q) {
19-
$q->where('role_id', '5');
20-
})->get();
18+
// $clients = User::whereHas('role', function ($q) {
19+
// $q->where('role_id', '5');
20+
// })->get();
21+
// $clients = Client::get();
22+
$clients= client::lists('name', 'id');
23+
2124
return view('hrms.project.add-project', compact('clients'));
2225
}
2326

@@ -161,7 +164,7 @@ public function doEditAssign($id, Request $request)
161164

162165

163166
\Session::flash('flash_message', 'project Assignment successfully updated!');
164-
return redirect('assignment-listing');
167+
return redirect('project-assignment-listing');
165168
}
166169

167170

@@ -175,6 +178,6 @@ public function doDeleteAssign($id)
175178
$assign->delete();
176179

177180
\Session::flash('flash_message', 'Project Assignment successfully Deleted!');
178-
return redirect('assignment-listing');
181+
return redirect('project-assignment-listing');
179182
}
180183
}

‎app/Http/Helper/helper.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ function convertRole($role)
4141
'Manager' => '16'
4242
//bharo baki
4343
];
44-
return $data[$role];
44+
if($role){
45+
return $data[$role];
46+
}
47+
return $data;
4548
}
4649

4750

‎app/Http/routes.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213

214214
//Routes for Event.
215215

216-
Route::get('create-event', 'EventController@index');
216+
Route::get('create-event', ['as'=>'create-event','uses'=>'EventController@index']);
217217

218218
Route::post('create-event', 'EventController@createEvent');
219219

‎app/Models/AttendanceFilename.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static function savefileName($filename, $description, $date)
1111
$instance = new AttendanceFilename();
1212
$instance->name = $filename;
1313
$instance->description = $description;
14-
$instance->date = date_format(date_create($date), 'd-m-Y');
14+
$instance->date = date_format(date_create($date), 'Y-m-d');
1515
$instance->save();
1616
}
1717
}

‎app/Models/AttendanceManager.php

+5-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ public static function saveExcelData($row, $hoursWorked, $difference)
4242
$attendance = new AttendanceManager();
4343
$attendance->name = $row->name;
4444
$attendance->code = $row->code;
45-
$attendance->date = $row->date;//date_format(date_create($row->date), 'd/m/Y');
46-
$attendance->day = covertDateToDay($row->date);
47-
$attendance->in_time = $row->in;
48-
$attendance->out_time = $row->out;
45+
$attendance->date = date_format(date_create($row->date), 'Y-m-d');
46+
$attendance->day = covertDateToDay($row->days);
47+
\Log::info('inTime='.$row->in_time);
48+
$attendance->in_time = isset($row->in_time)? $row->in_time : 'H:i:s' ;
49+
$attendance->out_time = isset($row->out_time)? $row->out_time : 'H:i:s';
4950
$attendance->status = convertAttendanceTo(preg_replace('/\s+/', '', $row->status));
5051
$attendance->leave_status = $row->leave_status;
5152
$attendance->user_id = $user->user_id;

‎app/Repositories/ImportAttendanceData.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function Import($filename)
2626
{
2727
Excel::load(storage_path('attendance/' . $filename), function ($reader)
2828
{
29-
$rows = $reader->get(['name', 'code', 'date', 'days', 'in', 'out', 'hours_worked', 'over_time', 'status']);
29+
$rows = $reader->get(['name', 'code', 'date', 'days', 'in_time', 'out_time', 'hours_worked', 'over_time', 'status']);
3030

3131
$counter = 0;
3232
$saturdays = 0;
@@ -37,7 +37,7 @@ public function Import($filename)
3737
$date = $this->validateDate($row->date);
3838
if(!$date)
3939
{
40-
echo $myDateTime = \DateTime::createFromFormat('d/m/Y', $row->date);
40+
echo $myDateTime = \DateTime::createFromFormat('Y/m/d', $row->date);
4141
//$row->date = $myDateTime->format('d-m-y');
4242
}
4343
if($row->status == 'A')

‎public/assets/js/function.js

-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,6 @@ $('#create-meeting').click(function () {
347347
$('#status-section').addClass('hidden');
348348
$('#message-section').removeClass('hidden');
349349
var parsed = JSON.parse(data);
350-
351350
if (parsed === 'success') {
352351
alert(parsed);
353352
}

‎public/photos/8FsknxbvvY7s.jpg

9.11 KB
Loading

‎public/photos/OJOR03kwbtMI.jpg

18.1 KB
Loading

‎public/photos/RBEv3ujDNuWX.jpg

18.1 KB
Loading

‎public/photos/wp6UaPqyX909.jpg

18.1 KB
Loading

‎public/sample_sheet/attendance_sample_sheet.xlsx

-4.98 KB
Binary file not shown.

‎public/sample_sheet/attendance_sheet1.xlsx

8.44 KB
Binary file not shown.

‎resources/views/home.blade.php

+37-30
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,15 @@
1313
placeholder="Share your status in 270 characters"
1414
style="padding-left:100px"></textarea>
1515
<label for="comment" class="field-icon">
16-
<img src="{{Auth::user()->employee->photo}}"
17-
width="80px" height="80px" style="padding-top: 10px; padding-left: 8px">
16+
{{--<img src="{{Auth::user()->employee->photo}}"--}}
17+
{{--width="80px" height="80px" style="padding-top: 10px; padding-left: 8px">--}}
18+
@if(Auth::user()->employee->photo)
19+
<img src="{{Auth::user()->employee->photo}}" width="80px" height="80px" style="padding-top: 10px; padding-left: 8px" class="img-responsive">
20+
@else
21+
<img src="/assets/img/avatars/profile_pic.png" class="img-responsive" width="80px" height="80px" style="padding-top: 10px; padding-left: 8px">
22+
23+
@endif
24+
1825
</label>
1926
<div class="input-footer br-b-l-r3 br-b-r-r3">
2027
<div style="padding-left:90%" id="post-button">
@@ -96,34 +103,34 @@
96103
</div>
97104
@endforeach
98105
</div>
99-
<div class="col-md-4 pull-right top-buffer">
100-
<div class="panel panel-default">
101-
<div class="panel-heading">
102-
Suggested updates
103-
</div>
104-
<div class="panel-body">
105-
@foreach($suggestions as $suggestion)
106-
<div class="row">
107-
<div class="col-md-2">
108-
@if(Auth::user()->employee->photo)
109-
<img src="{{\Auth::user()->employee->photo}}" width="80px"
110-
height="80px">
111-
<div class="small-help-block"> {{getUserData($suggestion->user_id)['name']}}</div>
112-
@else
113-
<img src="/assets/img/avatars/profile_pic.png" width="80px"
114-
height="80px">
115-
<div class="small-help-block"> {{getUserData($suggestion->user_id)['name']}}</div>
116-
@endif
117-
</div>
118-
<div class="col-md-8 pull-right">
119-
<a href="/post/{{$suggestion->id}}">{{substr($suggestion->status, 0, 40)}}...</a>
120-
</div>
121-
</div>
122-
<hr/>
123-
@endforeach
124-
</div>
125-
</div>
126-
</div>
106+
{{--<div class="col-md-4 pull-right top-buffer">--}}
107+
{{--<div class="panel panel-default">--}}
108+
{{--<div class="panel-heading">--}}
109+
{{--Suggested updates--}}
110+
{{--</div>--}}
111+
{{--<div class="panel-body">--}}
112+
{{--@foreach($suggestions as $suggestion)--}}
113+
{{--<div class="row">--}}
114+
{{--<div class="col-md-2">--}}
115+
{{--@if(Auth::user()->employee->photo)--}}
116+
{{--<img src="{{\Auth::user()->employee->photo}}" width="80px"--}}
117+
{{--height="80px">--}}
118+
{{--<div class="small-help-block"> {{getUserData($suggestion->user_id)['name']}}</div>--}}
119+
{{--@else--}}
120+
{{--<img src="/assets/img/avatars/profile_pic.png" width="80px"--}}
121+
{{--height="80px">--}}
122+
{{--<div class="small-help-block"> {{getUserData($suggestion->user_id)['name']}}</div>--}}
123+
{{--@endif--}}
124+
{{--</div>--}}
125+
{{--<div class="col-md-8 pull-right">--}}
126+
{{--<a href="/post/{{$suggestion->id}}">{{substr($suggestion->status, 0, 40)}}...</a>--}}
127+
{{--</div>--}}
128+
{{--</div>--}}
129+
{{--<hr/>--}}
130+
{{--@endforeach--}}
131+
{{--</div>--}}
132+
{{--</div>--}}
133+
{{--</div>--}}
127134
</div>
128135
</div>
129136
<!-- END CONTENT -->

‎resources/views/hrms/asset/assign_asset.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<input type="text" id="datepicker1" class="select2-single form-control" name="doa" value="@if($emps && $emps->date_of_assignment){{$emps->date_of_assignment}}@endif" required>
120120
@else
121121
<input type="text" id="datepicker1" class="select2-single form-control" name="doa" required>
122-
@endif
122+
@endif
123123
</div>
124124
</div>
125125
</div>

‎resources/views/hrms/attendance/upload_file.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</ol>
2121
</div>
2222
<div class="topbar-right">
23-
<h4><a class="link-unstyled" href="/sample_sheet/attendance_sample_sheet.xlsx" title="">
23+
<h4><a class="link-unstyled" href="/sample_sheet/attendance_sheet1.xlsx" title="">
2424
<i class="fa fa-cloud-download text-purple pr10"></i> Sample Sheet </a></h4>
2525
</div>
2626
</header>

‎resources/views/hrms/dashboard.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class="img-responsive mauto" alt=""/></div>
134134

135135
@if($events)
136136
<div class="col-md-12">
137-
<h3 class="mb10 mr5 notification" data-note-style="primary" style="color: darkturquoise"> Latest &nbsp; Events </h3>
137+
<h3 class="mb10 mr5 notification" data-note-style="primary" style="color: darkturquoise">Latest &nbsp; Events </h3>
138138
@foreach (array_chunk($events, 3, true) as $results)
139139
<table class="table">
140140
<tr>
@@ -145,7 +145,7 @@ class="img-responsive mauto" alt=""/></div>
145145
<span class="fa fa-exclamation"></span>
146146
</div>
147147
<div class="fc-event-desc blink" id="blink">
148-
<b>{{ \Carbon\Carbon::createFromTimestamp(strtotime($event->date))->diffForHumans()}} </b> {{$event->name}}
148+
<a href="{{route('create-event')}}" ><b>{{ \Carbon\Carbon::createFromTimestamp(strtotime($event->date))->diffForHumans()}} </b> {{$event->name}}</a>
149149
</div>
150150
</div>
151151
</td>

‎resources/views/hrms/employee/show_emp.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
<td class="text-center">{{$emp->code}}</td>
9696
<td class="text-center">{{$emp->name}}</td>
9797
<td class="text-center">{{convertStatusBack($emp->employee['status'])}}</td>
98-
<td class="text-center">{{$emp->role->role->name}}</td>
99-
<td class="text-center">{{date('d M Y', strtotime($emp->employee['date_of_joining']))}}</td>
98+
<td class="text-center">{{isset($emp->role->role->name)?$emp->role->role->name:''}}</td>
99+
<td class="text-center">{{date('Y-m-d', strtotime($emp->employee['date_of_joining']))}}</td>
100100
<td class="text-center">{{$emp->employee['current_address']}}</td>
101101
<td class="text-center">{{$emp->employee['number']}}</td>
102102
<td class="text-center">{{$emp->employee['department']}}</td>

‎resources/views/hrms/layouts/base.blade.php

+5
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,11 @@
632632
<script src="/assets/js/custom.js"></script>
633633
@endif
634634

635+
@if(\Route::getFacadeRoot()->current()->uri() == 'assign-project')
636+
<script src="/assets/js/pages/forms-widgets.js"></script>
637+
<script src="/assets/js/custom.js"></script>
638+
@endif
639+
635640
@if(\Route::getFacadeRoot()->current()->uri() == 'assign-award')
636641
<script src="/assets/js/pages/forms-widgets.js"></script>
637642
<script src="/assets/js/custom.js"></script>

‎resources/views/hrms/layouts/header.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<span class="hidden-xs"><name>{{\Auth::user()->name}}</name> </span>
2222
<span class="fa fa-caret-down hidden-xs mr15"></span>
2323
@if(\Auth::user()->employee->photo)
24-
<img src="{{\Auth::user()->employee->photo}}" alt="avatar" class="mw55">
24+
<img src="{{\Auth::user()->employee->photo}}" width="50px" height="50px" alt="avatar" class="mw55">
2525
@else
2626
<img src="/assets/img/avatars/profile_pic.png" alt="avatar" class="mw55">
2727
@endif

‎resources/views/hrms/layouts/sidebar.blade.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="media">
44
<a href="/profile" class="media-left">
55
@if(Auth::user()->employee->photo)
6-
<img src="{{Auth::user()->employee->photo}}" class="img-responsive">
6+
<img src="{{Auth::user()->employee->photo}}" width="40px" height="30px" class="img-responsive">
77
@else
88
<img src="/assets/img/avatars/profile_pic.png" class="img-responsive">
99
@endif
@@ -182,6 +182,7 @@
182182
<a href="{{route('my-leave-list')}}">
183183
<span class="glyphicon glyphicon-calendar"></span> My Leave List </a>
184184
</li>
185+
185186
@if(\Auth::user()->isHR())
186187
<li>
187188
<a href="{{route('add-leave-type')}}">

0 commit comments

Comments
 (0)