Merge pull request #2291 from HHS/al-ttahub-3196-new-tr-views

[TTAHUB-3196] Update TR views to make life easier for users

.circleci/config.yml

@@ -560,7 +560,7 @@ parameters:
     type: string
   dev_git_branch: # change to feature branch to test deployment
     description: "Name of github branch that will deploy to dev"
-    default: "TTAHUB-3097/transactions-for-workers-round-2"
+    default: "al-ttahub-3196-new-tr-views"
     type: string
   sandbox_git_branch:  # change to feature branch to test deployment
     default: "mb/TTAHUB-3198/training-report-alerts"

.gitignore

@@ -11,6 +11,7 @@ tests/api/report
 tests/e2e/report
 tests/e2e/test-results
 tests/api/test-results
+test-results
 
 # Ignore /doc => /docs symbolic link created for adr-tools
 /doc

email_templates/tr_collaborator_added/html.pug

@@ -2,7 +2,7 @@ style
   include ../email.css
 p Hello,
 p You've been added as an event collaborator on Training Report #{displayId}.
-p Access this report in the TTA Hub:
+p Select the link below to review and submit the event details in the TTA Hub:
 ul
   li 
     a(href=reportPath)= displayId

email_templates/tr_collaborator_added/subject.pug

@@ -1 +1 @@
-= `You have been added to Training Report ${displayId}`
+= `Action needed: Submit event details for Training Report ${displayId}`

email_templates/tr_collaborator_reminder_event/html.pug

@@ -0,0 +1,11 @@
+style
+  include ../email.css
+p Hello,
+p This is a reminder that you have been assigned as an Event Collaborator on Training Report #{displayId}.
+p Select the link below to access the report in the TTA Hub:
+ul
+  li 
+    a(href=reportPath)= displayId
+p Best Regards,
+  br
+  | Your TTA Hub team

email_templates/tr_collaborator_reminder_event/subject.pug

@@ -0,0 +1 @@
+= `${prefix} Submit event details for Training Report ${displayId}`

email_templates/tr_collaborator_reminder_no_sessions/html.pug

@@ -0,0 +1,11 @@
+style
+  include ../email.css
+p Hello,
+p This is a reminder that you have been assigned as an Event Collaborator on Training Report #{displayId}.
+p Select the link below to create a session in the TTA Hub:
+ul
+  li 
+    a(href=reportPath)= displayId
+p Best Regards,
+  br
+  | Your TTA Hub team

email_templates/tr_collaborator_reminder_no_sessions/subject.pug

@@ -0,0 +1 @@
+= `${prefix} Create a session for Training Report ${displayId}`

email_templates/tr_collaborator_reminder_session/html.pug

@@ -0,0 +1,11 @@
+style
+  include ../email.css
+p Hello,
+p This is a reminder that you have been assigned as an Event Collaborator on Training Report #{displayId}.
+p Select the link below to review and submit the session details in the TTA Hub:
+ul
+  li 
+    a(href=reportPath)= displayId
+p Best Regards,
+  br
+  | Your TTA Hub team

email_templates/tr_collaborator_reminder_session/subject.pug

@@ -0,0 +1 @@
+= `${prefix} Submit session details for Training Report  ${displayId}`

email_templates/tr_event_complete/html.pug

@@ -2,7 +2,7 @@ style
   include ../email.css
 p Hello,
 p Training Report #{displayId} has been completed.
-p Access this report in the TTA Hub:
+p Select the link below to access the report in the TTA Hub:
 ul
   li 
     a(href=reportPath)= displayId

email_templates/tr_event_complete/subject.pug

@@ -1 +1 @@
-= `A Training Report has been completed`
+= `Training Report ${displayId} has been completed!`

email_templates/tr_event_imported/html.pug

@@ -0,0 +1,11 @@
+style
+  include ../email.css
+p Hello,
+p You've been assigned as an Event Creator on Training Report #{displayId}.
+p Select the link below to review and submit the event details in the TTA Hub::
+ul
+  li 
+    a(href=reportPath)= displayId
+p Best Regards,
+  br
+  | Your TTA Hub team

email_templates/tr_event_imported/subject.pug

@@ -0,0 +1 @@
+= `Action needed: Submit event details for Training Report ${displayId}`

email_templates/tr_owner_reminder_event/html.pug

@@ -0,0 +1,11 @@
+style
+  include ../email.css
+p Hello,
+p This is a reminder that you have been assigned as an Event Creator on Training Report #{displayId}.
+p Select the link below to access the report in the TTA Hub:
+ul
+  li 
+    a(href=reportPath)= displayId
+p Best Regards,
+  br
+  | Your TTA Hub team

email_templates/tr_owner_reminder_event/subject.pug

@@ -0,0 +1 @@
+= `${prefix} Submit event details for Training Report  ${displayId}`

email_templates/tr_owner_reminder_event_not_completed/html.pug

@@ -0,0 +1,11 @@
+style
+  include ../email.css
+p Hello,
+p This is a reminder that Training Report #{displayId} is ready for your review.
+p Select the link below to review and complete the event in the TTA Hub:
+ul
+  li 
+    a(href=reportPath)= displayId
+p Best Regards,
+  br
+  | Your TTA Hub team

email_templates/tr_owner_reminder_event_not_completed/subject.pug

@@ -0,0 +1 @@
+= `${prefix} Complete Training Report ${displayId}`

email_templates/tr_owner_reminder_no_sessions/html.pug

@@ -0,0 +1,11 @@
+style
+  include ../email.css
+p Hello,
+p This is a reminder that you have been assigned as an Event Creator on Training Report #{displayId}.
+p Select the link below to create a session in the TTA Hub:
+ul
+  li 
+    a(href=reportPath)= displayId
+p Best Regards,
+  br
+  | Your TTA Hub team

email_templates/tr_owner_reminder_no_sessions/subject.pug

@@ -0,0 +1 @@
+= `${prefix} Create a session for Training Report ${displayId}`

email_templates/tr_owner_reminder_session/html.pug

@@ -0,0 +1,11 @@
+style
+  include ../email.css
+p Hello,
+p This is a reminder that you have been assigned as an Event Creator on Training Report #{displayId}.
+p Select the link below to review and submit the session details in the TTA Hub:
+ul
+  li 
+    a(href=reportPath)= displayId
+p Best Regards,
+  br
+  | Your TTA Hub team

email_templates/tr_owner_reminder_session/subject.pug

@@ -0,0 +1 @@
+= `${prefix} Submit session details for Training Report  ${displayId}`

email_templates/tr_poc_reminder_session/html.pug

@@ -0,0 +1,11 @@
+style
+  include ../email.css
+p Hello,
+p This is a reminder that you have been assigned as a Regional POC on Training Report #{displayId}.
+p Select the link below to review and submit the session details in the TTA Hub:
+ul
+  li 
+    a(href=reportPath)= displayId
+p Best Regards,
+  br
+  | Your TTA Hub team

email_templates/tr_poc_reminder_session/subject.pug

@@ -0,0 +1 @@
+= `${prefix} Submit session details for Training Report  ${displayId}`

email_templates/tr_session_created/html.pug

@@ -1,8 +1,8 @@
 style
   include ../email.css
 p Hello,
-p A session has been created for Training Report #{displayId}.
-p Access this report in the TTA Hub:
+p You have been added as a Regional POC on #{displayId}.
+p Select the link below to review and submit the session details in the TTA Hub:
 ul
   li 
     a(href=reportPath)= displayId 

email_templates/tr_session_created/subject.pug

@@ -1 +1 @@
-= `A session has been created for Training Report ${displayId}`
+= `Action needed: Submit session details for Training Report ${displayId}`

frontend/src/App.scss

@@ -445,3 +445,9 @@ fill: #1B1B1B;
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+.lead-paragraph {
+  font-family: "Merriweather Web", Georgia, Cambria, "Times New Roman", Times, serif;
+  font-size: 1.25rem;
+  line-height: 1.5;
+}

frontend/src/__tests__/permissions.js

@@ -9,6 +9,7 @@ import isAdmin, {
   canChangeObjectiveStatus,
   canChangeGoalStatus,
   canEditOrCreateGoals,
+  hasTrainingReportWritePermissions,
 } from '../permissions';
 
 describe('permissions', () => {
@@ -376,4 +377,42 @@ describe('permissions', () => {
       expect(result).toBe(false);
     });
   });
