From f35315c490897e01c135945acddd452d32924e4f Mon Sep 17 00:00:00 2001
From: Ovidio Rodriguez <ovifer02@gmail.com>
Date: Tue, 27 Sep 2022 15:52:47 -0400
Subject: [PATCH 1/2] Add selection buttons

---
 src/components/AllocationClientSpecifics.js | 193 +++++++++++---------
 1 file changed, 102 insertions(+), 91 deletions(-)

diff --git a/src/components/AllocationClientSpecifics.js b/src/components/AllocationClientSpecifics.js
index 9569339e..6376c3bb 100644
--- a/src/components/AllocationClientSpecifics.js
+++ b/src/components/AllocationClientSpecifics.js
@@ -44,7 +44,8 @@ const AllocationClientSpecifics = (props) => {
         project,
         setContributor,
         setProject,
-        setNewAllocation
+        setNewAllocation,
+        allocationSelection
     } = props
 
     const {
@@ -174,99 +175,109 @@ const AllocationClientSpecifics = (props) => {
 
     return (
         <Box className='AllocationClientSpecifics'>
-            <Grid container justifyContent='center'>
-                <Grid item xs={12}>
-                    <List component='nav'>
-                        <ListItem>
-                            <Grid container>
-                                <Grid item xs={2} md={3}>
-                                    <PaymentIcon color='primary'/>
-                                </Grid>
-                                <Grid item xs={10} md={3}>
-                                    <Typography>
-                                        {`${paymentAmount}`}
-                                    </Typography>
-                                </Grid>
-                                <Grid item xs={12} md={6} align='center'>
-                                    <Typography variant='caption' color='secondary'>
-                                        {`${payment.date_paid
-                                            ? moment.utc(payment.date_paid, 'x').format('MM/DD/YYYY')
-                                            : ''
-                                        }`}
-                                        {`${
-                                            !payment.date_paid && payment.date_incurred
-                                                ? 'Warning: This payment has not been paid'
-                                                : ''
+            {allocationSelection[0] 
+                ? ( 
+                    <Grid container justifyContent='center'>
+                        <Grid item xs={12}>
+                            <List component='nav'>
+                                <ListItem>
+                                    <Grid container>
+                                        <Grid item xs={2} md={3}>
+                                            <PaymentIcon color='primary'/>
+                                        </Grid>
+                                        <Grid item xs={10} md={3}>
+                                            <Typography>
+                                                {`${paymentAmount}`}
+                                            </Typography>
+                                        </Grid>
+                                        <Grid item xs={12} md={6} align='center'>
+                                            <Typography variant='caption' color='secondary'>
+                                                {`${payment.date_paid
+                                                    ? moment.utc(payment.date_paid, 'x').format('MM/DD/YYYY')
+                                                    : ''
+                                                }`}
+                                                {`${
+                                                    !payment.date_paid && payment.date_incurred
+                                                        ? 'Warning: This payment has not been paid'
+                                                        : ''
 
-                                        }`}
-                                    </Typography>
-                                </Grid>
-                            </Grid>
-                        </ListItem>
-                    </List>
-                </Grid>
+                                                }`}
+                                            </Typography>
+                                        </Grid>
+                                    </Grid>
+                                </ListItem>
+                            </List>
+                        </Grid>
 
-                <Grid item xs={12}>
-                    <List component='nav'>
-                        <ListItem button onClick={handleClickProjectsList}>
-                            <Grid container>
-                                <Grid item xs={2} md={3}>
-                                    <AssessmentIcon color='primary'/>
-                                </Grid>
-                                <Grid item xs={4} md={3}>
-                                    <Typography>
-                                        {selectedProject ? selectedProject.name : 'No selected'}
-                                    </Typography>
-                                </Grid>
-                                <Grid item xs={4} md={3} className='responsive-align'>
-                                    <Typography variant='caption' color='secondary'>
-                                        {`${githubProjectHandle}`}
-                                    </Typography>
-                                </Grid>
-                                <Grid item xs={2} md={3} align='right'>
-                                    {openProjectsList
-                                        ? <ExpandLess />
-                                        : <ExpandMore />
-                                    }
-                                </Grid>
-                            </Grid>
-                        </ListItem>
-                        <Collapse in={openProjectsList} timeout='auto' unmountOnExit>
-                            {listProjects({
-                                projects,
-                                selectedProject: selectedProject
-                            })}
-                        </Collapse>
-                        <ListItem button onClick={handleClickContributorsList}>
-                            <Grid container>
-                                <Grid item xs={2} md={3}>
-                                    <PeopleIcon color='primary'/>
-                                </Grid>
-                                <Grid item xs={4} md={3}>
-                                    <Typography>
-                                        {selectedContributor ? selectedContributor.name : 'No selected'}
-                                    </Typography>
-                                </Grid>
-                                <Grid item xs={4} md={3} className='responsive-align'>
-                                    <Typography variant='caption' color='secondary'>
-                                        {`${githubContributorHandle}`}
-                                    </Typography>
-                                </Grid>
-                                <Grid item xs={2} md={3} align='right'>
-                                    {openContributorsList
-                                        ? <ExpandLess />
-                                        : <ExpandMore />
-                                    }
-                                </Grid>
-                            </Grid>
-                        </ListItem>
-                        <Collapse in={openContributorsList} timeout='auto' unmountOnExit>
-                            {listContributors(contributors)}
-                        </Collapse>
-                    </List>
-                </Grid>
+                        <Grid item xs={12}>
+                            <List component='nav'>
+                                <ListItem button onClick={handleClickProjectsList}>
+                                    <Grid container>
+                                        <Grid item xs={2} md={3}>
+                                            <AssessmentIcon color='primary'/>
+                                        </Grid>
+                                        <Grid item xs={4} md={3}>
+                                            <Typography>
+                                                {selectedProject ? selectedProject.name : 'No selected'}
+                                            </Typography>
+                                        </Grid>
+                                        <Grid item xs={4} md={3} className='responsive-align'>
+                                            <Typography variant='caption' color='secondary'>
+                                                {`${githubProjectHandle}`}
+                                            </Typography>
+                                        </Grid>
+                                        <Grid item xs={2} md={3} align='right'>
+                                            {openProjectsList
+                                                ? <ExpandLess />
+                                                : <ExpandMore />
+                                            }
+                                        </Grid>
+                                    </Grid>
+                                </ListItem>
+                                <Collapse in={openProjectsList} timeout='auto' unmountOnExit>
+                                    {listProjects({
+                                        projects,
+                                        selectedProject: selectedProject
+                                    })}
+                                </Collapse>
+                                <ListItem button onClick={handleClickContributorsList}>
+                                    <Grid container>
+                                        <Grid item xs={2} md={3}>
+                                            <PeopleIcon color='primary'/>
+                                        </Grid>
+                                        <Grid item xs={4} md={3}>
+                                            <Typography>
+                                                {selectedContributor ? selectedContributor.name : 'No selected'}
+                                            </Typography>
+                                        </Grid>
+                                        <Grid item xs={4} md={3} className='responsive-align'>
+                                            <Typography variant='caption' color='secondary'>
+                                                {`${githubContributorHandle}`}
+                                            </Typography>
+                                        </Grid>
+                                        <Grid item xs={2} md={3} align='right'>
+                                            {openContributorsList
+                                                ? <ExpandLess />
+                                                : <ExpandMore />
+                                            }
+                                        </Grid>
+                                    </Grid>
+                                </ListItem>
+                                <Collapse in={openContributorsList} timeout='auto' unmountOnExit>
+                                    {listContributors(contributors)}
+                                </Collapse>
+                            </List>
+                        </Grid>
 
-            </Grid>
+                    </Grid>
+                ) : (
+                    <Grid container justifyContent='center'>
+                        <Grid item xs={12}>
+                            'test'
+                        </Grid>
+                    </Grid>
+                )
+            }
         </Box>
     )
 

