박권수

fix. 서비스명 변경, 자잘한 뷰 버그 수정

......@@ -74,7 +74,7 @@ const Header = (props : HeaderProps) => {
</styled.HeaderLeftWrapper>
<styled.HeaderCenterWrapper>
<styled.TitleImg src = {headerImg} />
<styled.Title>내 손 안의 주치의</styled.Title>
<styled.Title>SMART MEDICINE BOX for Doctor</styled.Title>
</styled.HeaderCenterWrapper>
<styled.HeaderRightWrapper>
{
......
......@@ -42,7 +42,7 @@ const DoctorMenuContainer = (props : DoctorMenuProps) => {
const [searchPatientKeyword, setSearchPatientKeyword] = useState<string>('');
const [filteringPatientList, setFilteringPatientList] = useState<any>([]);
const [patientDetail, setPatientDetail] = useState<any>();
const [patientDetail, setPatientDetail] = useState<any>(null);
const [editModal, setEditModal] = useState<boolean>(false);
const [editPatientInfo, setEditPatientInfo] = useState<string>('');
......@@ -112,6 +112,7 @@ const DoctorMenuContainer = (props : DoctorMenuProps) => {
const onInitialize = async () => {
await fetchData();
setPatientDetail(null);
setInfo({
infoType : 'DOCTOR',
userNm : doctorInfo.doctorNm,
......
......@@ -8,6 +8,8 @@ const lensImg = '/static/img/lens.png';
const closeButton = '/static/img/close.png';
const edit = '/static/img/edit.png';
const refreshing = '/static/img/refreshing.png';
const check = '/static/img/check.png';
const uncheck = '/static/img/uncheck.png'
interface DoctorMenuProps {
......@@ -216,7 +218,7 @@ const DoctorMenuPresenter = (props : DoctorMenuProps) => {
<styled.MedicineSearchButtonImg
src = {
props.prescribeMedicine && props.prescribeMedicine.medicineId === medicine.medicineId ?
lensImg : addButton
check : uncheck
}
/>
</styled.MedicineSearchResultEach>
......@@ -363,7 +365,7 @@ const DoctorMenuPresenter = (props : DoctorMenuProps) => {
</styled.InfoAndSearchWrapper>
<styled.BottleListWrapper>
{
props.patientDetail && props.patientDetail.bottleList ?
props.patientDetail && props.patientDetail.bottleList.length ?
props.patientDetail.bottleList.map((bottle : any) => {
return (
<styled.EachBottleWrapper
......@@ -376,6 +378,11 @@ const DoctorMenuPresenter = (props : DoctorMenuProps) => {
</styled.EachBottleWrapper>
)
}) :
props.patientDetail && !props.patientDetail.bottleList.length ?
<styled.NothingWrapper>
🤔관리하고 있는 환자의 약병이 없습니다.
</styled.NothingWrapper>
:
<styled.NothingWrapper>
🤔먼저 환자를 선택하세요.
</styled.NothingWrapper>
......
......@@ -668,6 +668,12 @@ export const NewPatientButton = styled.button `
background-color : #337DFF;
color : #fff;
}
&:disabled {
cursor : default;
background-color : #337DFF;
color : #fff;
}
`;
export const SearchAndDetailWrapper = styled.div `
......