alex
/
PNSPS-frontend-MaterialUI
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

update search form header & reset button color

master
jason.lam 1 year ago
parent
85eb75fcf7
commit
6395250dc9
21 changed files with 114 additions and 142 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/pages/DemandNote/Search/SearchForm.js
  2. +2
    -1
      src/pages/DemandNote/Search_Public/SearchForm.js
  3. +2
    -1
      src/pages/Message/Search/SearchForm.js
  4. +19
    -36
      src/pages/Organization/DetailPage/OrganizationCard.js
  5. +15
    -18
      src/pages/Organization/DetailPage/OrganizationPubCard.js
  6. +2
    -2
      src/pages/Organization/SearchPage/OrganizationSearchForm.js
  7. +2
    -1
      src/pages/Payment/Search_GLD/SearchForm.js
  8. +2
    -1
      src/pages/Payment/Search_Public/SearchForm.js
  9. +1
    -1
      src/pages/Proof/Search_GLD/SearchForm.js
  10. +2
    -1
      src/pages/Proof/Search_Public/SearchForm.js
  11. +1
    -0
      src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
  12. +1
    -1
      src/pages/PublicNotice/Search_GLD/SearchForm.js
  13. +19
    -33
      src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js
  14. +1
    -0
      src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js
  15. +35
    -41
      src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
  16. +1
    -0
      src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js
  17. +1
    -1
      src/pages/User/SearchPage/UserSearchForm.js
  18. +1
    -1
      src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js
  19. +1
    -1
      src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js
  20. +1
    -1
      src/pages/pnspsUserGroupSearchPage/UserGroupSearchForm.js
  21. +4
    -0
      src/themes/buttonConst.js

+ 1
- 1
src/pages/DemandNote/Search/SearchForm.js View File

@@ -92,7 +92,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
<Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1 }} width="98%"> <Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1 }} width="98%">
{/*row 1*/} {/*row 1*/}
<Grid item justifyContent="space-between" alignItems="center" sx={{mt:1, ml:3,mb:2.5}}> <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1, ml:3,mb:2.5}}>
<Typography variant="h5" >
<Typography variant="pnspsFormHeader" >
Search Form Search Form
</Typography> </Typography>
</Grid> </Grid>


+ 2
- 1
src/pages/DemandNote/Search_Public/SearchForm.js View File

@@ -83,7 +83,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
<Grid item xs={12}> <Grid item xs={12}>
<CardContent sx={{ px: 2.5, pt: 3 }}> <CardContent sx={{ px: 2.5, pt: 3 }}>
<Grid item justifyContent="space-between" alignItems="center" > <Grid item justifyContent="space-between" alignItems="center" >
<Typography variant="h4">
<Typography variant="pnspsFormHeader">
<FormattedMessage id="searchForm"/> <FormattedMessage id="searchForm"/>
</Typography> </Typography>
</Grid> </Grid>
@@ -215,6 +215,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
<ThemeProvider theme={PNSPS_BUTTON_THEME}> <ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Grid item sx={{mr: 3, mb: 3}}> <Grid item sx={{mr: 3, mb: 3}}>
<Button <Button
color="cancel"
variant="contained" variant="contained"
onClick={resetForm} onClick={resetForm}
> >


+ 2
- 1
src/pages/Message/Search/SearchForm.js View File

@@ -63,7 +63,7 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
{/*row 1*/} {/*row 1*/}
<CardContent sx={{ px: 2.5, pt: 3 }}> <CardContent sx={{ px: 2.5, pt: 3 }}>
<Grid item justifyContent="space-between" alignItems="center" > <Grid item justifyContent="space-between" alignItems="center" >
<Typography variant="h4">
<Typography variant="pnspsFormHeader">
<FormattedMessage id="searchForm"/> <FormattedMessage id="searchForm"/>
</Typography> </Typography>
</Grid> </Grid>
@@ -141,6 +141,7 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
<Grid item sx={{mr: 3, mb: 3 }}> <Grid item sx={{mr: 3, mb: 3 }}>
<Button <Button
variant="contained" variant="contained"
color="cancel"
onClick={resetForm} onClick={resetForm}
aria-label={intl.formatMessage({id: 'reset'})} aria-label={intl.formatMessage({id: 'reset'})}
> >


+ 19
- 36
src/pages/Organization/DetailPage/OrganizationCard.js View File

