Commit e468136e authored by d.arizona's avatar d.arizona

commit

parent fbe62400
...@@ -465,6 +465,7 @@ export default class UserRole extends Component { ...@@ -465,6 +465,7 @@ export default class UserRole extends Component {
const columns = [{ const columns = [{
name: "Action", name: "Action",
options: { options: {
filter: false,
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
...@@ -492,6 +493,7 @@ export default class UserRole extends Component { ...@@ -492,6 +493,7 @@ export default class UserRole extends Component {
}, { }, {
name: "ID", name: "ID",
options: { options: {
filter: false,
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
...@@ -598,7 +600,7 @@ export default class UserRole extends Component { ...@@ -598,7 +600,7 @@ export default class UserRole extends Component {
/> />
</div> </div>
</div> */} </div> */}
<div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}> {/* <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}>
<img src={Images.searchBlack} style={{ marginRight: 10 }} /> <img src={Images.searchBlack} style={{ marginRight: 10 }} />
<InputBase <InputBase
style={{ width: '100%' }} style={{ width: '100%' }}
...@@ -615,7 +617,7 @@ export default class UserRole extends Component { ...@@ -615,7 +617,7 @@ export default class UserRole extends Component {
}} }}
inputProps={{ 'aria-label': 'naked' }} inputProps={{ 'aria-label': 'naked' }}
/> />
</div> </div> */}
{/* <label style={{ color: 'white', width: '60%', justifyContent: 'center', display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center' }}>Search</label> */} {/* <label style={{ color: 'white', width: '60%', justifyContent: 'center', display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center' }}>Search</label> */}
<div style={{ width: '20%', justifyContent: 'flex-end', display: 'flex' }}> <div style={{ width: '20%', justifyContent: 'flex-end', display: 'flex' }}>
<a data-tip={'Download Template'} data-for="template"> <a data-tip={'Download Template'} data-for="template">
......
...@@ -165,6 +165,7 @@ class UserRole extends Component { ...@@ -165,6 +165,7 @@ class UserRole extends Component {
const columns = [{ const columns = [{
name: "Action", name: "Action",
options: { options: {
filter: false,
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
// console.log(tableMeta); // console.log(tableMeta);
return ( return (
...@@ -195,6 +196,7 @@ class UserRole extends Component { ...@@ -195,6 +196,7 @@ class UserRole extends Component {
}, { }, {
name: "ID", name: "ID",
options: { options: {
filter: false,
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
...@@ -251,7 +253,7 @@ class UserRole extends Component { ...@@ -251,7 +253,7 @@ class UserRole extends Component {
<div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -118 }}> <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -118 }}>
<label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Role & Authorization</label> <label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Role & Authorization</label>
<div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}> {/* <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}>
<img src={Images.searchBlack} style={{ marginRight: 10 }} /> <img src={Images.searchBlack} style={{ marginRight: 10 }} />
<InputBase <InputBase
style={{ width: '100%' }} style={{ width: '100%' }}
...@@ -268,7 +270,7 @@ class UserRole extends Component { ...@@ -268,7 +270,7 @@ class UserRole extends Component {
}} }}
inputProps={{ 'aria-label': 'naked' }} inputProps={{ 'aria-label': 'naked' }}
/> />
</div> </div> */}
{/* <label style={{ color: 'white', width: '60%', justifyContent: 'center', display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center' }}>Search</label> */} {/* <label style={{ color: 'white', width: '60%', justifyContent: 'center', display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center' }}>Search</label> */}
<div style={{ width: '20%', justifyContent: 'flex-end', display: 'flex' }}> <div style={{ width: '20%', justifyContent: 'flex-end', display: 'flex' }}>
{this.state.buttonCreate && ( {this.state.buttonCreate && (
......
...@@ -55,8 +55,8 @@ exports.customTable = function () { ...@@ -55,8 +55,8 @@ exports.customTable = function () {
MUIDataTableSearch: { MUIDataTableSearch: {
main: { main: {
position: 'absolute', position: 'absolute',
top: "0", top: "5px",
right: "-9px", right: "5px",
width: "350px !important", width: "350px !important",
backgroundColor: "#f2f6fa", backgroundColor: "#f2f6fa",
zIndex: "10", zIndex: "10",
...@@ -99,6 +99,17 @@ exports.customTable = function () { ...@@ -99,6 +99,17 @@ exports.customTable = function () {
verticalAlign: 'inherit', verticalAlign: 'inherit',
} }
}, },
MUIDataTableFilterList: {
root: {
backgroundColor: "#f2f6fa",
margin: "0px 0px 0px 0px",
padding: "0px 16px 0px 16px"
},
chip: {
margin: "8px 8px 8px 0px",
color: "#555",
}
},
MUIDataTableHead: { MUIDataTableHead: {
main: { main: {
position: 'relative', position: 'relative',
...@@ -114,6 +125,8 @@ exports.customTable = function () { ...@@ -114,6 +125,8 @@ exports.customTable = function () {
color: "#555", color: "#555",
padding: "10px 20px", padding: "10px 20px",
height: "auto" height: "auto"
,
marginTop: "10px"
}, },
}, },
MUIDataTableHeadRow: { MUIDataTableHeadRow: {
...@@ -272,7 +285,7 @@ exports.customTable2 = function () { ...@@ -272,7 +285,7 @@ exports.customTable2 = function () {
backgroundColor: secondColor, backgroundColor: secondColor,
color: "#555", color: "#555",
padding: "10px", padding: "10px",
height: "auto" height: "auto",
}, },
toolButton: { toolButton: {
display: "flex", display: "flex",
...@@ -330,8 +343,8 @@ exports.customOptions = function () { ...@@ -330,8 +343,8 @@ exports.customOptions = function () {
print: false, print: false,
download: false, download: false,
elevation: 5, elevation: 5,
filter: false, filter: true,
search: false search: true
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment