Added filtering to My Projet Page

hackforla · Dec 2, 2023 · 422dbe6 · 422dbe6
2 parents dceebae + 479279a
commit 422dbe6
Show file tree

Hide file tree

Showing 11 changed files with 618 additions and 330 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -44,6 +44,7 @@
     "react-aria-modal": "^5.0.0",
     "react-beautiful-dnd": "^13.1.1",
     "react-csv": "^2.2.2",
+    "react-datepicker": "^4.24.0",
     "react-dom": "^18.1.0",
     "react-gtm-module": "^2.0.11",
     "react-input-mask": "^2.0.4",

diff --git a/client/src/components/Layout/ContentContainerNoSidebar.js b/client/src/components/Layout/ContentContainerNoSidebar.js
@@ -10,7 +10,7 @@ const useStyles = createUseStyles({
     alignItems: "center",
     minHeight: "calc(100vh - 103px - 48px)",
     margin: "auto",
-    width: "85%"
+    width: "100%"
   }
 });
 

diff --git a/client/src/components/PdfPrint/PdfPrint.js b/client/src/components/PdfPrint/PdfPrint.js
@@ -18,11 +18,9 @@ import logo from "../../images/ladot.png";
 
 const useStyles = createUseStyles({
   Pdf: {
-    display: "flex",
-    flexDirection: "column",
-    flex: "1 1 auto",
-    minWidth: "85vw",
-    margin: "50px auto"
+    margin: "1em !important",
+    padding: "0 !important",
+    overflow: "hidden"
   },
   rule: {
     display: "flex",
@@ -148,7 +146,7 @@ export const PdfPrint = forwardRef((props, ref) => {
     );
 
   return (
-    <div ref={ref} className={clsx("tdm-wizard-review-page", classes.Pdf)}>
+    <div ref={ref} className={classes.Pdf}>
       <h1>
         <img
           className={classes.logo}

diff --git a/client/src/components/ProjectWizard/WizardFooter.js b/client/src/components/ProjectWizard/WizardFooter.js
@@ -44,6 +44,10 @@ const WizardFooter = ({
 }) => {
   const classes = useStyles();
   const componentRef = useRef();
+  const projectNameRule = rules && rules.find(r => r.code === "PROJECT_NAME");
+  const projectName = projectNameRule
+    ? projectNameRule.value
+    : "TDM Calculation Summary";
 
   return (
     <>
@@ -83,6 +87,9 @@ const WizardFooter = ({
                 />
               )}
               content={() => componentRef.current}
+              documentTitle={projectName}
+              bodyClass="printContainer"
+              pageStyle=".printContainer {overflow: hidden;}"
             />
             <div style={{ display: "none" }}>
               <PdfPrint