@@ -18,6 +18,8 @@ import Loadable from 'components/Loadable';
import { lazy } from 'react'; import { lazy } from 'react';
import { notifySaveSuccess } from 'utils/CommonFunction'; import { notifySaveSuccess } from 'utils/CommonFunction';
import { useIntl } from "react-intl"; import { useIntl } from "react-intl";
import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";


// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //


@@ -170,97 +172,78 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
<> <>
{createMode ? {createMode ?
<> <>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Grid item sx={{ ml: 0, mr: 3 }}> <Grid item sx={{ ml: 0, mr: 3 }}>
<Button <Button
size="large"
variant="contained" variant="contained"
type="submit" type="submit"
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
> >
<Typography variant="h5">Create</Typography>
Create
</Button> </Button>
</Grid> </Grid>
</ThemeProvider>
</> : </> :
<> <>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Grid item sx={{ ml: 0, mr: 3 }}> <Grid item sx={{ ml: 0, mr: 3 }}>
<Button <Button
size="large"
variant="contained" variant="contained"
onClick={loadDataFun} onClick={loadDataFun}
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
color="cancel"
> >
<Typography variant="h5">Reset & Back</Typography>
Reset & Back
</Button> </Button>
</Grid> </Grid>
<Grid item sx={{ ml: 3, mr: 3 }}> <Grid item sx={{ ml: 3, mr: 3 }}>
<Button <Button
size="large"
variant="contained" variant="contained"
type="submit" type="submit"
color="success" color="success"
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
> >
<Typography variant="h5">Save</Typography>
Save
</Button> </Button>
</Grid> </Grid>
</ThemeProvider>
</> </>
} }
</> </>
: :
<> <>
<Grid item sx={{ ml: 0, mr: 3 }}> <Grid item sx={{ ml: 0, mr: 3 }}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
size="large"
variant="contained" variant="contained"
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
onClick={onEditClick} onClick={onEditClick}
> >
<Typography variant="h5">Edit</Typography>
Edit
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>


{ {
currentUserData.creditor ? currentUserData.creditor ?
<Grid item sx={{ ml: 3, mr: 3 }}> <Grid item sx={{ ml: 3, mr: 3 }}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
size="large"
variant="contained" variant="contained"
color="error" color="error"
onClick={() => setNonCreditorConfirmPopUp(true)} onClick={() => setNonCreditorConfirmPopUp(true)}
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
> >
<Typography variant="h5">Mark as Non-Creditor</Typography>
Mark as Non-Creditor
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
: :
<Grid item sx={{ ml: 3, mr: 3 }}> <Grid item sx={{ ml: 3, mr: 3 }}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
size="large"
variant="contained" variant="contained"
color="orange" color="orange"
onClick={() => setCreditorConfirmPopUp(true)} onClick={() => setCreditorConfirmPopUp(true)}
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
> >
<Typography variant="h5">Mark as Creditor</Typography>
Mark as Creditor
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
} }
</> </>


+ 15
- 18
src/pages/Organization/DetailPage/OrganizationPubCard.js View File

@@ -20,6 +20,8 @@ import Loadable from 'components/Loadable';
import { lazy } from 'react'; import { lazy } from 'react';
import { notifySaveSuccess } from 'utils/CommonFunction'; import { notifySaveSuccess } from 'utils/CommonFunction';
import {FormattedMessage, useIntl} from "react-intl"; import {FormattedMessage, useIntl} from "react-intl";
import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";


// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //


@@ -126,43 +128,38 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
{createMode ? {createMode ?
<> <>
<Grid item sx={{ ml: 0, mr: 3 }}> <Grid item sx={{ ml: 0, mr: 3 }}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
size="large"
variant="contained" variant="contained"
type="submit" type="submit"
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
> >
<Typography variant="h5">
<FormattedMessage id="create" />
</Typography>
<FormattedMessage id="create" />
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
</> : </> :
<> <>
<Grid item sx={{ ml: 0, mr: 3 }}> <Grid item sx={{ ml: 0, mr: 3 }}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
size="large"
variant="contained" variant="contained"
color="cancel"
onClick={loadDataFun} onClick={loadDataFun}
> >
<Typography variant="h5">
<FormattedMessage id="resetAndBack" />
</Typography>
<FormattedMessage id="resetAndBack" />
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
<Grid item sx={{ ml: 3, mr: 3 }}> <Grid item sx={{ ml: 3, mr: 3 }}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
variant="contained" variant="contained"
type="submit" type="submit"
color="success" color="success"
> >
<Typography variant="h5">
<FormattedMessage id="save" />
</Typography>
<FormattedMessage id="save" />
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
</> </>
} }
@@ -170,14 +167,14 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
: :
<> <>
<Grid item sx={{ ml: 0, mr: 3 }}> <Grid item sx={{ ml: 0, mr: 3 }}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
variant="contained" variant="contained"
onClick={onEditClick} onClick={onEditClick}
> >
<Typography variant="h5">
<FormattedMessage id="edit" />
</Typography>
<FormattedMessage id="edit" />
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
</> </>
} }


