Merge pull request #5659 from flexion/10434-test

10434: Handle Feedback
ustaxcourt · Dec 18, 2024 · 044ae65 · 044ae65
2 parents c896284 + e358c24
commit 044ae65
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 21 deletions.
diff --git a/...i/src/business/useCases/trialSessions/getTrialSessionPlanningReportDataInteractor.test.ts b/...i/src/business/useCases/trialSessions/getTrialSessionPlanningReportDataInteractor.test.ts
@@ -18,7 +18,7 @@ describe('getTrialSessionPlanningReportDataInteractor', () => {
       },
       sessionType: 'Hybrid',
       startDate: '2099-03-01T00:00:00.000Z',
-      term: 'winter',
+      term: 'Winter',
       termYear: '2023',
       trialLocation: 'Denver, Colorado',
     } as RawTrialSession,
@@ -30,7 +30,7 @@ describe('getTrialSessionPlanningReportDataInteractor', () => {
       },
       sessionType: SESSION_TYPES.hybridSmall,
       startDate: '2098-03-01T00:00:00.000Z',
-      term: 'winter',
+      term: 'Winter',
       termYear: '2023',
       trialLocation: 'Denver, Colorado',
     } as RawTrialSession,
@@ -42,7 +42,7 @@ describe('getTrialSessionPlanningReportDataInteractor', () => {
       },
       sessionType: 'Hybrid',
       startDate: '2099-03-01T00:00:00.000Z',
-      term: 'spring',
+      term: 'Spring',
       termYear: '2023',
       trialLocation: 'Denver, Colorado',
     } as RawTrialSession,
@@ -62,62 +62,62 @@ describe('getTrialSessionPlanningReportDataInteractor', () => {
       isCalendared: true,
       sessionType: 'Special',
       startDate: '2024-03-01T00:00:00.000Z',
-      term: 'winter',
+      term: 'Winter',
       termYear: '2024',
       trialLocation: 'Denver, Colorado',
     } as RawTrialSession,
     {
       isCalendared: true,
       sessionType: 'Hybrid',
       startDate: '2024-03-01T00:00:00.000Z',
-      term: 'winter',
+      term: 'Winter',
       termYear: '2024',
       trialLocation: 'Denver, Colorado',
     } as RawTrialSession,
     {
       isCalendared: false,
       sessionType: 'Special',
       startDate: '2024-03-01T00:00:00.000Z',
-      term: 'winter',
+      term: 'Winter',
       termYear: '2024',
       trialLocation: 'Denver, Colorado',
     } as RawTrialSession,
     {
       isCalendared: true,
       sessionType: 'Special',
       startDate: '1998-03-01T00:00:00.000Z',
-      term: 'winter',
+      term: 'Winter',
       termYear: '2024',
       trialLocation: 'Fresno, California',
     } as RawTrialSession,
     {
       isCalendared: true,
       sessionType: 'Special',
       startDate: '1999-03-01T00:00:00.000Z',
-      term: 'winter',
+      term: 'Winter',
       termYear: '2024',
       trialLocation: 'Fresno, California',
     } as RawTrialSession,
     {
       isCalendared: true,
       sessionType: 'Special',
       startDate: '1997-03-01T00:00:00.000Z',
-      term: 'winter',
+      term: 'Winter',
       termYear: '2024',
     } as RawTrialSession,
     {
       isCalendared: true,
       sessionType: 'Special',
       startDate: '2024-03-01T00:00:00.000Z',
-      term: 'winter',
+      term: 'Winter',
       termYear: '2024',
       trialLocation: 'Denver, Colorado',
     } as RawTrialSession,
     {
       isCalendared: true,
       sessionType: 'Hybrid',
       startDate: '2019-03-01T00:00:00.000Z',
-      term: 'winter',
+      term: 'Winter',
       termYear: '2024',
       trialLocation: 'Denver, Colorado',
     } as RawTrialSession,

diff --git a/web-api/src/business/useCases/trialSessions/getTrialSessionPlanningReportDataInteractor.ts b/web-api/src/business/useCases/trialSessions/getTrialSessionPlanningReportDataInteractor.ts
@@ -5,13 +5,13 @@ import {
 import {
   ROLE_PERMISSIONS,
   isAuthorized,
-} from '../../../../../shared/src/authorization/authorizationClientService';
+} from '@shared/authorization/authorizationClientService';
 import { RawTrialSession } from '@shared/business/entities/trialSessions/TrialSession';
 import {
   SESSION_TYPES,
   TRIAL_CITIES,
   US_STATES,
-} from '../../../../../shared/src/business/entities/EntityConstants';
+} from '@shared/business/entities/EntityConstants';
 import { ServerApplicationContext } from '@web-api/applicationContext';
 import { UnauthorizedError } from '@web-api/errors/errors';
 import { UnknownAuthUser } from '@shared/business/entities/authUser/AuthUser';
@@ -82,7 +82,7 @@ const getTrialSessionPlanningReportData = async ({
     session =>
       session.sessionType === 'Special' &&
       Number(session.termYear) === year &&
-      session.term === term,
+      session.term.toLocaleLowerCase() === term.toLocaleLowerCase(),
   );
 
   const specialTrialSessionsCounts = specialTrialSessions.reduce(

diff --git a/web-client/src/styles/custom.scss b/web-client/src/styles/custom.scss
@@ -1120,6 +1120,10 @@ header.usa-header {
   }
 }
 
+@mixin h1-underline-border {
+  border-bottom: 3px solid color($theme-color-primary);
+}
+
 .title {
   border-bottom: 1px solid color($theme-color-base-lighter);
   margin-bottom: 20px;
@@ -1130,16 +1134,21 @@ header.usa-header {
   }
 
   h1 {
+		@include h1-underline-border;
+
     position: relative;
     top: 2px;
     display: inline-block;
     padding-bottom: 10px;
-    border-bottom: 3px solid color($theme-color-primary);
     margin-top: -2px;
     margin-bottom: 0;
   }
 }
 
+.h1-underline-border {
+  @include h1-underline-border;
+}
+
 hr.lighter {
   border-top: 1px solid color($theme-color-base-lighter);
 }

diff --git a/web-client/src/views/TrialSessions/TrialSessionPlanningReportView.tsx b/web-client/src/views/TrialSessions/TrialSessionPlanningReportView.tsx
@@ -81,14 +81,13 @@ function TrialSessionPlanningReportHeader({
   year,
 }: TrialSessionPlanningReportHeaderParams) {
   return (
-    <div className="grid-container display-flex height-6 ">
-      <div className="title">
-        <h1>{trialSessionPlanningReportHeader}</h1>
-      </div>
-      <div className="flex-fill text-right height-6 border-bottom-1px border-gray-10">
+    <div className="grid-container display-flex">
+      <h1 className="padding-bottom-2 margin-bottom-0 h1-underline-border">
+        {trialSessionPlanningReportHeader}
+      </h1>
+      <div className="flex-fill text-right border-bottom-1px border-gray-10">
         <Button
           link
-          className="margin-bottom-3"
           icon="print"
           onClick={() => {
             printSequence({