Merge branch 'administativePages' into 'dev'

Administative pages

See merge request kluppsoftware/smart-energia-web!88
This commit is contained in:
Alex Da Silva Santos 2022-06-29 14:37:41 +00:00
commit 6cea6339d1
3 changed files with 2 additions and 8 deletions

View File

@ -131,8 +131,6 @@ export default function index({userName}: any) {
content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px }' content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px }'
}} }}
/> />
</GeneralView> </GeneralView>
) )
} }

View File

@ -6,15 +6,11 @@ import BasicButton from '../../../components/buttons/basicButton/BasicButton'
import Header from '../../../components/header/Header' import Header from '../../../components/header/Header'
import PageTitle from '../../../components/pageTitle/PageTitle' import PageTitle from '../../../components/pageTitle/PageTitle'
import { IndustryInfoView } from '../../../styles/layouts/industryInfo/IndustryInfoView' import { IndustryInfoView } from '../../../styles/layouts/industryInfo/IndustryInfoView'
import InputUploadPdf from '../../../components/inputUploadPdf/inputUpload';
import { api } from '../../../services/api' import { api } from '../../../services/api'
// import PdfThumbnail from 'react-pdf-thumbnail';
import FormData from 'form-data'; import FormData from 'form-data';
import Snackbar from '@mui/material/Snackbar'; import Snackbar from '@mui/material/Snackbar';
import MuiAlert, { AlertProps } from '@mui/material/Alert'; import MuiAlert, { AlertProps } from '@mui/material/Alert';
import { InputUploadView } from '../../../components/inputUploadPdf/inputUploadView'
const Alert = React.forwardRef<HTMLDivElement, AlertProps>(function Alert( const Alert = React.forwardRef<HTMLDivElement, AlertProps>(function Alert(
props, props,

View File

@ -131,7 +131,7 @@ export default function pld({tableData, graphByHourData, graphByMonthData, userN
const dateFormated = new Date() const dateFormated = new Date()
function downloadCSVFile(csv, filename) { function downloadCSVFile(csv, filename) {
const csv_file = new Blob([csv], {type: "text/csv"}); const csv_file = new Blob(["\ufeff",csv], {type: "text/csv"});
const download_link = document.createElement("a"); const download_link = document.createElement("a");
@ -157,7 +157,7 @@ export default function pld({tableData, graphByHourData, graphByMonthData, userN
row.push(cols[j].innerText); row.push(cols[j].innerText);
} }
data.push(row.join(",")); data.push(row.join(";"));
} }
downloadCSVFile(data.join("\n"), filename); downloadCSVFile(data.join("\n"), filename);