| @@ -144,6 +144,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p | |||||
| <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 1 }}> | <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 1 }}> | ||||
| <Autocomplete | <Autocomplete | ||||
| disablePortal | disablePortal | ||||
| size="small" | |||||
| id="issueId" | id="issueId" | ||||
| options={issueCombo} | options={issueCombo} | ||||
| value={issueSelected} | value={issueSelected} | ||||
| @@ -105,6 +105,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue | |||||
| {...register("issueId")} | {...register("issueId")} | ||||
| disablePortal | disablePortal | ||||
| id="issueId" | id="issueId" | ||||
| size="small" | |||||
| options={issueCombo} | options={issueCombo} | ||||
| value={issueSelected} | value={issueSelected} | ||||
| inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""} | inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""} | ||||
| @@ -145,6 +146,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue | |||||
| {...register("orgId")} | {...register("orgId")} | ||||
| disablePortal | disablePortal | ||||
| id="orgId" | id="orgId" | ||||
| size="small" | |||||
| options={orgCombo} | options={orgCombo} | ||||
| value={orgSelected} | value={orgSelected} | ||||
| inputValue={(orgSelected?.label) ? orgSelected?.label : ""} | inputValue={(orgSelected?.label) ? orgSelected?.label : ""} | ||||
| @@ -220,6 +222,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue | |||||
| <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}> | <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}> | ||||
| <Autocomplete | <Autocomplete | ||||
| multiple | multiple | ||||
| size="small" | |||||
| {...register("status")} | {...register("status")} | ||||
| id="status" | id="status" | ||||
| options={ComboData.denmandNoteStatus} | options={ComboData.denmandNoteStatus} | ||||
| @@ -258,20 +261,17 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue | |||||
| {/*last row*/} | {/*last row*/} | ||||
| <Grid container maxWidth justifyContent="flex-end"> | <Grid container maxWidth justifyContent="flex-end"> | ||||
| <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}> | |||||
| <Grid item sx={{ ml: 3, mr: 3 }}> | |||||
| <Button | <Button | ||||
| size="large" | size="large" | ||||
| variant="contained" | variant="contained" | ||||
| onClick={resetForm} | onClick={resetForm} | ||||
| sx={{ | |||||
| textTransform: 'capitalize', | |||||
| alignItems: 'end' | |||||
| }}> | |||||
| > | |||||
| <Typography variant="h5">Clear</Typography> | <Typography variant="h5">Clear</Typography> | ||||
| </Button> | </Button> | ||||
| </Grid> | </Grid> | ||||
| <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}> | |||||
| <Grid item sx={{ ml: 3, mr: 3}}> | |||||
| <Button | <Button | ||||
| size="large" | size="large" | ||||
| variant="contained" | variant="contained" | ||||
| @@ -138,6 +138,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { | |||||
| <Autocomplete | <Autocomplete | ||||
| {...register("status")} | {...register("status")} | ||||
| disablePortal={false} | disablePortal={false} | ||||
| size="small" | |||||
| id="status" | id="status" | ||||
| filterOptions={(options) => options} | filterOptions={(options) => options} | ||||
| options={ComboData.paymentStatus} | options={ComboData.paymentStatus} | ||||
| @@ -132,6 +132,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss | |||||
| <Autocomplete | <Autocomplete | ||||
| {...register("issueId")} | {...register("issueId")} | ||||
| disablePortal | disablePortal | ||||
| size="small" | |||||
| id="issueId" | id="issueId" | ||||
| options={issueCombo} | options={issueCombo} | ||||
| value={issueSelected} | value={issueSelected} | ||||
| @@ -155,6 +156,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss | |||||
| <Autocomplete | <Autocomplete | ||||
| {...register("gazettGroup")} | {...register("gazettGroup")} | ||||
| disablePortal | disablePortal | ||||
| size="small" | |||||
| id="gazettGroup" | id="gazettGroup" | ||||
| options={ComboData.groupTitle} | options={ComboData.groupTitle} | ||||
| value={groupSelected} | value={groupSelected} | ||||
| @@ -229,6 +231,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss | |||||
| {...register("status")} | {...register("status")} | ||||
| disablePortal | disablePortal | ||||
| id="status" | id="status" | ||||
| size="small" | |||||
| filterOptions={(options) => options} | filterOptions={(options) => options} | ||||
| options={ComboData.proofStatus} | options={ComboData.proofStatus} | ||||
| value={status} | value={status} | ||||
| @@ -256,6 +259,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss | |||||
| {...register("orgId")} | {...register("orgId")} | ||||
| disablePortal={false} | disablePortal={false} | ||||
| id="orgId" | id="orgId" | ||||
| size="small" | |||||
| options={orgCombo} | options={orgCombo} | ||||
| value={orgSelected} | value={orgSelected} | ||||
| inputValue={(orgSelected?.label) ? orgSelected?.label : ""} | inputValue={(orgSelected?.label) ? orgSelected?.label : ""} | ||||
| @@ -237,6 +237,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss | |||||
| disablePortal | disablePortal | ||||
| id="orgId" | id="orgId" | ||||
| options={orgCombo} | options={orgCombo} | ||||
| size="small" | |||||
| value={orgSelected} | value={orgSelected} | ||||
| inputValue={(orgSelected?.label) ? orgSelected?.label : ""} | inputValue={(orgSelected?.label) ? orgSelected?.label : ""} | ||||
| onChange={(event, newValue) => { | onChange={(event, newValue) => { | ||||
| @@ -261,6 +262,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss | |||||
| <Autocomplete | <Autocomplete | ||||
| {...register("issueId")} | {...register("issueId")} | ||||
| disablePortal | disablePortal | ||||
| size="small" | |||||
| id="issueId" | id="issueId" | ||||
| size="small" | size="small" | ||||
| options={issueCombo} | options={issueCombo} | ||||
| @@ -110,6 +110,7 @@ const UserSearchForm_Individual = ({ applySearch }) => { | |||||
| {...register("accountFilter")} | {...register("accountFilter")} | ||||
| disablePortal | disablePortal | ||||
| id="accountFilter" | id="accountFilter" | ||||
| size="small" | |||||
| options={["Active", "Locked", "Not verified"]} | options={["Active", "Locked", "Not verified"]} | ||||
| value={accountFilter} | value={accountFilter} | ||||
| onChange={(event, newValue) => { | onChange={(event, newValue) => { | ||||
| @@ -139,6 +139,7 @@ const UserSearchForm_Organization = ({applySearch}) => { | |||||
| {...register("accountFilter")} | {...register("accountFilter")} | ||||
| disablePortal | disablePortal | ||||
| id="accountFilter" | id="accountFilter" | ||||
| size="small" | |||||
| options={["All", "Active","Locked","Not verified"]} | options={["All", "Active","Locked","Not verified"]} | ||||
| value={accountFilter} | value={accountFilter} | ||||
| onChange={(event, newValue) => { | onChange={(event, newValue) => { | ||||
| @@ -79,14 +79,10 @@ const UserGroupSearchForm = ({ applySearch }) => { | |||||
| > | > | ||||
| <Grid item xs={3} md={3} sx={{ ml: 3, mr: 1 }}> | <Grid item xs={3} md={3} sx={{ ml: 3, mr: 1 }}> | ||||
| <Button | <Button | ||||
| size="large" | |||||
| variant="contained" | variant="contained" | ||||
| onClick={handleNewGroupClick} | onClick={handleNewGroupClick} | ||||
| sx={{ | |||||
| textTransform: 'capitalize', | |||||
| alignItems: 'end', | |||||
| }}> | |||||
| <AddCircleOutlineIcon sx={{ mr: 1, mb: 0.5 }} /> | |||||
| startIcon={<AddCircleOutlineIcon sx={{alignItems:"center"}}/>} | |||||
| > | |||||
| <Typography variant="h5">New Group</Typography> | <Typography variant="h5">New Group</Typography> | ||||
| </Button> | </Button> | ||||
| </Grid> | </Grid> | ||||
| @@ -77,7 +77,7 @@ export const PNSPS_THEME = createTheme({ | |||||
| }, | }, | ||||
| '&.MuiButton-root':{ | '&.MuiButton-root':{ | ||||
| fontSize: '1.2rem', | fontSize: '1.2rem', | ||||
| alignItems: 'normal', | |||||
| alignItems: 'center', | |||||
| }, | }, | ||||
| } | } | ||||
| } | } | ||||