diff --git a/web-ui/web-react/public/images/deimos-logo.png b/web-ui/web-react/public/images/deimos-logo.png
new file mode 100644
index 00000000..37949c17
Binary files /dev/null and b/web-ui/web-react/public/images/deimos-logo.png differ
diff --git a/web-ui/web-react/src/App.js b/web-ui/web-react/src/App.js
index 164aaa17..5bf8cfec 100644
--- a/web-ui/web-react/src/App.js
+++ b/web-ui/web-react/src/App.js
@@ -446,6 +446,8 @@ const App = () => {
<>
+
+
>
)
diff --git a/web-ui/web-react/src/AppFooter.js b/web-ui/web-react/src/AppFooter.js
index 71548902..8f2835f7 100644
--- a/web-ui/web-react/src/AppFooter.js
+++ b/web-ui/web-react/src/AppFooter.js
@@ -6,11 +6,11 @@ export const AppFooter = (props) => {
por
diff --git a/web-ui/web-react/src/components/Reservaciones.js b/web-ui/web-react/src/components/Reservaciones.js
index a9829fb8..4918a5c1 100644
--- a/web-ui/web-react/src/components/Reservaciones.js
+++ b/web-ui/web-react/src/components/Reservaciones.js
@@ -94,7 +94,7 @@ const Reservations = () => {
)
data.map((item) => {
- item.date = formatDateString(item.date)
+ item.date = formatDateString(item.date)
if (item.status == '1') {
item.status_text = 'Activo';
@@ -134,7 +134,7 @@ const Reservations = () => {
let _reservation = { ...reservation };
if (_reservation.date && _reservation.time && tenantId && areaId
- && !validationTime()
+ && !validationTime()
&& !validationIsSameUser() && !validationIsReservation()) {
_reservation.common_area_name = areas.find(item => item._id == areaId).name;
let tenant = tenants.find(item => item._id == tenantId);
@@ -175,16 +175,25 @@ const Reservations = () => {
setAreaId('')
setTenantId('')
})
-
+
} else {
setSubmitted(true);
}
}
const exportCSV = () => {
- dt.current.exportCSV();
- selectedReservations.current.exportCSV();
- };
+ //
+ if (selectedReservations) {
+ while (dt.current.props.value.length > 0)
+ dt.current.props.value.pop();
+ let n=0;
+ for (let n = 0; n < selectedReservations.length; n++){
+ dt.current.props.value.push(selectedReservations[n]);
+ }
+ }
+ dt.current.exportCSV();
+
+ };
const actionsReservation = (rowData) => {
@@ -238,8 +247,9 @@ const Reservations = () => {