Non-Expiring trainings and centering text

client/src/common/EquipmentTrainingModal.tsx

@@ -236,7 +236,7 @@ export default function EquipmentTrainingModal(props: EquipmentTrainingModalProp
                 {
                   (totalRequirements === totalReqsComplete && byExpiry.length > 0)
                     ? <Typography variant="subtitle2">
-                      {`All Set Until: ${byExpiry[0].expirationDate}`}
+                      All Set Until: {byExpiry[0].expirationDate}
                     </Typography>
                     : null
                 }

client/src/common/TrainingModuleUtils.ts

@@ -70,6 +70,6 @@ export const moduleStatusMapper =
         archived: module.archived,
         status: expired ? "Expired" : "Passed",
         submissionDate: submissionDate.toDateString(),
-        expirationDate: expirationDate.toDateString(),
+        expirationDate: module.expires ? expirationDate.toDateString() : undefined,
       };
     };

client/src/queries/trainingQueries.ts

@@ -131,10 +131,12 @@ export const GET_ACCESS_PROGRESSES = gql`
       passedModules {
         id
         name
+        expires
       }
       availableModules {
         id
         name
+        expires
       }
       accessCheckDone
     }
@@ -147,6 +149,7 @@ export const GET_ALL_TRAINING_MODULES = gql`
 			id
 			name
 			archived
+      expires
 		}
 	}
 `;