Forráskód Böngészése

added confirm button to changeOrders

Boris K 5 éve
szülő
commit
8f0ae3beea

+ 1 - 1
src/components/Admin/Admin.js

@@ -53,7 +53,7 @@ import  {
 import Shedule from './Shedule'
 import ChangeUser from './ChangeUser'
 import ChangeServicesDoctors from './ChangeServices-Doctors'
-import Orders from "./Orders";
+import Orders from "./Orders/Orders";
 
 
 

+ 1 - 1
src/components/Admin/ChangeServices-Doctors.js

@@ -10,7 +10,7 @@ export default class ChangeServicesDoctors extends React.Component {
         flag: false,
     };
 
-    changeConfirm = (action, text) => {
+    changeConfirm = () => {
         this.setState({showConfirm: !this.state.showConfirm})
     };
 

+ 22 - 8
src/components/Admin/ChangeOrder.js

@@ -1,6 +1,7 @@
 import React from 'react';
-import {CustomSelect} from "../hooks/select";
-import Calendar from "../Calendar";
+import {CustomSelect} from "../../hooks/select";
+import Calendar from "../../Calendar";
+import ConfirmButton from "../../ConfirmButton";
 
 class ChangeOrder extends React.Component {
     state = {
@@ -13,6 +14,11 @@ class ChangeOrder extends React.Component {
             user: '',
         },
         flag: false,
+        showConfirm: false,
+    };
+
+    changeConfirm = () => {
+        this.setState({showConfirm: !this.state.showConfirm})
     };
 
     componentDidMount() {
@@ -69,7 +75,8 @@ class ChangeOrder extends React.Component {
                 orderNumber: this.state.order.orderNumber,
                 user:this.state.order.user._id
             }
-        })
+        });
+        this.changeConfirm()
     };
 
     render() {
@@ -78,21 +85,27 @@ class ChangeOrder extends React.Component {
             appointment,
             timeArray
         } = this.props;
-        console.log(this.props, this.state, appointment);
         return (
             <>
+                {this.state.showConfirm &&
+                <ConfirmButton
+                    yes={this.deleteAndPostNewOrder}
+                    no={this.changeConfirm}
+                    text={'Уверены что хотите изменить заказ?'}
+                />
+                }
                 <div style={{
-                    position: 'absolute',
+                    position: 'fixed',
                     right: '0',
                     left: '0',
                     display: 'flex',
                     flexDirection: 'column',
                     justifyContent: 'center',
                     backgroundColor: 'black',
-                    margin: '5% auto',
+                    margin: '-3% auto',
                     width: '80%',
                     fontSize: '12px',
-                    zIndex: '2'
+                    zIndex: '5',
                 }}>
 
                     <input readOnly={true} id={this.state.order.orderNumber}
@@ -170,9 +183,10 @@ class ChangeOrder extends React.Component {
                             </div>
                         )}
                         {appointment.time &&
-                        <button className="btn link" onClick={this.deleteAndPostNewOrder}>Подтвердите запись
+                        <button className="btn link" onClick={this.changeConfirm}>Подтвердите запись
                         </button>
                         }
+
                     </div>
                     }
                 </div>

src/components/Admin/Orders.js → src/components/Admin/Orders/Orders.js


+ 1 - 1
src/components/ConfirmButton.js

@@ -13,7 +13,7 @@ class ConfirmButton extends Component {
                     </div>
 
                 </div>
-                <div className = "wrap-check-off"  onClick={no}/>
+                <div className = "wrap-check-off" style={{zIndex:'10'}}  onClick={no}/>
             </>
         )
     }