gitkwesi/click-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

progress indicators, bug fixes, after a while

Browse Source
This commit is contained in:
Kwesi Banson
2023-12-13 12:13:47 +00:00
parent ea6d83e5d9
commit bc97f69748
1283 changed files with 1010757 additions and 7379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
app/Http/Controllers/ClickInfrastructureController.php
View File

@@ -85,6 +85,13 @@ class ClickInfrastructureController extends Controller
];
return view('infrastructure.edit_direct_connection', $data);
}
public function create()
{
$data = [
'page_title' => 'Add Server',
];
return view('infrastructure.create', $data);
}
public function update_direct(Request $request){
$request->validate([
@@ -124,24 +131,43 @@ class ClickInfrastructureController extends Controller
}
public function server_list(){
$servers = Models\ClickServer::with('credentials_info')->get();
//$servers = Models\ClickServer::with('credentials_info')->get();
// dd($servers[0]->credentials_info->where('username', 'root')->first());
$data = [
'page_title' => 'Servers',
'servers' => $servers
];
return view('infrastructure.server_list', $data);
}
public function getServerListJson(Request $request)
{
//$this->log_query();
$server_arr = \DB::table('click_servers')
->join('auth_users', 'auth_users.id', '=', 'click_servers.last_modified_by_id')
->select('click_servers.id','click_servers.server_id', 'auth_users.name AS username', 'click_servers.friendly_name','click_servers.status', 'click_servers.public_ip_address', 'click_servers.private_ip_address', 'click_servers.main_use', 'click_servers.remarks', 'click_servers.updated_at')
->orderBy('click_servers.friendly_name', 'ASC')
->paginate(20);
if($request->has('keyword')){
$keyword = $request->keyword;
$server_arr = \DB::table('click_servers')
->join('auth_users', 'auth_users.id', '=', 'click_servers.last_modified_by_id')
->select('click_servers.id', 'click_servers.server_id', 'auth_users.name AS username', 'click_servers.friendly_name', 'click_servers.status', 'click_servers.public_ip_address', 'click_servers.private_ip_address', 'click_servers.main_use', 'click_servers.remarks', 'click_servers.updated_at')
->whereRaw("click_servers.server_id LIKE '%$keyword%' OR click_servers.friendly_name LIKE '%$keyword%' OR click_servers.public_ip_address LIKE '%$keyword%' OR click_servers.private_ip_address LIKE '%$keyword%' OR auth_users.name LIKE '%$keyword%' OR click_servers.main_use LIKE '%$keyword%' OR click_servers.remarks LIKE '%$keyword%' OR click_servers.updated_at LIKE '%$keyword%' OR click_servers.updated_at LIKE '%$keyword%' OR click_servers.updated_at LIKE '%$keyword%' OR click_servers.status LIKE '%$keyword%' ")
->orderBy('click_servers.friendly_name', 'ASC')
->paginate(15);
}
return response()->json($server_arr);
}
public function edit_server($id)
{
$server = Models\ClickServer::find($id);
$credentials = Models\ServerCredential::where('username', 'root')->where('server_id', $server->id) ->first();
//$credentials = Models\ServerCredential::where('username', 'root')->where('server_id', $server->id) ->first();
// dd($server);
$data = [
'page_title' => 'Servers',
'server' => $server,
'credentials' => $credentials
'status_arr' => ['Active' => 'Active', 'Inactive' => 'Inactive', 'Decommissioned' => 'Decommissioned']
];
return view('infrastructure.edit_server', $data);
}
@@ -153,11 +179,15 @@ class ClickInfrastructureController extends Controller
'private_ip_address' => 'sometimes|nullable|ip',
'main_use' => 'required',
'remarks' => 'nullable',
'password' => 'nullable',
'status' => 'required',
'server_number' => 'required',
]);
$server = Models\ClickServer::findOrFail($request->server_id);
$server_arr = $request->except('_token', 'password', 'server_id');
$server_arr['last_modified_by'] = session('current_user.id');
$server_arr = $request->except('_token', 'server_id', 'server_number');
$server_arr['last_modified_by_id'] = session('current_user.id');
$server_arr['server_id'] = $request->server_number;
//dd($server_arr);
/*
if ($request->password !== null) {
// dd('foo bar');
$credentials_arr = [
@@ -174,10 +204,30 @@ class ClickInfrastructureController extends Controller
$result = Models\ServerCredential::create($credentials_arr);
}
}
*/
$result = $server->update($server_arr);
Session::flash('success_message', 'Server Details successfully updated');
return redirect(url('infrastructure/server-list'));
}
public function storeserver(Request $request){
$request->validate([
'friendly_name' => 'required',
'server_number' => 'required',
'public_ip_address' => 'sometimes|ip',
'private_ip_address' => 'sometimes|nullable|ip',
'main_use' => 'required',
'remarks' => 'nullable',
'server_number' => 'required',
]);
$server_arr = $request->except('_token', 'server_id', 'server_number');
$server_arr['last_modified_by_id'] = session('current_user.id');
$server_arr['server_id'] = $request->server_number;
$result = Models\ClickServer::create($server_arr);
Session::flash('success_message', 'Server Details successfully added');
return redirect(url('infrastructure/server-list'));
}
public function reveal_password($id){
$server = Models\ClickServer::find($id);
if ($server) {
@@ -194,7 +244,4 @@ class ClickInfrastructureController extends Controller
}
return response()->json($response_arr);
}
}
//LJ School Location
//5.637192,-0.158916
//5.637093,-0.159269
}