+ 2
- 2
src/pages/Organization/SearchPage/OrganizationSearchForm.js View File

@@ -1,6 +1,6 @@
// material-ui // material-ui
import { import {
Button,
CButton,
Grid, TextField, Grid, TextField,
Typography, Typography,
Autocomplete, Autocomplete,
@@ -66,7 +66,7 @@ const OrganizationSearchForm = ({ applySearch }) => {
<Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1}} width="98%"> <Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1}} width="98%">
{/*row 1*/} {/*row 1*/}
<Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}> <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
<Typography variant="h5" >
<Typography variant="pnspsFormHeader" >
Search Form Search Form
</Typography> </Typography>
</Grid> </Grid>


+ 2
- 1
src/pages/Payment/Search_GLD/SearchForm.js View File

@@ -49,7 +49,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
<Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1}} width="98%"> <Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1}} width="98%">
{/*row 1*/} {/*row 1*/}
<Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}> <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
<Typography variant="h5" >
<Typography variant="pnspsFormHeader" >
Search Form Search Form
</Typography> </Typography>
</Grid> </Grid>
@@ -154,6 +154,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
<Grid item sx={{ ml: 3, mb: 3}}> <Grid item sx={{ ml: 3, mb: 3}}>
<Button <Button
variant="contained" variant="contained"
color="cancel"
onClick={resetForm} onClick={resetForm}
> >
Reset Reset


+ 2
- 1
src/pages/Payment/Search_Public/SearchForm.js View File

@@ -68,7 +68,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
{/*row 1*/} {/*row 1*/}
<CardContent sx={{ px: 2.5, pt: 3 }}> <CardContent sx={{ px: 2.5, pt: 3 }}>
<Grid item justifyContent="space-between" alignItems="center" > <Grid item justifyContent="space-between" alignItems="center" >
<Typography variant="h4">
<Typography variant="pnspsFormHeader">
<FormattedMessage id="searchForm"/> <FormattedMessage id="searchForm"/>
</Typography> </Typography>
</Grid> </Grid>
@@ -182,6 +182,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
<ThemeProvider theme={PNSPS_BUTTON_THEME}> <ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Grid item sx={{mr: 3, mb: 3 }}> <Grid item sx={{mr: 3, mb: 3 }}>
<Button <Button
color="cancel"
variant="contained" variant="contained"
onClick={resetForm} onClick={resetForm}
aria-label={intl.formatMessage({id: 'reset'})} aria-label={intl.formatMessage({id: 'reset'})}


+ 1
- 1
src/pages/Proof/Search_GLD/SearchForm.js View File

@@ -96,7 +96,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss


{/*row 1*/} {/*row 1*/}
<Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}> <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
<Typography variant="h5" >
<Typography variant="pnspsFormHeader" >
Search Form Search Form
</Typography> </Typography>
</Grid> </Grid>


+ 2
- 1
src/pages/Proof/Search_Public/SearchForm.js View File

@@ -102,7 +102,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
{/*row 1*/} {/*row 1*/}
<CardContent sx={{ px: 2.5, pt: 3 }}> <CardContent sx={{ px: 2.5, pt: 3 }}>
<Grid item justifyContent="space-between" alignItems="center"> <Grid item justifyContent="space-between" alignItems="center">
<Typography variant="h4">
<Typography variant="pnspsFormHeader">
<FormattedMessage id="searchForm"/> <FormattedMessage id="searchForm"/>
</Typography> </Typography>
</Grid> </Grid>
@@ -276,6 +276,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
<Grid item sx={{ mr: 3, mb: 3 }}> <Grid item sx={{ mr: 3, mb: 3 }}>
<Button <Button
variant="contained" variant="contained"
color="cancel"
onClick={resetForm} onClick={resetForm}
aria-label={intl.formatMessage({id: 'reset'})} aria-label={intl.formatMessage({id: 'reset'})}
> >


