Skip to content

Commit

Permalink
add copy icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathan Keeys committed Sep 6, 2023
1 parent a6ac243 commit 3c48841
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 28 deletions.
Binary file added services/ui-src/src/assets/icons/icon_copy_blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added services/ui-src/src/assets/icons/icon_copy_gray.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added services/ui-src/src/assets/icons/icon_copy_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 20 additions & 28 deletions services/ui-src/src/components/modals/AddEditReportModal.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import { useContext, useState } from "react";
// components
import { Modal, ReportContext } from "components";
import { Text, Button } from "@chakra-ui/react";
import { Text, Button, Image } from "@chakra-ui/react";
// form
import wpFormJson from "forms/addEditWpReport/addEditWpReport.json";
import sarFormJson from "forms/addEditSarReport/addEditSarReport.json";
// utils
import { AnyObject, FormJson, ReportStatus } from "types";
import { States } from "../../constants";
import {
calculateDueDate,
convertDateEtToUtc,
convertDateUtcToEt,
useStore,
} from "utils";
import { useStore } from "utils";
// assets
import muteCopyIcon from "assets/icons/icon_copy_white.png";
import activeCopyIcon from "assets/icons/icon_copy_blue.png";

export const AddEditReportModal = ({
activeState,
Expand All @@ -32,31 +30,17 @@ export const AddEditReportModal = ({
const modalFormJson = modalFormJsonMap[reportType]!;
const form: FormJson = modalFormJson;

// WP report payload
const prepareWpPayload = (formData: any) => {
const programName = formData["fields"][0]["programName"];

const dueDate = calculateDueDate(formData["reportingPeriodEndDate"]);
const combinedData = formData["combinedData"] || false;
const reportingPeriodStartDate = convertDateEtToUtc(
formData["reportingPeriodStartDate"]
);
const reportingPeriodEndDate = convertDateEtToUtc(
formData["reportingPeriodEndDate"]
);
const previousWPReport = false;

// WP report payload
const prepareWpPayload = () => {
const programName = "programName";
return {
metadata: {
programName,
reportingPeriodStartDate,
reportingPeriodEndDate,
dueDate,
combinedData,
lastAlteredBy: full_name,
},
fieldData: {
reportingPeriodStartDate: convertDateUtcToEt(reportingPeriodStartDate),
reportingPeriodEndDate: convertDateUtcToEt(reportingPeriodEndDate),
programName,
},
};
Expand Down Expand Up @@ -86,9 +70,7 @@ export const AddEditReportModal = ({
submitButton?.setAttribute("disabled", "true");

const dataToWrite =
reportType === "WP"
? prepareWpPayload(formData)
: prepareSarPayload(formData);
reportType === "WP" ? prepareWpPayload() : prepareSarPayload(formData);

await createReport(reportType, activeState, {
...dataToWrite,
Expand Down Expand Up @@ -140,6 +122,12 @@ export const AddEditReportModal = ({
</Text>
<Button sx={sx.stayActive} type="submit">
Copy from previous
<Image
sx={sx.muteCopyIcon}
src={previousWPReport ? activeCopyIcon : muteCopyIcon}
alt="Copy Icon"
className="copyIcon"
/>
</Button>
<Button
sx={sx.close}
Expand Down Expand Up @@ -172,6 +160,10 @@ const sx = {
marginX: "4rem",
padding: "0",
},
muteCopyIcon: {
width: "20px",
marginLeft: "10px",
},
modalHeader: {
padding: "2rem 2rem 0 2rem",
},
Expand Down

0 comments on commit 3c48841

Please sign in to comment.