Merge pull request #135 from PLADI-ALM/fix/PDW-86-refactoring

[PDW-86/fix] 차량, 장비 '제조사' 데이터 추가
PLADI-ALM · Nov 15, 2023 · 49415d8 · 49415d8
2 parents 1c896a0 + 7af56c8
commit 49415d8
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 10 deletions.
diff --git a/src/components/card/ResourceInfo.js b/src/components/card/ResourceInfo.js
@@ -34,7 +34,7 @@ function ResourceInfo(props) {
 
                 <InfoContainer>
                     <ResourceTitleContainer>
-                        <ResourceTitle>{props.name}</ResourceTitle>
+                        <ResourceTitle>{props.name}({props.manufacturer})</ResourceTitle>
                         <CardText>{props.location}</CardText>
                     </ResourceTitleContainer>
 

diff --git a/src/pages/admin/car/CarManage.js b/src/pages/admin/car/CarManage.js
@@ -54,14 +54,14 @@ function CarManage(props) {
                         <tbody>
                             { cars.length === 0 ?
                             <NoLineTr>
-                                <td colSpan={5}>차량 내역이 없습니다.</td>
+                                <td colSpan={6}>차량 내역이 없습니다.</td>
                             </NoLineTr>
                             : cars.map((car) =>
                                 <CarManageTableCell
                                     key={car.carId}
                                     id={car.carId}
                                     name={car.name}
-                                    manufacturer={car.location}
+                                    manufacturer={car.manufacturer}
                                     location={car.location}
                                     user={car.responsibilityName}
                                     userPhone={car.responsibilityPhone}

diff --git a/src/pages/admin/resource/ResourceManage.js b/src/pages/admin/resource/ResourceManage.js
@@ -59,13 +59,14 @@ function ResourceManage(props) {
                         <tbody>
                             { resources.length === 0 ?
                             <NoLineTr>
-                                <td colSpan={5}>장비 내역이 없습니다.</td>
+                                <td colSpan={6}>장비 내역이 없습니다.</td>
                             </NoLineTr>
                             : resources.map((resource) =>
                                 <ResourceManageTableCell
                                     key={resource.resourceId}
                                     id={resource.resourceId}
                                     name={resource.name}
+                                    manufacturer={resource.manufacturer}
                                     location={resource.location}
                                     user={resource.responsibilityName}
                                     userPhone={resource.responsibilityPhone}

diff --git a/src/pages/basic/booking/car/CarBooking.js b/src/pages/basic/booking/car/CarBooking.js
@@ -172,7 +172,7 @@ function CarBooking(props) {
 
             <WhiteContainer>
                 <Bar>
-                    <NameSubTitleText>{carInfo.name}</NameSubTitleText>
+                    <NameSubTitleText>{carInfo.name}({carInfo.manufacturer})</NameSubTitleText>
                     <DetailSubTitleText>{carInfo.location}</DetailSubTitleText>
                 </Bar>
 

diff --git a/src/pages/basic/booking/car/CarBookingCheck.js b/src/pages/basic/booking/car/CarBookingCheck.js
@@ -54,7 +54,7 @@ function CarBookingCheck(props) {
             .then((Response) => {
                 setBookingDetail(Response.data.data)
                 setStatus(findStatus(Response.data.data.status))
-                getCarInfo(Response.data.data.carId)
+                getCarInfo(Response.data.data.id)
             })
             .catch((Error) => {
                 basicError(Error)
@@ -74,7 +74,7 @@ function CarBookingCheck(props) {
         <WhiteContainer>
             <Bar space={true}>
                 <div>
-                    <NameSubTitleText>{carInfo.name}{carInfo.manufacture}</NameSubTitleText>
+                    <NameSubTitleText>{carInfo.name}({carInfo.manufacturer})</NameSubTitleText>
                     <DetailSubTitleText>{carInfo.location}</DetailSubTitleText>
                 </div>
                 <StatusContainer style={{margin: '0'}} isCheck={'true'}

diff --git a/src/pages/basic/booking/car/SelectCar.js b/src/pages/basic/booking/car/SelectCar.js
@@ -99,6 +99,7 @@ function SelectCar(props) {
                             <ResourceInfo key={car.carId}
                                           id={car.carId}
                                           name={car.name}
+                                          manufacturer={car.manufacturer}
                                           imgUrl={car.imgUrl}
                                           location={car.location}
                                           description={car.description}

diff --git a/src/pages/basic/booking/resource/ResourceBooking.js b/src/pages/basic/booking/resource/ResourceBooking.js
@@ -180,7 +180,7 @@ function ResourceBooking(props) {
 
             <WhiteContainer>
                 <Bar>
-                    <NameSubTitleText>{resourceInfo.name}</NameSubTitleText>
+                    <NameSubTitleText>{resourceInfo.name}({resourceInfo.manufacturer})</NameSubTitleText>
                     <DetailSubTitleText>{resourceInfo.location}</DetailSubTitleText>
                 </Bar>
 

diff --git a/src/pages/basic/booking/resource/ResourceBookingCheck.js b/src/pages/basic/booking/resource/ResourceBookingCheck.js
@@ -54,7 +54,7 @@ function ResourceBookingCheck(props) {
             .then((Response) => {
                 setBookingDetail(Response.data.data)
                 setStatus(findStatus(Response.data.data.status))
-                getResourceInfo(Response.data.data.resourceId)
+                getResourceInfo(Response.data.data.id)
             })
             .catch((Error) => {
                 basicError(Error)
@@ -74,7 +74,7 @@ function ResourceBookingCheck(props) {
         <WhiteContainer>
             <Bar space={true}>
                 <div>
-                    <NameSubTitleText>{resourceInfo.name}({resourceInfo.manufacture})</NameSubTitleText>
+                    <NameSubTitleText>{resourceInfo.name}({resourceInfo.manufacturer})</NameSubTitleText>
                     <DetailSubTitleText>{resourceInfo.location}</DetailSubTitleText>
                 </div>
                 <StatusContainer style={{margin: '0'}} isCheck={'true'}

diff --git a/src/pages/basic/booking/resource/SelectResource.js b/src/pages/basic/booking/resource/SelectResource.js
@@ -99,6 +99,7 @@ function SelectResource(props) {
                             <ResourceInfo key={resource.resourceId}
                                           id={resource.resourceId}
                                           name={resource.name}
+                                          manufacturer={resource.manufacturer}
                                           imgUrl={resource.imgUrl}
                                           location={resource.location}
                                           description={resource.description}