- Progress Commit

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -8,7 +8,7 @@ import Icon, {
   SyncOutlined,
   ToolFilled
 } from "@ant-design/icons";
-import {Button, Divider, Form, notification, Space, Tabs} from "antd";
+import {Badge, Button, Divider, Form, notification, Space, Tabs} from "antd";
 import {PageHeader} from "@ant-design/pro-layout";
 
 import Axios from "axios";
@@ -55,7 +55,7 @@ import ScheduleJobModalContainer
 import {insertAuditTrail} from "../../redux/application/application.actions";
 import {selectJobReadOnly} from "../../redux/application/application.selectors";
 import {setModalContext} from "../../redux/modals/modals.actions";
-import {selectBodyshop} from "../../redux/user/user.selectors";
+import {selectBodyshop, selectCurrentUser} from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import _ from "lodash";
@@ -69,7 +69,8 @@ import {QUERY_JOB_TASKS_PAGINATED} from "../../graphql/tasks.queries.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly
+  jobRO: selectJobReadOnly,
+  currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
   setPrintCenterContext: (context) => dispatch(setModalContext({
@@ -90,6 +91,7 @@ export function JobsDetailPage({
                                  job,
                                  mutationUpdateJob,
                                  handleSubmit,
+                                  currentUser,
                                  insertAuditTrail,
                                  refetch
                                }) {
@@ -391,8 +393,10 @@ export function JobsDetailPage({
             {
               key: 'tasks',
               icon: <FaTasks/>,
-              label: t("menus.jobsdetail.tasks"),
-              children: <TaskListContainer bodyshop={bodyshop} relationshipType={'jobid'} relationshipId={job.id} query={QUERY_JOB_TASKS_PAGINATED} titleTranslation='tasks.titles.job_tasks'/>
+              label: <Space direction='horizontal'>
+                {t("jobs.labels.tasks")}{job.tasks_aggregate.aggregate.count > 0 && <Badge count={job.tasks_aggregate.aggregate.count} />}
+              </Space>,
+              children: <TaskListContainer currentUser={currentUser} bodyshop={bodyshop} relationshipType={'jobid'} relationshipId={job.id} query={QUERY_JOB_TASKS_PAGINATED} titleTranslation='tasks.titles.job_tasks'/>
             },
           ]}
                 />

client/src/pages/tasks/tasks.page.component.jsx

@@ -6,7 +6,7 @@ export default function TasksPageComponent({bodyshop, currentUser}) {
 
   return (
     <div>
-      <TaskListContainer  relationshipId={currentUser.email} relationshipType={'user'} query={QUERY_MY_TASKS_PAGINATED} bodyshop={bodyshop} titleTranslation={'tasks.titles.my_tasks'}
+      <TaskListContainer  onlyMine={true} relationshipId={currentUser.email} relationshipType={'user'} query={QUERY_MY_TASKS_PAGINATED} bodyshop={bodyshop} titleTranslation={'tasks.titles.my_tasks'}
                          currentUser={currentUser}/>
     </div>
   );