|
|
@ -345,6 +345,13 @@ class PresenceController extends Controller |
|
|
|
"status_assign" => true |
|
|
|
"status_assign" => true |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
// bypass work area restriction |
|
|
|
|
|
|
|
$temp[]=array( |
|
|
|
|
|
|
|
"activity_id" => null, |
|
|
|
|
|
|
|
"boundary" => true, |
|
|
|
|
|
|
|
"status_assign" => true |
|
|
|
|
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
// assign and not in boundary |
|
|
|
// assign and not in boundary |
|
|
@ -359,12 +366,21 @@ class PresenceController extends Controller |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
else{ |
|
|
|
else{ |
|
|
|
// not assign |
|
|
|
if ($user->status_boundary) { |
|
|
|
$temp[]=array( |
|
|
|
// bypass work area restriction |
|
|
|
"activity_id" => null, |
|
|
|
$temp[]=array( |
|
|
|
"boundary" => false, |
|
|
|
"activity_id" => null, |
|
|
|
"status_assign" => false |
|
|
|
"boundary" => true, |
|
|
|
); |
|
|
|
"status_assign" => true |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
// not assign |
|
|
|
|
|
|
|
$temp[]=array( |
|
|
|
|
|
|
|
"activity_id" => null, |
|
|
|
|
|
|
|
"boundary" => false, |
|
|
|
|
|
|
|
"status_assign" => false |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return $temp; |
|
|
|
return $temp; |
|
|
|
} |
|
|
|
} |
|
|
|