박권수

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

...@@ -74,7 +74,7 @@ const Header = (props : HeaderProps) => { ...@@ -74,7 +74,7 @@ const Header = (props : HeaderProps) => {
74 </styled.HeaderLeftWrapper> 74 </styled.HeaderLeftWrapper>
75 <styled.HeaderCenterWrapper> 75 <styled.HeaderCenterWrapper>
76 <styled.TitleImg src = {headerImg} /> 76 <styled.TitleImg src = {headerImg} />
77 - <styled.Title>내 손 안의 주치의</styled.Title> 77 + <styled.Title>SMART MEDICINE BOX for Doctor</styled.Title>
78 </styled.HeaderCenterWrapper> 78 </styled.HeaderCenterWrapper>
79 <styled.HeaderRightWrapper> 79 <styled.HeaderRightWrapper>
80 { 80 {
......
...@@ -42,7 +42,7 @@ const DoctorMenuContainer = (props : DoctorMenuProps) => { ...@@ -42,7 +42,7 @@ const DoctorMenuContainer = (props : DoctorMenuProps) => {
42 const [searchPatientKeyword, setSearchPatientKeyword] = useState<string>(''); 42 const [searchPatientKeyword, setSearchPatientKeyword] = useState<string>('');
43 const [filteringPatientList, setFilteringPatientList] = useState<any>([]); 43 const [filteringPatientList, setFilteringPatientList] = useState<any>([]);
44 44
45 - const [patientDetail, setPatientDetail] = useState<any>(); 45 + const [patientDetail, setPatientDetail] = useState<any>(null);
46 46
47 const [editModal, setEditModal] = useState<boolean>(false); 47 const [editModal, setEditModal] = useState<boolean>(false);
48 const [editPatientInfo, setEditPatientInfo] = useState<string>(''); 48 const [editPatientInfo, setEditPatientInfo] = useState<string>('');
...@@ -112,6 +112,7 @@ const DoctorMenuContainer = (props : DoctorMenuProps) => { ...@@ -112,6 +112,7 @@ const DoctorMenuContainer = (props : DoctorMenuProps) => {
112 112
113 const onInitialize = async () => { 113 const onInitialize = async () => {
114 await fetchData(); 114 await fetchData();
115 + setPatientDetail(null);
115 setInfo({ 116 setInfo({
116 infoType : 'DOCTOR', 117 infoType : 'DOCTOR',
117 userNm : doctorInfo.doctorNm, 118 userNm : doctorInfo.doctorNm,
......
...@@ -8,6 +8,8 @@ const lensImg = '/static/img/lens.png'; ...@@ -8,6 +8,8 @@ const lensImg = '/static/img/lens.png';
8 const closeButton = '/static/img/close.png'; 8 const closeButton = '/static/img/close.png';
9 const edit = '/static/img/edit.png'; 9 const edit = '/static/img/edit.png';
10 const refreshing = '/static/img/refreshing.png'; 10 const refreshing = '/static/img/refreshing.png';
11 +const check = '/static/img/check.png';
12 +const uncheck = '/static/img/uncheck.png'
11 13
12 14
13 interface DoctorMenuProps { 15 interface DoctorMenuProps {
...@@ -216,7 +218,7 @@ const DoctorMenuPresenter = (props : DoctorMenuProps) => { ...@@ -216,7 +218,7 @@ const DoctorMenuPresenter = (props : DoctorMenuProps) => {
216 <styled.MedicineSearchButtonImg 218 <styled.MedicineSearchButtonImg
217 src = { 219 src = {
218 props.prescribeMedicine && props.prescribeMedicine.medicineId === medicine.medicineId ? 220 props.prescribeMedicine && props.prescribeMedicine.medicineId === medicine.medicineId ?
219 - lensImg : addButton 221 + check : uncheck
220 } 222 }
221 /> 223 />
222 </styled.MedicineSearchResultEach> 224 </styled.MedicineSearchResultEach>
...@@ -363,7 +365,7 @@ const DoctorMenuPresenter = (props : DoctorMenuProps) => { ...@@ -363,7 +365,7 @@ const DoctorMenuPresenter = (props : DoctorMenuProps) => {
363 </styled.InfoAndSearchWrapper> 365 </styled.InfoAndSearchWrapper>
364 <styled.BottleListWrapper> 366 <styled.BottleListWrapper>
365 { 367 {
366 - props.patientDetail && props.patientDetail.bottleList ? 368 + props.patientDetail && props.patientDetail.bottleList.length ?
367 props.patientDetail.bottleList.map((bottle : any) => { 369 props.patientDetail.bottleList.map((bottle : any) => {
368 return ( 370 return (
369 <styled.EachBottleWrapper 371 <styled.EachBottleWrapper
...@@ -376,6 +378,11 @@ const DoctorMenuPresenter = (props : DoctorMenuProps) => { ...@@ -376,6 +378,11 @@ const DoctorMenuPresenter = (props : DoctorMenuProps) => {
376 </styled.EachBottleWrapper> 378 </styled.EachBottleWrapper>
377 ) 379 )
378 }) : 380 }) :
381 + props.patientDetail && !props.patientDetail.bottleList.length ?
382 + <styled.NothingWrapper>
383 + 🤔관리하고 있는 환자의 약병이 없습니다.
384 + </styled.NothingWrapper>
385 + :
379 <styled.NothingWrapper> 386 <styled.NothingWrapper>
380 🤔먼저 환자를 선택하세요. 387 🤔먼저 환자를 선택하세요.
381 </styled.NothingWrapper> 388 </styled.NothingWrapper>
......
...@@ -668,6 +668,12 @@ export const NewPatientButton = styled.button ` ...@@ -668,6 +668,12 @@ export const NewPatientButton = styled.button `
668 background-color : #337DFF; 668 background-color : #337DFF;
669 color : #fff; 669 color : #fff;
670 } 670 }
671 +
672 + &:disabled {
673 + cursor : default;
674 + background-color : #337DFF;
675 + color : #fff;
676 + }
671 `; 677 `;
672 678
673 export const SearchAndDetailWrapper = styled.div ` 679 export const SearchAndDetailWrapper = styled.div `
......