Skip to content

T
Tia-dev
Commit 57b57450 authored by Rifka Kurnia Irfiana's avatar Rifka Kurnia Irfiana
Browse files
Options

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

parents c26cc487 0703d033
Expand all Show whitespace changes
Inline Side-by-side
Showing with 299 additions and 112 deletions
src/api/index.js
View file @ 57b57450
......@@ -200,6 +200,7 @@ const create = (type = "") => {
const getMonthTransaction = () => api.get('transaction/get_default_month')
const countingFormula = (body) => api.post('transaction/counting_formula', body)
const submitMasterBudget = (body) => api.post('transaction/master_budget/submit_master_budget', body)
const checkIsSubmit = (body) => api.post('transaction/master_budget/is_can_submit', body)
const getIdDeleteFromExcel = (body) => api.post('transaction/master_budget/delete_from_excel', body)
const getOpetratingIndID = (body) => api.post('transaction/get_operating_indicator_id', body)
......@@ -208,7 +209,8 @@ const create = (type = "") => {
const createOpetaingInd = (body) => api.post('transaction/operating_indicator/create_submission_report', body)
const checkUploadOperatingInd = (body) => api.post('transaction/operating_indicator/check_import', body)
const uploadOperatingInd = (body) => api.post('transaction/operating_indicator/import_operating_indicator', body)
const getDashboard = (body) => api.get('transaction/master_budget/get_dashboard')
const getDashboard = (body) => api.get('transaction/get_dashboard')
const historyApproval = (body) => api.post('transaction/master_budget/history_approval', body)
//Template
const downloadTemplate = (fileName, fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`)
......@@ -356,8 +358,10 @@ const create = (type = "") => {
getLastestUpdateMB,
countingFormula,
submitMasterBudget,
checkIsSubmit,
getIdDeleteFromExcel,
getDashboard
getDashboard,
historyApproval
}
}
......
src/container/BudgetTahunan.js
View file @ 57b57450
This diff is collapsed.
src/container/BudgetTahunan/BalanceSheet.js
View file @ 57b57450
......@@ -612,7 +612,8 @@ export default class BalanceSheet extends Component {
<div style={{ textAlign: 'right' }}>
{tableMeta.rowData[0] === 4 ?
null
:
: tableMeta.rowData[0] === 1 ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
......
src/container/BudgetTahunan/ProfitLoss.js
View file @ 57b57450
......@@ -553,7 +553,12 @@ export default class ProfitLoss extends Component {
"formula": rilFormula
}
api.create().countingFormula(body).then(response => {
// console.log(response);
console.log(response);
// if (response.data) {
// if (response.data.status === "success") {
// return response.data.data.result
// }
// }
})
} else {
let body = {
......
src/container/Home.js
View file @ 57b57450
......@@ -26,7 +26,7 @@ import {
Route,
Link,
useParams,
useRouteMatch
useRouteMatch, useLocation
} from "react-router-dom";
import Images from '../assets/Images';
import { FadeMenu, Footer, UseWindowDimensions } from '../Utils/Index';
......@@ -144,6 +144,7 @@ const useStyles = makeStyles((theme) => ({
}));
export default function MiniDrawer() {
let location = useLocation();
const classes = useStyles();
const theme = useTheme();
const [open, setOpen] = React.useState(false);
......@@ -401,6 +402,7 @@ export default function MiniDrawer() {
const selectIndex = (e) => {
setSelectSub("")
setSelectedIndex(e)
// alert(e)
// if (open === false) {
// setOpen(true)
// }
......@@ -652,7 +654,8 @@ export default function MiniDrawer() {
key={index}
path={route.path}
// exact={route.exact}
children={<route.main height={height} width={width} open={open} />}
location={location}
children={<route.main height={height} width={width} open={open} location={location} selectIndex={selectIndex.bind(this)}/>}
/>
))}
</Switch>
......
src/container/HomePage.js
View file @ 57b57450
......@@ -5,6 +5,7 @@ import Images from '../assets/Images';
import DonutChart from 'react-d3-donut';
import Constant from '../library/Constant';
import api from '../api';
import { Link } from 'react-router-dom';
var ct = require("../library/CustomTable");
const getMuiTheme = () => createMuiTheme(ct.customTable());
......@@ -32,6 +33,13 @@ class HomePage extends Component {
this.getDashboard()
}
componentDidUpdate(){
window.onpopstate = e => {
//your code...
this.props.selectIndex('Home')
}
}
getDashboard() {
let listDashboard = []
api.create().getDashboard().then((response) => {
......@@ -52,6 +60,7 @@ class HomePage extends Component {
customBodyRender: (val, tableMeta) => {
return (
<div style={{ display: 'flex' }}>
<Link to={{pathname: `/home/master-budget/`, state: {userType: 'approver'}}}>
<button
style={{
backgroundColor: 'transparent',
......@@ -63,16 +72,7 @@ class HomePage extends Component {
>
<img src={Images.editCopy2} />
</button>
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent'
}}
onClick={() => null}
>
<img src={Images.editCopy} />
</button>
</Link>
</div >
);
}
......@@ -126,11 +126,11 @@ class HomePage extends Component {
return (
<div style={{ flex: 1, backgroundColor: '#f8f8f8' }}>
<div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
<Typography style={{ fontSize: '24px', color: 'white' }}>{this.state.userData === null? '' : `Selamat Datang, ${this.state.userData.fullname} !`}</Typography>
<Typography style={{ fontSize: '24px', color: 'white' }}>{this.state.userData === null? '' : `Welcome, ${this.state.userData.fullname} !`}</Typography>
</div>
<div style={{ flex: 1, padding: 20, width: '100%' }}>
<div style={{ display: 'flex' }}>
<Typography style={{ color: '#656565', fontSize: '16px', fontWeight: 'bold' }}>Menunggu Persetujuan Anda</Typography>
<Typography style={{ color: '#656565', fontSize: '16px', fontWeight: 'bold' }}>Waiting Your Submission</Typography>
</div>
</div>
......@@ -138,7 +138,7 @@ class HomePage extends Component {
<div>
<MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable
data={this.state.listDashboard}
data={data}
columns={columns}
options={options}
/>
......
src/container/OprIndicator/OperatingIndicator.js
View file @ 57b57450
import React, { Component } from 'react';
import { Typography, Paper, TextField, MenuItem, Select, FormControlLabel, createMuiTheme, MuiThemeProvider } from '@material-ui/core';
import { Typography, Paper, TextField, MenuItem, Select, FormControlLabel, createMuiTheme, withStyles, MuiThemeProvider } from '@material-ui/core';
import MUIDataTable from 'mui-datatables';
import Images from '../../assets/Images';
import OperatingIndicatorDetail from './OperatingIndicatorDetail'
import api from '../../api';
import Autocomplete from '@material-ui/lab/Autocomplete';
import MuiAlert from '@material-ui/lab/Alert';
import { titleCase } from '../../library/Utils';
import { ExcelRenderer } from 'react-excel-renderer';
import UploadFile from "../../library/Upload";
......@@ -14,6 +15,9 @@ import Constant from '../../library/Constant';
var ct = require("../../library/CustomTable");
const getMuiTheme = () => createMuiTheme(ct.customTable());
const Alert = withStyles({
})((props) => <MuiAlert elevation={6} variant="filled" {...props} />);
export default class OperatingIndicator extends Component {
constructor(props) {
super(props)
......@@ -30,7 +34,10 @@ export default class OperatingIndicator extends Component {
report_id: null,
listAttachment: [],
visibleUpload: false,
operatingIndID: null
operatingIndID: null,
alert: false,
tipeAlert: '',
messageAlert: ''
}
this.fileHandler = this.fileHandler.bind(this);
}
......@@ -69,11 +76,9 @@ export default class OperatingIndicator extends Component {
return [
item.number,
item.report_name,
// item.revision,
item.current_status,
item.report_id,
item.is_can_upload,
// item.revision
item.is_can_upload
]
})
// console.log(dataTable);
......@@ -268,7 +273,7 @@ export default class OperatingIndicator extends Component {
}
render() {
const columns = ["#", "Jenis Laporan",
const columns = ["#", "Report Type",
// {
// name: "Revision",
// options: {
......@@ -329,14 +334,14 @@ export default class OperatingIndicator extends Component {
<button
style={{
backgroundColor: 'transparent',
cursor: tableMeta.rowData[5] ? 'pointer' : null,
cursor: tableMeta.rowData[4] ? 'pointer' : null,
borderColor: 'transparent'
}}
onClick={() =>
tableMeta.rowData[4] ? this.clickDetail(tableMeta.rowData) : null
tableMeta.rowData[4] ? this.clickDetail(tableMeta.rowData, tableMeta.rowData[1], tableMeta.rowData[3], tableMeta.rowData[2]) : null
}
>
<Typography style={{ color: tableMeta.rowData[5] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>
<Typography style={{ color: tableMeta.rowData[4] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>
</button>
</div >
);
......@@ -357,7 +362,8 @@ export default class OperatingIndicator extends Component {
download: false,
selectableRows: false,
viewColumns: false,
rowsPerPage: 5,
rowsPerPage: 50,
pagination: false,
rowsPerPageOptions: [5, 25, 100],
search: false
}
......@@ -402,10 +408,11 @@ export default class OperatingIndicator extends Component {
this.getOperatingID()
// this.getReportAttachment()
})}
debug
// debug
clearOnEscape
disableClearable
style={{ width: 250 }}
renderInput={(params) => <TextField {...params} label="Periode" margin="normal" style={{ marginTop: 7 }} />}
renderInput={(params) => <TextField {...params} label="Period" margin="normal" style={{ marginTop: 7 }} />}
value={this.state.periode}
/>
</div>
......@@ -418,7 +425,7 @@ export default class OperatingIndicator extends Component {
this.getOperatingID()
// this.getReportAttachment()
})}
debug
clearOnEscape
disableClearable
style={{ width: 250 }}
renderInput={(params) =>
......
src/container/Profile.js
View file @ 57b57450
......@@ -181,7 +181,7 @@ export default class Profile extends Component {
getPerusahaan() {
api.create().getPerusahaanHierarki().then((response) => {
// console.log(response);
console.log(response);
if (response.data) {
if (response.ok) {
if (response.data.status === 'success') {
......
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