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

@@ -0,0 +1,35 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class BranchFilesRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'document_one' => 'max:10240|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx,pptx,ppt',
'document_two' => 'max:10240|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx,pptx,ppt',
'document_three' => 'max:10240|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx,pptx,ppt',
'document_one_name' => 'required_with:document_one.*',
'document_two_name' => 'required_with:document_two.*',
'document_three_name' => 'required_with:document_three.*'
];
}
}

View File

@@ -30,6 +30,12 @@ class GeneralDocumentsRequest extends FormRequest
'document_one_name' => 'required_with:document_one.*',
'document_two_name' => 'required_with:document_two.*',
'document_three_name' => 'required_with:document_three.*'
/*
revisit this again and make it work: for now i will use a custom validation in the controller
'document_one_name' => 'required_with_all:document_one.*,document_one_category.*',
'document_two_name' => 'required_with_all:document_two.*,document_two_category.*',
'document_three_name' => 'required_with:document_three,document_three_category'
*/
];
}
}

View File

@@ -22,13 +22,13 @@ class UpdateClientRequest extends FormRequest
//'document_three_name.required_with' => 'Please select a file to upload.',
'document_one.mimes' => 'The uploaded file must be a PDF, An MS Word Document or An Image.',
'document_one.max' => 'The uploaded file may not be larger than 10MB.',
'document_one.max' => 'The uploaded file may not be larger than 20MB.',
'document_two.mimes' => 'The uploaded file must be a PDF, An MS Word Document or An Image.',
'document_two.max' => 'The uploaded file may not be larger than 10MB.',
'document_two.max' => 'The uploaded file may not be larger than 20MB.',
'document_three.mimes' => 'The uploaded file must be a PDF, An MS Word Document or An Image.',
'document_three.max' => 'The uploaded file may not be larger than 10MB.',
'document_three.max' => 'The uploaded file may not be larger than 20MB.',
'other_document.mimes' => 'The uploaded file must be a PDF, An MS Word Document or An Image.',
'other_document.max' => 'The uploaded file may not be larger than 10MB.',
'other_document.max' => 'The uploaded file may not be larger than 20MB.',
];
}
@@ -46,16 +46,18 @@ class UpdateClientRequest extends FormRequest
'status' => 'required',
'currency' => 'required',
'auth_user_id' => 'required',
'progress_indicators' => 'required',
'contract_validity' => 'sometimes|date',
/*
'document_one_name' => 'required_with:document_one.*',
'document_two_name' => 'required_with:document_two.*',
'document_three_name' => 'required_with:document_three.*',
*/
'other_document_name' => 'required_with:other_document.*',
'document_one' => 'max:10240|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx',
'document_two' => 'max:10240|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx',
'document_three' => 'max:10240|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx',
'other_document' => 'max:10240|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx'
'document_one' => 'max:20480|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx',
'document_two' => 'max:20480|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx',
'document_three' => 'max:20480|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx',
'other_document' => 'max:20480|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx'
];
}
}

View File

@@ -18,9 +18,9 @@ class UpdateMnoRequest extends FormRequest
public function messages(){
return [
'document_one.mimes' => 'The uploaded file must be a PDF, An MS Word Document or An Image.',
'document_one.max' => 'The uploaded file may not be larger than 10MB.',
'document_one.max' => 'The uploaded file may not be larger than 20MB.',
'document_two.mimes' => 'The uploaded file must be a PDF, An MS Word Document or An Image.',
'document_two.max' => 'The uploaded file may not be larger than 10MB.',
'document_two.max' => 'The uploaded file may not be larger than 20MB.',
];
}
/**
@@ -38,8 +38,8 @@ class UpdateMnoRequest extends FormRequest
'contact_person' => 'required',
'contact_person_email' => 'required',
'contact_person_phone' => 'required',
'document_one' => 'max:10240|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx',
'document_two' => 'max:10240|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx',
'document_one' => 'max:20480|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx',
'document_two' => 'max:20480|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx',
];
}