Add some fields to the report

.circleci/config.yml

@@ -133,7 +133,7 @@ parameters:
     default: "main"
     type: string
   sandbox_git_branch:  # change to feature branch to test deployment
-    default: "js-saving-activity-report-frontend"
+    default: "js-add-report-fields"
     type: string
 jobs:
   build_and_lint:

docs/logical_data_model.md

@@ -1,7 +1,7 @@
 Logical Data Model
 ==================
 
-<img src="http://www.plantuml.com/plantuml/png/nLRRRkCs47tNL_2jxG8nYXP5WKMms4kzHHxg6dRo0RGuaTcI77OuIc34-VUQ8YABiP8oLe5ziQ4pzyF3oyV0ahYrfWgrD21-dFtwIrLz9-GTQYKyuSQ03U9UyrP8rnXGeYQy3-8MWAlmjtPUahJ2Q0Uyyo2GU8jLLHiPWhW9GEAX4kATq4gy5zenD0Veyh811oGPr8SF1_CsG8Y-Lz4fC6dN750dBGo__HOTB5gx0Jh2CJTOgSqGOiq6tWjmhOtPqS8A6etkQj34zp__z8DOpR_EL_F5b_bQ-7PZT3rBZc6cLPUw9eXTVk9386iBWQNrdQNrQiJo-3HwobCo_Bjyq6EATOqUpiaWX89Ga_QiqVNef76MG5Q7K3nI6u0As8wBtdDDPwvHY3mLX7Ly_Xyh-qzxmEP4IA643VJnGwCRhb1BUlXfWRUOgPzIcS-eTZaSFBe0B-5VK46FJnmKpPZyNfFiDNfTbyVqPL9SaR883PHe1CrnhJcclrB_5TDrCLqWlwCqPHm84LXo6uP8J7XBpznq-4ferrOIXoq0NxDS6Xa5jK4q8DsaZjEolTPsSx0La1vJV2lIIJg6GhrEh_HYdPFhwTnJhKa3bR2UF5FWYQ0YGloRP7WsA3XrYauc9agWO2EVCs1EJMbSYZfBmnEuMA1BNPzvWKye_QbcVQTvjmAFn2Nb2GAsL7TliEmEaahfU759iq26J5L9w7_UBYMnhhMFJ6TxGO7HTq2xFqvkDjNsrw62MbjfCZN6uJBPzf0_rhhUUHYvBP-_34ztWoTiIDeO7t5997UNoHgfO4aDy19zQxeUntm8P41tOiZw6ubB1-AeWMMQPoHZ0sjE9FmLq9tzjZ8oy4tIpUVTMuCdIt4WahBj83CD5_IRYpur_gPZ8eMuVjiMn1tt-0IY8j5Ylx_01v4kW8GyuiN5_c7mxAwwr-i8dgB636Xw_-wIhT8hwt7VGV6SgrB_lLj_WbVnvmHDAMSp4V-7AKUXLFIOBKTIuJXvN-9fb0mR4fGlSfL_PZwPv5AnQ1yt7zVnPP-Fu5HhpRy0">
+<img src="http://www.plantuml.com/plantuml/png/nLRRRkCs47tNL_2jRO0OHOkYm29OxANU8WzrWoJx0HDn8hCbEUnmbAqHvzzhYbX2yYfRnYhG5niwSpyylBo90YoziqrimQBwVlNpJqtpZO87Cbe5fZkBBgfFHhOAV6THgvRfKrJtYDB4FuqFmE2KDHvb5r0HovQQfhKGe_eOaTLZezIPCbgzKiOBTWVeug93Zmo2-lNhWtaRCIRVo-GKXOtl3gW7X-Fli2MFczxT8O_XCuKEZ1r3OiJYAuM-ToaxERp6pf2_73NnxOy_VAUkrn_Mr-lD-_MD2lsTDUqgEyQLqKFgbZ5r-LOEWM8SHW4N1aiVz8pbwVFeEK_Dy6T7WvOKDoq5F2M3KXfZooQ88L_GHUDS8JiJO_L8VKIkO3ijUk6QJroZc7Yg21lu_2zMzgyUewoPYMCD6nJIXo4_Ng6UpVZJeMnfedxEPTwHtatX6CX7V0v_JneBld1GidFo-vfaRocOjZwcbCbnLSfYiZMBdRAMjPQK_bB_MypGnNA1_4fWwpXGAWf87yT8IdZFHsucVc1oDmvOuXPHRWMkB2H1tH5P1B-ius7mhxNT7MmLfASK_nVf35wmKg_BAprRv_XwElbKw_90DQndpnGu8wY4iFm2WaU3ejSpw59YaWHgDl890qwfgOrBKQTeU1aN6_AvwrCky6MbtxPY7epihZ4GIqrvnaWzjyCRR787WTOcNLnWDoGuKLKM-k_tLy1YMXCIqvEzeD6Q1-JTRr_SRBelrw76rZYm4pMcuOfi9n2KoGu53NgvtGMSkJEFteSpUo8mTGmknISSc65taQs9407kKAuez7ReTCw74IBv6KEOCd9apiVYh44WzJDZQSaB_YsJ0Q336ydi_179d_peiX3bOnRKkzqBWvThTAIUkdq24t5Nz3lT3Rdn5vqVESIN_LmHjodE2uXAHAlz_fmULRuPCl94v-Vxnz5xl1cUjJDuZfepa2t-m-tR3B_gQJz0wG1iSl_5hHpjJVhv0iqfLokL_aSfvw5Sj6GhoBXmchoK-3pA11iJD5taPlgPVUOabuib-xovh2C-x_C6lUwT_GS0">
 
 UML Source
 ----------