From b1f0940366044cad7b501e5ca1a0f51937f626a2 Mon Sep 17 00:00:00 2001
From: Ovidio Rodriguez <ovifer02@gmail.com>
Date: Tue, 27 Sep 2022 15:53:17 -0400
Subject: [PATCH 2/2] Selection buttons

---
 src/components/AllocationAddForm.js | 42 ++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/components/AllocationAddForm.js b/src/components/AllocationAddForm.js
index f88809ab..b1c792f3 100644
--- a/src/components/AllocationAddForm.js
+++ b/src/components/AllocationAddForm.js
@@ -61,6 +61,7 @@ const AllocationAddForm = (props) => {
     } = props
 
     const [allocationTypes, setAllocationTypes] = useState([1, 0])
+    const [allocationSelection, setAllocationSelection] = useState([1, 0])
     const [contributorAllocations, setContributorAllocations] = useState(null)
     const [contributorRates, setContributorRates] = useState(null)
     const [displayError, setDisplayError] = useState(false)
@@ -84,6 +85,14 @@ const AllocationAddForm = (props) => {
         setAllocationTypes([...allocationTypesState])
     }
 
+    const addAllocationOrLinkPayment = (props) => {
+        const { allocationSelection, selection } = props
+        const selectionState = allocationSelection
+        fill(selectionState, 0)
+        selectionState[selection] = 1
+        setAllocationSelection([...selectionState])
+    }
+
     const handleAlertClose = (event, reason) => {
         if (reason === 'clickaway') {
             return
@@ -427,7 +436,37 @@ const AllocationAddForm = (props) => {
         >
             <Box m={5}>
                 <DialogTitle>
-                    {`Add Allocation`}
+                    {project && 
+                        `Add Allocation`
+                    }
+                    {client && !selectedProject &&
+                        <ButtonGroup color='primary' aria-label='outlined primary button group'>
+                            <Button
+                                variant={`${allocationSelection[0] ? 'contained' : 'outlined'}`}
+                                color='primary'
+                                onClick={() => (
+                                    addAllocationOrLinkPayment({
+                                        selection: 0,
+                                        allocationSelection
+                                    })
+                                )}
+                            >
+                                {'Create New Allocation'}
+                            </Button>
+                            <Button
+                                variant={`${allocationSelection[1] ? 'contained' : 'outlined'}`}
+                                color='primary'
+                                onClick={() => (
+                                    addAllocationOrLinkPayment({
+                                        selection: 1,
+                                        allocationSelection
+                                    })
+                                )}
+                            >
+                                {'Link Existing Payment'}
+                            </Button>
+                        </ButtonGroup>
+                    }
                 </DialogTitle>
                 <Grid container spacing={5} justifyContent='center'>
                     <Grid item xs={12}>
@@ -457,6 +496,7 @@ const AllocationAddForm = (props) => {
                                         setNewAllocation={setNewAllocation}
                                         setContributor={setSelectedContributor}
                                         setProject={setSelectedProject}
+                                        allocationSelection={allocationSelection}
                                     />
                                 ) : (
                                     <AllocationProposeSpecifics