AB#777: Add Sub-Tasks field to efforts

NCI-Agency · Mar 6, 2023 · b2fb83a · b2fb83a
1 parent 833b488
commit b2fb83a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 7 deletions.
diff --git a/anet-dictionary.yml b/anet-dictionary.yml
@@ -196,11 +196,9 @@ fields:
               label: Instant assessment Question 3
 
     parentTask:
-      label: Parent task
+      label: Parent objective / effort
       placeholder: Start typing to search for a higher level task
-    childTask:
-      label: Child task
-      placeholder: Start typing to search for a lower level task
+    childrenTasks: Sub efforts
     taskedOrganizations:
       label: Tasked organizations
       placeholder: Search for an organization...

diff --git a/client/src/pages/tasks/Show.js b/client/src/pages/tasks/Show.js
@@ -31,6 +31,10 @@ import React, { useContext, useState } from "react"
 import { connect } from "react-redux"
 import { useLocation, useParams } from "react-router-dom"
 import Settings from "settings"
+import {
+  ListGroup,
+  ListGroupItem
+} from "react-bootstrap"
 import DictionaryField from "../../HOC/DictionaryField"
 
 const GQL_GET_TASK = gql`
@@ -55,6 +59,10 @@ const GQL_GET_TASK = gql`
         shortName
         longName
       }
+      childrenTasks {
+        uuid
+        shortName
+      }
       descendantTasks(query: { pageNum: 0, pageSize: 0 }) {
         uuid
         shortName
@@ -166,6 +174,7 @@ const TaskShow = ({ pageDispatchers }) => {
   const ShortNameField = DictionaryField(Field)
   const LongNameField = DictionaryField(Field)
   const TaskParentTask = DictionaryField(Field)
+  const TaskChildrenTasks = DictionaryField(Field)
   const PlannedCompletionField = DictionaryField(Field)
   const ProjectedCompletionField = DictionaryField(Field)
 
@@ -278,7 +287,7 @@ const TaskShow = ({ pageDispatchers }) => {
                       )
                     }
                   />
-                  {task.parentTask && task.parentTask.uuid && (
+                  {Settings.fields.task.parentTask && task.parentTask?.uuid && (
                     <TaskParentTask
                       dictProps={Settings.fields.task.parentTask}
                       name="parentTask"
@@ -293,6 +302,26 @@ const TaskShow = ({ pageDispatchers }) => {
                       }
                     />
                   )}
+                  {Settings.fields.task.childrenTasks && task.childrenTasks.length > 0 && (
+                    <TaskChildrenTasks
+                      dictProps={Settings.fields.task.childrenTasks}
+                      name="subEfforts"
+                      component={FieldHelper.ReadonlyField}
+                      humanValue={
+                        <ListGroup>
+                          {task.childrenTasks?.map(task => (
+                            <ListGroupItem key={task.uuid}>
+                              <LinkTo
+                                showIcon={false}
+                                modelType="Task"
+                                model={task}
+                              />
+                            </ListGroupItem>
+                          ))}
+                        </ListGroup>
+                      }
+                    />
+                  )}
                   {Settings.fields.task.plannedCompletion && (
                     <PlannedCompletionField
                       dictProps={Settings.fields.task.plannedCompletion}

diff --git a/src/main/resources/anet-schema.yml b/src/main/resources/anet-schema.yml
@@ -506,8 +506,10 @@ properties:
             "$ref": "#/$defs/inputField"
           parentTask:
             "$ref": "#/$defs/inputField"
-          childTask:
-            "$ref": "#/$defs/inputField"
+          childrenTasks:
+            type: string
+            title: The sub tasks for this field
+            description: Used in the UI where a sub tasks for task is shown.
           taskedOrganizations:
             "$ref": "#/$defs/inputField"
           responsiblePositions: