Merge pull request #214 from bcgov/test

Test
bcgov · Feb 19, 2025 · c1fd793 · c1fd793
2 parents d4c5b0e + d21307c
commit c1fd793
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 21 deletions.
diff --git a/Modules/Institution/App/Http/Controllers/AttestationController.php b/Modules/Institution/App/Http/Controllers/AttestationController.php
@@ -273,29 +273,59 @@ public function exportCsv()
 
     public function capStat(Request $request)
     {
-        $instCap = Cap::where('institution_guid', $request->input('institution_guid'))
+
+        $cap = Cap::where('institution_guid', $request->input('institution_guid'))
             ->selectedFedcap()
             ->active()
             ->where('program_guid', null)
             ->first();
 
-        if (! is_null($instCap)) {
-            $issuedUnderAttestations = Attestation::whereIn('status', ['Issued', 'Declined'])
-                ->where('institution_guid', $instCap->institution_guid)
-                ->where('fed_cap_guid', $instCap->fed_cap_guid)
-                ->count();
+        $counts = Attestation::selectRaw("
+    SUM(CASE WHEN status = 'Issued' AND programs.program_graduate = false THEN 1 ELSE 0 END) as issued_undergrad_attestations,
+    SUM(CASE WHEN status = 'Declined' AND programs.program_graduate = false THEN 1 ELSE 0 END) as declined_undergrad_attestations,
+    SUM(CASE WHEN status = 'Issued' AND programs.program_graduate = true THEN 1 ELSE 0 END) as issued_grad_attestations,
+    SUM(CASE WHEN status = 'Declined' AND programs.program_graduate = true THEN 1 ELSE 0 END) as declined_grad_attestations
+")
+            ->leftJoin('programs', 'programs.guid', '=', 'attestations.program_guid')
+            ->where('attestations.institution_guid', $cap->institution_guid)
+            ->where('attestations.fed_cap_guid', $cap->fed_cap_guid)
+            ->first();
 
-            $issuedGradAttestations = Attestation::whereIn('status', ['Issued', 'Declined'])
-                ->where('institution_guid', $instCap->institution_guid)
-                ->where('fed_cap_guid', $instCap->fed_cap_guid)
-                ->whereHas('program', function ($query) {
-                    $query->where('program_graduate', true);
-                })
-                ->count();
-        }
+        $issuedUnderAttestations       = $counts->issued_undergrad_attestations;
+        $declinedUnderAttestations     = $counts->declined_undergrad_attestations;
+        $issuedGradAttestations = $counts->issued_grad_attestations;
+        $declinedGradAttestations = $counts->declined_grad_attestations;
+
+        $institutionAttestationsDetails = InstitutionFacade::getInstitutionAttestInfo($issuedUnderAttestations,
+            $issuedGradAttestations, $declinedUnderAttestations, $declinedGradAttestations, $cap);
 
+//
+//        if (! is_null($cap)) {
+//            $issuedUnderAttestations = Attestation::whereIn('status', ['Issued', 'Declined'])
+//                ->where('institution_guid', $instCap->institution_guid)
+//                ->where('fed_cap_guid', $instCap->fed_cap_guid)
+//                ->count();
+//
+//            $issuedGradAttestations = Attestation::whereIn('status', ['Issued', 'Declined'])
+//                ->where('institution_guid', $instCap->institution_guid)
+//                ->where('fed_cap_guid', $instCap->fed_cap_guid)
+//                ->whereHas('program', function ($query) {
+//                    $query->where('program_graduate', true);
+//                })
+//                ->count();
+//        }
         return Response::json(['status' => true, 'body' =>
-            ['instCap' => $instCap, 'issued' => $issuedUnderAttestations ?? 0, 'gradIssued' => $issuedGradAttestations ?? 0]]);
+            ['instCap' => $cap,
+                'issued' => $issuedUnderAttestations ?? 0,
+                'declined' => $declinedUnderAttestations ?? 0,
+                'issuedGrad' => $issuedGradAttestations ?? 0,
+                'declinedGrad' => $declinedGradAttestations ?? 0,
+                'remainingUndergrad' => $institutionAttestationsDetails['undergradRemaining'] ?? 0,
+                'totalRemaining' => $institutionAttestationsDetails['totalRemaining'] ?? 0
+                ]]);
+
+//        return Response::json(['status' => true, 'body' =>
+//            ['instCap' => $instCap, 'issued' => $issuedUnderAttestations ?? 0, 'gradIssued' => $issuedGradAttestations ?? 0]]);
     }
 
     public function duplicateStudent(Request $request)

