diff --git a/frontend/src/components/Report/MTable/index.js b/frontend/src/components/Report/MTable/index.js
index ed32cde..58c38ba 100644
--- a/frontend/src/components/Report/MTable/index.js
+++ b/frontend/src/components/Report/MTable/index.js
@@ -23,9 +23,11 @@ const MTable = (props) => {
return (
{
@@ -34,8 +36,12 @@ const MTable = (props) => {
console.log(selectedRow);
console.log(selectedRow.messages);
setSelectedRow(selectedRow.tableData.id)
-
- render()
+
+ if(props.hasChild) {
+ render()
+ }
+
+ console.log('props.hasChild: ', props.hasChild)
//evt.stopPropagation()
}
@@ -46,6 +52,7 @@ const MTable = (props) => {
selection: false,
paging: false,
padding: 'dense',
+ sorting: true ? props.hasChild: false,
//loadingType: 'linear',
searchFieldStyle: {
width: 300,
@@ -53,8 +60,7 @@ const MTable = (props) => {
rowStyle: rowData => ({
fontSize: 12,
- backgroundColor:
- selectedRow === rowData.tableData.id ? '#ec5114' : '#FFF'
+ backgroundColor: selectedRow === rowData.tableData.id ? '#ec5114' : '#FFF'
})
}}
/>
diff --git a/frontend/src/components/Report/Modal/index.js b/frontend/src/components/Report/Modal/index.js
index 0099389..f50b2c8 100644
--- a/frontend/src/components/Report/Modal/index.js
+++ b/frontend/src/components/Report/Modal/index.js
@@ -3,6 +3,10 @@ import Button from '@mui/material/Button';
import Dialog from '@mui/material/Dialog';
import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogContentText from '@mui/material/DialogContentText';
+import DialogTitle from '@mui/material/DialogTitle';
+
import DataGridTable from '../Table';
import MTable from "../MTable";
@@ -10,12 +14,13 @@ let columns = [
{
title: 'Atendente/Cliente',
field: 'fromMe',
+
},
{
title: 'Mensagem',
field: 'body',
- cellStyle: {whiteSpace: 'nowrap'},
+ //cellStyle: {whiteSpace: 'nowrap'},
},
{ title: 'Criado', field: 'createdAt' }
@@ -73,10 +78,21 @@ const Modal = (props) => {
scroll={scroll}
aria-labelledby="scroll-dialog-title"
aria-describedby="scroll-dialog-description"
- >
+ >
-
+ {props.modal_header}
+
+
+
+
+
+
+
diff --git a/frontend/src/pages/Report/index.js b/frontend/src/pages/Report/index.js
index aecfd5f..c750b43 100644
--- a/frontend/src/pages/Report/index.js
+++ b/frontend/src/pages/Report/index.js
@@ -296,7 +296,7 @@ console.log('XXXXXXXXX: ', query)
display: 'grid',
}}>
-
-
+