Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#1172] Add monitoring response #1173

Merged
merged 4 commits into from
Feb 14, 2024
Merged

[#1172] Add monitoring response #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8339e7
[#1172] Add monitoring response
navins94 Feb 13, 2024
12e1a73
[#1172] Update test snapshot
navins94 Feb 13, 2024
73c9c84
[#1173] Update approval detail last response
navins94 Feb 14, 2024
afa1d88
Merge branch 'develop' into feature/1172-showing-monitoring-data-in-a…
ifirmawan Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"files": ["**/*.test.js", "**/*.test.jsx"],
"env": {
"jest": true
}
}
],
"rules": {
Expand Down
20 changes: 20 additions & 0 deletions frontend/src/components/EditableCell.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ const EditableCell = ({
readonly = false,
isPublic = false,
resetButton,
lastValue = false,
}) => {
const [editing, setEditing] = useState(false);
const [locationName, setLocationName] = useState(null);
const [value, setValue] = useState(null);
const [oldValue, setOldValue] = useState(null);

useEffect(() => {
if (
Expand All @@ -34,11 +36,17 @@ const EditableCell = ({
record.newValue || record.newValue === 0
? record.newValue
: record.value;

setValue(
record.type === "date"
? moment(newValue).format("YYYY-MM-DD")
: newValue
);
setOldValue(
record.type === "date"
? moment(record.lastValue).format("YYYY-MM-DD")
: record.lastValue
);
}
}, [record]);

Expand Down Expand Up @@ -82,6 +90,16 @@ const EditableCell = ({
: value;
};

const getLastAnswerValue = () => {
return record.type === "multiple_option"
? oldValue?.join(", ")
: record.type === "option"
? oldValue
? oldValue[0]
: "-"
: oldValue;
};

const renderAnswerInput = () => {
return record.type === "option" ? (
<Select
Expand Down Expand Up @@ -186,6 +204,8 @@ const EditableCell = ({
locationName
) : record.type === "photo" && value ? (
<Image src={value} width={100} />
) : lastValue ? (
getLastAnswerValue()
) : (
getAnswerValue()
)}
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/lib/__test__/__snapshots__/ui-text.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ Object {
"invalidInviteDesc": "Lorem, ipsum dolor sit amet consectetur adipisicing elit. Autem provident voluptatum cum numquam, quidem vitae, qui quam beatae exercitationem ullam perferendis! Nobis in aut fuga voluptate harum, tempore distinctio optio.",
"invalidInviteTitle": "Invalid Invite Code",
"lastLoginLabel": "Last login",
"lastResponseCol": "Last Response",
"latestUpdateText": "Latest Updates",
"learnMoreButton": "Learn more",
"levelField": "Level",
Expand Down Expand Up @@ -503,6 +504,7 @@ Object {
"printBtn": "Print",
"profileDes": "This page shows your current user setup. It also shows the most important activities for your current user setup",
"profileLabel": "Profile",
"questionCol": "Question",
"questionnaireText": "Questionnaire",
"questionnairesLabel": "Questionnaires",
"realTime": "Real Time Management Information System",
Expand All @@ -514,6 +516,7 @@ Object {
Your password must include:
</React.Fragment>,
"resetText": "Reset",
"responseCol": "Response",
"roleLabel": "Role",
"saveButton": "Save",
"saveEditButton": "Save Edits",
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/lib/ui-text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,9 @@ const uiText = {
`The selected administration doesn't have ${entity} entities`,
errorEntityNotExists: (entity) =>
`Unfortunately, ${entity} entities are not yet available. Please get in touch with Admin to add it`,
questionCol: "Question",
responseCol: "Response",
lastResponseCol: "Last Response",
},

de: {},
Expand Down
40 changes: 37 additions & 3 deletions frontend/src/pages/approvals/ApprovalDetail.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import {
DownCircleOutlined,
LoadingOutlined,
HistoryOutlined,
FileSyncOutlined,
FileTextOutlined,
} from "@ant-design/icons";
import { api, store, config, uiText } from "../../lib";
import { EditableCell } from "../../components";
Expand All @@ -40,6 +42,16 @@ const columnsRawData = [
title: "Name",
dataIndex: "name",
key: "name",
render: (name, row) => {
return (
<div>
{name}
<span className="monitoring-icon">
{row.is_monitoring ? <FileSyncOutlined /> : <FileTextOutlined />}
</span>
</div>
);
},
},
{
title: "Administration",
Expand Down Expand Up @@ -362,9 +374,15 @@ const ApprovalDetail = ({
const findValue = res.data.find(
(d) => d.question === q.id
)?.value;
const findOldValue = res.data.find(
(d) => d.question === q.id
)?.last_value;
return {
...q,
value: findValue || findValue === 0 ? findValue : null,
lastValue:
findOldValue || findOldValue === 0 ? findOldValue : null,

history:
res.data.find((d) => d.question === q.id)?.history || false,
};
Expand Down Expand Up @@ -478,12 +496,12 @@ const ApprovalDetail = ({
rowKey="id"
columns={[
{
title: "Question",
title: text?.questionCol,
dataIndex: "name",
width: "50%",
},
{
title: "Response",
title: text?.responseCol,
render: (row) => (
<EditableCell
record={row}
Expand All @@ -495,7 +513,23 @@ const ApprovalDetail = ({
resetButton={resetButton}
/>
),
width: "50%",
width: "25%",
},
{
title: text?.lastResponseCol,
render: (row) => (
<EditableCell
record={row}
lastValue={true}
parentId={record.id}
updateCell={updateCell}
resetCell={resetCell}
disabled={true}
readonly={true}
resetButton={resetButton}
/>
),
width: "25%",
},
Table.EXPAND_COLUMN,
]}
Expand Down
13 changes: 13 additions & 0 deletions frontend/src/pages/approvals/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,19 @@
}
}

.monitoring-icon {
margin-left: 10px;
span {
width: 20px;
height: 20px;
}
svg {
width: 100%;
height: 100%;
fill: black;
}
}

.ant-table {
tr.row-edited td {
background-color: #fefebe;
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/pages/submissions/BatchDetail.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,14 @@ const BatchDetail = ({
const findValue = res.data.find(
(d) => d.question === q.id
)?.value;
const findOldValue = res.data.find(
(d) => d.question === q.id
)?.last_value;
return {
...q,
value: findValue || findValue === 0 ? findValue : null,
lastValue:
findOldValue || findOldValue === 0 ? findOldValue : null,
history:
res.data.find((d) => d.question === q.id)?.history ||
false,
Expand Down
20 changes: 18 additions & 2 deletions frontend/src/pages/submissions/SubmissionEditing.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const SubmissionEditing = ({
rowKey="id"
columns={[
{
title: text?.QuestionCol,
title: text?.questionCol,
dataIndex: "name",
width: "50%",
},
Expand All @@ -77,7 +77,23 @@ const SubmissionEditing = ({
resetButton={resetButton}
/>
),
width: "50%",
width: "25%",
},
{
title: text?.lastResponseCol,
render: (row) => (
<EditableCell
record={row}
lastValue={true}
parentId={expanded.id}
updateCell={updateCell}
resetCell={resetCell}
disabled={true}
readonly={true}
resetButton={resetButton}
/>
),
width: "25%",
},
Table.EXPAND_COLUMN,
]}
Expand Down
39 changes: 36 additions & 3 deletions frontend/src/pages/submissions/UploadDetail.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
DownCircleOutlined,
LoadingOutlined,
HistoryOutlined,
FileTextOutlined,
FileSyncOutlined,
} from "@ant-design/icons";
import { api, store, uiText } from "../../lib";
import { EditableCell } from "../../components";
Expand All @@ -28,6 +30,16 @@ const columnsRawData = [
title: "Name",
dataIndex: "name",
key: "name",
render: (name, row) => {
return (
<div>
{name}
<span className="monitoring-icon">
{row.is_monitoring ? <FileSyncOutlined /> : <FileTextOutlined />}
</span>
</div>
);
},
},
{
title: "Administration",
Expand Down Expand Up @@ -301,9 +313,14 @@ const UploadDetail = ({ record, setReload }) => {
const findValue = res.data.find(
(d) => d.question === q.id
)?.value;
const findOldValue = res.data.find(
(d) => d.question === q.id
)?.last_value;
return {
...q,
value: findValue || findValue === 0 ? findValue : null,
lastValue:
findOldValue || findOldValue === 0 ? findOldValue : null,
history:
res.data.find((d) => d.question === q.id)?.history || false,
};
Expand Down Expand Up @@ -410,12 +427,12 @@ const UploadDetail = ({ record, setReload }) => {
rowKey="id"
columns={[
{
title: "Question",
title: text?.questionCol,
dataIndex: "name",
width: "50%",
},
{
title: "Response",
title: text?.responseCol,
render: (row) => (
<EditableCell
record={row}
Expand All @@ -427,7 +444,23 @@ const UploadDetail = ({ record, setReload }) => {
resetButton={resetButton}
/>
),
width: "50%",
width: "25%",
},
{
title: text?.lastResponseCol,
render: (row) => (
<EditableCell
record={row}
lastValue={true}
parentId={expanded.id}
updateCell={updateCell}
resetCell={resetCell}
disabled={true}
readonly={true}
resetButton={resetButton}
/>
),
width: "25%",
},
Table.EXPAND_COLUMN,
]}
Expand Down
13 changes: 13 additions & 0 deletions frontend/src/pages/submissions/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,19 @@
}
}

.monitoring-icon {
margin-left: 10px;
span {
width: 20px;
height: 20px;
}
svg {
width: 100%;
height: 100%;
fill: black;
}
}

.ant-table {
tr.row-edited td {
background-color: #fefebe;
Expand Down