Merge pull request #21 from php-kchat/dev

Dev

Author: GaneshKandu

app/Http/Controllers/UserController.php

@@ -26,7 +26,7 @@ function members_ajax(Request $request){
 		$keys = array_column($users->items(),'id');
 
 		$values = array_map([$this,"SecrurePass"],$users->items());
-		
+        
 		$jsonusers = array_combine($keys, $values);
 
 		$pages = range(1, $users->lastPage());
@@ -58,7 +58,7 @@ function members(Request $request){
 		$keys = array_column($users->items(),'id');
 
 		$values = array_map([$this,"SecrurePass"],$users->items());
-		
+        
 		$jsonusers = array_combine($keys, $values);
 
 		$pages = range(1, $users->lastPage());
@@ -240,6 +240,12 @@ function Profile(Request $request){
 
 		$profile = $profile[0];
 
+        $profile->department = json_decode($profile->department);
+        
+        if (json_last_error() != 0) {
+            $profile->department = [];
+        }
+        
 		if($request->role != 'admin'){
             return view('user.profile',compact('profile','departments'));
         }
@@ -299,6 +305,10 @@ function SaveProfile(Request $request){
 
 		$data = $request->all();
 
+        if(isset($request->department)){
+            $data['department'] = json_encode(explode(',',$data['department']));
+        }
+        
         $request->validate([
             'first_name'         =>   'required',
             'last_name'         =>   'required',
@@ -344,6 +354,15 @@ function SaveProfile(Request $request){
 	}
 
 	function SecrurePass($UserDetail){
+        
+        $tmp = json_decode($UserDetail->department);
+        
+        if (json_last_error() != 0) {
+            $tmp = ['NA'];
+        }
+        
+        $UserDetail->department = implode(', ',$tmp);
+        
 		unset(
 			$UserDetail->password, 
 			$UserDetail->email_verified_at, 

public/js/kchat.js

@@ -92,7 +92,7 @@ $( "[ajax_post]" ).on( "click", function () {
 			if(row[i].type == 'file'){
 				Data.append(row[i].id, $('#'+row[i].id)[0].files[0]);
 			}else{
-				Data.append(row[i].id, row[i].value);
+				Data.append(row[i].id, $("#"+row[i].id).val());
 			}
 		}
 

resources/views/admin/profile.blade.php

@@ -62,12 +62,13 @@
                            </div>
                            <div class="row">
                               <div class="col">
-                                 <div class="form-group"> <label>Department <span class="badge badge-secondary">{{ $profile->department }}</span></label>
-									<select class="form-control profile" type="text" placeholder="[email protected]" id="department" >
+                                 <div class="form-group"> <label>Department</label>
+									<select class="form-control profile" type="text" placeholder="[email protected]" id="department" multiple>
 									@foreach($departments as $department)
 										<option value="{{ $department->department }}">{{ $department->department }}</option>
 									@endforeach
 									</select>
+                                    <script> $("#department").val( @json($profile->department) ); </script>
 								</div>
 							    </div>
                            </div>

resources/views/user/profile.blade.php

@@ -56,8 +56,8 @@
                            </div>
                            <div class="row">
                               <div class="col">
-                                 <div class="form-group"> <label>Department <span class="badge badge-secondary">{{ $profile->department }}</span></label>
-									<select class="form-control profile" type="text" placeholder="[email protected]" id="department" >
+                                 <div class="form-group"> <label>Department</label>
+									<select class="form-control profile" type="text" placeholder="[email protected]" id="department" multiple>
 									@foreach($departments as $department)
 										<option value="{{ $department->department }}">{{ $department->department }}</option>
 									@endforeach