adriano.andrade
/
projeto-hit
mirror of https://github.com/AdrianoRobson/projeto-hit.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'testeA'

pull/1/head
adriano 2022-02-04 12:31:57 -03:00
parent d038631045 c16d75781d
commit f74ce5549f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/Report/ExportCSV/index.js
View File

@ -48,7 +48,7 @@ const ExportCSV = (props) => {
return ( return (
<div> <div>
<Button onClick={getTransactionData}>EXPORT CSV</Button> <Button onClick={getTransactionData}>CSV EXPORT</Button>
<CSVLink <CSVLink
headers={header} headers={header}
data={dataRow} data={dataRow}

8
frontend/src/components/Report/MTable/index.js
View File

@ -11,8 +11,10 @@ const MTable = (props) => {
const [selectedRow, setSelectedRow] = useState(null); const [selectedRow, setSelectedRow] = useState(null);
const dataLoad = props.data.map((dt) => { return { ...dt }}); //const dataLoad = props.data.map((dt) => { return { ...dt }});
const columnsLoad = props.columns.map((column) => { return { ...column }}); const dataLoad = props.data.map(({user, ...others})=>({...others, 'user': user ? user : {name: 'Aguardando atendente', email:''}}));
const columnsLoad = props.columns.map((column) => { return { ...column }});
useEffect(() => { useEffect(() => {
@ -41,7 +43,7 @@ const MTable = (props) => {
render(<Modal data={selectedRow.messages} render(<Modal data={selectedRow.messages}
hasChild={false} hasChild={false}
modal_header={'Chat do atendimento pelo Whatsapp'} modal_header={'Chat do atendimento pelo Whatsapp'}
user={selectedRow.user.name} user={selectedRow.user.name}
clientContactNumber={selectedRow.contact.number}/>) clientContactNumber={selectedRow.contact.number}/>)
} }