diff --git a/Modules/Institution/resources/assets/js/Pages/Attestations.vue b/Modules/Institution/resources/assets/js/Pages/Attestations.vue
@@ -25,10 +25,9 @@
                                     <template v-if="capStat != '' && capStat.instCap != null">
                                         <span class="badge rounded-pill text-bg-primary me-1">Active Cap Total: {{ capStat.instCap.total_attestations }}</span>
                                         <span class="badge rounded-pill text-bg-primary me-1">Active Res. Grad.: {{ capStat.instCap.total_reserved_graduate_attestations }}</span>
-                                        <span class="badge rounded-pill text-bg-primary me-1">Issued PALs: {{ capStat.issued }}</span>
                                         <span class="badge rounded-pill text-bg-primary me-1">Remaining PALs: {{ capStat.totalRemaining }}</span>
-                                        <span class="badge rounded-pill text-bg-primary me-1">Issued Grad. PALs: {{ capStat.gradIssued }}</span>
-                                        <span class="badge rounded-pill text-bg-primary me-1">Issued Undegrad. PALs: {{ capStat.remainingUndergrad }}</span>
+                                        <span class="badge rounded-pill text-bg-primary me-1">Issued Grad. PALs: {{ capStat.issuedGrad }}</span>
+                                        <span class="badge rounded-pill text-bg-primary me-1">Issued Undegrad. PALs: {{ capStat.issued }}</span>
                                     </template>
                                 </div>
                                 <div class="col-md-2">

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -10,10 +10,10 @@
     "/images/2022/BC_PSEFS_H_Solid_rev.png": "/images/2022/BC_PSEFS_H_Solid_rev.png",
     "/images/attestation_sign.png": "/images/attestation_sign.png",
     "/images/bc-logo-grey.gif": "/images/bc-logo-grey.gif",
-    "/images/bceid_rev.png": "/images/bceid_rev.png",
     "/images/bc_lg_logo.png": "/images/bc_lg_logo.png",
     "/images/bc_no_bg.png": "/images/bc_no_bg.png",
     "/images/bc_sq_logo.png": "/images/bc_sq_logo.png",
+    "/images/bceid_rev.png": "/images/bceid_rev.png",
     "/images/favicon.ico": "/images/favicon.ico",
     "/images/gov_bc_logo.svg": "/images/gov_bc_logo.svg",
     "/images/logo.png": "/images/logo.png",
@@ -26,12 +26,12 @@
     "/fonts/BCSans-Light.ttf": "/fonts/BCSans-Light.ttf",
     "/fonts/BCSans-LightItalic.ttf": "/fonts/BCSans-LightItalic.ttf",
     "/fonts/BCSans-Regular.ttf": "/fonts/BCSans-Regular.ttf",
+    "/fonts/DejaVuSans.ttf": "/fonts/DejaVuSans.ttf",
+    "/fonts/NotoSans-Regular.ttf": "/fonts/NotoSans-Regular.ttf",
     "/fonts/customfontpack.eot": "/fonts/customfontpack.eot",
     "/fonts/customfontpack.svg": "/fonts/customfontpack.svg",
     "/fonts/customfontpack.ttf": "/fonts/customfontpack.ttf",
     "/fonts/customfontpack.woff": "/fonts/customfontpack.woff",
-    "/fonts/DejaVuSans.ttf": "/fonts/DejaVuSans.ttf",
-    "/fonts/NotoSans-Regular.ttf": "/fonts/NotoSans-Regular.ttf",
     "/fonts/texgyreadventor-regular-webfont.eot": "/fonts/texgyreadventor-regular-webfont.eot",
     "/fonts/texgyreadventor-regular-webfont.svg": "/fonts/texgyreadventor-regular-webfont.svg",
     "/fonts/texgyreadventor-regular-webfont.ttf": "/fonts/texgyreadventor-regular-webfont.ttf",