diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php index d638aa8..290530a 100644 --- a/app/Http/Controllers/RoleController.php +++ b/app/Http/Controllers/RoleController.php @@ -32,8 +32,7 @@ class RoleController extends Controller public function index(Request $request){ if(!GlobalController::user_can(Auth::user()->role_id, ['view_user_role'])) return redirect(url('my-profile')); $recordStatusCondition = Auth::id()==1 ? [RecordStatusEnum::DELETE, RecordStatusEnum::ACTIVE] : [RecordStatusEnum::ACTIVE]; - $roles = $this->roleModel::with('lab')->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition) - ->where('organization_id', $this->baseOrganizationId) + $roles = $this->roleModel::query()->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition) ->whereNotIn('id', [UtilEnum::ADMINISTRATOR_ROLE]) ->when(!empty($request->kword), function ($roles) use($request){ $roles->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'"); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 9a08e98..6537c3c 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -62,17 +62,15 @@ class UserController extends Controller $this->labs = parent::getAccessAbleLabs(); $roles = $this->roleModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE) ->whereNotIn('id', [UtilEnum::ADMINISTRATOR_ROLE])->get(); - $sample_sources = $this->sampleSourceModel::query()->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE) - ->where('organization_id', Session::get('base_organization_id'))->get(); - $users = $this->userModel::with(['role','lab_covers'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE) - ->whereIn('id', $this->labs->pluck('labUsers')->flatten()->pluck('user_id')->toArray()) + $users = $this->userModel::with(['role','userOrganizations'])->where(BaseModel::RECORD_STATUS_FIELD, RecordStatusEnum::ACTIVE) + ->whereIn('id', $this->labs->pluck('userOrganizations')->flatten()->pluck('user_id')->toArray()) ->whereNotIn('role_id', [UtilEnum::ADMINISTRATOR_ROLE]) ->when(!empty($request->kword), function($users) use ($request) { $users->whereRaw("replace(name, ' ','') like '%".str_replace(" ","",$request->kword)."%'") ->orWhereRaw("replace(email, ' ','') like '%".str_replace(" ","",$request->kword)."%'"); })->orderBy(BaseModel::CREATED_AT,'desc')->paginate(config('labis.pagination.perpage', 10)); - return view('user_account', ['users' => $users, 'roles' => $roles, 'labs' => $this->labs, 'sample_sources' => $sample_sources]); + return view('user_account', ['users' => $users, 'roles' => $roles, 'labs' => $this->labs]); } public function save(Request $request){ @@ -82,16 +80,13 @@ class UserController extends Controller 'name' => 'required', 'email' => 'required|email|unique:users', 'password' => 'required', - 'role_id' => 'required', - 'sample_source_id' => 'nullable' + 'role_id' => 'required' ]); if ($validator->fails()) return response()->json(['success' => false, 'message' => __('user_account.create_fail'), 'errors' => $validator->errors()->all()]); $data = array( 'name' => $request->name, 'email' => $request->email, 'password' => Hash::make($request->password), - 'is_manager' => ($request->role_id==3 ? 1: 0), - 'sample_source_id' => $request->sample_source_id, 'role_id' => $request->role_id, 'created_at' => date('Y-m-d H:i:s'), 'created_by' => Auth::id(), @@ -120,8 +115,6 @@ class UserController extends Controller 'name' => $request->name, 'email' => $request->email, 'role_id' => $request->role_id, - 'is_manager' => ($request->role_id==3 ? 1: 0), - 'sample_source_id' => $request->sample_source_id, 'updated_at' => date('Y-m-d H:i:s'), 'updated_by' => Auth::id() ); @@ -155,7 +148,7 @@ class UserController extends Controller public function get(Request $request){ try{ - $user = $this->userModel::with(['lab_covers'])->find($request->uid); + $user = $this->userModel::with(['userOrganizations'])->find($request->uid); return response()->json(['success' => true, 'message' => __('user_account.get_success'), 'data' => $user]); } catch (\Exception $e){ return response()->json(['success' => false, 'message' => __('user_account.get_fail'), 'errors' => $e->getMessage()]); @@ -186,7 +179,7 @@ class UserController extends Controller if(!GlobalController::user_can(Auth::user()->role_id, ['assign_lab'])) return false; $validator = \Validator::make($request->all(), [ 'uid' => 'required']); if ($validator->fails()) return response()->json(['success' => false, 'message' => __('user_account.assign_lab_fail'), 'errors'=>$validator->errors()->all()]); - $this->userLabCover::query()->where('user_id', $request->uid) + $this->userOrganizations::query()->where('user_id', $request->uid) ->update(['end_date' => date('Y-m-d'), BaseModel::RECORD_STATUS_FIELD => RecordStatusEnum::DELETE, BaseModel::UPDATED_AT_FIELD => date('Y-m-d H:i:s'), BaseModel::UPDATED_BY_FIELD =>Auth::id()]); $data = array(); foreach ($request->organization_ids as $organization_id){ @@ -198,7 +191,7 @@ class UserController extends Controller 'created_by' => Auth::id() ); } - $this->userLabCover::query()->insert($data); + $this->userOrganizations::query()->insert($data); return response()->json(['success' => true, 'message' => __('user_account.assign_lab_success')]); } catch (\Exception $e){ return response()->json(['success' => false, 'message' => __('user_account.assign_lab_fail'), 'errors' => $e->getMessage()]); diff --git a/lang/en/laboratory.php b/lang/en/laboratory.php index 5ddc7c3..3873f67 100644 --- a/lang/en/laboratory.php +++ b/lang/en/laboratory.php @@ -1,7 +1,7 @@ 'Organization', + 'table_title' => 'Laboratory', 'search_placeholder' => 'Organization name, address...', 'table_no' => 'No.', 'table_name_kh' => 'Name Khmer', @@ -11,14 +11,14 @@ return [ 'table_labs' => 'Labs', 'table_status' => 'Status', 'table_action' => 'Actions', - 'form_add_tittle' => 'New Organization', + 'form_add_tittle' => 'New Laboratory', 'form_name' => 'Full-Name', 'form_login_email' => 'Login-Email', 'form_ismnager' => 'Lab Manager', - 'form_edit_tittle' => 'Edit Organization Information', + 'form_edit_tittle' => 'Edit Laboratory Information', 'form_system_role' => 'System-Role', - 'form_lab_cover' => 'Organization Coverage', - 'form_laboratory' => 'Organization', + 'form_lab_cover' => 'Laboratory Coverage', + 'form_laboratory' => 'Laboratory', 'form_select_all_lab' => 'Select All Labs', 'form_password' => 'Password', 'form_address_en' => 'Address-En', diff --git a/lang/kh/general.php b/lang/kh/general.php index 8d2e3d7..7764477 100644 --- a/lang/kh/general.php +++ b/lang/kh/general.php @@ -63,7 +63,7 @@ return [ 'sample_source_distribution' => 'ចំនួនសំណាកតាមប្រភពសំណាក(ឆ្នាំនេះ)', 'manage_user_accounts' => 'គ្រប់គ្រងគណនីប្រើប្រាស់', - 'manage_user_roles' => 'គ្រប់គ្រងតួនាទីអ្នកប្រើប្រាស់', + 'manage_user_roles' => 'គ្រប់គ្រងតួនាទី', 'laboratory_settings' => 'គ្រប់គ្រងមន្ទីរពិសោធន៍', 'activity_logs' => 'កំណត់ហេតុប្រតិបត្តិការណ៍', 'btn_save_patient_add_new_sample' => 'រក្សាទុក និងបង្កើតសំណាកថ្មី', diff --git a/public/storage/assets/css/overwrite.css b/public/storage/assets/css/overwrite.css index 6c01804..d3c32ef 100644 --- a/public/storage/assets/css/overwrite.css +++ b/public/storage/assets/css/overwrite.css @@ -642,8 +642,9 @@ div select{ display: inline-block; width: 5px; height: 30px; - background-color: #0f4ebd !important; + background-color: #0cb55f !important; } + .bar-loader { width: auto !important; } diff --git a/public/storage/assets/js/admin/user.js b/public/storage/assets/js/admin/user.js index 35b10f2..7435c16 100644 --- a/public/storage/assets/js/admin/user.js +++ b/public/storage/assets/js/admin/user.js @@ -11,12 +11,10 @@ $("#btnSave").on('click',function(e){ uid : data_id, name: $('#name').val(), email: $('#email').val(), - is_manager: isManager, role_id: $('#role-id').val(), password: $('#password').val(), default_manager: $('#default-manager').val(), signature: $('#signature').val(), - sample_source_id: ($('#role-id').val() == 6 ? $('#sample-source-id').val():0) }, success:function(res){ handleMessage(res.success, res.message) @@ -106,7 +104,7 @@ $('#modal-user').on('show.bs.modal', function (event) { modal.find('.modal-body input[name="name"]').val(data.name); modal.find('.modal-body input[name="email"]').val(data.email); modal.find('.modal-body input[name="password"]').val('***************'); - modal.find('.modal-body input[name="is_manager"]').prop( "checked", data.is_manager); + //modal.find('.modal-body input[name="is_manager"]').prop( "checked", data.is_manager); modal.find('.modal-body select[name="role_id"]').val(data.role_id).trigger('change'); isManager = data.is_manager if(data.role_id==6) { @@ -139,8 +137,8 @@ $('#modal-user-labs').on('show.bs.modal', function (event) { success:function(res){ let data = res.data; organization_ids = [] - if(data.lab_covers.length) { - $.each(data.lab_covers, function (key, value) { + if(data.user_organizations.length) { + $.each(data.user_organizations, function (key, value) { organization_ids[key] = value.organization_id }); } diff --git a/resources/views/laboratory.blade.php b/resources/views/laboratory.blade.php index c78ecf9..a946f3a 100644 --- a/resources/views/laboratory.blade.php +++ b/resources/views/laboratory.blade.php @@ -26,7 +26,7 @@
-

{{__('laboratory.table_title')}}

+

{{__('laboratory.table_title')}}

@@ -95,7 +95,7 @@
@@ -158,7 +158,7 @@
- +
diff --git a/resources/views/user_account.blade.php b/resources/views/user_account.blade.php index cd08c03..bd9a5ea 100644 --- a/resources/views/user_account.blade.php +++ b/resources/views/user_account.blade.php @@ -90,12 +90,12 @@ {{$user->role->name_en}} @if(\App\Http\Controllers\Helper\GlobalController::user_can(Auth::user()->role_id, ['assign_lab'])) -   +   @endif @foreach($user->userOrganizations as $userOrganization) - + @endforeach {{-- --}} @@ -163,7 +163,7 @@
@if(\App\Http\Controllers\Helper\GlobalController::user_can(Auth::user()->role_id, ['create_user_account'])) - + @endif
@@ -191,13 +191,7 @@
- -
- -
+
- +
- +
@@ -244,11 +238,6 @@ -
-
- @csrf -
-
@@ -268,32 +257,19 @@ var get_url = "{{url('user.get')}}"; var assignLabUrl = "{{url('user.assign-labs')}}"; - var isManager = 0; var reset_password_url = "{{url('user.reset_password')}}"; - let modal_add_title = "{{__('user_account.form_add_tittle')}}"; let modal_edit_title = "{{__('user_account.form_edit_tittle')}}"; let base_organization_id = "{{Session::get('base_organization_id')}}"; - $('#role-id').change(function () { if($(this).val()==6 || $(this).val()==7){ $('#physician-id').show() } else $('#physician-id').hide() }) - $('#select-all-lab').click(function () { - if( $('#select-all-lab').is(':checked')){ - $('#organization_ids > option').prop("selected", true) - $('#organization_ids').trigger('change') - }else{ - $('#organization_ids > option').prop("selected", false) - $('#organization_ids').trigger('change') - } - }) -