Update client_detail when archived change

munkireport · Apr 11, 2020 · 4fe9b12 · 4fe9b12
1 parent b074bb7
commit 4fe9b12
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/js/machine_detail.js b/js/machine_detail.js
@@ -1,4 +1,4 @@
-$(document).on('appReady', function(e, lang) {
+$(document).on('appReady ', function(e, lang) {
 
     $.getJSON( appUrl + '/module/machine/report/' + serialNumber, function( data ) {
 
@@ -33,7 +33,9 @@ $(document).on('appReady', function(e, lang) {
             $('.machine-uptime').text(i18n.t('unavailable'));
         }
     });
+});
 
+$(document).on('appReady appUpdate', function(e, lang) {
     // Get reportdata
     $.getJSON( appUrl + '/module/reportdata/report/' + serialNumber, function( data ) {
 
@@ -45,19 +47,26 @@ $(document).on('appReady', function(e, lang) {
         // Registration date
         var msecs = moment(data.reg_timestamp * 1000);
         $('.reportdata-reg_date').html('<time title="'+msecs.format('LLLL')+'" >'+msecs.fromNow()+'</time>');
- 
+
         // Check-in date
         var msecs = moment(data.timestamp * 1000);
         $('.reportdata-check-in_date').html('<time title="'+msecs.format('LLLL')+'" >'+msecs.fromNow()+'</time>');
 
         // Remote IP
         $('.reportdata-remote_ip').text(data.remote_ip);
-    });
 
-    // Get machinegroup name
-    $.getJSON(appUrl + '/unit/get_machine_groups', function( data ){
-        var machine_group = parseInt($('.machine-machine_group').text())
-        var name = data.find(x => parseInt(x.groupid) === machine_group).name;
-        $('.machine-machine_group').text(name)
-    })
+        // Get machinegroup name
+        $.getJSON(appUrl + '/unit/get_machine_groups', function( data ){
+            var machine_group = parseInt($('.machine-machine_group').text())
+            var name = data.find(x => parseInt(x.groupid) === machine_group).name;
+            $('.machine-machine_group').text(name)
+        })
+
+        // Status
+        var machineStatus = { '0': 'in_use', '1': 'archived'};
+        $('.reportdata-status').text(
+            i18n.t('machine.status.' + machineStatus[$('.reportdata-status').text()])
+        );
+
+    });
 });
diff --git a/machine_controller.php b/machine_controller.php
@@ -122,7 +122,7 @@ public function report($serial_number = '')
     {
         jsonView(
             Machine_model::where('machine.serial_number', $serial_number)
-                ->filter()
+                ->filter('groupOnly')
                 ->first()
         );
     }