Web API Implementation for Submitting Projects

client/src/components/Button/SubmitButton.js

@@ -0,0 +1,32 @@
+import React from "react";
+import PropTypes from "prop-types";
+import Button from "../Button/Button";
+
+const SubmitButton = ({ id, onClick, isDisabled, isDisplayed, color }) => {
+  return (
+    <>
+      <Button
+        type="input"
+        color={color}
+        onClick={onClick}
+        id={id}
+        data-testid={id}
+        disabled={isDisabled}
+        isDisplayed={isDisplayed}
+      >
+        SUBMIT
+      </Button>
+    </>
+  );
+};
+
+SubmitButton.propTypes = {
+  children: PropTypes.object,
+  onClick: PropTypes.func.isRequired,
+  id: PropTypes.string.isRequired,
+  color: PropTypes.string,
+  isDisabled: PropTypes.bool,
+  isDisplayed: PropTypes.bool.isRequired
+};
+
+export default SubmitButton;

client/src/components/ProjectWizard/TdmCalculationWizard.js

@@ -200,6 +200,13 @@ const TdmCalculationWizard = props => {
     return false;
   };
 
+  const setDisplaySubmitButton = () => {
+    if (page === 5) {
+      return true;
+    }
+    return false;
+  };
+
   const handleValidate = () => {
     const { page } = params;
     const validations = {
@@ -329,6 +336,7 @@ const TdmCalculationWizard = props => {
           setDisabledSaveButton={setDisabledSaveButton}
           setDisplaySaveButton={setDisplaySaveButton}
           setDisplayPrintButton={setDisplayPrintButton}
+          setDisplaySubmitButton={setDisplaySubmitButton}
           onSave={onSave}
           project={project}
           // dateModified={dateModified}

client/src/components/ProjectWizard/WizardFooter.js

@@ -2,6 +2,7 @@ import React, { useRef, useContext } from "react";
 import PropTypes from "prop-types";
 import NavButton from "../Button/NavButton";
 import SaveButton from "../Button/SaveButton";
+import SubmitButton from "../Button/SubmitButton";
 import { createUseStyles } from "react-jss";
 import PrintButton from "../Button/PrintButton";
 import ReactToPrint from "react-to-print";
@@ -48,6 +49,7 @@ const WizardFooter = ({
   setDisabledSaveButton,
   setDisplaySaveButton,
   setDisplayPrintButton,
+  setDisplaySubmitButton,
   onSave,
   project
 }) => {
@@ -115,6 +117,11 @@ const WizardFooter = ({
               isDisplayed={setDisplaySaveButton()}
               onClick={onSave}
             />
+            <SubmitButton
+              id="submitButton"
+              color="colorPrimary"
+              isDisplayed={setDisplaySubmitButton()}
+            />
           </>
         ) : null}
       </div>
@@ -163,6 +170,7 @@ WizardFooter.propTypes = {
   setDisabledSaveButton: PropTypes.any,
   setDisplaySaveButton: PropTypes.any,
   setDisplayPrintButton: PropTypes.any,
+  setDisplaySubmitButton: PropTypes.any,
   onSave: PropTypes.any,
   onDownload: PropTypes.any,
   project: PropTypes.shape

client/src/components/Projects/ProjectTableRow.js

@@ -98,6 +98,13 @@ const ProjectTableRow = ({
     return <span>{formatDate(project.dateModified)}</span>;
   };
 
+  const dateSubmittedDisplay = () => {
+    if (project.dateSubmitted) {
+      return <span>{moment(project.dateSubmitted).format("YYYY-MM-DD")}</span>;
+    }
+    return <span>{moment(project.dateSubmitted).format("YYYY-MM-DD")}</span>;
+  };
+
   return (
     <tr key={project.id}>
       <td className={classes.tdCenterAlign}>
@@ -141,6 +148,7 @@ const ProjectTableRow = ({
       </td>
 
       <td className={classes.td}>{dateModifiedDisplay()}</td>
+      <td className={classes.td}>{dateSubmittedDisplay()}</td>
 
       <td className={classes.actionIcons}>
         {projectRules && (

client/src/components/Projects/ProjectsPage.js

@@ -598,6 +598,7 @@ const ProjectsPage = ({ contentContainerRef }) => {
     { id: "firstName", label: "Created By" },
     { id: "dateCreated", label: "Created On" },
     { id: "dateModified", label: "Last Modified" },
+    { id: "dateSubmitted", label: "Submitted" },
     {
       id: "contextMenu",
       label: ""

client/src/services/project.service.js

@@ -26,6 +26,10 @@ export function del(id) {
   return axios.delete(baseUrl + "/" + id);
 }
 
+export function submit(id) {
+  return axios.put(baseUrl + "/submit", id);
+}
+
 export function snapshot(id) {
   return axios.put(baseUrl + "/snapshot", id);
 }

server/app/controllers/project.controller.js

@@ -107,6 +107,21 @@ const trash = async (req, res) => {
   }
 };
 
+const submit = async (req, res) => {
+  try {
+    const { id, name } = req.body;
+
+    const result = await projectService.submit(id, req.user.id, name);
+    if (result === 1) {
+      res.sendStatus(403);
+    } else {
+      res.sendStatus(204);
+    }
+  } catch (err) {
+    res.status(500).send(err);
+  }
+};
+
 const snapshot = async (req, res) => {
   try {
     const { id, name } = req.body;
@@ -160,6 +175,7 @@ module.exports = {
   del,
   hide,
   trash,
+  submit,
   snapshot,
   renameSnapshot,
   getAllArchivedProjects

server/app/routes/project.routes.js

@@ -15,6 +15,7 @@ router.post("/", jwtSession.validateUser, projectController.post);
 router.put("/hide", jwtSession.validateUser, projectController.hide);
 router.put("/trash", jwtSession.validateUser, projectController.trash);
 router.put("/snapshot", jwtSession.validateUser, projectController.snapshot);
+router.put("/submit", jwtSession.validateUser, projectController.submit);
 router.put(
   "/renameSnapshot",
   jwtSession.validateUser,

server/app/services/project.service.js

@@ -139,6 +139,23 @@ const snapshot = async (id, loginId, name) => {
   }
 };
 
+const submit = async (id, loginId, name) => {
+  try {
+    await poolConnect;
+    const request = pool.request();
+
+    request.input("id", id);
+    request.input("loginId", loginId);
+    request.input("name", name);
+
+    const response = await request.execute("Project_Submit");
+    return response.returnValue;
+  } catch (err) {
+    console.log("err:", err);
+    return Promise.reject(err);
+  }
+};
+
 const renameSnapshot = async (id, loginId, name) => {
   try {
     await poolConnect;
@@ -175,6 +192,7 @@ module.exports = {
   del,
   hide,
   trash,
+  submit,
   snapshot,
   renameSnapshot,
   getAllArchivedProjects