@seniorsistemas/yms-integration 1.18.4 → 1.19.1

package/fesm5/seniorsistemas-yms-integration.js

@@ -12,9 +12,9 @@ import { MessageService, DynamicDialogRef, DynamicDialogConfig, DialogService, C
 import { ControleCircuito, ControleOperacao, IntegrationDispatcher, CircuitoFinalizado, ControleUnificado, ChegadaVeiculo, IntegrationEventsCallback, IntegrationModule, ChegadaVeiculoOverride, Agendamento } from '@seniorsistemas/yms-routines';
 import { trigger, state, style, transition, animate } from '@angular/animations';
 import { PermissionsModule } from '@seniorsistemas/platform-components';
-import { StompService, StompConfig } from '@stomp/ng2-stompjs';
-import { CookieService } from 'ngx-cookie-service';
+import { StompConfig, StompService } from '@stomp/ng2-stompjs';
 import * as SockJS from 'sockjs-client';
+import { CookieService } from 'ngx-cookie-service';
 import { DynamicDialogModule } from 'primeng/components/dynamicdialog/dynamicdialog';
 import { TooltipModule, SharedModule, CardModule, DialogModule, PanelModule, InputTextModule as InputTextModule$1, DropdownModule, ConfirmDialogModule, TabViewModule, CalendarModule } from 'primeng/primeng';
 import { SelectPlantService, SelectPlantModule } from '@seniorsistemas/yms-components';
@@ -375,6 +375,9 @@ var BalancasService = /** @class */ (function (_super) {
     BalancasService.prototype.fallbackCall = function (balanca, peso) {
         return this.http.post(this.urlBalanca + "actions/manualWeight", { code: balanca, weight: peso }).pipe(this.defaultCatch());
     };
+    BalancasService.prototype.getStabilizedWeight = function (code) {
+        return this.http.post(this.urlBalanca + "queries/getStabilizedWeight", { code: code }).pipe(this.defaultCatch());
+    };
     BalancasService.prototype.getWeightScaleByCode = function (code) {
         var params = {
             displayFields: ["description", "code"],
@@ -408,13 +411,10 @@ var VisualizarBalancaDescritor = /** @class */ (function () {
 }());
 var VisualizarBalancaComponent = /** @class */ (function (_super) {
     __extends(VisualizarBalancaComponent, _super);
-    function VisualizarBalancaComponent(service, client, cookieService) {
+    function VisualizarBalancaComponent(service) {
         var _this = _super.call(this) || this;
         _this.service = service;
-        _this.client = client;
-        _this.cookieService = cookieService;
         _this.loading = false;
-        _this.websocket = new IntegrationWebSocket(_this.client, _this.cookieService, 'integration');
         _this.unsubscribe$ = new Subject();
         _this.weightScales$ = new BehaviorSubject([]);
         _this.weightScaleValues = new Map();
@@ -432,19 +432,10 @@ var VisualizarBalancaComponent = /** @class */ (function (_super) {
             _this.weightScales$.next(contents);
             contents.forEach(function (value) {
                 _this.weightScaleValues.set(value.id, 0);
-            });
-        });
-        this.websocket.connect(function (url, client) {
-            client.subscribe(url + "wsWeightScale")
-                .pipe(map(function (message) { return message.body; }), map(function (body) { return JSON.parse(body).data; }), takeUntil(_this.unsubscribe$))
-                .subscribe(function (payload) {
-                if (!_this.weightScales$.value.length)
-                    return;
-                var index = _this.weightScales$.value.findIndex(function (value) { return value.id === payload.weightScale.id; });
-                if (index < 0)
-                    return;
-                var find = _this.weightScales$.value[index];
-                _this.weightScaleValues.set(find.id, payload.weight);
+                _this.service.getStabilizedWeight(value.code)
+                    .subscribe(function (stabilized) {
+                    _this.weightScaleValues.set(value.id, stabilized.weight);
+                });
             });
         });
     };
@@ -461,9 +452,7 @@ var VisualizarBalancaComponent = /** @class */ (function (_super) {
             selector: 'visualizar-balanca-component',
             template: "<div *sLoadingState=\"loading\">\n    <p-table [value]=\"weightScales$ | async\">\n        <ng-template pTemplate=\"header\">\n            <tr>\n                <th>C\u00F3digo</th>\n                <th>Descri\u00E7\u00E3o</th>\n                <th>Peso</th>\n            </tr>\n        </ng-template>\n        <ng-template let-rowData pTemplate=\"body\">\n            <tr>\n                <td>{{rowData.code}}</td>\n                <td>{{rowData.description}}</td>\n                <td>{{weightScaleValues.get(rowData.id)}}</td>\n            </tr>\n        </ng-template>\n    </p-table>\n</div>"
         }),
-        __metadata("design:paramtypes", [BalancasService,
-            StompService,
-            CookieService])
+        __metadata("design:paramtypes", [BalancasService])
     ], VisualizarBalancaComponent);
     return VisualizarBalancaComponent;
 }(VisualizarBalancaDescritor));
@@ -1900,6 +1889,16 @@ var VisitanteComponent = /** @class */ (function () {
                 driver: true
             });
         }
+        if (this.visitors.length > 0) {
+            this.visitors[0].visitor = {
+                name: mot.nome,
+                document: mot.cpf,
+                contact: this.getContatoMotorista(mot),
+                visitorSituation: VisitorSituation.CHECK_IN_PENDING,
+                documentType: this.getDocumentType(),
+                driver: true
+            };
+        }
     };
     VisitanteComponent.prototype.adicionaVisitantesGrid = function () {
         var _this = this;
@@ -1992,6 +1991,14 @@ var VisitanteComponent = /** @class */ (function () {
             if (visitor.document === visitante.document) {
                 visitor.contact = visitante.contact;
                 visitor.name = visitante.name;
+                var novoVisitante_1 = _this.buildVisitorCredentialsDto(visitor);
+                _this.visitors.forEach(function (result) {
+                    if (result.visitor.document === novoVisitante_1.visitor.document) {
+                        result.visitor.name = novoVisitante_1.visitor.name;
+                        result.visitor.contact = novoVisitante_1.visitor.contact;
+                    }
+                });
+                _this.visitorsChange.emit(_this.visitors);
                 _this.visitorFound = true;
             }
         });
@@ -2019,6 +2026,19 @@ var VisitanteComponent = /** @class */ (function () {
         this.visitorsChange.emit(this.visitors);
         this.hasChange.emit(true);
     };
+    VisitanteComponent.prototype.buildVisitorCredentialsDto = function (visitor) {
+        var visitorCredentialsDto = new VisitorCredentialsDto();
+        var visitante = {
+            name: visitor.name,
+            document: visitor.document,
+            contact: visitor.contact,
+            documentType: visitor.documentType,
+            visitorSituation: visitor.visitorSituation,
+            driver: false
+        };
+        visitorCredentialsDto.visitor = visitante;
+        return visitorCredentialsDto;
+    };
     VisitanteComponent.prototype.model = function (visitante) {
         var _this = this;
         var isDriver = visitante.document === this.motorista.cpf;