@denevads/dnv-smo 1.0.38 → 1.0.40

package/dist/interfaces/callbacks.d.ts

@@ -3,6 +3,8 @@ export interface setDatasource {
 }
 export interface start {
 }
+export interface dispose {
+}
 export interface variable {
     variable: string;
     valor: string;
@@ -80,3 +82,11 @@ export interface Datasource {
 export interface DatasourceMap {
     [codigo: string]: Datasource;
 }
+export interface ValorCalendario {
+    codigo: number;
+    valor: any;
+    tipo: number;
+    inicio: string;
+    fin: string;
+    objIdDispositivo: number;
+}

package/dist/smo.d.ts

@@ -1,4 +1,4 @@
-import { setDatasource, variable, location, DataSalida, ExecFunction, Notify, start, GetRecursosByCodigo, GetRecursos, GetRecursosRelleno, GetRecursosMetadatos, RecursosMetadato, DatasourceMap } from "./interfaces/callbacks";
+import { setDatasource, variable, location, DataSalida, ExecFunction, Notify, start, GetRecursosByCodigo, GetRecursos, GetRecursosRelleno, GetRecursosMetadatos, RecursosMetadato, DatasourceMap, ValorCalendario } from "./interfaces/callbacks";
 import { Subject } from 'rxjs';
 export declare class SMO {
     vars: any;
@@ -12,6 +12,7 @@ export declare class SMO {
     init(): void;
     initOnMessage(): void;
     start(): void;
+    dispose(): void;
     setDatasource(datasource: setDatasource): void;
     getVariable(variable: variable): void;
     setCurrentStream(stream: string): void;
@@ -27,11 +28,12 @@ export declare class SMO {
     getVariableStorage(variable: variable): void;
     checkHealth(json: string): void;
     checkHealthPrinter(json: string): void;
-    getValorCalendario(estado: boolean): void;
+    getValorCalendario(data: ValorCalendario | any): void;
     getLocalDatasource(data: DatasourceMap): void;
 }
 declare class SmoEvents {
     start: Subject<start>;
+    dispose: Subject<start>;
     setDatasource: Subject<setDatasource>;
     setDatasourceJson: Subject<any>;
     getVariable: Subject<variable>;
@@ -48,7 +50,7 @@ declare class SmoEvents {
     getVariableStorage: Subject<variable>;
     checkHealth: Subject<string>;
     checkHealthPrinter: Subject<string>;
-    getValorCalendario: Subject<boolean>;
+    getValorCalendario: Subject<ValorCalendario | any>;
     getLocalDatasource: Subject<DatasourceMap>;
     constructor(smo: SMO);
 }
@@ -99,7 +101,7 @@ declare class smoCallBacks {
     checkHealth(): void;
     checkHealthPrinter(): void;
     printImage(image: string): void;
-    getValorCalendario(codigo: number, tipoObjeto?: number): void;
+    getValorCalendario(codigo: number, compleja?: boolean, tipoObjeto?: number): void;
     /**
      * Funcion que permite obtener uno o varios datasources pasando su/sus codigos
      * Permite un solo codigo o un array de codigos
@@ -119,6 +121,7 @@ declare class Utils {
 }
 export declare enum SMO_EVENT_TYPE {
     start = "start",
+    dispose = "dispose",
     setDatasource = "setDatasource",
     getVariable = "getVariable",
     setCurrentStream = "setCurrentStream",

package/dist/smo.js

@@ -156,6 +156,10 @@ var SMO = /** @class */ (function () {
                     selft.start();
                     return;
                 }
+                if (func == SMO_EVENT_TYPE.dispose) {
+                    selft.dispose();
+                    return;
+                }
                 if (func == SMO_EVENT_TYPE.setDatasource) {
                     selft.setDatasource(e.data.objData);
                     return;
@@ -229,6 +233,9 @@ var SMO = /** @class */ (function () {
     SMO.prototype.start = function () {
         this.events.start.next({});
     };
+    SMO.prototype.dispose = function () {
+        this.events.dispose.next({});
+    };
     SMO.prototype.setDatasource = function (datasource) {
         this.events.setDatasource.next(datasource);
         this.events.setDatasourceJson.next(this.utils.xmlToJSON(datasource.xml));
@@ -275,8 +282,8 @@ var SMO = /** @class */ (function () {
     SMO.prototype.checkHealthPrinter = function (json) {
         this.events.checkHealthPrinter.next(json);
     };
-    SMO.prototype.getValorCalendario = function (estado) {
-        this.events.getValorCalendario.next(estado);
+    SMO.prototype.getValorCalendario = function (data) {
+        this.events.getValorCalendario.next(data);
     };
     SMO.prototype.getLocalDatasource = function (data) {
         this.events.getLocalDatasource.next(data);
@@ -287,6 +294,7 @@ exports.SMO = SMO;
 var SmoEvents = /** @class */ (function () {
     function SmoEvents(smo) {
         this.start = new rxjs_1.Subject();
+        this.dispose = new rxjs_1.Subject();
         this.setDatasource = new rxjs_1.Subject();
         this.setDatasourceJson = new rxjs_1.Subject();
         this.getVariable = new rxjs_1.Subject();
@@ -668,12 +676,13 @@ var smoCallBacks = /** @class */ (function () {
             idSmo: this.smo.id
         }, this.smo.vars.idSmo);
     };
-    smoCallBacks.prototype.getValorCalendario = function (codigo, tipoObjeto) {
+    smoCallBacks.prototype.getValorCalendario = function (codigo, compleja, tipoObjeto) {
         this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getValorCalendario",
             objData: {
                 codigo: codigo,
-                tipoObjeto: tipoObjeto
+                tipoObjeto: tipoObjeto,
+                compleja: compleja
             },
             idSmo: this.smo.id
         }, this.smo.vars.idSmo);
@@ -852,6 +861,7 @@ var Utils = /** @class */ (function () {
 var SMO_EVENT_TYPE;
 (function (SMO_EVENT_TYPE) {
     SMO_EVENT_TYPE["start"] = "start";
+    SMO_EVENT_TYPE["dispose"] = "dispose";
     SMO_EVENT_TYPE["setDatasource"] = "setDatasource";
     SMO_EVENT_TYPE["getVariable"] = "getVariable";
     SMO_EVENT_TYPE["setCurrentStream"] = "setCurrentStream";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@denevads/dnv-smo",
-    "version": "1.0.38",
+    "version": "1.0.40",
     "description": "SMO module",
     "main": "./src/index.js",
     "types": "./src/index.d.ts",

package/src/interfaces/callbacks.ts

@@ -1,9 +1,12 @@
 
-export  interface setDatasource{
+export interface setDatasource{
     xml:string
 }
 export interface start{
     
+}
+export interface dispose{
+    
 }
 export interface variable{
     variable:string,
@@ -84,4 +87,11 @@ export interface Datasource{
 export interface DatasourceMap {
     [codigo: string]: Datasource; // Cada clave tiene un solo Datasource
 }
-
+export interface ValorCalendario {
+    codigo: number;
+    valor: any;
+    tipo: number;
+    inicio: string;
+    fin: string;
+    objIdDispositivo: number;
+}

package/src/smo.ts

@@ -6,9 +6,10 @@ import {
     ExecFunction,
     Notify,
     start,
+    dispose,
     GetRecursosByCodigo,
     GetRecursos,
-    GetRecursosRelleno, GetRecursosMetadatos, RecursosMetadato, Datasource, DatasourceMap
+    GetRecursosRelleno, GetRecursosMetadatos, RecursosMetadato, Datasource, DatasourceMap, ValorCalendario
 } from "./interfaces/callbacks";
 import {interval, Subject, Subscription} from 'rxjs';
 
@@ -177,6 +178,10 @@ export  class SMO  {
                     selft.start();
                     return;
                 }
+                if(func == SMO_EVENT_TYPE.dispose){
+                    selft.dispose();
+                    return;
+                }
                 if(func == SMO_EVENT_TYPE.setDatasource){
                     selft.setDatasource(e.data.objData);
                     return;
@@ -250,6 +255,9 @@ export  class SMO  {
     start():void{
         this.events.start.next({});
     }
+    dispose():void{
+        this.events.dispose.next({});
+    }
     setDatasource(datasource:setDatasource):void {
         this.events.setDatasource.next(datasource);
         this.events.setDatasourceJson.next(this.utils.xmlToJSON(datasource.xml));
@@ -297,8 +305,8 @@ export  class SMO  {
     checkHealthPrinter(json:string):void{
         this.events.checkHealthPrinter.next(json);
     }
-    getValorCalendario(estado:boolean):void{
-        this.events.getValorCalendario.next(estado);
+    getValorCalendario(data:ValorCalendario|any):void{
+        this.events.getValorCalendario.next(data);
     }
     getLocalDatasource(data: DatasourceMap):void{
         this.events.getLocalDatasource.next(data);
@@ -307,6 +315,7 @@ export  class SMO  {
 
 class SmoEvents{
     public start: Subject<start> = new Subject<start>();
+    public dispose: Subject<start> = new Subject<dispose>();
     public setDatasource: Subject<setDatasource> = new Subject<setDatasource>();
     public setDatasourceJson: Subject<any> = new Subject<any>();
     public getVariable: Subject<variable> = new Subject<variable>();
@@ -323,7 +332,7 @@ class SmoEvents{
     public getVariableStorage: Subject<variable> = new Subject<variable>();
     public checkHealth: Subject<string> = new Subject<string>();
     public checkHealthPrinter: Subject<string> = new Subject<string>();
-    public getValorCalendario: Subject<boolean> = new Subject<boolean>();
+    public getValorCalendario: Subject<ValorCalendario|any> = new Subject<ValorCalendario|any>();
     public getLocalDatasource: Subject<DatasourceMap> = new Subject<DatasourceMap>();
     constructor(smo:SMO){}
 }
@@ -691,12 +700,13 @@ class smoCallBacks{
             idSmo: this.smo.id
         }, this.smo.vars.idSmo);
     }
-    getValorCalendario(codigo:number, tipoObjeto?:number){
+    getValorCalendario(codigo:number, compleja?:boolean, tipoObjeto?:number){
         this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getValorCalendario",
             objData: {
                 codigo: codigo,
-                tipoObjeto: tipoObjeto
+                tipoObjeto: tipoObjeto,
+                compleja: compleja
             },
             idSmo: this.smo.id
         }, this.smo.vars.idSmo);
@@ -891,6 +901,7 @@ class Utils{
 }
 export enum SMO_EVENT_TYPE{
     start = "start",
+    dispose = "dispose",
     setDatasource = "setDatasource",
     getVariable = "getVariable",
     setCurrentStream = "setCurrentStream",