+ 1
- 0
src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js View File

@@ -217,6 +217,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
<Grid item sx={{ ml: 3, mr: 3 }}> <Grid item sx={{ ml: 3, mr: 3 }}>
<Button <Button
variant="contained" variant="contained"
color="cancel"
onClick={resetForm} onClick={resetForm}
aria-label={intl.formatMessage({id: 'reset'})} aria-label={intl.formatMessage({id: 'reset'})}
> >


+ 1
- 1
src/pages/PublicNotice/Search_GLD/SearchForm.js View File

@@ -94,7 +94,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
<Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1, mb: marginBottom}} width="98%"> <Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1, mb: marginBottom}} width="98%">
{/*row 1*/} {/*row 1*/}
<Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:marginBottom}}> <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:marginBottom}}>
<Typography variant="h5" >
<Typography variant="pnspsFormHeader" >
Search Form Search Form
</Typography> </Typography>
</Grid> </Grid>


+ 19
- 33
src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js View File

@@ -17,6 +17,8 @@ import Loadable from 'components/Loadable';
import { lazy } from 'react'; import { lazy } from 'react';
import { notifyActiveSuccess, notifyLockSuccess, notifySaveSuccess, notifyVerifySuccess } from 'utils/CommonFunction'; import { notifyActiveSuccess, notifyLockSuccess, notifySaveSuccess, notifyVerifySuccess } from 'utils/CommonFunction';
import {useIntl} from "react-intl"; import {useIntl} from "react-intl";
import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";
// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //




@@ -150,49 +152,39 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => {
<Grid container maxWidth justifyContent="flex-start"> <Grid container maxWidth justifyContent="flex-start">
{editMode ? {editMode ?
<> <>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Grid item sx={{ mr: 3 }}> <Grid item sx={{ mr: 3 }}>
<Button <Button
size="large"
variant="contained" variant="contained"
onClick={loadDataFun} onClick={loadDataFun}
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
color="cancel"
> >
<Typography variant="h5">Reset & Back</Typography>
Reset & Back
</Button> </Button>
</Grid> </Grid>


<Grid item sx={{ ml: 3, mr: 3 }}> <Grid item sx={{ ml: 3, mr: 3 }}>
<Button <Button
size="large"
variant="contained" variant="contained"
type="submit" type="submit"
color="success" color="success"
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
> >
<Typography variant="h5">Save</Typography>
Save
</Button> </Button>
</Grid> </Grid>
</ThemeProvider>
</> </>
: :
<> <>
<Grid item sx={{ mr: 3 }}> <Grid item sx={{ mr: 3 }}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
size="large"
variant="contained" variant="contained"
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
onClick={onEditClick} onClick={onEditClick}
> >
<Typography variant="h5">Edit</Typography>
Edit
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
</> </>
} }
@@ -321,16 +313,14 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => {
})} })}
</Grid> </Grid>
<Grid item xs={2} sm={2} md={2} lg={2} sx={{ml:2 ,mb:2}}> <Grid item xs={2} sm={2} md={2} lg={2} sx={{ml:2 ,mb:2}}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
variant="contained" variant="contained"
sx={{
textTransform: 'capitalize',
alignItems: 'end',
}}
onClick={onVerifiedClick} onClick={onVerifiedClick}
> >
<Typography variant="h5">Verify</Typography>
Verify
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
</> </>
} }
@@ -454,31 +444,27 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => {
</Grid> </Grid>
{locked ? {locked ?
<Grid item xs={2} sm={2} md={2} lg={2} sx={{ml:2}}> <Grid item xs={2} sm={2} md={2} lg={2} sx={{ml:2}}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
variant="contained" variant="contained"
color="success" color="success"
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
onClick={doUnlock} onClick={doUnlock}
> >
<Typography variant="h5">Active</Typography>
Active
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
: :
<Grid item xs={2} sm={2} md={2} lg={2} sx={{ml:2}}> <Grid item xs={2} sm={2} md={2} lg={2} sx={{ml:2}}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
variant="contained" variant="contained"
color="error" color="error"
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
onClick={doLock} onClick={doLock}
> >
<Typography variant="h5">Lock</Typography>
Lock
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
} }
</> </>


+ 1
- 0
src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js View File

@@ -118,6 +118,7 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => {
<Button <Button
aria-label={intl.formatMessage({id: 'back'})} aria-label={intl.formatMessage({id: 'back'})}
variant="contained" variant="contained"
color="cancel"
onClick={loadDataFun} onClick={loadDataFun}
> >
<FormattedMessage id="resetAndBack" /> <FormattedMessage id="resetAndBack" />


+ 35
- 41
src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js View File

@@ -18,6 +18,8 @@ import Loadable from 'components/Loadable';
import { lazy } from 'react'; import { lazy } from 'react';
import { notifyActiveSuccess, notifyLockSuccess, notifySaveSuccess, notifyVerifySuccess } from 'utils/CommonFunction'; import { notifyActiveSuccess, notifyLockSuccess, notifySaveSuccess, notifyVerifySuccess } from 'utils/CommonFunction';
import {useIntl} from "react-intl"; import {useIntl} from "react-intl";
import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
import {ThemeProvider} from "@emotion/react";
// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //




@@ -196,50 +198,39 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
<Grid container maxWidth justifyContent="flex-start"> <Grid container maxWidth justifyContent="flex-start">
{editMode ? {editMode ?
<> <>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Grid item sx={{ ml: 3, mr: 3 }}> <Grid item sx={{ ml: 3, mr: 3 }}>
<Button <Button
size="large"
variant="contained" variant="contained"
onClick={loadDataFun} onClick={loadDataFun}
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
color="cancel"
> >
<Typography variant="h5">Reset & Back</Typography>
Reset & Back
</Button> </Button>
</Grid> </Grid>
<Grid item sx={{ ml: 3, mr: 3 }}> <Grid item sx={{ ml: 3, mr: 3 }}>
<Button <Button
size="large"
variant="contained" variant="contained"
type="submit" type="submit"
color="success" color="success"
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
> >
<Typography variant="h5">Save</Typography>
Save
</Button> </Button>
</Grid> </Grid>
</ThemeProvider>
</> </>
: :
<> <>


<Grid item sx={{ ml: 3, mr: 3 }}> <Grid item sx={{ ml: 3, mr: 3 }}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
size="large"
variant="contained" variant="contained"
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
onClick={onEditClick} onClick={onEditClick}
> >
<Typography variant="h5">Edit</Typography>
Edit
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
</> </>
} }
@@ -380,17 +371,14 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
})} })}
</Grid> </Grid>
<Grid item xs={1} md={1} lg={1}> <Grid item xs={1} md={1} lg={1}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
size="large"
variant="contained" variant="contained"
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
onClick={() => { onVerifiedClick() }} onClick={() => { onVerifiedClick() }}
> >
<Typography variant="h5">Verify</Typography>
Verify
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
</> </>
} }
@@ -436,33 +424,27 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>


