Commit 7735adee authored by EKSAD's avatar EKSAD

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

parents 61b32313 fbe62400
...@@ -559,6 +559,8 @@ export default class BudgetTahunan extends Component { ...@@ -559,6 +559,8 @@ export default class BudgetTahunan extends Component {
{this.state.visibleBS && ( {this.state.visibleBS && (
<BalanceSheet <BalanceSheet
report_id={this.state.report_id} report_id={this.state.report_id}
height={this.props.height}
width={this.props.width}
company={this.state.company} company={this.state.company}
revision={this.state.revisionTable} revision={this.state.revisionTable}
periode={this.state.periode.periode} periode={this.state.periode.periode}
......
This diff is collapsed.
...@@ -473,22 +473,25 @@ export default function MiniDrawer() { ...@@ -473,22 +473,25 @@ export default function MiniDrawer() {
</IconButton>} </IconButton>}
{open && {open &&
<div style={{ width: '100%', marginTop: 15, marginBottom: 60 }}> <div style={{ width: '100%', marginTop: 15, marginBottom: 60 }}>
<Typography style={{ fontSize: 14, color: '#fff', textAlign: 'center', fontWeight: 'bold' }}>{userFullname}</Typography> <Link to={"profile"}>
<Typography style={{ fontSize: 14, color: '#fff', textAlign: 'center', marginTop: 10 }}>{userEmail}</Typography> <Typography style={{ fontSize: 14, color: '#fff', textAlign: 'center', fontWeight: 'bold' }}>{userFullname}</Typography>
</Link>
<Link to={"profile"}>
<Typography style={{ fontSize: 14, color: '#fff', textAlign: 'center', marginTop: 10 }}>{userEmail}</Typography>
</Link>
</div> </div>
} }
</div> </div>
<Divider /> <Divider />
{open && {open &&
<div style={{ width: '100%', textAlign: '-webkit-center', marginTop: -45, display: 'flex', justifyContent: 'center' }}> <div style={{ width: '100%', textAlign: '-webkit-center', marginTop: -45, display: 'flex', justifyContent: 'center' }}>
<div className={"sub-color"} style={{ width: 90, height: 90, borderRadius: 50, display: 'flex', justifyContent: 'center' }}> <Link to={"profile"}>
<div style={{ width: 72, height: 72, backgroundColor: '#838383', borderRadius: 50, alignSelf: 'center' }}> <div className={"sub-color"} style={{ width: 90, height: 90, borderRadius: 50, display: 'flex', justifyContent: 'center' }}>
<Link to={"profile"}> <div style={{ width: 72, height: 72, backgroundColor: '#838383', borderRadius: 50, alignSelf: 'center' }}>
{userPhoto === "" ? null : <img src={userPhoto} style={{ width: 72, height: 72, borderRadius: 50 }} />} {userPhoto === "" ? null : <img src={userPhoto} style={{ width: 72, height: 72, borderRadius: 50 }} />}
</Link> </div>
</div> </div>
</Link>
</div>
</div> </div>
} }
{open && application.length > 0 && {open && application.length > 0 &&
...@@ -619,7 +622,7 @@ export default function MiniDrawer() { ...@@ -619,7 +622,7 @@ export default function MiniDrawer() {
key={index} key={index}
path={route.path} path={route.path}
// exact={route.exact} // exact={route.exact}
children={<route.main height={height} />} children={<route.main height={height} width={width} />}
/> />
))} ))}
</Switch> </Switch>
......
...@@ -356,6 +356,7 @@ exports.customOptionsFixedColumn = function () { ...@@ -356,6 +356,7 @@ exports.customOptionsFixedColumn = function () {
filterType: false, filterType: false,
filter: false, filter: false,
sort: false, sort: false,
responsive: 'scrollMaxHeight',
viewColumns:false, viewColumns:false,
overflowX: 'auto', overflowX: 'auto',
print: false, print: false,
......
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