@@ -139,7 +139,7 @@ class ActivityReport {
   duration : decimal
   endDate : date
   startDate : date
-  participantType : string
+  activityRecipientType : string
   requester : string
   * status : string
   programTypes : array<string>
@@ -148,6 +148,7 @@ class ActivityReport {
   participants : array<string>
   topics : array<string>
   ttaType : array<string>
+  context : string
   pageState : json
   * userId : integer(32) REFERENCES public.Users.id
   * lastUpdatedById : integer(32) REFERENCES public.Users.id
@@ -189,7 +190,7 @@ NonGrantee ||-{ ActivityParticipant
 Instructions
 ------------
 
-1. [Edit this diagram with plantuml.com](http://www.plantuml.com/plantuml/umla/nLRRRkCs47tNL_2jxG8nYXP5WKMms4kzHHxg6dRo0RGuaTcI77OuIc34-VUQ8YABiP8oLe5ziQ4pzyF3oyV0ahYrfWgrD21-dFtwIrLz9-GTQYKyuSQ03U9UyrP8rnXGeYQy3-8MWAlmjtPUahJ2Q0Uyyo2GU8jLLHiPWhW9GEAX4kATq4gy5zenD0Veyh811oGPr8SF1_CsG8Y-Lz4fC6dN750dBGo__HOTB5gx0Jh2CJTOgSqGOiq6tWjmhOtPqS8A6etkQj34zp__z8DOpR_EL_F5b_bQ-7PZT3rBZc6cLPUw9eXTVk9386iBWQNrdQNrQiJo-3HwobCo_Bjyq6EATOqUpiaWX89Ga_QiqVNef76MG5Q7K3nI6u0As8wBtdDDPwvHY3mLX7Ly_Xyh-qzxmEP4IA643VJnGwCRhb1BUlXfWRUOgPzIcS-eTZaSFBe0B-5VK46FJnmKpPZyNfFiDNfTbyVqPL9SaR883PHe1CrnhJcclrB_5TDrCLqWlwCqPHm84LXo6uP8J7XBpznq-4ferrOIXoq0NxDS6Xa5jK4q8DsaZjEolTPsSx0La1vJV2lIIJg6GhrEh_HYdPFhwTnJhKa3bR2UF5FWYQ0YGloRP7WsA3XrYauc9agWO2EVCs1EJMbSYZfBmnEuMA1BNPzvWKye_QbcVQTvjmAFn2Nb2GAsL7TliEmEaahfU759iq26J5L9w7_UBYMnhhMFJ6TxGO7HTq2xFqvkDjNsrw62MbjfCZN6uJBPzf0_rhhUUHYvBP-_34ztWoTiIDeO7t5997UNoHgfO4aDy19zQxeUntm8P41tOiZw6ubB1-AeWMMQPoHZ0sjE9FmLq9tzjZ8oy4tIpUVTMuCdIt4WahBj83CD5_IRYpur_gPZ8eMuVjiMn1tt-0IY8j5Ylx_01v4kW8GyuiN5_c7mxAwwr-i8dgB636Xw_-wIhT8hwt7VGV6SgrB_lLj_WbVnvmHDAMSp4V-7AKUXLFIOBKTIuJXvN-9fb0mR4fGlSfL_PZwPv5AnQ1yt7zVnPP-Fu5HhpRy0)
+1. [Edit this diagram with plantuml.com](http://www.plantuml.com/plantuml/umla/nLRRRkCs47tNL_2jRO0OHOkYm29OxANU8WzrWoJx0HDn8hCbEUnmbAqHvzzhYbX2yYfRnYhG5niwSpyylBo90YoziqrimQBwVlNpJqtpZO87Cbe5fZkBBgfFHhOAV6THgvRfKrJtYDB4FuqFmE2KDHvb5r0HovQQfhKGe_eOaTLZezIPCbgzKiOBTWVeug93Zmo2-lNhWtaRCIRVo-GKXOtl3gW7X-Fli2MFczxT8O_XCuKEZ1r3OiJYAuM-ToaxERp6pf2_73NnxOy_VAUkrn_Mr-lD-_MD2lsTDUqgEyQLqKFgbZ5r-LOEWM8SHW4N1aiVz8pbwVFeEK_Dy6T7WvOKDoq5F2M3KXfZooQ88L_GHUDS8JiJO_L8VKIkO3ijUk6QJroZc7Yg21lu_2zMzgyUewoPYMCD6nJIXo4_Ng6UpVZJeMnfedxEPTwHtatX6CX7V0v_JneBld1GidFo-vfaRocOjZwcbCbnLSfYiZMBdRAMjPQK_bB_MypGnNA1_4fWwpXGAWf87yT8IdZFHsucVc1oDmvOuXPHRWMkB2H1tH5P1B-ius7mhxNT7MmLfASK_nVf35wmKg_BAprRv_XwElbKw_90DQndpnGu8wY4iFm2WaU3ejSpw59YaWHgDl890qwfgOrBKQTeU1aN6_AvwrCky6MbtxPY7epihZ4GIqrvnaWzjyCRR787WTOcNLnWDoGuKLKM-k_tLy1YMXCIqvEzeD6Q1-JTRr_SRBelrw76rZYm4pMcuOfi9n2KoGu53NgvtGMSkJEFteSpUo8mTGmknISSc65taQs9407kKAuez7ReTCw74IBv6KEOCd9apiVYh44WzJDZQSaB_YsJ0Q336ydi_179d_peiX3bOnRKkzqBWvThTAIUkdq24t5Nz3lT3Rdn5vqVESIN_LmHjodE2uXAHAlz_fmULRuPCl94v-Vxnz5xl1cUjJDuZfepa2t-m-tR3B_gQJz0wG1iSl_5hHpjJVhv0iqfLokL_aSfvw5Sj6GhoBXmchoK-3pA11iJD5taPlgPVUOabuib-xovh2C-x_C6lUwT_GS0)
 2. Copy and paste the final UML into the UML Source section
 3. Update the img src and edit link target to the current values
 

docs/openapi/index.yaml

@@ -72,6 +72,9 @@ components:
           description: Why the activity was conducted
           items:
             type: string
+        context:
+          type: string
+          description: Additional context an author can provide for a report
         participants:
           type: array
           description: The roles of the people attending the TTA

frontend/src/pages/ActivityReport/Pages/activitySummary.js

@@ -9,12 +9,13 @@ import {
 import DatePicker from '../../../components/DatePicker';
 import MultiSelect from '../../../components/MultiSelect';
 import {
-  otherParticipants,
+  nonGranteeParticipants,
+  granteeParticipants,
   reasons,
   otherUsers,
   programTypes,
   targetPopulations,
-} from './constants';
+} from '../constants';
 
 const ActivitySummary = ({
   register,
@@ -47,10 +48,13 @@ const ActivitySummary = ({
   const selectedRecipients = nonGranteeSelected ? nonGrantees : grants;
   const previousActivityRecipientType = useRef(activityRecipientType);
   const recipientLabel = nonGranteeSelected ? 'Non-grantee name(s)' : 'Grantee name(s)';
+  const participantsLabel = nonGranteeSelected ? 'Non-grantee participants' : 'Grantee participants';
+  const participants = nonGranteeSelected ? nonGranteeParticipants : granteeParticipants;
 
   useEffect(() => {
     if (previousActivityRecipientType.current !== activityRecipientType) {
-      setValue('activityParticipants', []);
+      setValue('activityRecipients', []);
+      setValue('participants', []);
       previousActivityRecipientType.current = activityRecipientType;
     }
   }, [activityRecipientType, setValue]);
@@ -240,10 +244,10 @@ const ActivitySummary = ({
         <div className="smart-hub--form-section">
           <MultiSelect
             name="participants"
-            label="Grantee participant(s) involved"
+            label={participantsLabel}
             control={control}
             options={
-              otherParticipants.map((participant) => ({ value: participant, label: participant }))
+              participants.map((participant) => ({ value: participant, label: participant }))
             }
           />
         </div>

frontend/src/pages/ActivityReport/Pages/goalsObjectives.js

@@ -1,27 +1,45 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { Helmet } from 'react-helmet';
 
-const GoalsObjectives = () => (
+import {
+  Fieldset, Label, Textarea,
+} from '@trussworks/react-uswds';
+
+const GoalsObjectives = ({ register }) => (
   <>
     <Helmet>
       <title>Goals and objectives</title>
     </Helmet>
-    <div>
-      Goals and objectives
-    </div>
+    <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Context">
+      <Label htmlFor="context">OPTIONAL: Provide background or context for this activity</Label>
+      <Textarea id="context" name="context" inputRef={register()} />
+    </Fieldset>
   </>
 );
 
-GoalsObjectives.propTypes = {};
-const sections = [];
+GoalsObjectives.propTypes = {
+  register: PropTypes.func.isRequired,
+};
+
+const sections = [
+  {
+    title: 'Context',
+    anchor: 'context',
+    items: [
+      { label: 'Context', name: 'context' },
+    ],
+  },
+];
 
 export default {
   position: 3,
   label: 'Goals and objectives',
   path: 'goals-objectives',
   review: false,
   sections,
-  render: () => (
-    <GoalsObjectives />
-  ),
+  render: (hookForm) => {
+    const { register } = hookForm;
+    return <GoalsObjectives register={register} />;
+  },
 };

frontend/src/pages/ActivityReport/Pages/topicsResources.js

@@ -10,7 +10,7 @@ import {
 
 import MultiSelect from '../../../components/MultiSelect';
 import FileUploader from '../../../components/FileUploader';
-import { topics } from './constants';
+import { topics } from '../constants';
 
 const TopicsResources = ({
   register,

frontend/src/pages/ActivityReport/constants.js

@@ -0,0 +1,74 @@
+export const reasons = [
+  'Below Competitive Threshold (CLASS)',
+  'Below Quality Threshold (CLASS)',
+  'Change in Scope',
+  'Full Enrollment',
+  'New Grantee',
+  'New Director or Management',
+  'New Program Option',
+  'New Staff / Turnover',
+  'Ongoing Quality Improvement',
+  'Planning/Coordination (also TTA Plan Agreement)',
+  'School Readiness Goals',
+  'Monitoring | Area of Concern',
+  'Monitoring | Noncompliance',
+  'Monitoring | Deficiency',
+];
+
+export const granteeParticipants = [
+  'CEO / CFO / Executive',
+  'Center Director / Site Director',
+  'Coach',
+  'Direct Service: Other',
+  'Family Service Worker / Case Manager',
+  'Fiscal Manager/Team',
+  'Governing Body / Tribal Council / Policy Council',
+  'Home Visitor',
+  'Manager / Coordinator / Specialist',
+  'Parent / Guardian',
+  'Program Director (HS / EHS)',
+  'Program Support / Administrative Assistant',
+  'Teacher / Infant-Toddler Caregiver',
+  'Volunteer',
+];
+
+export const nonGranteeParticipants = [
+  'Local/State Agency(ies)',
+  'HSCO',
+  'OCC Regional Office',
+  'OHS Regional Office',
+  'Regional Head Start Association',
+  'Regional TTA Team / Specialists',
+  'State Early Learning System',
+  'State Head Start Association',
+  'Other',
+];
+
+export const targetPopulations = [
+  'Affected by Child Welfare Involvement',
+  'Affected by Disaster',
+  'Affected by Substance Use',
+  'Children with Disabilities',
+  'Children Experiencing Homelessness',
+  'Dual-Language Learners',
+  'Pregnant Women',
+];
+
+export const otherUsers = [
+  'User 1',
+  'User 2',
+  'User 3',
+];
+
+export const programTypes = [
+  'program type 1',
+  'program type 2',
+  'program type 3',
+  'program type 4',
+  'program type 5',
+];
+
+export const topics = [
+  'first',
+  'second',
+];

frontend/src/pages/ActivityReport/index.js

@@ -22,6 +22,7 @@ const defaultValues = {
   deliveryMethod: [],
   activityType: [],
   attachments: [],
+  context: '',
   duration: '',
   endDate: null,
   grantees: [],

src/migrations/20210120153248-add-context-field.js

@@ -0,0 +1,15 @@
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    queryInterface.addColumn(
+      'ActivityReports',
+      'context',
+      {
+        type: Sequelize.DataTypes.STRING,
+      },
+    );
+  },
+
+  down: async (queryInterface) => {
+    queryInterface.removeColumn('ActivityReports', 'context');
+  },
+};

src/models/activityReport.js

@@ -69,6 +69,9 @@ export default (sequelize, DataTypes) => {
     topics: {
       type: DataTypes.ARRAY(DataTypes.STRING),
     },
+    context: {
+      type: DataTypes.STRING,
+    },
     pageState: {
       type: DataTypes.JSON,
     },