cambios

2018-11-28 15:56:46 -06:00
parent cda147f967
commit 484b8a805f
6 changed files with 119 additions and 26 deletions
@@ -3891,6 +3891,11 @@
        "is-symbol": "^1.0.2"
      }
    },
+    "es6-object-assign": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
+      "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw="
+    },
    "escape-html": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -5226,14 +5231,12 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@@ -5248,20 +5251,17 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "core-util-is": {
          "version": "1.0.2",
@@ -5378,8 +5378,7 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "ini": {
          "version": "1.3.5",
@@ -5391,7 +5390,6 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@@ -5406,7 +5404,6 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@@ -5414,14 +5411,12 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "minipass": {
          "version": "2.2.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.1",
            "yallist": "^3.0.0"
@@ -5440,7 +5435,6 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@@ -5521,8 +5515,7 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "object-assign": {
          "version": "4.1.1",
@@ -5534,7 +5527,6 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@@ -5656,7 +5648,6 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@@ -11911,6 +11902,11 @@
      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
      "dev": true
    },
+    "promise-polyfill": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz",
+      "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc="
+    },
    "proxy-addr": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
@@ -13821,6 +13817,15 @@
        "util.promisify": "~1.0.0"
      }
    },
+    "sweetalert": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/sweetalert/-/sweetalert-2.1.2.tgz",
+      "integrity": "sha512-iWx7X4anRBNDa/a+AdTmvAzQtkN1+s4j/JJRWlHpYE8Qimkohs8/XnFcWeYHH2lMA8LRCa5tj2d244If3S/hzA==",
+      "requires": {
+        "es6-object-assign": "^1.1.0",
+        "promise-polyfill": "^6.0.2"
+      }
+    },
    "table": {
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
@@ -16,6 +16,7 @@
    "bulma": "^0.7.2",
    "i": "^0.3.6",
    "npm": "^6.4.1",
+    "sweetalert": "^2.1.2",
    "vue": "^2.5.17",
    "vue-router": "^3.0.1",
    "vue2-animate": "^2.1.0"
@@ -3,7 +3,6 @@
    um-header
    transition(name="router-anim" enter-active-class="animated slideInLeft")
      router-view
-    um-footer
 </template>

 <script>
@@ -1,6 +1,6 @@
 const api = {}

-// api.url = 'http://e9111523.ngrok.io'
+// api.url = 'http://192.168.4.226:3000'
 api.url = 'http://venus.acatlan.unam.mx:3010'
 api.isAuth = function () {
  if (window.localStorage.pcpumaT && window.localStorage.pcpumaU) {
@@ -0,0 +1,87 @@
+<template lang="pug">
+  section.container
+    .columns
+      .column.is-8.is-offset-2
+        h1.is-size-3 Prestamo de Equipo
+        br
+        .control
+          .select
+            select(v-model="tipo")
+              option(value="laptop") Laptop
+              option(value="chromebook") Choromebook
+              option(value="ipad") Tablet
+        br
+        a.button.is-u-golden(v-on:click="prestamo()") Aceptar
+        br
+        br
+        h1.is-size-3 Devolver Equipo
+        br
+        a.button.is-u-golden(v-on:click="devolver()") Aceptar
+    .columns
+      .column.is-8.is-offset-2(v-if="prestamoData.idCarrito")
+        p.is-size-5 Carrito: {{prestamoData.idCarrito}}
+        p.is-size-5 Equipo: {{prestamoData.equipo_carrito}}
+</template>
+
+<script>
+import api from '../../api'
+import swal from 'sweetalert'
+const axios = require('axios')
+export default {
+  props: ['usuario'],
+  data () {
+    return {
+      tipo: '',
+      prestamoData: {}
+    }
+  },
+  methods: {
+    prestamo: function () {
+      axios({
+        method: 'post',
+        url: api.url + '/prestamo',
+        data: {
+          equipo: this.tipo,
+          idLugar: 1,
+          idUsuario: this.usuario,
+          idKiosko: window.localStorage.pcpumaK
+        },
+        headers: {
+          token: window.localStorage.pcpumaT
+        }
+      })
+        .then(response => {
+          this.prestamoData = response.data
+          console.log(this.prestamoData)
+          swal('Exito', 'Peticion exitosa ', 'success')
+        })
+        .catch(error => {
+          console.log(error.response.data)
+          swal('Error', error.response.data.err, 'error')
+        })
+    },
+    devolver: function () {
+      axios({
+        method: 'put',
+        url: api.url + '/devolucion',
+        data: {
+          idUsuario: this.usuario
+        },
+        headers: {
+          token: window.localStorage.pcpumaT
+        }
+      })
+        .then(response => {
+          swal('Exito', 'Se devolvio con exito', 'success')
+        })
+        .catch(error => {
+          console.log(error.response.data)
+          swal('Error', 'Algo salio mal', 'error')
+        })
+    }
+  }
+}
+</script>
+
+<style lang="css">
+</style>
@@ -23,15 +23,16 @@
        .column.is-8.is-offset-2
          p.is-size-3 Usuario : {{data.id}}
          p.is-size-4 Multa : {{multa(data.multa)}}
+          prestamo(v-bind:usuario="buscar")
 </template>

 <script>
-import UmFooter from '../layout/Footer.vue'
-import UmHeader from '../layout/Header.vue'
+import Prestamo from '../components/usuario/Prestamo.vue'
+
 import api from '../api'
 const axios = require('axios')
 export default {
-  components: { UmHeader, UmFooter },
+  components: { Prestamo },
  data () {
    return {
      buscar: '',