Unify timezone

SplunkAppForWazuh/appserver/static/js/controllers/agents/agents/agents.html

@@ -112,7 +112,7 @@
     <!-- Table -->
     <div ng-if="!loading" layout="row" class="wz-margin-10">
       <wazuh-table flex path="'/agents'" custom-columns="true"
-        keys="['id',{value:'name',size:2},'ip','status','group','os.name','os.version','version', 'dateAdd', 'lastKeepAlive']"
+        keys="['id',{value:'name',size:2},'ip','status','group','os.name','os.version','version', {value: 'dateAdd', offset: true}, {value: 'lastKeepAlive', offset: true}]"
         allow-click="true" rows-per-page="17"></wazuh-table>
     </div>
 

SplunkAppForWazuh/appserver/static/js/controllers/agents/agents/agentsCtrl.js

@@ -40,7 +40,8 @@ define([
       $tableFilterService,
       agentData,
       $mdDialog,
-      $groupHandler
+      $groupHandler,
+      $dateDiffService
     ) {
       this.scope = $scope
       this.submittedTokenModel = $urlTokenModel.getSubmittedTokenModel()
@@ -56,6 +57,7 @@ define([
       this.wzTableFilter = $tableFilterService
       this.$mdDialog = $mdDialog
       this.groupHandler = $groupHandler
+      this.setBrowserOffset = $dateDiffService.setBrowserOffset
 
       try {
         const parsedResult = agentData.map(item =>
@@ -142,6 +144,14 @@ define([
       })
       this.scope.reloadList = () => this.reloadList()
 
+      this.scope.offsetTimestamp = (text, time) => {
+        try {
+          return text + this.setBrowserOffset(time)
+        } catch (error) {
+          return ''
+        }
+      }
+
       this.scope.loadCharts = (id) => {
         setTimeout(() => {
           const chart = new Chart(document.getElementById(id),

SplunkAppForWazuh/appserver/static/js/controllers/agents/configuration-assessment/agents-ca.html

@@ -52,79 +52,78 @@
         <div class="layout-column md-padding wz-width-25" ng-repeat="policy in configAssess">
           <span class="wz-headline-title">{{policy.name}}</span>
           <md-divider class="wz-margin-top-10"></md-divider>
-          <canvas id="{{policy.policy_id}}" class=" wz-margin-top-10 chart chart-doughnut" ng-init="loadCharts(policy)" height="150">
+          <canvas id="{{policy.policy_id}}" class=" wz-margin-top-10 chart chart-doughnut" ng-init="loadCharts(policy)"
+            height="150">
         </div>
       </div>
     </div>
-  </div>
 
-  <div layout="row" class="wz-margin-top-10 wz-margin-right-8 wz-margin-left-8"
-    ng-if="showPolicies && (!agent || !agent.os)">
-    <div flex class="euiCallOut euiCallOut--warning">
-      <div class="euiCallOutHeader">
-        <svg class="euiIcon euiIcon--medium euiCallOutHeader__icon" aria-hidden="true"
-          xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"
-          viewBox="0 0 16 16">
-          <defs>
-            <path id="help-a"
-              d="M13.6 12.186l-1.357-1.358c-.025-.025-.058-.034-.084-.056.53-.794.84-1.746.84-2.773a4.977 4.977 0 0 0-.84-2.772c.026-.02.059-.03.084-.056L13.6 3.813a6.96 6.96 0 0 1 0 8.373zM8 15A6.956 6.956 0 0 1 3.814 13.6l1.358-1.358c.025-.025.034-.057.055-.084C6.02 12.688 6.974 13 8 13a4.978 4.978 0 0 0 2.773-.84c.02.026.03.058.056.083l1.357 1.358A6.956 6.956 0 0 1 8 15zm-5.601-2.813a6.963 6.963 0 0 1 0-8.373l1.359 1.358c.024.025.057.035.084.056A4.97 4.97 0 0 0 3 8c0 1.027.31 1.98.842 2.773-.027.022-.06.031-.084.056l-1.36 1.358zm5.6-.187A4 4 0 1 1 8 4a4 4 0 0 1 0 8zM8 1c1.573 0 3.019.525 4.187 1.4l-1.357 1.358c-.025.025-.035.057-.056.084A4.979 4.979 0 0 0 8 3a4.979 4.979 0 0 0-2.773.842c-.021-.027-.03-.059-.055-.084L3.814 2.4A6.957 6.957 0 0 1 8 1zm0-1a8.001 8.001 0 1 0 .003 16.002A8.001 8.001 0 0 0 8 0z">
-            </path>
-          </defs>
-          <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#help-a" fill-rule="evenodd"></use>
-        </svg>
-        <span class="euiCallOutHeader__title">This agent is never connected.</span>
+    <div layout="row" class="wz-margin-top-10 wz-margin-right-8 wz-margin-left-8"
+      ng-if="showPolicies && (!agent || !agent.os)">
+      <div flex class="euiCallOut euiCallOut--warning">
+        <div class="euiCallOutHeader">
+          <svg class="euiIcon euiIcon--medium euiCallOutHeader__icon" aria-hidden="true"
+            xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"
+            viewBox="0 0 16 16">
+            <defs>
+              <path id="help-a"
+                d="M13.6 12.186l-1.357-1.358c-.025-.025-.058-.034-.084-.056.53-.794.84-1.746.84-2.773a4.977 4.977 0 0 0-.84-2.772c.026-.02.059-.03.084-.056L13.6 3.813a6.96 6.96 0 0 1 0 8.373zM8 15A6.956 6.956 0 0 1 3.814 13.6l1.358-1.358c.025-.025.034-.057.055-.084C6.02 12.688 6.974 13 8 13a4.978 4.978 0 0 0 2.773-.84c.02.026.03.058.056.083l1.357 1.358A6.956 6.956 0 0 1 8 15zm-5.601-2.813a6.963 6.963 0 0 1 0-8.373l1.359 1.358c.024.025.057.035.084.056A4.97 4.97 0 0 0 3 8c0 1.027.31 1.98.842 2.773-.027.022-.06.031-.084.056l-1.36 1.358zm5.6-.187A4 4 0 1 1 8 4a4 4 0 0 1 0 8zM8 1c1.573 0 3.019.525 4.187 1.4l-1.357 1.358c-.025.025-.035.057-.056.084A4.979 4.979 0 0 0 8 3a4.979 4.979 0 0 0-2.773.842c-.021-.027-.03-.059-.055-.084L3.814 2.4A6.957 6.957 0 0 1 8 1zm0-1a8.001 8.001 0 1 0 .003 16.002A8.001 8.001 0 0 0 8 0z">
+              </path>
+            </defs>
+            <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#help-a" fill-rule="evenodd"></use>
+          </svg>
+          <span class="euiCallOutHeader__title">This agent is never connected.</span>
+        </div>
       </div>
     </div>
-  </div>
-
-  <div ng-if="configAssess.length" layout="row" class="wz-padding-top-0" ng-if="agent && agent.os">
-    <md-card flex="" class="wz-md-card _md flex">
-      <md-card-content>
-        <span class="wz-headline-title"><i class="fa fa-fw fa-shield"></i> Configuration assessment</span>
-        <md-divider class="wz-margin-top-10"></md-divider>
-        <table class="table table-condensed table-layout-fixed table-hover table-vertical-align-middle">
-          <thead>
-            <th class="wz-nowrap">Policy</th>
-            <th class="wz-nowrap">Description</th>
-            <th class="wz-nowrap">Last scan</th>
-            <th class="wz-nowrap">Pass</th>
-            <th class="wz-nowrap">Fail</th>
-            <th class="wz-nowrap">Not applicable</th>
-            <th class="wz-nowrap">Score</th>
-          </thead>
-          <tbody>
-            <tr class="wz-word-wrap" ng-repeat="policy in configAssess track by $index">
-              <td ng-click="loadPolicyChecks(policy.policy_id, policy.name)" class="wz-text-link cursor-pointer">
-                {{policy.name}}</td>
-              <td>{{policy.description}}</td>
-              <td>{{policy.end_scan}}</td>
-              <td>{{policy.pass}}</td>
-              <td>{{policy.fail}}</td>
-              <td>{{policy.invalid}}</td>
-              <td>{{policy.score}}%</td>
-            </tr>
-          </tbody>
-        </table>
-      </md-card-content>
-    </md-card>
-  </div>
 
-  <div ng-if="!configAssess.length" layout="row" class="wz-padding-top-0" ng-if="agent && agent.os">
-    <md-card flex="60" class="wz-md-card center">
-      <md-card-content class="wazuh-column">
-        <span class="wz-headline-title">
-          <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
-          No scans available.
+    <div ng-if="configAssess.length" layout="row" class="wz-padding-top-0" ng-if="agent && agent.os">
+      <md-card flex="" class="wz-md-card _md flex">
+        <md-card-content>
+          <span class="wz-headline-title"><i class="fa fa-fw fa-shield"></i> Configuration assessment</span>
           <md-divider class="wz-margin-top-10"></md-divider>
-          <button class="btn wz-button-empty wz-margin-top-15" ng-click="refreshScans()" aria-label="Refresh">
-            <wz-svg icon="refresh"></wz-svg>
-            &nbsp;Refresh
-          </button>
-        </span>
-      </md-card-content>
-    </md-card>
-  </div>
+          <table class="table table-condensed table-layout-fixed table-hover table-vertical-align-middle">
+            <thead>
+              <th class="wz-nowrap">Policy</th>
+              <th class="wz-nowrap">Description</th>
+              <th class="wz-nowrap">Last scan</th>
+              <th class="wz-nowrap">Pass</th>
+              <th class="wz-nowrap">Fail</th>
+              <th class="wz-nowrap">Not applicable</th>
+              <th class="wz-nowrap">Score</th>
+            </thead>
+            <tbody>
+              <tr class="wz-word-wrap" ng-repeat="policy in configAssess track by $index">
+                <td ng-click="loadPolicyChecks(policy.policy_id, policy.name)" class="wz-text-link cursor-pointer">
+                  {{policy.name}}</td>
+                <td>{{policy.description}}</td>
+                <td>{{policy.end_scan}}</td>
+                <td>{{policy.pass}}</td>
+                <td>{{policy.fail}}</td>
+                <td>{{policy.invalid}}</td>
+                <td>{{policy.score}}%</td>
+              </tr>
+            </tbody>
+          </table>
+        </md-card-content>
+      </md-card>
+    </div>
 
+    <div ng-if="!configAssess.length" layout="row" class="wz-padding-top-0" ng-if="agent && agent.os">
+      <md-card flex="60" class="wz-md-card center">
+        <md-card-content class="wazuh-column">
+          <span class="wz-headline-title">
+            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+            No scans available.
+            <md-divider class="wz-margin-top-10"></md-divider>
+            <button class="btn wz-button-empty wz-margin-top-15" ng-click="refreshScans()" aria-label="Refresh">
+              <wz-svg icon="refresh"></wz-svg>
+              &nbsp;Refresh
+            </button>
+          </span>
+        </md-card-content>
+      </md-card>
+    </div>
   </div>
 
   <!-- Policies checks table -->

SplunkAppForWazuh/appserver/static/js/controllers/agents/configuration-assessment/agentsConfigurationAssessmentsCtrl.js

@@ -45,7 +45,8 @@ define([
       $tableFilterService,
       reportingEnabled,
       BASE_URL,
-      extensions
+      extensions,
+      $dateDiffService
     ) {
       this.urlTokenModel = $urlTokenModel
       this.rootScope = $rootScope
@@ -60,7 +61,17 @@ define([
       this.configAssess = configAssess
       this.notification = $notificationService
       this.api = $currentDataService.getApi()
+      this.setBrowserOffset = $dateDiffService.setBrowserOffset
       this.csvReq = $csvRequestService
+
+      this.scope.offsetTimestamp = (text, time) => {
+        try {
+          return text + this.setBrowserOffset(time)
+        } catch (error) {
+          return ''
+        }
+      }
+
       this.wzTableFilter = $tableFilterService
       this.baseUrl = BASE_URL
       this.scope.noScansPng = `${

SplunkAppForWazuh/appserver/static/js/controllers/agents/inventory/inventory.html

@@ -79,7 +79,7 @@
     <md-card flex class="wz-md-card">
       <md-card-content>
         <span class="wz-headline-title"><i class="fa fa-fw fa-cubes"></i> Packages</span>
-        <span class="color-grey pull-right">Last scan: {{syscollector.packagesDate}}</span>
+        <span class="color-grey pull-right">Last scan: {{setBrowserOffset(syscollector.packagesDate)}}</span>
         <md-divider class="wz-margin-top-10"></md-divider>
         <div layout="row" class="wz-margin-top-10">
           <label class="wz-icon-loupe" style="margin-bottom: -16px;">
@@ -113,7 +113,7 @@
     <md-card flex class="wz-md-card">
       <md-card-content>
         <span class="wz-headline-title"><i class="fa fa-fw fa-terminal"></i> Processes</span>
-        <span class="color-grey pull-right">Last scan: {{syscollector.processesDate}}</span>
+        <span class="color-grey pull-right">Last scan: {{setBrowserOffset(syscollector.processesDate)}}</span>
         <md-divider class="wz-margin-top-10"></md-divider>
         <div layout="row" class="wz-margin-top-10">
           <label class="wz-icon-loupe" style="margin-bottom: -16px;">
@@ -151,7 +151,7 @@
       </md-card-content>
       <md-card-content ng-if="syscollector.netiface && syscollector.netiface.items.length">
         <span class="wz-headline-title"><i class="fa fa-fw fa-sitemap"></i> Network interfaces</span>
-        <span class="color-grey pull-right">Last scan: {{syscollector.netiface.items[0].scan.time}}</span>
+        <span class="color-grey pull-right">Last scan: {{setBrowserOffset(syscollector.netiface.items[0].scan.time)}}</span>
         <md-divider class="wz-margin-top-10"></md-divider>
 
         <table class="table table-striped table-condensed table-layout-fixed">
@@ -199,7 +199,7 @@
       </md-card-content>
       <md-card-content class="wz-margin-bottom-40-inv" ng-if="syscollector.ports && syscollector.ports.items.length">
         <span class="wz-headline-title"><i class="fa fa-fw fa-exchange"></i> Network ports</span>
-        <span class="color-grey pull-right">Last scan: {{syscollector.ports.items[0].scan.time}}</span>
+        <span class="color-grey pull-right">Last scan: {{setBrowserOffset(syscollector.ports.items[0].scan_time)}}</span>
         <md-divider class="wz-margin-top-10"></md-divider>
         <wazuh-table flex ng-if="agent && agent.os && agent.os.platform === 'windows'" path="'/syscollector/' + agent.id + '/ports'"
           row-sizes="[4]" keys="[{value:'process',nosortable:true},{value:'local.ip',nosortable:true}, {value:'local.port',nosortable:true},'state','protocol']">

SplunkAppForWazuh/appserver/static/js/controllers/agents/inventory/inventoryCtrl.js

@@ -31,7 +31,8 @@ define(['../../module', 'FileSaver'], function(module) {
       $reportingService,
       reportingEnabled,
       $currentDataService,
-      $csvRequestService
+      $csvRequestService, 
+      $dateDiffService
     ) {
       this.scope = $scope
       this.scope.reportingEnabled = reportingEnabled
@@ -48,6 +49,7 @@ define(['../../module', 'FileSaver'], function(module) {
       this.reportingService = $reportingService
       this.api = $currentDataService.getApi()
       this.csvReq = $csvRequestService
+      this.setBrowserOffset = $dateDiffService.setBrowserOffset
     }
 
     /**
@@ -64,6 +66,7 @@ define(['../../module', 'FileSaver'], function(module) {
      */
     $onInit() {
       try {
+        this.setBrowserOffset("2019/04/24 10:59:03")
         this.scope.downloadCsv = (path, name) => this.downloadCsv(path, name)
         this.scope.hasSize = obj =>
           obj && typeof obj === 'object' && Object.keys(obj).length
@@ -116,6 +119,8 @@ define(['../../module', 'FileSaver'], function(module) {
           this.scope.loadingReporting = data.status
         })
 
+        this.scope.setBrowserOffset = date => this.setBrowserOffset(date)
+
         return
       } catch (error) {
         this.notification.showErrorToast(error.message || error)
@@ -162,7 +167,8 @@ define(['../../module', 'FileSaver'], function(module) {
             ? this.processesDate.items[0].scan_time
             : 'Unknown'
         }
-        if (!this.scope.$$phase) this.scope.$digest()
+        console.log("tss ", this.scope.syscollector)
+        this.scope.$applyAsync()
         return
       } catch (error) {
         throw new Error(error.message || error)

SplunkAppForWazuh/appserver/static/js/controllers/agents/overview/agentsOverviewCtrl.js

@@ -10,7 +10,7 @@
  * Find more information about this on the LICENSE file.
  */
 
-define(['../../module'], function(app) {
+define(['../../module'], function (app) {
   'use strict'
 
   class AgentsOverview {
@@ -72,27 +72,27 @@ define(['../../module'], function(app) {
 
           this.scope.agentOS =
             this.scope.agent &&
-            this.scope.agent.os &&
-            this.scope.agent.os.name &&
-            this.scope.agent.os.codename &&
-            this.scope.agent.os.version
+              this.scope.agent.os &&
+              this.scope.agent.os.name &&
+              this.scope.agent.os.codename &&
+              this.scope.agent.os.version
               ? `${this.scope.agent.os.name || '-'} ${this.scope.agent.os
-                  .codename || '-'} ${this.scope.agent.os.version || '-'}`
+                .codename || '-'} ${this.scope.agent.os.version || '-'}`
               : 'Unknown'
 
           this.scope.syscheck =
             this.agent.length > 0 &&
-            typeof this.agent[1] === 'object' &&
-            typeof this.agent[1].data === 'object' &&
-            !this.agent[1].data.error
+              typeof this.agent[1] === 'object' &&
+              typeof this.agent[1].data === 'object' &&
+              !this.agent[1].data.error
               ? this.agent[1].data.data
               : (this.scope.syscheck = { start: 'Unknown', end: 'Unknown' })
           this.scope.id = this.stateParams.id
           this.scope.rootcheck =
             this.agent.length > 1 &&
-            typeof this.agent[2] === 'object' &&
-            typeof this.agent[2].data === 'object' &&
-            !this.agent[2].data.error
+              typeof this.agent[2] === 'object' &&
+              typeof this.agent[2].data === 'object' &&
+              !this.agent[2].data.error
               ? this.agent[2].data.data
               : { start: 'Unknown', end: 'Unknown' }
           if (!this.scope.agent.error) {
@@ -150,6 +150,15 @@ define(['../../module'], function(app) {
                 : group
             }
 
+
+            this.scope.offsetTimestamp = (text, time) => {
+              try {
+                return text + this.dateDiffService.setBrowserOffset(time)
+              } catch (error) {
+                return ''
+              }
+            }
+
             this.scope.cancelAddGroup = () =>
               (this.scope.addingGroupToAgent = false)
 
@@ -171,7 +180,7 @@ define(['../../module'], function(app) {
                   this.scope.editGroup = false
                   this.notification.showSuccessToast(
                     `Agent ${this.scope.agent.name}(${
-                      this.scope.agent.id
+                    this.scope.agent.id
                     }) has been added to group ${group}.`
                   )
                   if (!this.scope.$$phase) this.scope.$digest()