Skip to content

Commit 9288f0a

Browse files
hora en el formato correcto
1 parent dd6bb14 commit 9288f0a

5 files changed

Lines changed: 22 additions & 6 deletions

File tree

backend/server/config/db.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ export const pool = mysql.createPool({
88
user: process.env.USER_DB,
99
password: process.env.PASSWORD,
1010
database: process.env.DATABASE,
11-
connectionLimit: 10,
12-
timezone: '-3:00'
11+
connectionLimit: 10
1312
});
1413

1514
export const promisePool = pool.promise();

backend/server/controllers/login.controller.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ export const seleccionarPorNombreU = async (req, res) => {
88

99
try {
1010
const data = await Usuario.seleccionarPorNombreU(nombre_usuario);
11-
console.log(data);
12-
1311
/*los array vacios cuentan como valores verdaderos asi que lo evaluo asi para que sirva la comprobacion
1412
en vez de usar !data como haria normalmente*/
1513
if (data == false) {

frontend/package-lock.json

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"@testing-library/react": "^11.2.7",
88
"@testing-library/user-event": "^13.1.9",
99
"bootstrap": "^5.0.1",
10+
"moment": "^2.29.1",
1011
"react": "^17.0.2",
1112
"react-dom": "^17.0.2",
1213
"react-router-dom": "^5.2.0",

frontend/src/components/ordenes/Orden.jsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import React from 'react';
2+
import moment from 'moment';
23
import Detalles from './Detalles';
34
import '../../css/index.css';
45

56
const Orden = ({ orden, eliminar }) => {
6-
const hora = orden.fecha.split(/[T.]/);
7+
moment().format();
8+
let hora = moment(orden.fecha);
79

810
return (
911
<div className="col-3">
@@ -14,7 +16,9 @@ const Orden = ({ orden, eliminar }) => {
1416
<h6 className="card-subtitle mb-2 text-muted">
1517
Cliente: {orden.nombres} {orden.apellidos}
1618
</h6>
17-
<h6 className="card-subtitle mb-2 text-muted">Hora: {hora[1]}</h6>
19+
<h6 className="card-subtitle mb-2 text-muted">
20+
Hora: {hora.format('hh:mm A')}
21+
</h6>
1822
<Detalles detalles={orden.detalles} />
1923
<br />
2024
<input

0 commit comments

Comments
 (0)