UPDATE 1405-01-29
This commit is contained in:
@@ -34,9 +34,9 @@ class AdminController extends Controller
|
||||
$u = User::select('name', 'is_admin')
|
||||
->where('user_name', $uname)
|
||||
->first();
|
||||
if ($u->is_admin == 1){
|
||||
if ($u->is_admin == 1) {
|
||||
$provider = 'admin';
|
||||
}elseif ($u->is_admin == 2){
|
||||
} elseif ($u->is_admin == 2) {
|
||||
$provider = 'supervisor';
|
||||
}
|
||||
if ($u->is_admin == '1' || $u->is_admin == '2') {
|
||||
@@ -143,15 +143,15 @@ class AdminController extends Controller
|
||||
$nendt = $request->endtime;
|
||||
// dd($request);
|
||||
$user = User::where('user_name', $_COOKIE['user_identity'])->first();
|
||||
if ($user->is_admin == 2){
|
||||
if ($user->is_admin == 2) {
|
||||
$attController = new AttendanceController();
|
||||
return $attController->edit($request);
|
||||
}
|
||||
if ($id == 'new') {
|
||||
$user_name = $request->uname;
|
||||
if($request->display_date == null){
|
||||
if ($request->display_date == null) {
|
||||
$date = Carbon::now()->format('Y-m-d');
|
||||
}else{
|
||||
} else {
|
||||
// dump($date);
|
||||
$date = \Morilog\Jalali\CalendarUtils::convertNumbers($request->display_date, true);
|
||||
$date = str_replace('/', '-', $date);
|
||||
@@ -279,12 +279,21 @@ class AdminController extends Controller
|
||||
// }
|
||||
|
||||
$record->exited_at = $date . ' ' . $data->newexit;
|
||||
$record->duration = $attendance->duration($data->newenter, $data->newexit);
|
||||
$duration = $attendance->duration($data->newenter, $data->newexit);
|
||||
|
||||
} else {
|
||||
$record->exited_at = null;
|
||||
$record->duration = null;
|
||||
}
|
||||
$break = AttendanceBreak::where('attendance_id', $data->id)->sum('duration');
|
||||
if ($break) {
|
||||
$breakSec = strtotime("1970-01-01 " . $break) - strtotime("1970-01-01 00:00:00");
|
||||
$durationSec = strtotime("1970-01-01 " . $duration) - strtotime("1970-01-01 00:00:00");
|
||||
$durationSec -= $breakSec;
|
||||
$record->duration = gmdate("H:i:s", $durationSec);
|
||||
|
||||
}
|
||||
//dd($record->duration, $duration, $break);
|
||||
$record->requested = '';
|
||||
$record->save();
|
||||
// $create_requests_key = "att-tempreq:creates:{$data->userid}";
|
||||
@@ -292,12 +301,13 @@ class AdminController extends Controller
|
||||
// $t = Redis::connection()->lrem($create_requests_key, -1, json_encode($data));
|
||||
|
||||
Redis::connection()->del("att-tempreq:{$data->userid}:{$data->id}");
|
||||
|
||||
tel_notif($record->user_identity, "تایید");
|
||||
return json_encode($data);
|
||||
// return redirect()->back()->with('message', [
|
||||
// 'color' => '#6aff00ff',
|
||||
// "text" => 'رکورد با موفقیت ذخیره شد.✔️'
|
||||
// ]);
|
||||
|
||||
return redirect()->back()->with('message', [
|
||||
'color' => '#6aff00ff',
|
||||
"text" => 'رکورد با موفقیت ذخیره شد.✔️'
|
||||
]);
|
||||
} elseif ($data->function == 'new') {
|
||||
// dd($data);
|
||||
$starttime = $data->oldenter ? Carbon::parse($data->oldenter)->format('H:i:s') : null;
|
||||
@@ -324,9 +334,9 @@ class AdminController extends Controller
|
||||
|
||||
}
|
||||
if ($request->update == 'reject') {
|
||||
if($data->function == 'delete' || $data->function == 'edit'){
|
||||
if ($data->function == 'delete' || $data->function == 'edit') {
|
||||
Redis::connection()->del("att-tempreq:{$data->userid}:{$data->id}");
|
||||
}elseif($data->function == 'new'){
|
||||
} elseif ($data->function == 'new') {
|
||||
$create_requests_key = "att-tempreq:creates:{$data->userid}";
|
||||
Redis::connection()->lrem($create_requests_key, 1, json_encode($data));
|
||||
}
|
||||
@@ -347,7 +357,8 @@ class AdminController extends Controller
|
||||
|
||||
}
|
||||
|
||||
private function fa2en_numbers($input) {
|
||||
private function fa2en_numbers($input)
|
||||
{
|
||||
if (is_string($input)) {
|
||||
$fa_numbers = ['۰', '۱', '۲', '۳', '۴', '۵', '۶', '۷', '۸', '۹'];
|
||||
$en_numbers = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
|
||||
|
||||
Reference in New Issue
Block a user