Final fixes (AOT-Technologies#1776)

* list-view fixes * final fixes
auslin-aot · Nov 24, 2023 · 7beda8e · 7beda8e
1 parent 98d1735
commit 7beda8e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/forms-flow-web/src/components/Application/historyTable.js b/forms-flow-web/src/components/Application/historyTable.js
@@ -17,7 +17,7 @@ const linkSubmision = (row, redirectUrl) => {
   const { formId, submissionId } = row;
   const url = getFormUrl(formId, submissionId, redirectUrl);
   return (
-    <div title={url} onClick={() => window.open(url, "_blank")}>
+    <div onClick={() => window.open(url, "_blank")}>
       <span className="btn btn-primary btn-sm form-btn">
         <span>
           <i className="fa fa-eye" aria-hidden="true"></i>&nbsp;

diff --git a/forms-flow-web/src/components/ServiceFlow/list/ServiceTaskListView.js b/forms-flow-web/src/components/ServiceFlow/list/ServiceTaskListView.js
@@ -11,7 +11,9 @@ import Loading from "../../../containers/Loading";
 import { useTranslation } from "react-i18next";
 import "./../ServiceFlow.scss";
 import TaskSearchBarListView from "./search/TaskSearchBarListView";
-
+import {
+  getFormattedDateAndTime,
+} from "../../../apiManager/services/formatterService";
 import Pagination from "react-js-pagination";
 import { push } from "connected-react-router";
 // import { MAX_RESULTS } from "../constants/taskConstants";
@@ -155,8 +157,9 @@ const ServiceTaskListView = React.memo(() => {
               {vissibleAttributes?.taskVisibleAttributes?.createdDate &&  <Col xs={2}>
                   <div className="col-12">
                     <h6>{t("Created Date")}</h6>
-
-                    <h6>
+                    <h6 title={
+                      task.created ? getFormattedDateAndTime(task.created) : ""
+                    }>
                       {moment(task.created).isSame(moment(), "day")
                         ? moment(task.created).fromNow() 
                         : task.created.split('T')[0]} 

diff --git a/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js b/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js
@@ -819,8 +819,8 @@ export default function CreateNewFilterDrawer({
             onClick={toggleModal}
             placeholder={
               taskAttributesCount === 0
-                ? "Select Elements"
-                : taskAttributesCount + " Task Attributes Selected"
+                ? t("Select Elements")
+                : taskAttributesCount + t(" Task Attributes Selected")
             }
           />
         </div>
@@ -858,7 +858,7 @@ export default function CreateNewFilterDrawer({
               }}
             >
               <Translation>
-                {(t) => t(`${selectedFilterData ? "Save" : "Create"} Filter`)}
+                {(t) => (`${selectedFilterData ? t("Save Filter") : t("Create Filter")} `)}
               </Translation>
             </button>
           </div>

diff --git a/forms-flow-web/src/components/ServiceFlow/list/sort/TaskAttributeComponent.js b/forms-flow-web/src/components/ServiceFlow/list/sort/TaskAttributeComponent.js
@@ -65,31 +65,31 @@ function TaskAttributeComponent({
             <Col xs={6}>
               <Form.Check
                 type="checkbox"
-                label="Application ID"
+                label={t("Application ID")}
                 name="applicationId"
                 checked={checkboxes.applicationId}
                 onChange={handleCheckboxChange}
                 className="m-2"
               />
               <Form.Check
                 type="checkbox"
-                label="Assignee"
+                label={t("Assignee")}
                 name="assignee"
                 checked={checkboxes.assignee}
                 onChange={handleCheckboxChange}
                 className="m-2"
               />
               <Form.Check
                 type="checkbox"
-                label="Task Title"
+                label={t("Task Title")}
                 name="taskTitle"
                 checked={checkboxes.taskTitle}
                 onChange={handleCheckboxChange}
                 className="m-2"
               />
               <Form.Check
                 type="checkbox"
-                label="Created Date"
+                label={t("Created Date")}
                 name="createdDate"
                 checked={checkboxes.createdDate}
                 onChange={handleCheckboxChange}
@@ -99,31 +99,31 @@ function TaskAttributeComponent({
             <Col xs={6}>
               <Form.Check
                 type="checkbox"
-                label="Due date"
+                label={t("Due Date")}
                 name="dueDate"
                 checked={checkboxes.dueDate}
                 onChange={handleCheckboxChange}
                 className="m-2"
               />
               <Form.Check
                 type="checkbox"
-                label="Follow-up date"
+                label={t("Follow up Date")}
                 name="followUp"
                 checked={checkboxes.followUp}
                 onChange={handleCheckboxChange}
                 className="m-2"
               />
               <Form.Check
                 type="checkbox"
-                label="Priority"
+                label={t("Priority")}
                 name="priority"
                 checked={checkboxes.priority}
                 onChange={handleCheckboxChange}
                 className="m-2"
               />
               <Form.Check
                 type="checkbox"
-                label="Groups"
+                label={t("Groups")}
                 name="groups"
                 checked={checkboxes.groups}
                 onChange={handleCheckboxChange}
@@ -160,7 +160,7 @@ function TaskAttributeComponent({
                     <Form.Label>{t("Name")}</Form.Label>
                     <Form.Control
                       type="text"
-                      placeholder="Enter name"
+                      placeholder={t("Enter name")}
                       value={input.name}
                       onChange={(e) =>
                         handleVariableInputChange(index, "name", e.target.value)
@@ -173,7 +173,7 @@ function TaskAttributeComponent({
                     <Form.Label>{t("Label")}</Form.Label>
                     <Form.Control
                       type="text"
-                      placeholder="Enter label"
+                      placeholder={t("Enter label")}
                       value={input.label}
                       onChange={(e) =>
                         handleVariableInputChange(