Changeset cc4db18 for frontend/src/Dashboard

Timestamp:

07/06/22 13:13:35 (2 years ago)

Author:

Danilo <danilo.najkov@…>

Branches:

master

Children:

899b19d

Parents:

d76b7ee

Message:

reservation module changes + contact module + menu module

Location:

frontend/src/Dashboard

Files:

• Menu.js (added)
• Reservations.js (modified) (9 diffs)
• Restaurant.js (added)

frontend/src/Dashboard/Reservations.js

@@ -1 +1 @@
 import React, {useEffect, useState} from 'react'
-import {Button, Modal, DatePicker, List, notification} from "antd";
+import {Button, Modal, DatePicker, List, notification, Input} from "antd";
 import AddNewReservation from "./AddNewReservation";
 import moment from 'moment'
@@ -13 +13 @@
     const [date, setDate] = useState([moment().startOf('day'), moment().add(24,'hours')]);
     const [reservations, setReservations] = useState([])
+    const [newReservations, setNewReservations] = useState([])
     const [loadingReservations, setLoadingReservations] = useState(true)
 
@@ -26 +27 @@
                     to: date[1].format('YYYY-MM-DDThh:mm:ss') + 'Z'
                 }, headers: {Authorization: sessionStorage.getItem('Auth')}
-            })
-                .then(res => {
+            }).then(res => {
+                axios.get(env.api + 'Reservations/new', {
+                     headers: {Authorization: sessionStorage.getItem('Auth')}
+                }).then(newres=>{
+                    setNewReservations(newres.data);
                     setReservations(res.data);
-                    console.log(res.data)
                     setLoadingReservations(false)
-                }).catch(er => {
+                })
+            }).catch(er => {
                 setLoadingReservations(false)
                 notification['error']({
                     message: 'Се случи проблем при додавање резервација. Ве молиме пробајте повторно подоцна',
                 });
-
                 console.log(er);
             });
@@ -48 +51 @@
     const changeReservationStatus = (id, newStatus) => {
         console.log(id)
-        axios.put(env.api + 'Reservations/'+id,{}, {
+        axios.put(env.api + 'Reservations/'+id+'/status',{}, {
             params: {
                 status: newStatus
@@ -59 +62 @@
             });
             console.log(er);
-        });
-    }
+        })
+    }
+    const changeTable = (ev, item) => {
+        axios.put(env.api + 'Reservations/'+item.id+'/table',{}, {
+            params: {
+                tableId: ev.target.value == '' ? 0 : ev.target.value
+            }, headers: {Authorization: sessionStorage.getItem('Auth')}
+        }).then(res => {
+            console.log("success");
+        }).catch(er => {
+            notification['error']({
+                message: 'Се случи проблем при менување резервација. Ве молиме пробајте повторно подоцна',
+            });
+            console.log(er);
+        })
+        setNewReservations(old =>{
+            const newRes = old.indexOf(item);
+            if(newRes == -1) return old;
+            const copy = [...old];
+            copy[newRes].table = ev.target.value;
+            return copy;
+        })
+        setReservations(old =>{
+            const newRes = old.indexOf(item);
+            if(newRes == -1) return old;
+            const copy = [...old];
+            copy[newRes].table = ev.target.value;
+            return copy;
+        })
+    }
+
     const ReservationType = [ 'Кратко', 'Долго', 'Настан' ];
     const ReservationPlace = [ 'Внатре', 'Надвор' ];
@@ -84 +116 @@
                     border: '1px solid lightgray'
                 }} >
+                    <h3 style={{float: 'left'}}>Нови резервации</h3>
+                </div>
+                <List loading={loadingReservations} dataSource={newReservations} itemLayout={'horizontal'} locale={{emptyText:'Немате нови резервации'}}
+                      renderItem={item => (
+                          <List.Item
+                              actions={
+                                  item.reservationStatus == 0 ?
+                                      [<a onClick={()=>changeReservationStatus(item.id,ReservationStatus[1])}>Прифати</a>, <a style={{color:'red'}} onClick={()=>changeReservationStatus(item.id,ReservationStatus[2])}>Отфрли</a>]
+                                      : item.reservationStatus == 1 ? [<span style={{color:'green'}}>Прифатено</span>] : [<span style={{color:'red'}}>Отфрлено</span>]}>
+                              <div style={{display:'flex',flexDirection:'row',justifyContent:'space-between',width:'100%', padding:'10px'}}>
+                                  <div style={{textAlign:'start', width:'200px'}}>
+                                      <div><b>Име:</b> {item.contactName}</div>
+                                      <div><b>Број:</b> {item.contactNumber}</div>
+                                  </div>
+                                  <div style={{marginTop:'10px'}}>
+                                      Маса: <Input style={{ width: '60px' }} type={'number'} value={item.table == 0 ? '' : item.table} onChange={(ev)=>changeTable(ev,item)}/>
+                                  </div>
+                                  <div>
+                                      <div><b>Луѓе:</b> {item.persons}</div>
+                                      <div>{ReservationPlace[item.reservationPlace]}, {ReservationType[item.reservationType]}</div>
+                                  </div>
+                                  <div>
+                                      <div style={{marginTop:'10px'}}>{moment(item.startDate).format('hh:mm DD/MM/YY')}</div>
+                                  </div>
+                              </div>
+                          </List.Item>
+                      )}/>
+            </div>
+            <div style={{marginTop:'20px', backgroundColor:'white'}}>
+                <div style={{
+                    width: '100%',
+                    height:'75px',
+                    backgroundColor: 'white',
+                    padding: '20px',
+                    border: '1px solid lightgray'
+                }} >
                     <h3 style={{float: 'left'}}>Сите резервации</h3>
                     <RangePicker
@@ -89 +157 @@
                         style={{float:'right'}}
                         ranges={{
+                            'Наредни 3 часа': [moment(), moment().add(3,'hours')],
                             'Следни 24 часа': [moment().startOf('day'), moment().add(24,'hours')],
                             'Овој месец': [moment().startOf('month'), moment().endOf('month')],
@@ -96 +165 @@
                     />
                 </div>
-                <List loading={loadingReservations} dataSource={reservations} itemLayout={'horizontal'}
+                <List loading={loadingReservations} dataSource={reservations} itemLayout={'horizontal'} locale={{emptyText:'Нема резервации за овој период'}}
                       renderItem={item => (
                           <List.Item
@@ -107 +176 @@
                                     <div><b>Име:</b> {item.contactName}</div>
                                     <div><b>Број:</b> {item.contactNumber}</div>
+                                </div>
+                                <div style={{marginTop:'10px'}}>
+                                    Маса: <Input style={{ width: '60px' }} type={'number'} value={item.table == 0 ? '' : item.table} onChange={(ev)=>changeTable(ev,item)}/>
                                 </div>
                                 <div>