From afaa7f3c73f4a002270d3c3063e79bdadf1c0910 Mon Sep 17 00:00:00 2001 From: mudassirmir Date: Fri, 5 Jan 2018 17:25:10 +0500 Subject: [PATCH 1/4] milestone --- app/Http/Controllers/Milestones/Milestones.php | 13 ++++++++++--- resources/views/milestone/view.blade.php | 6 +++--- routes/web.php | 4 ++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Milestones/Milestones.php b/app/Http/Controllers/Milestones/Milestones.php index 55bf558..e9bc241 100644 --- a/app/Http/Controllers/Milestones/Milestones.php +++ b/app/Http/Controllers/Milestones/Milestones.php @@ -34,9 +34,9 @@ public function getData() // get data form user table $data = Datatables::of($milestones) ->escapeColumns() ->addColumn('action', function ($milestones) { - return 'id) . '" class="btn btn-xs btn-primary"> Edit - ';}) + return 'id) . '" class="btn btn-xs btn-primary"> + ';}) ->addColumn('mile_status',function($milestones){ if($milestones->mile_status == 1){ return 'Active'; @@ -155,4 +155,11 @@ public function milestones_pay_status(Request $request){ return response()->json($is_updated); } } + + public function destroy($id) + { + $Milestone = Milestone::findOrFail($id); + $data = $Milestone->delete(); + return response()->json($data); + } } diff --git a/resources/views/milestone/view.blade.php b/resources/views/milestone/view.blade.php index ce60f74..75ea612 100644 --- a/resources/views/milestone/view.blade.php +++ b/resources/views/milestone/view.blade.php @@ -205,7 +205,7 @@ }); $(document).on('click', '.delete-modal', function() { $('.modal-title').text('Delete'); - $('.heading_text').text('Are you sure you want to Delete the following Project?'); + $('.heading_text').text('Are you sure you want to Delete the following Milestone?'); $('.custom-button').text('Delete'); $('.custom-button').addClass('delete'); $('#id_delete').val($(this).data('id')); @@ -218,13 +218,13 @@ $('.modal-footer').on('click', '.delete', function() { $.ajax({ type: 'DELETE', - url: 'projects_delete/'+id, + url: 'milestones_delete/'+id, data: { '_token': $('input[name=_token]').val(), }, success: function(data) { if(data === true ) - toastr.success('Successfully deleted Project!', 'Success Alert', {timeOut: 3000}); + toastr.success('Successfully deleted Milestone!', 'Success Alert', {timeOut: 3000}); $('.custom-button').removeClass('delete'); oTable.draw(); } diff --git a/routes/web.php b/routes/web.php index f00ee44..e70d32e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -167,8 +167,8 @@ Route::get('/milestones', 'Milestones\Milestones@index'); Route::get('/get-data-milestones', ['as'=>'get.milestones_data','uses'=>'Milestones\Milestones@getData']); //get data for single employee and client -Route::get('/get-data-getData_me/{id}', ['as'=>'get.milestones_data_me','uses'=>'Milestones\Milestones@getData_me']); -Route::get('/get-data-getData_for_cl/{id}', ['as'=>'get.getData_for_cl','uses'=>'Milestones\Milestones@getData_for_cl']); +//Route::get('/get-data-getData_me/{id}', ['as'=>'get.milestones_data_me','uses'=>'Milestones\Milestones@getData_me']); +//Route::get('/get-data-getData_for_cl/{id}', ['as'=>'get.getData_for_cl','uses'=>'Milestones\Milestones@getData_for_cl']); // delete Route::delete('/milestones_delete/{id}', ['as'=>'milestones_delete','uses'=>'Milestones\Milestones@destroy']); // Change Status From 7cba69a406ad059dfd8690a45e3c13c8d1491256 Mon Sep 17 00:00:00 2001 From: Hamidcreative Date: Thu, 4 Jan 2018 18:31:34 +0500 Subject: [PATCH 2/4] test --- resources/views/client/profile.blade.php | 8 +++++-- resources/views/employee/profile.blade.php | 28 ++++++---------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/resources/views/client/profile.blade.php b/resources/views/client/profile.blade.php index 346e5bd..ff9f269 100644 --- a/resources/views/client/profile.blade.php +++ b/resources/views/client/profile.blade.php @@ -154,13 +154,13 @@
@@ -344,5 +344,9 @@ ] }); }); + $(document).ready(function(){ + var tp = $('#projects > tr').size(); + $('#p_t').text(tp); + }); @stop \ No newline at end of file diff --git a/resources/views/employee/profile.blade.php b/resources/views/employee/profile.blade.php index 2d4937e..3f6c833 100644 --- a/resources/views/employee/profile.blade.php +++ b/resources/views/employee/profile.blade.php @@ -169,7 +169,7 @@
@@ -357,26 +357,12 @@ { data: 'project_status', name: 'project_status' }, { data: 'payment_status', name: 'payment_status' }, ] - }); - //var rowCount = $('#projects').length; -// var rowCount = $('table#projects tr').length; -// console.log(rowCount); -// function CountRows() { -// var totalRowCount = 0; -// var rowCount = 0; -// var table = document.getElementById("#projects"); -// var rows = table.getElementsByTagName("tr") -// for (var i = 0; i < rows.length; i++) { -// totalRowCount++; -// if (rows[i].getElementsByTagName("td").length > 0) { -// rowCount++; -// } -// } -// var message = "Total Row Count: " + totalRowCount; -// message += "\nRow Count: " + rowCount; -// alert(message); -// } - }); + }); + }); + $(document).ready(function(){ + var tp = $('#projects > tr').size(); + $('#p_t').text(tp); + }); @stop \ No newline at end of file From 1f61d84bc8bce44d7fd150dcb1d0cdafa8e6ca63 Mon Sep 17 00:00:00 2001 From: Hamidcreative Date: Fri, 5 Jan 2018 16:57:55 +0500 Subject: [PATCH 3/4] test --- app/Http/Controllers/Client/Client.php | 6 ++--- app/Http/Controllers/Employee/Employee.php | 1 + app/Http/Controllers/Users/Users.php | 22 ++++++++++++++++++ app/User.php | 2 +- ...103059_add_users_colums_to_users_table.php | 1 + resources/views/client/profile.blade.php | 2 +- resources/views/employee/profile.blade.php | 23 ++++++++++++++++++- routes/web.php | 2 ++ 8 files changed, 52 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Client/Client.php b/app/Http/Controllers/Client/Client.php index 3b8e6fa..821dff4 100644 --- a/app/Http/Controllers/Client/Client.php +++ b/app/Http/Controllers/Client/Client.php @@ -20,8 +20,7 @@ public function __construct() { $this->middleware('auth'); } - - //Need to work on the client dashboard 123456 + //Need to work on the client dashboard 123456 public function index() { return view('client.view'); @@ -34,9 +33,8 @@ public function getData() // get data form user table $data = Datatables::of($clients) ->escapeColumns() ->addColumn('action', function ($clients) { - return 'id) . '" class="btn btn-xs btn-primary"> View + return 'id) . '" class="btn btn-xs btn-primary"> View id) . '" class="btn btn-xs btn-primary"> Edit - ';}) ->addColumn('status',function($clients){ diff --git a/app/Http/Controllers/Employee/Employee.php b/app/Http/Controllers/Employee/Employee.php index e99824b..d601548 100644 --- a/app/Http/Controllers/Employee/Employee.php +++ b/app/Http/Controllers/Employee/Employee.php @@ -150,4 +150,5 @@ public function profile($id){ 'dev_pro' => $dev_pro, ]); } + } diff --git a/app/Http/Controllers/Users/Users.php b/app/Http/Controllers/Users/Users.php index 4b27fcc..811e172 100644 --- a/app/Http/Controllers/Users/Users.php +++ b/app/Http/Controllers/Users/Users.php @@ -134,5 +134,27 @@ public function destroy($id) $data = $User->delete(); return response()->json($data); } + public function update_user_image( Request $request){ + + $id = $request->input('ids'); + + if($request->hasFile('names')) { + $file = $request->file('names'); + $name = 'logo'.'.'.$file->getClientOriginalExtension(); + $image['filePath'] = $name; + $file->move('assets/images/logo', $name); + }else{ + $name ="sdf "; + } + $name = $request->input('names'); + $data = User::find($id)->update(array('logo'=>$name)); + if($data){ + return response()->json(array("exists" =>true)); + } + else{ + return response()->json(array("exists"=>false)); + } + + } } diff --git a/app/User.php b/app/User.php index 6f8d6a6..f612729 100644 --- a/app/User.php +++ b/app/User.php @@ -16,7 +16,7 @@ class User extends Authenticatable * @var array */ protected $fillable = [ - 'email', 'name', 'first_name','last_name','city','country','zipcode','status','gender','password','active','user_type', + 'email', 'name', 'first_name','last_name','city','country','zipcode','status','gender','password','active','user_type','logo', ]; /** * The attributes that should be hidden for arrays. diff --git a/database/migrations/2017_12_12_103059_add_users_colums_to_users_table.php b/database/migrations/2017_12_12_103059_add_users_colums_to_users_table.php index b52de8b..56ebc6c 100644 --- a/database/migrations/2017_12_12_103059_add_users_colums_to_users_table.php +++ b/database/migrations/2017_12_12_103059_add_users_colums_to_users_table.php @@ -20,6 +20,7 @@ public function up() $table->string('country')->nullable(); $table->string('zipcode')->nullable(); $table->string('phone')->nullable(); + $table->string('logo')->nullable(); $table->longText('address')->nullable(); $table->string('user_type')->nullable(); $table->integer('status')->nullable(); diff --git a/resources/views/client/profile.blade.php b/resources/views/client/profile.blade.php index ff9f269..ad94f58 100644 --- a/resources/views/client/profile.blade.php +++ b/resources/views/client/profile.blade.php @@ -9,7 +9,7 @@ Overview -
  • +
  • id ) }}"> Edit Account diff --git a/resources/views/employee/profile.blade.php b/resources/views/employee/profile.blade.php index 3f6c833..d082b7e 100644 --- a/resources/views/employee/profile.blade.php +++ b/resources/views/employee/profile.blade.php @@ -9,7 +9,7 @@ Overview
    • -
  • +
  • id ) }}"> Edit Account @@ -42,6 +42,7 @@
    • +