progress indicators, bug fixes, after a while

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

View File

@@ -10,16 +10,45 @@ use App\Http\Requests;
class GeneralDocumentsController extends Controller
{
public function index(){
//$document_arr = new Models\GeneralDocument;
$document_arr = \DB::table('general_documents')
->select(\DB::raw('count(*) as docs_count, category'))
->groupBy('category')
->get();
$client_docs = \DB::table('client_files')
->join('clients', 'clients.id', '=', 'client_files.client_id')
->select(\DB::raw('count(*) as docs_count, clients.name, client_files.client_id'))
->groupBy('clients.name', 'client_files.client_id')
->get();
$mno_docs = \DB::table('mno_files')
->join('network_operators', 'network_operators.id', '=', 'mno_files.mno_id')
->select(\DB::raw('count(*) as docs_count, network_operators.name, mno_files.mno_id'))
->groupBy('network_operators.name', 'mno_files.mno_id')
->get();
$category_names = [
'api' => 'API Documents',
'presentations' => 'Presentations',
'rates' => 'SMS/Voice Rates',
'scfees' => 'Short Code Fees',
'vpn_forms' => 'VPN Forms',
'sidwl' => 'SID Whitelisting Letter',
'others' => 'Others'
];
$data = [
'page_title' => 'General Documents',
'current_user' => session('current_user')
'page_title' => 'All Documents',
'document_arr' => $document_arr,
'category_names' => $category_names,
'current_user' => session('current_user'),
'client_docs' => $client_docs,
'mno_docs' => $mno_docs
];
return view('generaldocuments.index', $data);
}
public function listcategory($category){
//$document_arr = new Models\GeneralDocument;
//dd($category);
// dd($category);
$data = [
'page_title' => ucfirst($category) . ' Documents',
'current_user' => session('current_user'),
@@ -50,7 +79,7 @@ class GeneralDocumentsController extends Controller
}
public function getDocumentsCategoryJson(Request $request)
{
$this->log_query();
//$this->log_query();
$category = $request->category;
$document_arr = \DB::table('general_documents')
->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by')
@@ -72,11 +101,20 @@ class GeneralDocumentsController extends Controller
return response()->json($document_arr);
}
public function create()
{
//$auth_users = Models\SystemUser::pluck('name', 'id');
{
$categories = [
'sidwl' => 'Sender ID Whitelisting Letter',
'api' => 'API Docs',
'rates' => 'Rates',
'scfees' => 'Short Code Fees',
'presentations' => 'presentations',
'vpn_forms' => 'VPN Forms',
'others' => 'Others'
];
$data = [
'page_title' => 'Upload Document',
//'auth_users' => $auth_users
'page_title' => 'Upload Document',
'categories' => $categories
];
return view('generaldocuments.create', $data);
}
@@ -88,13 +126,14 @@ class GeneralDocumentsController extends Controller
*/
public function store(Requests\GeneralDocumentsRequest $request)
{
if ($request->has('document_one') && $request->has('document_one_name')) {
if ($request->has('document_one') && $request->has('document_one_name') && $request->has('document_one_category')) {
if ($request->file('document_one')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_one->extension();
$request->document_one->storeAs('general_files', $filename, 'public');
$document_arr['filename'] = $filename;
$document_arr['category'] = $request->document_one_category;
$document_arr['file_extension'] = $request->document_one->extension();
$document_arr['file_reff'] = time() . uniqid();
$document_arr['name'] = $request->document_one_name;
@@ -102,11 +141,12 @@ class GeneralDocumentsController extends Controller
$result = Models\GeneralDocument::create($document_arr);
}
}
if ($request->has('document_two') && $request->has('document_two_name')) {
if ($request->has('document_two') && $request->has('document_two_name') && $request->has('document_two_category')) {
if ($request->file('document_two')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_two->extension();
$request->document_two->storeAs('general_files', $filename, 'public');
$document_arr['filename'] = $filename;
$document_arr['category'] = $request->document_two_category;
$document_arr['file_extension'] = $request->document_two->extension();
$document_arr['file_reff'] = time() . uniqid();
@@ -115,11 +155,12 @@ class GeneralDocumentsController extends Controller
$result = Models\GeneralDocument::create($document_arr);
}
}
if ($request->has('document_three') && $request->has('document_three_name')) {
if ($request->has('document_three') && $request->has('document_three_name') && $request->has('document_three_category')) {
if ($request->file('document_three')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_three->extension();
$request->document_three->storeAs('general_files', $filename, 'public');
$document_arr['filename'] = $filename;
$document_arr['category'] = $request->document_three_category;
$document_arr['file_extension'] = $request->document_three->extension();
$document_arr['file_reff'] = time() . uniqid();