Merge pull request #175 from scientist-softserv/138-display-pos

138 display pos

Author: summer-cook

src/components/StatusBar/StatusBar.jsx

@@ -16,7 +16,7 @@ const StatusBar = ({ backgroundColor, statusArray, apiRequestStatus, addClass })
 
   return (
     <div className={`container ${addClass}`}>
-      <div className='row border'>
+      <div className='row border' data-cy='status-bar'>
         {statusArray.map((statusObject, index) => {
           const { statusLabel, statusIcon } = statusObject
           const border = index !== statusArray.length - 1 ? 'border-end' : ''

src/compounds/Document/Document.jsx

@@ -5,10 +5,11 @@ import LineItemsTable from '../../components/LineItemsTable/LineItemsTable'
 import './document.scss'
 
 const Document = ({ document, addClass }) => {
-  const { identifier, date, documentStatusColor, documentType,
-    documentTypeColor, documentStatus, lineItems, requestIdentifier,
-    shippingPrice, shipTo, shipFrom, subtotalPrice,
-    taxAmount, terms, totalPrice } = document
+  const {
+    adPO, date, documentStatusColor, documentType, documentTypeColor, documentStatus, identifier, lineItems, poNumber,
+    relatedSOWIdentifier, requestIdentifier, shippingPrice, shipTo, shipFrom, subtotalPrice, taxAmount, terms, totalPrice,
+    turnaroundTime,
+  } = document
   const [show, setShow] = useState(false)
   const handleClose = () => setShow(false)
   const handleShow = () => setShow(true)
@@ -21,14 +22,14 @@ const Document = ({ document, addClass }) => {
             {documentType}
           </div>
           <div className='border-end p-2'>
-            <b>{identifier}:</b> {subtotalPrice}
+            <b>{(documentType === 'SOW') ? identifier : poNumber}:</b> {subtotalPrice}
           </div>
           <small className='text-muted fw-light p-2'>
             {date}
           </small>
         </div>
         <div className='ms-auto p-2'>
-          <div className='badge p-2' style={{backgroundColor: documentStatusColor}}>
+          <div className='badge p-2' style={{ backgroundColor: documentStatusColor }}>
             {documentStatus}
           </div>
         </div>
@@ -52,8 +53,12 @@ const Document = ({ document, addClass }) => {
         <Offcanvas.Body>
           <div className='d-block d-md-flex justify-content-between'>
             <div className='details'>
-              <h6>Details:</h6>
-              <b>Proposal:</b> {identifier}<br />
+              <h5>Details:</h5>
+              {poNumber && <><b>PO:</b> {poNumber}<br /></>}
+              {adPO && <><b>AD PO:</b> {identifier}<br /></>}
+              {documentType === 'SOW'
+                ? <><b>Proposal:</b> {identifier}</>
+                : <><b>Related SOW:</b> {relatedSOWIdentifier}</>}<br />
               <b>Amount:</b> {subtotalPrice}<br />
               <b>Request:</b> {requestIdentifier} <br />
               <b>Date:</b> {date}<br />
@@ -71,8 +76,7 @@ const Document = ({ document, addClass }) => {
               <div className='address'>{shipFrom.text}</div>
             </div>
           </div>
-          {lineItems
-          && (
+          {lineItems && (
             <LineItemsTable
               lineItems={lineItems}
               subtotalPrice={subtotalPrice}
@@ -81,6 +85,7 @@ const Document = ({ document, addClass }) => {
               totalPrice={totalPrice}
             />
           )}
+          {turnaroundTime && <h5><b>Turnaround Time:</b> {turnaroundTime}</h5>}
         </Offcanvas.Body>
       </Offcanvas>
     </>
@@ -91,13 +96,16 @@ const Document = ({ document, addClass }) => {
 Document.propTypes = {
   addClass: PropTypes.string,
   document: PropTypes.shape({
+    adPO: PropTypes.string,
     identifier: PropTypes.string.isRequired,
     date: PropTypes.string.isRequired,
     documentStatus: PropTypes.string.isRequired,
     documentStatusColor: PropTypes.string,
     documentType: PropTypes.string.isRequired,
     documentTypeColor: PropTypes.string,
     lineItems: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
+    poNumber: PropTypes.string,
+    relatedSOWIdentifier: PropTypes.string,
     requestIdentifier: PropTypes.string.isRequired,
     shippingPrice: PropTypes.string.isRequired,
     shipTo: PropTypes.shape({
@@ -112,6 +120,7 @@ Document.propTypes = {
     taxAmount: PropTypes.string.isRequired,
     terms: PropTypes.string.isRequired,
     totalPrice: PropTypes.string.isRequired,
+    turnaroundTime: PropTypes.string,
   }),
 }