+
+ {{ $page.props.errors.error }}
+
{{ results.name }}
@@ -40,6 +43,33 @@
{{ issued }}
+
+
+
+
+
+
{{ issuedResGrad }}
+
+
+
+
+
+
{{ issuedUndegrad }}
+
+
+
+
+
+
{{ undergradRemaining }}
+
+
+
@@ -75,7 +105,10 @@ export default {
props: {
results: Object,
capTotal: Object|Number|null,
- issued: Object|Number|null
+ issued: Object|Number|null,
+ issuedUndegrad: Number|null,
+ undergradRemaining: Number|null,
+ issuedResGrad: Number|null
},
data() {
return {
diff --git a/Modules/Ministry/App/Http/Controllers/AttestationController.php b/Modules/Ministry/App/Http/Controllers/AttestationController.php
index c5f5d252..d04577f8 100644
--- a/Modules/Ministry/App/Http/Controllers/AttestationController.php
+++ b/Modules/Ministry/App/Http/Controllers/AttestationController.php
@@ -31,19 +31,27 @@ class AttestationController extends Controller
public function __construct()
{
$this->fedCaps = FedCap::active()->get();
- $this->countries = Country::select('name')->where('active', true)->get();
- $this->institutions = Institution::whereHas('activeCaps')->active()->with('activeCaps')->get();
+ $this->countries = Country::select('name')
+ ->where('active', true)
+ ->get();
+ $this->institutions = Institution::whereHas('activeCaps')
+ ->active()
+ ->with('activeCaps')
+ ->get();
}
/**
* Display a listing of the resource.
*/
- public function index()
+ public function index(Request $request)
{
$attestations = $this->paginateAtte();
- return Inertia::render('Ministry::Attestations', ['status' => true, 'results' => $attestations,
- 'institutions' => $this->institutions, 'countries' => $this->countries,
+ return Inertia::render('Ministry::Attestations', [
+ 'status' => true,
+ 'results' => $attestations,
+ 'institutions' => $this->institutions,
+ 'countries' => $this->countries,
]);
}
@@ -56,11 +64,21 @@ public function store($request): ?array
$inst = Institution::where('guid', $request->institution_guid)->first();
//1. check for duplicate attestations
$check1 = Attestation::where([
- 'first_name' => $request->first_name, 'last_name' => $request->last_name, 'id_number' => $request->id_number,
- 'dob' => $request->dob, 'institution_guid' => $request->institution_guid,
- 'program_guid' => $request->program_guid, 'cap_guid' => $request->cap_guid, 'email' => $request->email,
- 'address1' => $request->address1, 'address2' => $request->address2, 'city' => $request->city,
- 'zip_code' => $request->zip_code, 'province' => $request->province, 'country' => $request->country])->first();
+ 'first_name' => $request->first_name,
+ 'last_name' => $request->last_name,
+ 'id_number' => $request->id_number,
+ 'dob' => $request->dob,
+ 'institution_guid' => $request->institution_guid,
+ 'program_guid' => $request->program_guid,
+ 'cap_guid' => $request->cap_guid,
+ 'email' => $request->email,
+ 'address1' => $request->address1,
+ 'address2' => $request->address2,
+ 'city' => $request->city,
+ 'zip_code' => $request->zip_code,
+ 'province' => $request->province,
+ 'country' => $request->country,
+ ])->first();
//2. check cap has not been reached
if (is_null($check1)) {
@@ -79,10 +97,16 @@ public function storeAttestations(AttestationStoreRequest $request, $page = null
if ($page === 'institution') {
if (! is_null($error)) {
- return redirect(route('ministry.institutions.show', [$inst->id, 'attestations']))->withErrors(['first_name' => $error]);
+ return redirect(route('ministry.institutions.show', [
+ $inst->id,
+ 'attestations',
+ ]))->withErrors(['first_name' => $error]);
}
- return redirect(route('ministry.institutions.show', [$inst->id, 'attestations']));
+ return redirect(route('ministry.institutions.show', [
+ $inst->id,
+ 'attestations',
+ ]));
} else {
if (! is_null($error)) {
return redirect(route('ministry.attestations.index'))->withErrors(['first_name' => $error]);
@@ -100,27 +124,39 @@ private function update(AttestationEditRequest $request): ?string
$error = null;
//1. update only draft attestations
- $check1 = Attestation::where('id', $request->id)->where('status', 'Draft')->first();
+ $check1 = Attestation::where('id', $request->id)
+ ->where('status', 'Draft')
+ ->first();
//2. dont allow duplicate
$check2 = Attestation::where([
- 'first_name' => $request->first_name, 'last_name' => $request->last_name, 'id_number' => $request->id_number,
- 'dob' => $request->dob, 'institution_guid' => $request->institution_guid,
- 'program_guid' => $request->program_guid, 'cap_guid' => $request->cap_guid, 'email' => $request->email,
- 'address1' => $request->address1, 'address2' => $request->address2, 'city' => $request->city,
- 'zip_code' => $request->zip_code, 'province' => $request->province, 'country' => $request->country])
+ 'first_name' => $request->first_name,
+ 'last_name' => $request->last_name,
+ 'id_number' => $request->id_number,
+ 'dob' => $request->dob,
+ 'institution_guid' => $request->institution_guid,
+ 'program_guid' => $request->program_guid,
+ 'cap_guid' => $request->cap_guid,
+ 'email' => $request->email,
+ 'address1' => $request->address1,
+ 'address2' => $request->address2,
+ 'city' => $request->city,
+ 'zip_code' => $request->zip_code,
+ 'province' => $request->province,
+ 'country' => $request->country,
+ ])
->where('id', '!=', $request->id)
->first();
- if(is_null($check1)){
+ if (is_null($check1)) {
$error = 'This attestation cannot be edited. Only draft attestations can be edited.';
- }
- elseif(!is_null($check2)){
+ } elseif (! is_null($check2)) {
$error = "There's already an attestation for the exact same user.";
- }else{
+ } else {
$cap = Cap::where('guid', $request->cap_guid)->first();
- Attestation::where('id', $request->id)->update($request->validated());
+ Attestation::where('id', $request->id)
+ ->update($request->validated());
$attestation = Attestation::find($request->id);
$this->authorize('download', $attestation);
event(new AttestationDraftUpdated($cap, $attestation, $check1, $request->status));
@@ -136,10 +172,16 @@ public function updateAttestations(AttestationEditRequest $request, $page = null
$att = Attestation::where('id', $request->id)->first();
if ($page === 'institution') {
if (! is_null($error)) {
- return redirect(route('ministry.institutions.show', [$att->institution->id, 'attestations']))->withErrors(['first_name' => $error]);
+ return redirect(route('ministry.institutions.show', [
+ $att->institution->id,
+ 'attestations',
+ ]))->withErrors(['first_name' => $error]);
}
- return redirect(route('ministry.institutions.show', [$att->institution->id, 'attestations']));
+ return redirect(route('ministry.institutions.show', [
+ $att->institution->id,
+ 'attestations',
+ ]));
} else {
if (! is_null($error)) {
return redirect(route('ministry.attestations.index'))->withErrors(['first_name' => $error]);
@@ -153,18 +195,21 @@ public function rebuild(Request $request, Attestation $attestation)
{
$this->authorize('rebuild', $attestation);
event(new AttestationRebuildPdf($attestation));
+
return redirect(route('ministry.attestations.index'));
}
-
public function download(Request $request, Attestation $attestation)
{
$this->authorize('download', $attestation);
- $storedPdf = AttestationPdf::where('attestation_guid', $attestation->guid)->first();
+ $storedPdf = AttestationPdf::where('attestation_guid', $attestation->guid)
+ ->first();
$pdf = App::make('dompdf.wrapper');
$pdf->loadHTML(base64_decode($storedPdf->content));
- $pdf->getCanvas()->get_cpdf()->setEncryption('', env('PDF_KEY'), ['print']);
+ $pdf->getCanvas()
+ ->get_cpdf()
+ ->setEncryption('', env('PDF_KEY'), ['print']);
return $pdf->download($attestation->last_name.'-'.$attestation->fed_guid.'-attestation.pdf');
}
@@ -180,13 +225,27 @@ private function paginateAtte()
if (request()->filter_pal !== null) {
$attestations = $attestations->where('fed_guid', request()->filter_pal);
}
+ if (request()->filter_program) {
+ $attestations->whereHas('program', function ($query) {
+ $query->where('program_graduate', request()->filter_program === 'graduate');
+ });
+ }
- if (request()->sort !== null) {
+ if (request()->sort === 'program_graduate') {
+ $attestations->join('programs', 'attestations.program_guid', '=', 'programs.guid')
+ ->orderBy('programs.program_graduate', request()->direction ?? 'asc');
+ } elseif (request()->sort !== null) {
$attestations = $attestations->orderBy(request()->sort, request()->direction);
} else {
$attestations = $attestations->orderBy('created_at', 'desc');
}
- return $attestations->with('institution.activeCaps', 'institution.programs')->paginate(25)->onEachSide(1)->appends(request()->query());
+ return $attestations->with([
+ 'institution.activeCaps',
+ 'institution.programs',
+ 'program' => function ($query) {
+ $query->select('guid', 'program_name', 'program_graduate');
+ },
+ ])->paginate(25)->onEachSide(1)->appends(request()->query());
}
}
diff --git a/Modules/Ministry/App/Http/Controllers/CapController.php b/Modules/Ministry/App/Http/Controllers/CapController.php
index a28b19b7..16e3606e 100644
--- a/Modules/Ministry/App/Http/Controllers/CapController.php
+++ b/Modules/Ministry/App/Http/Controllers/CapController.php
@@ -3,6 +3,7 @@
namespace Modules\Ministry\App\Http\Controllers;
use App\Events\InstitutionCapCreated;
+use App\Facades\InstitutionFacade;
use App\Http\Controllers\Controller;
use App\Http\Requests\CapEditRequest;
use App\Http\Requests\CapStoreRequest;
@@ -97,7 +98,18 @@ public function capStat(Request $request)
->where('institution_guid', $instCap->institution_guid)
->where('fed_cap_guid', $instCap->fed_cap_guid)
->count();
+
+ // Reserved Graduate Attestations issued
+ $issuedResGradInstAttestations = Attestation::where('status', 'Issued')
+ ->where('institution_guid', $instCap->institution_guid)
+ ->where('fed_cap_guid', $instCap->fed_cap_guid)
+ ->whereHas('program', function ($query) {
+ $query->where('program_graduate', true);
+ })
+ ->count();
+
+ $institutionAttestationsDetails = InstitutionFacade::getInstitutionAttestInfo($issuedInstAttestations, $issuedResGradInstAttestations, $instCap);
}
- return Response::json(['status' => true, 'body' => ['instCap' => $instCap, 'issued' => $issuedInstAttestations ?? 0]]);
+ return Response::json(['status' => true, 'body' => ['instCap' => $instCap, 'issued' => $issuedInstAttestations ?? 0, 'resGradIssued' => $issuedResGradInstAttestations ?? 0, 'remainingUndergrad' => $institutionAttestationsDetails['undergradRemaining'] ?? 0]], 200);
}
}
diff --git a/Modules/Ministry/App/Http/Controllers/MaintenanceController.php b/Modules/Ministry/App/Http/Controllers/MaintenanceController.php
index d79fe37e..18c5d45f 100644
--- a/Modules/Ministry/App/Http/Controllers/MaintenanceController.php
+++ b/Modules/Ministry/App/Http/Controllers/MaintenanceController.php
@@ -255,6 +255,9 @@ public function reportSourcesFetch(Request $request, $from, $to, $type)
'caps.total_attestations',
'caps.issued_attestations',
'caps.draft_attestations',
+ 'caps.total_reserved_graduate_attestations',
+ 'caps.issued_reserved_graduate_attestations',
+ 'caps.draft_reserved_graduate_attestations',
'caps.active_status',
'institutions.guid as institution_guid',
'institutions.name',
@@ -265,6 +268,7 @@ public function reportSourcesFetch(Request $request, $from, $to, $type)
'fed_caps.start_date',
'fed_caps.end_date',
'fed_caps.total_attestations as fc_total_attestations',
+ 'fed_caps.total_reserved_graduate_attestations as fc_total_reserved_graduate_attestations',
'fed_caps.status'
)
->join('institutions', 'institutions.guid', '=', 'caps.institution_guid')
@@ -355,8 +359,8 @@ public function reportsSummaryFetch(Request $request)
$fromDate = $request->from_date;
$toDate = $request->to_date . " 23:59:59";
- $publicReport = ['total' => 0, 'issued' => 0, 'draft' => 0];
- $privateReport = ['total' => 0, 'issued' => 0, 'draft' => 0];
+ $publicReport = ['total' => 0, 'issued' => 0, 'draft' => 0, 'total_res_grad' => 0, 'issued_res_grad' => 0, 'draft_res_grad' => 0];
+ $privateReport = ['total' => 0, 'issued' => 0, 'draft' => 0, 'total_res_grad' => 0, 'issued_res_grad' => 0, 'draft_res_grad' => 0];
// Fetch institutions with active attestations
$institutions = Institution::with(['activeCaps.attestations'])->get();
@@ -398,23 +402,31 @@ public function reportsSummaryFetch(Request $request)
private function addInstToReport($inst, &$report)
{
if (!isset($report[$inst->category])) {
- $report[$inst->category] = ['instList' => [], 'total' => 0, 'issued' => 0, 'draft' => 0];
+ $report[$inst->category] = ['instList' => [], 'total' => 0, 'issued' => 0, 'draft' => 0, 'total_res_grad' => 0, 'issued_res_grad' => 0, 'draft_res_grad' => 0];
}
$total = is_null($inst->activeCaps->first()) ? 0 : $inst->activeCaps->first()->total_attestations;
+ $total_res_grad = is_null($inst->activeCaps->first()) ? 0 : $inst->activeCaps->first()->total_reserved_graduate_attestations;
$report[$inst->category]['instList'][$inst->name] = [
'total' => $total,
'issued' => 0,
- 'draft' => 0
+ 'draft' => 0,
+ 'total_res_grad' => $total_res_grad,
+ 'issued_res_grad' => 0,
+ 'draft_res_grad' => 0
];
$report[$inst->category]['total'] += $total;
$report['total'] += $total;
+
+ $report[$inst->category]['total_res_grad'] += $total_res_grad;
+ $report['total_res_grad'] += $total_res_grad;
}
private function updateReport($att, &$report)
{
$inst = $att->institution;
+ $prog = $att->program;
$instName = $inst->name;
$status = ($att->status === 'Issued') ? 'issued' : 'draft';
@@ -425,6 +437,12 @@ private function updateReport($att, &$report)
$report[$inst->category]['instList'][$instName][$status]++;
$report[$inst->category][$status]++;
$report[$status]++;
+
+ if ($prog->program_graduate) {
+ $report[$inst->category]['instList'][$instName][$status.'_res_grad']++;
+ $report[$inst->category][$status.'_res_grad']++;
+ $report[$status.'_res_grad']++;
+ }
}
private function getReportType($category)
@@ -444,8 +462,8 @@ public function reportsDetailFetch(Request $request)
$institutions = Institution::with(['activeCaps.attestations'])->whereHas('activeCaps')->get();
// Initialize report arrays
- $publicReport = ['total' => 0, 'issued' => 0, 'draft' => 0];
- $privateReport = ['total' => 0, 'issued' => 0, 'draft' => 0];
+ $publicReport = ['total' => 0, 'issued' => 0, 'draft' => 0, 'total_res_grad' => 0, 'issued_res_grad' => 0, 'draft_res_grad' => 0];
+ $privateReport = ['total' => 0, 'issued' => 0, 'draft' => 0, 'total_res_grad' => 0, 'issued_res_grad' => 0, 'draft_res_grad' => 0];
// Add missing institutions that have not issued any attestation
foreach ($institutions as $inst) {
@@ -459,7 +477,7 @@ public function reportsDetailFetch(Request $request)
}
// Fetch attestations within the specified date range
- $results = Attestation::with('institution')->whereBetween('created_at', [$fromDate, $toDate])->get();
+ $results = Attestation::with('institution', 'program')->whereBetween('created_at', [$fromDate, $toDate])->get();
// Update report based on fetched attestations
foreach ($results as $att) {
diff --git a/Modules/Ministry/resources/assets/js/Components/AttestationCreate.vue b/Modules/Ministry/resources/assets/js/Components/AttestationCreate.vue
index d2f56d61..949c2c45 100644
--- a/Modules/Ministry/resources/assets/js/Components/AttestationCreate.vue
+++ b/Modules/Ministry/resources/assets/js/Components/AttestationCreate.vue
@@ -107,7 +107,14 @@
class="form-control" id="inputExpiryDate" v-model="selectedInst.active_caps[0].end_date"
disabled readonly/>
@@ -235,7 +247,8 @@ export default {
country: "",
status: "",
expiry_date: "",
- gt_fifty_pct_in_person: ""
+ gt_fifty_pct_in_person: "",
+ student_confirmation: false
},
selectedProgram: '',
selectedInst: '',
@@ -266,7 +279,20 @@ export default {
});
},
submitForm: function (status) {
+
+ // Reset error messages
+ this.editAtteForm.errors = [];
+ this.editAtteForm.hasErrors = false;
+
this.editAtteForm.status = status;
+
+ // Student confirmation (checkbox) is required for issuing an attestation.
+ if ((this.editAtteForm.status === 'Issued') && (!this.editAtteForm.student_confirmation)) {
+ this.editAtteForm.errors.push('Please confirm that the applicant has been informed that the personal information contained in this application will be shared.');
+ this.editAtteForm.hasErrors = true;
+ return;
+ }
+
if(this.editAtteForm.status !== 'Draft'){
let check = confirm('You are about to Save & Lock this record. Are you sure you want to continue?');
if(!check){
diff --git a/Modules/Ministry/resources/assets/js/Components/AttestationSearch.vue b/Modules/Ministry/resources/assets/js/Components/AttestationSearch.vue
index 329dd99a..f38830ee 100644
--- a/Modules/Ministry/resources/assets/js/Components/AttestationSearch.vue
+++ b/Modules/Ministry/resources/assets/js/Components/AttestationSearch.vue
@@ -12,6 +12,16 @@