+
+  describe('hasTrainingReportWritePermissions', () => {
+    it('returns true if the user has read_write_training_repotrs', () => {
+      const user = {
+        permissions: [
+          {
+            scopeId: SCOPE_IDS.READ_WRITE_TRAINING_REPORTS,
+            regionId: 1,
+          },
+        ],
+      };
+      expect(hasTrainingReportWritePermissions(user)).toBeTruthy();
+    });
+
+    it('returns true if the user has POC training reports', () => {
+      const user = {
+        permissions: [
+          {
+            scopeId: SCOPE_IDS.POC_TRAINING_REPORTS,
+            regionId: 1,
+          },
+        ],
+      };
+      expect(hasTrainingReportWritePermissions(user)).toBeTruthy();
+    });
+
+    it('returns false otherwise', () => {
+      const user = {
+        permissions: [
+          {
+            scopeId: SCOPE_IDS.READ_REPORTS,
+            regionId: 1,
+          },
+        ],
+      };
+      expect(hasTrainingReportWritePermissions(user)).toBeFalsy();
+    });
+  });
 });

frontend/src/components/ApprovedReportSpecialButtons.js

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { Grid, ModalToggleButton } from '@trussworks/react-uswds';
+import { Grid, ModalToggleButton, Button } from '@trussworks/react-uswds';
 import { canUnlockReports } from '../permissions';
 import PrintToPdf from './PrintToPDF';
 
@@ -9,6 +9,8 @@ export default function ApprovedReportSpecialButtons({
   modalRef,
   user,
   showUnlockReports,
+  showCompleteEvent,
+  onCompleteEvent,
 }) {
   const [successfullyCopiedClipboard, setSuccessfullyCopiedClipboard] = useState(false);
   const [somethingWentWrongWithClipboard, setSomethingWentWrongWithClipboard] = useState(false);
@@ -53,12 +55,17 @@ export default function ApprovedReportSpecialButtons({
         : null}
       <Grid row>
         {navigator && navigator.clipboard
-          ? <button id="approved-url" type="button" className="usa-button no-print" disabled={modalRef && modalRef.current ? modalRef.current.modalIsOpen : false} onClick={handleCopyUrl}>Copy URL Link</button>
+          ? <button id="approved-url" type="button" className="usa-button usa-button--outline no-print" disabled={modalRef && modalRef.current ? modalRef.current.modalIsOpen : false} onClick={handleCopyUrl}>Copy URL Link</button>
           : null}
         <PrintToPdf
           id="approved-print"
           disabled={modalRef && modalRef.current ? modalRef.current.modalIsOpen : false}
         />
+        {(showCompleteEvent && onCompleteEvent) ? (
+          <Button onClick={onCompleteEvent} className="no-print">
+            Complete event
+          </Button>
+        ) : null}
         {showUnlockReports && user && user.permissions && canUnlockReports(user)
           ? <ModalToggleButton type="button" className="usa-button usa-button--outline no-print" modalRef={modalRef} opener>Unlock report</ModalToggleButton>
           : null}
@@ -78,11 +85,15 @@ ApprovedReportSpecialButtons.propTypes = {
     PropTypes.shape(),
   ]),
   showUnlockReports: PropTypes.bool,
+  onCompleteEvent: PropTypes.func,
+  showCompleteEvent: PropTypes.bool,
 };
 
 ApprovedReportSpecialButtons.defaultProps = {
   UnlockModal: <></>,
   modalRef: null,
   showUnlockReports: false,
   user: null,
+  onCompleteEvent: null,
+  showCompleteEvent: false,
 };

frontend/src/pages/ActivityReport/Pages/Review/IncompletePages.js → frontend/src/components/IncompletePages.js

@@ -5,13 +5,14 @@ import { Alert } from '@trussworks/react-uswds';
 import './IncompletePages.css';
 
 const IncompletePages = ({
+  type,
   incompletePages,
 }) => (
   <Alert className="smart-hub--incomplete-notice" validation noIcon slim type="error">
-    <b>Incomplete report</b>
+    <b>{`Incomplete ${type}`}</b>
     <br />
-    This report cannot be submitted until all sections are complete.
-    Please review the following sections:
+    {`This ${type} cannot be submitted until all sections are complete.
+    Please review the following sections:`}
     <ul>
       {incompletePages.map((page) => (
         <li key={page}>
@@ -23,7 +24,12 @@ const IncompletePages = ({
 );
 
 IncompletePages.propTypes = {
+  type: PropTypes.string,
   incompletePages: PropTypes.arrayOf(PropTypes.string).isRequired,
 };
 
+IncompletePages.defaultProps = {
+  type: 'report',
+};
+
 export default IncompletePages;