GilenoNeto901/riseup-squad23
1
0
Fork 0
forked from RiseUP/riseup-squad23
Code Pull Requests Activity

Salvar pequenas alterações

Browse Source
This commit is contained in:
joao_pedro 2025-10-28 15:42:21 -03:00
parent f11bf05cc0
commit ede2be7edd
10 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/AgendarConsulta/CardConsulta.jsx
View File

@ -12,6 +12,9 @@ const CardConsulta = ( {DadosConsulta, TabelaAgendamento, setShowDeleteModal, se
const [Paciente, setPaciente] = useState() const [Paciente, setPaciente] = useState()
const [Medico, setMedico] = useState() const [Medico, setMedico] = useState()
console.log(DadosConsulta.chief_complaint)
const ids = useMemo(() => { const ids = useMemo(() => {
return { return {
doctor_id: DadosConsulta?.doctor_id, doctor_id: DadosConsulta?.doctor_id,
@ -50,18 +53,23 @@ const CardConsulta = ( {DadosConsulta, TabelaAgendamento, setShowDeleteModal, se
return ( return (
<div className={`container-cardconsulta container-cardconsulta-${TabelaAgendamento}`}> <div className={`container-cardconsulta container-cardconsulta-${TabelaAgendamento}`}>
{DadosConsulta.id? {DadosConsulta.id?
<div className='cardconsulta' id={`status-card-consulta-${DadosConsulta.status}`}> <div className='cardconsulta' id={`status-card-consulta-${DadosConsulta.status}`}>
<div> <div>
<section className='cardconsulta-infosecundaria'> <section className='cardconsulta-infosecundaria'>
<p>{DadosConsulta.horario} {nameArrayMedico && nameArrayMedico.length > 0 ? nameArrayMedico[0] : ''} {nameArrayMedico && nameArrayMedico.length > 1 ? ` ${nameArrayMedico[1]}` : ''} </p> <p>Medico:{DadosConsulta.horario} {nameArrayMedico && nameArrayMedico.length > 0 ? nameArrayMedico[0] : ''} {nameArrayMedico && nameArrayMedico.length > 1 ? ` ${nameArrayMedico[1]}` : ''} </p>
</section> </section>
<section className='cardconsulta-infoprimaria'> <section className='cardconsulta-infoprimaria'>
<p>{nameArrayPaciente && nameArrayPaciente.length > 0 ? nameArrayPaciente[0] : ''} {nameArrayPaciente && nameArrayPaciente.length > 1 ? ` ${nameArrayPaciente[1]}` : ''}- {}</p> <p>Paciente: {nameArrayPaciente && nameArrayPaciente.length > 0 ? nameArrayPaciente[0] : ''} {nameArrayPaciente && nameArrayPaciente.length > 1 ? ` ${nameArrayPaciente[1]}` : ''}- {}
{DadosConsulta.chief_complaint && `Reclamação: ${DadosConsulta.chief_complaint}`}
</p>
</section> </section>
</div> </div>
@ -94,6 +102,7 @@ const CardConsulta = ( {DadosConsulta, TabelaAgendamento, setShowDeleteModal, se
console.log(DadosConsulta.id) console.log(DadosConsulta.id)
setSelectedId(DadosConsulta.id); setSelectedId(DadosConsulta.id);
setShowDeleteModal(true); setShowDeleteModal(true);
}} }}
> >
<i className="bi bi-trash me-1"></i> <i className="bi bi-trash me-1"></i>

8
src/components/AgendarConsulta/FormNovaConsulta.jsx
View File

@ -87,7 +87,11 @@ const [isDropdownOpen, setIsDropdownOpen] = useState(false);
} }
} }
// Se estiver na página de edição esse useEffect pega o horario de inicio para coloca-lo no horarioInicio
useEffect(() => {
console.log("Horario", )
setHorarioInicio(formatarHora(agendamento.scheduled_at))
}, [])
useEffect(() => { useEffect(() => {
@ -287,7 +291,7 @@ const handleSubmit = (e) => {
<div className="campo-de-input"> <div className="campo-de-input">
<label>Data *</label> <label>Data *</label>
<input type="date" name="dataAtendimento" onChange={handleChange} required /> <input type="date" name="dataAtendimento" onChange={handleChange} value={agendamento.dataAtendimento} required />
</div> </div>
</div> </div>
<div className="linha"> <div className="linha">

8
src/components/AgendarConsulta/TabelaAgendamentoMes.jsx
View File

@ -6,7 +6,7 @@ import "./style/styleTabelas/tabelames.css";
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { useMemo } from 'react'; import { useMemo } from 'react';
const TabelaAgendamentoMes = ({ ListarDiasdoMes, agendamentos, setShowDeleteModal, setSelectedId ,setDictInfo }) => { const TabelaAgendamentoMes = ({ ListarDiasdoMes, agendamentos, setShowDeleteModal, setSelectedId ,setDictInfo, setShowConfirmModal }) => {
const dataHoje = dayjs(); const dataHoje = dayjs();
const AnoAtual = dataHoje.year(); const AnoAtual = dataHoje.year();
@ -202,9 +202,9 @@ const TabelaAgendamentoMes = ({ ListarDiasdoMes, agendamentos, setShowDeleteModa
{ {
semana && typeof semana === "object" && Object.keys(semana).map((dia) => ( semana && typeof semana === "object" && Object.keys(semana).map((dia) => (
<td key={dia} > <td key={dia} >
<CardConsulta DadosConsulta={((semana[dia]|| [])[0]) || {status:'vazio'}} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo}/> <CardConsulta TabelaAgendamento={'mes'} DadosConsulta={((semana[dia]|| [])[0]) || {status:'vazio'}} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal}/>
<CardConsulta DadosConsulta={((semana[dia]|| [])[1]) || {status:'vazio'}} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo}/> <CardConsulta TabelaAgendamento={'mes'} DadosConsulta={((semana[dia]|| [])[1]) || {status:'vazio'}} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal}/>
<CardConsulta DadosConsulta={((semana[dia]|| [])[2]) || {status:'vazio'}} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo}/> <CardConsulta TabelaAgendamento={'mes'} DadosConsulta={((semana[dia]|| [])[2]) || {status:'vazio'}} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal} />
{semana[dia].length > 3 ? ( {semana[dia].length > 3 ? (
<div> <div>
<p>{` +${semana[dia].length - 2}`}</p> <p>{` +${semana[dia].length - 2}`}</p>

10
src/components/AgendarConsulta/TabelaAgendamentoSemana.jsx
View File

@ -178,31 +178,31 @@ const TabelaAgendamentoSemana = ({ agendamentos, ListarDiasdoMes, setShowDeleteM
{/* Mapeamento de COLUNAS (dias) */} {/* Mapeamento de COLUNAS (dias) */}
<td> <td>
{semanaParaRenderizar?.segunda[indiceLinha] {semanaParaRenderizar?.segunda[indiceLinha]
? <CardConsulta DadosConsulta={semanaParaRenderizar?.segunda[indiceLinha]} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal}/> ? <CardConsulta TabelaAgendamento={'semana'} DadosConsulta={semanaParaRenderizar?.segunda[indiceLinha]} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal}/>
: null : null
} }
</td> </td>
<td> <td>
{semanaParaRenderizar.terça[indiceLinha] {semanaParaRenderizar.terça[indiceLinha]
? <CardConsulta DadosConsulta={semanaParaRenderizar.terça[indiceLinha]} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal}/> ? <CardConsulta TabelaAgendamento={'semana'} DadosConsulta={semanaParaRenderizar.terça[indiceLinha]} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal}/>
: null : null
} }
</td> </td>
<td> <td>
{semanaParaRenderizar.quarta[indiceLinha] {semanaParaRenderizar.quarta[indiceLinha]
? <CardConsulta DadosConsulta={semanaParaRenderizar.quarta[indiceLinha]} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal}/> ? <CardConsulta TabelaAgendamento={'semana'} DadosConsulta={semanaParaRenderizar.quarta[indiceLinha]} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal}/>
: null : null
} }
</td> </td>
<td> <td>
{semanaParaRenderizar.quinta[indiceLinha] {semanaParaRenderizar.quinta[indiceLinha]
? <CardConsulta DadosConsulta={semanaParaRenderizar.quinta[indiceLinha]} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal}/> ? <CardConsulta TabelaAgendamento={'semana'} DadosConsulta={semanaParaRenderizar.quinta[indiceLinha]} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal}/>
: null : null
} }
</td> </td>
<td> <td>
{semanaParaRenderizar.sexta[indiceLinha] {semanaParaRenderizar.sexta[indiceLinha]
? <CardConsulta DadosConsulta={semanaParaRenderizar.sexta[indiceLinha]} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal} /> ? <CardConsulta TabelaAgendamento={'semana'} DadosConsulta={semanaParaRenderizar.sexta[indiceLinha]} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal} />
: null : null
} }
</td> </td>

4
src/components/AgendarConsulta/style/card-consulta.css
View File

@ -69,3 +69,7 @@
} }
.container-cardconsulta{
width: 40rem;
}

2
src/components/AgendarConsulta/style/styleTabelas/tabeladia.css
View File

@ -6,6 +6,8 @@
overflow: hidden; /* mantém o arredondado */ overflow: hidden; /* mantém o arredondado */
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
border: 4px solid #4a90e2; /* borda azul, altere para a cor desejada */ border: 4px solid #4a90e2; /* borda azul, altere para a cor desejada */
} }
/* 1. Estilização do TD (Container) */ /* 1. Estilização do TD (Container) */
.coluna-horario { .coluna-horario {

4
src/components/AgendarConsulta/style/styleTabelas/tabelames.css
View File

@ -9,7 +9,7 @@
} }
/* Células da tabela */ /* Células da tabela */
.tabelamensal th, .tabelamensal td { .tabelamensal th {
padding: 9px; padding: 9px;
text-align: left; text-align: left;
border: 1px solid #e0e0e0; border: 1px solid #e0e0e0;
@ -73,7 +73,7 @@
border: 4px solid #4a90e2; /* borda azul, altere para a cor desejada */ border: 4px solid #4a90e2; /* borda azul, altere para a cor desejada */
} }
.tabelamensal th, .tabelamensal td { .tabelamensal th {
padding: 9px; padding: 9px;
text-align: left; text-align: left;
border: 1px solid #e0e0e0; border: 1px solid #e0e0e0;

11
src/components/AgendarConsulta/style/styleTabelas/tabelasemana.css
View File

@ -6,6 +6,7 @@
overflow: hidden; /* mantém o arredondado */ overflow: hidden; /* mantém o arredondado */
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
border: 4px solid #4a90e2; /* borda azul, altere para a cor desejada */ border: 4px solid #4a90e2; /* borda azul, altere para a cor desejada */
} }
/* Células da tabela */ /* Células da tabela */
@ -67,10 +68,10 @@
.tabelasemanal tr:hover { .tabelasemanal tr:hover {
background-color: #f1f1f1 !important; background-color: #f1f1f1 !important;
} }
/*
tr{ tr{
width: 1000px; width: 1000px;
} }*/
html[data-bs-theme="dark"] .tabelasemanal { html[data-bs-theme="dark"] .tabelasemanal {
border: 4px solid #333; border: 4px solid #333;
@ -111,3 +112,9 @@ html[data-bs-theme="dark"] .tabelasemanal .cardconsulta {
box-shadow: 0 1px 3px rgba(0,0,0,0.3); box-shadow: 0 1px 3px rgba(0,0,0,0.3);
border-left: 5px solid #333; border-left: 5px solid #333;
} }
.tabelasemanal td{
width: 50rem;
}

5
src/pages/Agendamento.jsx
View File

@ -45,12 +45,13 @@ const Agendamento = ({setDictInfo}) => {
const [MedicoFiltrado, setMedicoFiltrado] = useState({id:"vazio"}) const [MedicoFiltrado, setMedicoFiltrado] = useState({id:"vazio"})
const [cacheFiladeEspera, setcacheFiladeEspera] = useState([])
const [cacheAgendamentos, setCacheAgendamentos] = useState([]) const [cacheAgendamentos, setCacheAgendamentos] = useState([])
const [showConfirmModal, setShowConfirmModal] = useState(false) const [showConfirmModal, setShowConfirmModal] = useState(false)
let authHeader = getAuthorizationHeader() let authHeader = getAuthorizationHeader()
const cacheMedicos = {}; const cacheMedicos = {};
@ -426,7 +427,7 @@ const handleSearchMedicos = (term) => {
{/* Componentes de Tabela - Adicionado props de delete da main */} {/* Componentes de Tabela - Adicionado props de delete da main */}
{tabela === "diario" && <TabelaAgendamentoDia handleClickAgendamento={handleClickAgendamento} agendamentos={DictAgendamentosOrganizados} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal} />} {tabela === "diario" && <TabelaAgendamentoDia handleClickAgendamento={handleClickAgendamento} agendamentos={DictAgendamentosOrganizados} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal} />}
{tabela === 'semanal' && <TabelaAgendamentoSemana agendamentos={DictAgendamentosOrganizados} ListarDiasdoMes={ListarDiasdoMes} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal}/>} {tabela === 'semanal' && <TabelaAgendamentoSemana agendamentos={DictAgendamentosOrganizados} ListarDiasdoMes={ListarDiasdoMes} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal}/>}
{tabela === 'mensal' && <TabelaAgendamentoMes ListarDiasdoMes={ListarDiasdoMes} aplicarCores={true} agendamentos={DictAgendamentosOrganizados} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} />} {tabela === 'mensal' && <TabelaAgendamentoMes ListarDiasdoMes={ListarDiasdoMes} aplicarCores={true} agendamentos={DictAgendamentosOrganizados} setShowDeleteModal={setShowDeleteModal} setSelectedId={setSelectedId} setDictInfo={setDictInfo} setShowConfirmModal={setShowConfirmModal} />}
</div> </div>
</div> </div>
) )

4
src/pages/AgendamentoEditPage.jsx
View File

@ -13,7 +13,6 @@ const AgendamentoEditPage = ({setDictInfo, DictInfo}) => {
//let DataAtual = dayjs() //let DataAtual = dayjs()
const {getAuthorizationHeader} = useAuth() const {getAuthorizationHeader} = useAuth()
const params = useParams() const params = useParams()
const [PatientToPatch, setPatientToPatch] = useState({})
let id = params.id let id = params.id
@ -22,8 +21,7 @@ const AgendamentoEditPage = ({setDictInfo, DictInfo}) => {
//console.log(DictInfo, 'aqui') //console.log(DictInfo, 'aqui')
useEffect(() => { useEffect(() => {
setDictInfo({...DictInfo?.Infos,...DictInfo?.agendamento}) setDictInfo({...DictInfo, dataAtendimento:DictInfo.scheduled_at.split("T")[0]})
const ColherInfoUsuario =async () => { const ColherInfoUsuario =async () => {
const result = await UserInfos(authHeader) const result = await UserInfos(authHeader)