Browse Source

Fixes a few information presentation bugs.

Christopher Leggett 5 years ago
parent
commit
a1cf33e291

+ 12 - 7
public/js/app.js

@@ -1950,16 +1950,19 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
 /* harmony default export */ __webpack_exports__["default"] = ({
-  props: ['asset'],
+  props: ['asset', 'pcextraStart'],
   data: function data() {
     return {
-      data: JSON.parse(this.asset)
+      data: JSON.parse(this.asset),
+      pcextra: JSON.parse(this.pcextraStart)
     };
   },
   mounted: function mounted() {
     var _this = this;
 
+    console.log(this.pcextra);
     Echo.channel('assets').listen('AssetUpdated', function (e) {
       _this.data = JSON.parse(e.data);
     });
@@ -48418,13 +48421,15 @@ var render = function() {
       ])
     ]),
     _vm._v(" "),
-    _c("p", [_vm._v("S/N: " + _vm._s(this.data.pcserial))]),
+    _c("p", [_vm._v("OS: " + _vm._s(this.pcextra[2]))]),
+    _vm._v(" "),
+    _c("p", [_vm._v("S/N: " + _vm._s(this.pcextra[104]))]),
     _vm._v(" "),
-    _c("p", [_vm._v("CPU: " + _vm._s(this.data.pcproc))]),
+    _c("p", [_vm._v("CPU: " + _vm._s(this.pcextra[101]))]),
     _vm._v(" "),
-    _c("p", [_vm._v("RAM: " + _vm._s(this.data.pcram))]),
+    _c("p", [_vm._v("RAM: " + _vm._s(this.pcextra[100]))]),
     _vm._v(" "),
-    _c("p", [_vm._v("OS: " + _vm._s(this.data.pcos))])
+    _c("p", [_vm._v("Graphics: " + _vm._s(this.pcextra[4]))])
   ])
 }
 var staticRenderFns = []
@@ -48923,7 +48928,7 @@ var render = function() {
                 attrs: {
                   "data-toggle": "tooltip",
                   "data-placement": "bottom",
-                  tittle: this.getHRDate(this.data.pickupdate)
+                  title: this.getHRDate(this.data.pickupdate)
                 }
               },
               [

+ 9 - 6
resources/js/components/assetinfo.vue

@@ -1,21 +1,24 @@
 <template>
     <div>
         <h4 class="text-center">{{ this.data.pcmanu }} {{ this.data.pcmake }} - <small class="text-muted">{{this.data.pcnickname}}</small></h4>
-        <p>S/N: {{ this.data.pcserial }}</p>
-        <p>CPU: {{ this.data.pcproc}}</p>
-        <p>RAM: {{ this.data.pcram }}</p>
-        <p>OS: {{this.data.pcos}}</p>
+        <p>OS: {{this.pcextra[2]}}</p>
+        <p>S/N: {{ this.pcextra[104] }}</p>
+        <p>CPU: {{ this.pcextra[101]}}</p>
+        <p>RAM: {{ this.pcextra[100] }}</p>
+        <p>Graphics: {{this.pcextra[4]}}</p>
     </div>
 </template>
 <script>
 export default {
-    props: ['asset'],
+    props: ['asset', 'pcextraStart'],
     data() {
         return {
-            data: JSON.parse(this.asset)
+            data: JSON.parse(this.asset),
+            pcextra: JSON.parse(this.pcextraStart)
         }
     },
     mounted() {
+        console.log(this.pcextra);
         Echo.channel('assets')
             .listen('AssetUpdated', (e) => {
                 this.data = JSON.parse(e.data);

+ 1 - 1
resources/js/components/woinfo.vue

@@ -30,7 +30,7 @@
             </span>
         </p>
         <p><i class="fas fa-sign-out-alt"></i> 
-            <span class="dashed-underline" data-toggle="tooltip" data-placement="bottom" v-if="!this.isZero(this.data.pickupdate)" v-bind:tittle=this.getHRDate(this.data.pickupdate)>
+            <span class="dashed-underline" data-toggle="tooltip" data-placement="bottom" v-if="!this.isZero(this.data.pickupdate)" v-bind:title=this.getHRDate(this.data.pickupdate)>
                 {{ Math.floor(this.daysSinceToday(this.data.pickupdate)) }} days ago
             </span>
         </p>

+ 1 - 1
resources/views/workorders/show.blade.php

@@ -31,7 +31,7 @@
                 <div class="card-body">
                     <div class="tab-content">
                         <div class="tab-pane active" id="assetinfo" role="tabpanel" aria-labelledby="assetinfo-tab">
-                            <assetinfo asset="{{$workOrder->asset}}"></assetinfo>
+                            <assetinfo asset="{{$workOrder->asset}}" pcextra-start="{{json_encode(unserialize($workOrder->asset->pcextra))}}"></assetinfo>
                             <a href="{{ route('editasset', ['asset' => $workOrder->asset]) }}" class="btn btn-primary">Edit</a>
                         </div>
                         @if($workOrder->asset->group !== null)