{formik.values.locked ? {formik.values.locked ?
<Grid item xs={1} md={1} lg={1} sx={{ ml: 1 }}> <Grid item xs={1} md={1} lg={1} sx={{ ml: 1 }}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
size="large"
variant="contained" variant="contained"
color="success" color="success"
sx={{
textTransform: 'capitalize',
alignItems: 'end'
}}
onClick={doUnlock} onClick={doUnlock}
> >
<Typography variant="h5">Active</Typography>
Active
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
: :
<Grid item xs={1} md={1} lg={1} sx={{ ml: 1 }}> <Grid item xs={1} md={1} lg={1} sx={{ ml: 1 }}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button <Button
size="large"
variant="contained" variant="contained"
color="error" color="error"
sx={{
textTransform: 'capitalize',
alignItems: 'end',
}}
onClick={doLock} onClick={doLock}
> >
<Typography variant="h5">Lock</Typography>
Lock
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
} }
</> </>
@@ -478,11 +460,13 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
<Grid container alignItems={"center"}> <Grid container alignItems={"center"}>
{currentUserData.orgId == null ? {currentUserData.orgId == null ?
<Grid item lg={2} > <Grid item lg={2} >
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button variant="contained" <Button variant="contained"
onClick={createOrgClick} onClick={createOrgClick}
> >
<Typography variant="h5">Create Organisation</Typography>
Create Organisation
</Button> </Button>
</ThemeProvider>
</Grid> </Grid>
: null : null
} }
@@ -593,7 +577,11 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
<Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography> <Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography>
</DialogContent> </DialogContent>
<DialogActions> <DialogActions>
<Button onClick={() => setIsWarningPopUp(false)}><Typography variant="h5">Close</Typography></Button>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button onClick={() => setIsWarningPopUp(false)}>
Close
</Button>
</ThemeProvider>
</DialogActions> </DialogActions>
</Dialog> </Dialog>
</div> </div>
@@ -614,8 +602,14 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
<Typography variant="h4" style={{ padding: '16px' }}>{confirmText}</Typography> <Typography variant="h4" style={{ padding: '16px' }}>{confirmText}</Typography>
</DialogContent> </DialogContent>
<DialogActions> <DialogActions>
<Button onClick={() => { setIsConfirmPopUp(false) }}><Typography variant="h5">Close</Typography></Button>
<Button onClick={() => { confirmAction?.function(); }}><Typography variant="h5">Confirm</Typography></Button>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Button onClick={() => { setIsConfirmPopUp(false) }}>
Close
</Button>
<Button onClick={() => { confirmAction?.function(); }}>
Confirm
</Button>
</ThemeProvider>
</DialogActions> </DialogActions>
</Dialog> </Dialog>
</div> </div>


+ 1
- 0
src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js View File

@@ -114,6 +114,7 @@ const UserInformationCard_Organization_Pub = ({ userData, loadDataFun,}) => {
<Button <Button
variant="contained" variant="contained"
onClick={loadDataFun} onClick={loadDataFun}
color="cancel"
> >
<FormattedMessage id="resetAndBack" /> <FormattedMessage id="resetAndBack" />




+ 1
- 1
src/pages/User/SearchPage/UserSearchForm.js View File

@@ -81,7 +81,7 @@ const UserSearchForm = ({ applySearch }) => {
<Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1}} width="98%"> <Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1}} width="98%">
{/*row 1*/} {/*row 1*/}
<Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}> <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
<Typography variant="h5" >
<Typography variant="pnspsFormHeader" >
Search Form (GLD User) Search Form (GLD User)
</Typography> </Typography>
</Grid> </Grid>


+ 1
- 1
src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js View File

@@ -52,7 +52,7 @@ const UserSearchForm_Individual = ({ applySearch }) => {
<Grid container sx={{ ml: 2, mt: 1}} width="98%"> <Grid container sx={{ ml: 2, mt: 1}} width="98%">
{/*row 1*/} {/*row 1*/}
<Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}> <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
<Typography variant="h5" >
<Typography variant="pnspsFormHeader" >
Search Form Search Form
</Typography> </Typography>
</Grid> </Grid>


+ 1
- 1
src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js View File

@@ -57,7 +57,7 @@ const UserSearchForm_Organization = ({applySearch}) => {
<Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1}} width="98%"> <Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1}} width="98%">
{/*row 1*/} {/*row 1*/}
<Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}> <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
<Typography variant="h5" >
<Typography variant="pnspsFormHeader" >
Search Form Search Form
</Typography> </Typography>
</Grid> </Grid>


+ 1
- 1
src/pages/pnspsUserGroupSearchPage/UserGroupSearchForm.js View File

@@ -41,7 +41,7 @@ const UserGroupSearchForm = ({ applySearch }) => {
<Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1}} width="98%"> <Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1}} width="98%">
{/*row 1*/} {/*row 1*/}
<Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}> <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
<Typography variant="h5" >
<Typography variant="pnspsFormHeader" >
Search Form Search Form
</Typography> </Typography>
</Grid> </Grid>


+ 4
- 0
src/themes/buttonConst.js View File

@@ -35,6 +35,10 @@ export const PNSPS_BUTTON_THEME = createTheme({
main: '#F3AF2B', main: '#F3AF2B',
contrastText: '#FFFFFF', contrastText: '#FFFFFF',
}, },
error:{
main: '#F3AF2B',
contrastText: '#FFFFFF',
},
exportExcel:{ exportExcel:{
main: '#6A8B9E', main: '#6A8B9E',
contrastText: '#FFFFFF', contrastText: '#FFFFFF',


Write Preview
Loading…
Cancel
Save