cambio okay horas

This commit is contained in:
arturo guerrero
2019-08-21 18:44:36 -05:00
parent 469072b5f1
commit ed2184c491
9 changed files with 44 additions and 14 deletions
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>PC Puma</title><link href=/css/app.d0a863bd.css rel=preload as=style><link href=/css/chunk-vendors.3c3429cd.css rel=preload as=style><link href=/js/app.4cd074e3.js rel=preload as=script><link href=/js/chunk-vendors.e50360cf.js rel=preload as=script><link href=/css/chunk-vendors.3c3429cd.css rel=stylesheet><link href=/css/app.d0a863bd.css rel=stylesheet></head><body><noscript><strong>We're sorry but pcpuma-front doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.e50360cf.js></script><script src=/js/app.4cd074e3.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>PC Puma</title><link href=/css/app.c3f538f1.css rel=preload as=style><link href=/css/chunk-vendors.3c3429cd.css rel=preload as=style><link href=/js/app.bd269eaf.js rel=preload as=script><link href=/js/chunk-vendors.e50360cf.js rel=preload as=script><link href=/css/chunk-vendors.3c3429cd.css rel=stylesheet><link href=/css/app.c3f538f1.css rel=stylesheet></head><body><noscript><strong>We're sorry but pcpuma-front doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.e50360cf.js></script><script src=/js/app.bd269eaf.js></script></body></html>
-2
View File
File diff suppressed because one or more lines are too long
-1
View File
File diff suppressed because one or more lines are too long
+2
View File
File diff suppressed because one or more lines are too long
+1
View File
File diff suppressed because one or more lines are too long
+5
View File
@@ -7586,6 +7586,11 @@
"yallist": "^2.1.2"
}
},
"luxon": {
"version": "1.17.2",
"resolved": "https://registry.npmjs.org/luxon/-/luxon-1.17.2.tgz",
"integrity": "sha512-qELKtIj3HD41N+MvgoxArk8DZGUb4Gpiijs91oi+ZmKJzRlxY6CoyTwNoUwnogCVs4p8HuxVJDik9JbnYgrCng=="
},
"make-dir": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+1
View File
@@ -18,6 +18,7 @@
"bulma": "^0.7.2",
"bulma-extensions": "^4.0.1",
"i": "^0.3.6",
"luxon": "^1.17.2",
"npm": "^6.4.1",
"sweetalert": "^2.1.2",
"vue": "^2.5.17",
+33 -9
View File
@@ -27,6 +27,13 @@
p.has-text-centered
span.is-size-6.space(v-for="s in status") {{` ${s.equipo.toUpperCase()} : ${s.prestadas} / ${s.total}`}}
br
.columns
.column.is-3
.field
.control.has-icons-left
input.input(v-model="search" placeholder="Buscar")
span.icon.is-small.is-left
font-awesome-icon(icon="search")
table.table.is-fullwidth.is-hoverable.is-narrow
thead
tr
@@ -40,7 +47,7 @@
th Multar
th Regresar
tbody
tr(v-bind:class="{'warn-time':timeWarn(p.fechaInicio)}" v-for="p in prestamo")
tr(v-bind:class="{'warn-time':timeWarn(p.fechaInicio)}" v-for="p in filteredEquipo")
td {{p.Equipo.Carrito.alias}}
td {{p.Equipo.equipo_carrito}}
td {{p.Equipo.Tipo.nombre}}
@@ -69,7 +76,8 @@ export default {
status: [],
multa: [],
multar: {},
time: true
time: true,
search: ''
}
},
mounted () {
@@ -100,6 +108,20 @@ export default {
swal('Error', error.response.data.err, 'error')
})
},
computed: {
filteredEquipo: function () {
return this.prestamo.filter(dat => {
console.log(this.search)
if (this.search == '') {
return true
}
if (parseInt(this.search) == dat.Equipo.equipo_carrito) {
return true
}
return false
})
}
},
methods: {
toggleModal: function () {
let modal = document.getElementById('modal')
@@ -141,18 +163,20 @@ export default {
},
fecha: function (date) {
let dt = new Date(date)
// console.log(dt)
return `${dt.getMonth() + 1}-${dt.getDate()} ${dt.getHours()}:${dt.getMinutes()}`
var options = { year:'numeric', month: 'numeric',day:'numeric' ,hour: 'numeric', minute: '2-digit' }
return dt.toLocaleString('en-US',options)
},
maxFecha: function (date) {
let dt = new Date(date)
dt.setMonth(dt.getMonth() + 1)
var options = { year:'numeric', month: 'numeric',day:'numeric' ,hour: 'numeric', minute: '2-digit' }
dt.setHours(dt.getHours() + 2)
console.log(dt.toLocaleString())
if (dt.getMinutes() >= 45 && dt.getHours() >= 7) {
return `${dt.getMonth()}-${dt.getDate()} 7:45`
dt.setMinutes(dt.getMinutes() + 15)
let cierre = new Date()
cierre.setHours(19, 45, 0)
if (dt > cierre) {
return cierre.toLocaleString('en-US',options)
}
return `${dt.getMonth()}-${dt.getDate()} ${dt.getHours()}:${dt.getMinutes()}`
return dt.toLocaleString('en-US',options)
},
regresar: function (idPrestamo,idUsuario) {
axios({