@ricado/api-client 2.5.1 → 2.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ricado.api.client.js +1 -1
- package/lib/Controllers/Lab/Site/LabController.js +1 -1
- package/lib/Controllers/Lab/Site/RackPositionController.js +2 -2
- package/lib/Controllers/Packhouse/Site/MAFSizerController.js +2 -2
- package/lib/Models/Lab/Site/LabModel.js +14 -1
- package/lib/Models/Lab/Site/RackPositionModel.js +27 -1
- package/lib/Models/Packhouse/Site/MAFSizerModel.js +69 -1
- package/lib/PackageVersion.js +1 -1
- package/lib/index.d.ts +23 -3
- package/package.json +1 -1
- package/src/Controllers/Lab/Site/LabController.js +1 -1
- package/src/Controllers/Lab/Site/RackPositionController.js +2 -2
- package/src/Controllers/Packhouse/Site/MAFSizerController.js +2 -2
- package/src/Models/Lab/Site/LabModel.js +19 -1
- package/src/Models/Lab/Site/RackPositionModel.js +37 -1
- package/src/Models/Packhouse/Site/MAFSizerModel.js +93 -1
- package/src/PackageVersion.js +1 -1
|
@@ -213,7 +213,7 @@ var _default = LabController;
|
|
|
213
213
|
* A **InspectIntegration** Type
|
|
214
214
|
*
|
|
215
215
|
* @typedef {Object} LabController.InspectIntegration
|
|
216
|
-
* @property {{sqlServerCommunicationStatus: number, sampleCreationEnabled: number, sampleSchedulingEnabled: number, samplePublishingEnabled: number}} points The Points used for this Inspect Integration
|
|
216
|
+
* @property {{sqlServerCommunicationStatus: number, sampleCreationEnabled: number, sampleSchedulingEnabled: number, samplePublishingEnabled: number, samplePublishingFilter: number}} points The Points used for this Inspect Integration
|
|
217
217
|
* @property {boolean} enabled Whether the Inspect Integration is Enabled on this Lab
|
|
218
218
|
* @property {string} labName Name of the Lab referenced by Inspect
|
|
219
219
|
* @property {string} sqlServerHost Host of the Inspect SQL Server
|
|
@@ -183,7 +183,7 @@ var _default = RackPositionController;
|
|
|
183
183
|
* @typedef {Object} RackPositionController.CreateData
|
|
184
184
|
* @property {?number} [rtuId] The RTU this Rack Position belongs to
|
|
185
185
|
* @property {string} name The Name of this Rack Position
|
|
186
|
-
* @property {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentSampleStatus: number, nextSampleId: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}} points The Points used by this Rack Position
|
|
186
|
+
* @property {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentAdditionalSampleIds: number, currentSampleStatus: number, nextSampleId: number, nextAdditionalSampleIds: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}} points The Points used by this Rack Position
|
|
187
187
|
* @property {string} labId The Lab that owns this Rack Position
|
|
188
188
|
* @property {string} rackId The Rack associated with this Rack Position
|
|
189
189
|
* @property {number} verticalLevelIndex The Index of the Vertical Level in the Rack where this Position resides
|
|
@@ -196,7 +196,7 @@ var _default = RackPositionController;
|
|
|
196
196
|
*
|
|
197
197
|
* @typedef {Object} RackPositionController.UpdateData
|
|
198
198
|
* @property {string} [name] The Name of this Rack Position
|
|
199
|
-
* @property {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentSampleStatus: number, nextSampleId: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}} [points] The Points used by this Rack Position
|
|
199
|
+
* @property {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentAdditionalSampleIds: number, currentSampleStatus: number, nextSampleId: number, nextAdditionalSampleIds: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}} [points] The Points used by this Rack Position
|
|
200
200
|
* @property {string} [labId] The Lab that owns this Rack Position
|
|
201
201
|
* @property {string} [rackId] The Rack associated with this Rack Position
|
|
202
202
|
* @property {number} [verticalLevelIndex] The Index of the Vertical Level in the Rack where this Position resides
|
|
@@ -184,7 +184,7 @@ var _default = MAFSizerController;
|
|
|
184
184
|
* @property {string} packingLineId The Packing Line ID that manages this MAF Sizer
|
|
185
185
|
* @property {string} sizerType The Sizer Type
|
|
186
186
|
* @property {number} [autoCreateBatchDelay] The Auto Create Batch Delay in Seconds for this MAF Sizer
|
|
187
|
-
* @property {{currentBatchId: number, currentBatchName: number, currentBatchGrowerCode: number, currentBatchGrowerName: number, currentBatchVarietyCode: number, currentBatchVarietyName: number, machineAverageFruitWeight: number, machineAverageFruitSize: number, machineCupFill: number, machineRecycledFruitPerMinute: number, machineTotalFruitPerMinute: number, machineTraysPerHour: number, machineTonnesPerHour: number, machineRodsPerMinute: number, outletGroupSummaries: number, packTypeOutletUtilizationTargets: number, class1TraysPerHour: ?number}} points The Points used by this MAF Sizer
|
|
187
|
+
* @property {{currentBatchId: number, currentBatchName: number, currentBatchGrowerCode: number, currentBatchGrowerName: number, currentBatchVarietyCode: number, currentBatchVarietyName: number, machineAverageFruitWeight: number, machineAverageFruitSize: number, machineCupFill: number, machineRecycledFruitPerMinute: number, machineTotalFruitPerMinute: number, machineTraysPerHour: number, machineTonnesPerHour: number, machineRodsPerMinute: number, outletGroupSummaries: number, packTypeOutletUtilizationTargets: number, class1TraysPerHour: ?number, createNewBatchRequest: ?number, createBatchOnPackrunChange: ?number, createBatchOnTimeBatchChange: ?number, restartServiceRequest: ?number}} points The Points used by this MAF Sizer
|
|
188
188
|
* @property {Array<MAFSizerController.MAFSizerLane>} [lanes] The Lanes defined for this MAF Sizer
|
|
189
189
|
* @property {Array<MAFSizerController.MAFSizerOutlet>} [outlets] The Outlets defined for this MAF Sizer
|
|
190
190
|
* @property {Array<MAFSizerController.MAFSizerFruitSize>} [fruitSizes] The Fruit Sizes defined and handled by this MAF Sizer
|
|
@@ -203,7 +203,7 @@ var _default = MAFSizerController;
|
|
|
203
203
|
* @property {string} [packingLineId] The Packing Line ID that manages this MAF Sizer
|
|
204
204
|
* @property {string} [sizerType] The Sizer Type
|
|
205
205
|
* @property {number} [autoCreateBatchDelay] The Auto Create Batch Delay in Seconds for this MAF Sizer
|
|
206
|
-
* @property {{currentBatchId: number, currentBatchName: number, currentBatchGrowerCode: number, currentBatchGrowerName: number, currentBatchVarietyCode: number, currentBatchVarietyName: number, machineAverageFruitWeight: number, machineAverageFruitSize: number, machineCupFill: number, machineRecycledFruitPerMinute: number, machineTotalFruitPerMinute: number, machineTraysPerHour: number, machineTonnesPerHour: number, machineRodsPerMinute: number, outletGroupSummaries: number, packTypeOutletUtilizationTargets: number, class1TraysPerHour: ?number}} [points] The Points used by this MAF Sizer
|
|
206
|
+
* @property {{currentBatchId: number, currentBatchName: number, currentBatchGrowerCode: number, currentBatchGrowerName: number, currentBatchVarietyCode: number, currentBatchVarietyName: number, machineAverageFruitWeight: number, machineAverageFruitSize: number, machineCupFill: number, machineRecycledFruitPerMinute: number, machineTotalFruitPerMinute: number, machineTraysPerHour: number, machineTonnesPerHour: number, machineRodsPerMinute: number, outletGroupSummaries: number, packTypeOutletUtilizationTargets: number, class1TraysPerHour: ?number, createNewBatchRequest: ?number, createBatchOnPackrunChange: ?number, createBatchOnTimeBatchChange: ?number, restartServiceRequest: ?number}} [points] The Points used by this MAF Sizer
|
|
207
207
|
* @property {Array<MAFSizerController.MAFSizerLane>} [lanes] The Lanes defined for this MAF Sizer
|
|
208
208
|
* @property {Array<MAFSizerController.MAFSizerOutlet>} [outlets] The Outlets defined for this MAF Sizer
|
|
209
209
|
* @property {Array<MAFSizerController.MAFSizerFruitSize>} [fruitSizes] The Fruit Sizes defined and handled by this MAF Sizer
|
|
@@ -114,7 +114,7 @@ var LabModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
114
114
|
/**
|
|
115
115
|
* The Inspect Integration Configuration for this Lab
|
|
116
116
|
*
|
|
117
|
-
* @type {?{points: {sqlServerCommunicationStatus: number, sampleCreationEnabled: number, sampleSchedulingEnabled: number, samplePublishingEnabled: number}, enabled: boolean, labName: string, sqlServerHost: string, sqlServerUsername: string, sqlServerPassword: string}}
|
|
117
|
+
* @type {?{points: {sqlServerCommunicationStatus: number, sampleCreationEnabled: number, sampleSchedulingEnabled: number, samplePublishingEnabled: number, samplePublishingFilter: number}, enabled: boolean, labName: string, sqlServerHost: string, sqlServerUsername: string, sqlServerPassword: string}}
|
|
118
118
|
* @public
|
|
119
119
|
*/
|
|
120
120
|
|
|
@@ -346,6 +346,18 @@ var LabModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
346
346
|
pointsObject.samplePublishingEnabled = 0;
|
|
347
347
|
}
|
|
348
348
|
|
|
349
|
+
if (_typeof(jsonObject['inspectIntegration'].points) === 'object' && 'samplePublishingFilter' in jsonObject['inspectIntegration'].points) {
|
|
350
|
+
pointsObject.samplePublishingFilter = function () {
|
|
351
|
+
if (typeof jsonObject['inspectIntegration'].points.samplePublishingFilter !== 'number') {
|
|
352
|
+
return Number.isInteger(Number(jsonObject['inspectIntegration'].points.samplePublishingFilter)) ? Number(jsonObject['inspectIntegration'].points.samplePublishingFilter) : Math.floor(Number(jsonObject['inspectIntegration'].points.samplePublishingFilter));
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
return Number.isInteger(jsonObject['inspectIntegration'].points.samplePublishingFilter) ? jsonObject['inspectIntegration'].points.samplePublishingFilter : Math.floor(jsonObject['inspectIntegration'].points.samplePublishingFilter);
|
|
356
|
+
}();
|
|
357
|
+
} else {
|
|
358
|
+
pointsObject.samplePublishingFilter = 0;
|
|
359
|
+
}
|
|
360
|
+
|
|
349
361
|
return pointsObject;
|
|
350
362
|
}();
|
|
351
363
|
} else {
|
|
@@ -355,6 +367,7 @@ var LabModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
355
367
|
pointsDefaultValue.sampleCreationEnabled = 0;
|
|
356
368
|
pointsDefaultValue.sampleSchedulingEnabled = 0;
|
|
357
369
|
pointsDefaultValue.samplePublishingEnabled = 0;
|
|
370
|
+
pointsDefaultValue.samplePublishingFilter = 0;
|
|
358
371
|
return pointsDefaultValue;
|
|
359
372
|
}();
|
|
360
373
|
}
|
|
@@ -82,7 +82,7 @@ var RackPositionModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
82
82
|
/**
|
|
83
83
|
* The Points used by this Rack Position
|
|
84
84
|
*
|
|
85
|
-
* @type {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentSampleStatus: number, nextSampleId: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}}
|
|
85
|
+
* @type {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentAdditionalSampleIds: number, currentSampleStatus: number, nextSampleId: number, nextAdditionalSampleIds: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}}
|
|
86
86
|
* @public
|
|
87
87
|
*/
|
|
88
88
|
|
|
@@ -94,8 +94,10 @@ var RackPositionModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
94
94
|
pointsDefaultValue.calibrationOffset = 0;
|
|
95
95
|
pointsDefaultValue.disabled = 0;
|
|
96
96
|
pointsDefaultValue.currentSampleId = 0;
|
|
97
|
+
pointsDefaultValue.currentAdditionalSampleIds = 0;
|
|
97
98
|
pointsDefaultValue.currentSampleStatus = 0;
|
|
98
99
|
pointsDefaultValue.nextSampleId = 0;
|
|
100
|
+
pointsDefaultValue.nextAdditionalSampleIds = 0;
|
|
99
101
|
pointsDefaultValue.loadCurrentSampleRequest = 0;
|
|
100
102
|
pointsDefaultValue.startCurrentSampleRequest = 0;
|
|
101
103
|
pointsDefaultValue.finishCurrentSampleRequest = 0;
|
|
@@ -310,6 +312,18 @@ var RackPositionModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
310
312
|
pointsObject.currentSampleId = 0;
|
|
311
313
|
}
|
|
312
314
|
|
|
315
|
+
if (_typeof(jsonObject['points']) === 'object' && 'currentAdditionalSampleIds' in jsonObject['points']) {
|
|
316
|
+
pointsObject.currentAdditionalSampleIds = function () {
|
|
317
|
+
if (typeof jsonObject['points'].currentAdditionalSampleIds !== 'number') {
|
|
318
|
+
return Number.isInteger(Number(jsonObject['points'].currentAdditionalSampleIds)) ? Number(jsonObject['points'].currentAdditionalSampleIds) : Math.floor(Number(jsonObject['points'].currentAdditionalSampleIds));
|
|
319
|
+
}
|
|
320
|
+
|
|
321
|
+
return Number.isInteger(jsonObject['points'].currentAdditionalSampleIds) ? jsonObject['points'].currentAdditionalSampleIds : Math.floor(jsonObject['points'].currentAdditionalSampleIds);
|
|
322
|
+
}();
|
|
323
|
+
} else {
|
|
324
|
+
pointsObject.currentAdditionalSampleIds = 0;
|
|
325
|
+
}
|
|
326
|
+
|
|
313
327
|
if (_typeof(jsonObject['points']) === 'object' && 'currentSampleStatus' in jsonObject['points']) {
|
|
314
328
|
pointsObject.currentSampleStatus = function () {
|
|
315
329
|
if (typeof jsonObject['points'].currentSampleStatus !== 'number') {
|
|
@@ -334,6 +348,18 @@ var RackPositionModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
334
348
|
pointsObject.nextSampleId = 0;
|
|
335
349
|
}
|
|
336
350
|
|
|
351
|
+
if (_typeof(jsonObject['points']) === 'object' && 'nextAdditionalSampleIds' in jsonObject['points']) {
|
|
352
|
+
pointsObject.nextAdditionalSampleIds = function () {
|
|
353
|
+
if (typeof jsonObject['points'].nextAdditionalSampleIds !== 'number') {
|
|
354
|
+
return Number.isInteger(Number(jsonObject['points'].nextAdditionalSampleIds)) ? Number(jsonObject['points'].nextAdditionalSampleIds) : Math.floor(Number(jsonObject['points'].nextAdditionalSampleIds));
|
|
355
|
+
}
|
|
356
|
+
|
|
357
|
+
return Number.isInteger(jsonObject['points'].nextAdditionalSampleIds) ? jsonObject['points'].nextAdditionalSampleIds : Math.floor(jsonObject['points'].nextAdditionalSampleIds);
|
|
358
|
+
}();
|
|
359
|
+
} else {
|
|
360
|
+
pointsObject.nextAdditionalSampleIds = 0;
|
|
361
|
+
}
|
|
362
|
+
|
|
337
363
|
if (_typeof(jsonObject['points']) === 'object' && 'loadCurrentSampleRequest' in jsonObject['points']) {
|
|
338
364
|
pointsObject.loadCurrentSampleRequest = function () {
|
|
339
365
|
if (typeof jsonObject['points'].loadCurrentSampleRequest !== 'number') {
|
|
@@ -106,7 +106,7 @@ var MAFSizerModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
106
106
|
/**
|
|
107
107
|
* The Points used by this MAF Sizer
|
|
108
108
|
*
|
|
109
|
-
* @type {{currentBatchId: number, currentBatchName: number, currentBatchGrowerCode: number, currentBatchGrowerName: number, currentBatchVarietyCode: number, currentBatchVarietyName: number, machineAverageFruitWeight: number, machineAverageFruitSize: number, machineCupFill: number, machineRecycledFruitPerMinute: number, machineTotalFruitPerMinute: number, machineTraysPerHour: number, machineTonnesPerHour: number, machineRodsPerMinute: number, outletGroupSummaries: number, packTypeOutletUtilizationTargets: number, class1TraysPerHour: ?number}}
|
|
109
|
+
* @type {{currentBatchId: number, currentBatchName: number, currentBatchGrowerCode: number, currentBatchGrowerName: number, currentBatchVarietyCode: number, currentBatchVarietyName: number, machineAverageFruitWeight: number, machineAverageFruitSize: number, machineCupFill: number, machineRecycledFruitPerMinute: number, machineTotalFruitPerMinute: number, machineTraysPerHour: number, machineTonnesPerHour: number, machineRodsPerMinute: number, outletGroupSummaries: number, packTypeOutletUtilizationTargets: number, class1TraysPerHour: ?number, createNewBatchRequest: ?number, createBatchOnPackrunChange: ?number, createBatchOnTimeBatchChange: ?number, restartServiceRequest: ?number}}
|
|
110
110
|
* @public
|
|
111
111
|
*/
|
|
112
112
|
|
|
@@ -129,6 +129,10 @@ var MAFSizerModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
129
129
|
pointsDefaultValue.outletGroupSummaries = 0;
|
|
130
130
|
pointsDefaultValue.packTypeOutletUtilizationTargets = 0;
|
|
131
131
|
pointsDefaultValue.class1TraysPerHour = null;
|
|
132
|
+
pointsDefaultValue.createNewBatchRequest = null;
|
|
133
|
+
pointsDefaultValue.createBatchOnPackrunChange = null;
|
|
134
|
+
pointsDefaultValue.createBatchOnTimeBatchChange = null;
|
|
135
|
+
pointsDefaultValue.restartServiceRequest = null;
|
|
132
136
|
return pointsDefaultValue;
|
|
133
137
|
}();
|
|
134
138
|
/**
|
|
@@ -519,6 +523,70 @@ var MAFSizerModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
519
523
|
pointsObject.class1TraysPerHour = null;
|
|
520
524
|
}
|
|
521
525
|
|
|
526
|
+
if (_typeof(jsonObject['points']) === 'object' && 'createNewBatchRequest' in jsonObject['points']) {
|
|
527
|
+
pointsObject.createNewBatchRequest = function () {
|
|
528
|
+
if (jsonObject['points'].createNewBatchRequest === null) {
|
|
529
|
+
return null;
|
|
530
|
+
}
|
|
531
|
+
|
|
532
|
+
if (typeof jsonObject['points'].createNewBatchRequest !== 'number') {
|
|
533
|
+
return Number.isInteger(Number(jsonObject['points'].createNewBatchRequest)) ? Number(jsonObject['points'].createNewBatchRequest) : Math.floor(Number(jsonObject['points'].createNewBatchRequest));
|
|
534
|
+
}
|
|
535
|
+
|
|
536
|
+
return Number.isInteger(jsonObject['points'].createNewBatchRequest) ? jsonObject['points'].createNewBatchRequest : Math.floor(jsonObject['points'].createNewBatchRequest);
|
|
537
|
+
}();
|
|
538
|
+
} else {
|
|
539
|
+
pointsObject.createNewBatchRequest = null;
|
|
540
|
+
}
|
|
541
|
+
|
|
542
|
+
if (_typeof(jsonObject['points']) === 'object' && 'createBatchOnPackrunChange' in jsonObject['points']) {
|
|
543
|
+
pointsObject.createBatchOnPackrunChange = function () {
|
|
544
|
+
if (jsonObject['points'].createBatchOnPackrunChange === null) {
|
|
545
|
+
return null;
|
|
546
|
+
}
|
|
547
|
+
|
|
548
|
+
if (typeof jsonObject['points'].createBatchOnPackrunChange !== 'number') {
|
|
549
|
+
return Number.isInteger(Number(jsonObject['points'].createBatchOnPackrunChange)) ? Number(jsonObject['points'].createBatchOnPackrunChange) : Math.floor(Number(jsonObject['points'].createBatchOnPackrunChange));
|
|
550
|
+
}
|
|
551
|
+
|
|
552
|
+
return Number.isInteger(jsonObject['points'].createBatchOnPackrunChange) ? jsonObject['points'].createBatchOnPackrunChange : Math.floor(jsonObject['points'].createBatchOnPackrunChange);
|
|
553
|
+
}();
|
|
554
|
+
} else {
|
|
555
|
+
pointsObject.createBatchOnPackrunChange = null;
|
|
556
|
+
}
|
|
557
|
+
|
|
558
|
+
if (_typeof(jsonObject['points']) === 'object' && 'createBatchOnTimeBatchChange' in jsonObject['points']) {
|
|
559
|
+
pointsObject.createBatchOnTimeBatchChange = function () {
|
|
560
|
+
if (jsonObject['points'].createBatchOnTimeBatchChange === null) {
|
|
561
|
+
return null;
|
|
562
|
+
}
|
|
563
|
+
|
|
564
|
+
if (typeof jsonObject['points'].createBatchOnTimeBatchChange !== 'number') {
|
|
565
|
+
return Number.isInteger(Number(jsonObject['points'].createBatchOnTimeBatchChange)) ? Number(jsonObject['points'].createBatchOnTimeBatchChange) : Math.floor(Number(jsonObject['points'].createBatchOnTimeBatchChange));
|
|
566
|
+
}
|
|
567
|
+
|
|
568
|
+
return Number.isInteger(jsonObject['points'].createBatchOnTimeBatchChange) ? jsonObject['points'].createBatchOnTimeBatchChange : Math.floor(jsonObject['points'].createBatchOnTimeBatchChange);
|
|
569
|
+
}();
|
|
570
|
+
} else {
|
|
571
|
+
pointsObject.createBatchOnTimeBatchChange = null;
|
|
572
|
+
}
|
|
573
|
+
|
|
574
|
+
if (_typeof(jsonObject['points']) === 'object' && 'restartServiceRequest' in jsonObject['points']) {
|
|
575
|
+
pointsObject.restartServiceRequest = function () {
|
|
576
|
+
if (jsonObject['points'].restartServiceRequest === null) {
|
|
577
|
+
return null;
|
|
578
|
+
}
|
|
579
|
+
|
|
580
|
+
if (typeof jsonObject['points'].restartServiceRequest !== 'number') {
|
|
581
|
+
return Number.isInteger(Number(jsonObject['points'].restartServiceRequest)) ? Number(jsonObject['points'].restartServiceRequest) : Math.floor(Number(jsonObject['points'].restartServiceRequest));
|
|
582
|
+
}
|
|
583
|
+
|
|
584
|
+
return Number.isInteger(jsonObject['points'].restartServiceRequest) ? jsonObject['points'].restartServiceRequest : Math.floor(jsonObject['points'].restartServiceRequest);
|
|
585
|
+
}();
|
|
586
|
+
} else {
|
|
587
|
+
pointsObject.restartServiceRequest = null;
|
|
588
|
+
}
|
|
589
|
+
|
|
522
590
|
return pointsObject;
|
|
523
591
|
}();
|
|
524
592
|
}
|
package/lib/PackageVersion.js
CHANGED
package/lib/index.d.ts
CHANGED
|
@@ -7137,6 +7137,7 @@ declare module '@ricado/api-client/Controllers/Lab/Site/LabController' {
|
|
|
7137
7137
|
sampleCreationEnabled: number;
|
|
7138
7138
|
sampleSchedulingEnabled: number;
|
|
7139
7139
|
samplePublishingEnabled: number;
|
|
7140
|
+
samplePublishingFilter: number;
|
|
7140
7141
|
};
|
|
7141
7142
|
/**
|
|
7142
7143
|
* Whether the Inspect Integration is Enabled on this Lab
|
|
@@ -7736,8 +7737,10 @@ declare module '@ricado/api-client/Controllers/Lab/Site/RackPositionController'
|
|
|
7736
7737
|
calibrationOffset: number;
|
|
7737
7738
|
disabled: number;
|
|
7738
7739
|
currentSampleId: number;
|
|
7740
|
+
currentAdditionalSampleIds: number;
|
|
7739
7741
|
currentSampleStatus: number;
|
|
7740
7742
|
nextSampleId: number;
|
|
7743
|
+
nextAdditionalSampleIds: number;
|
|
7741
7744
|
loadCurrentSampleRequest: number;
|
|
7742
7745
|
startCurrentSampleRequest: number;
|
|
7743
7746
|
finishCurrentSampleRequest: number;
|
|
@@ -7788,8 +7791,10 @@ declare module '@ricado/api-client/Controllers/Lab/Site/RackPositionController'
|
|
|
7788
7791
|
calibrationOffset: number;
|
|
7789
7792
|
disabled: number;
|
|
7790
7793
|
currentSampleId: number;
|
|
7794
|
+
currentAdditionalSampleIds: number;
|
|
7791
7795
|
currentSampleStatus: number;
|
|
7792
7796
|
nextSampleId: number;
|
|
7797
|
+
nextAdditionalSampleIds: number;
|
|
7793
7798
|
loadCurrentSampleRequest: number;
|
|
7794
7799
|
startCurrentSampleRequest: number;
|
|
7795
7800
|
finishCurrentSampleRequest: number;
|
|
@@ -14422,6 +14427,10 @@ declare module '@ricado/api-client/Controllers/Packhouse/Site/MAFSizerController
|
|
|
14422
14427
|
outletGroupSummaries: number;
|
|
14423
14428
|
packTypeOutletUtilizationTargets: number;
|
|
14424
14429
|
class1TraysPerHour: number | null;
|
|
14430
|
+
createNewBatchRequest: number | null;
|
|
14431
|
+
createBatchOnPackrunChange: number | null;
|
|
14432
|
+
createBatchOnTimeBatchChange: number | null;
|
|
14433
|
+
restartServiceRequest: number | null;
|
|
14425
14434
|
};
|
|
14426
14435
|
/**
|
|
14427
14436
|
* The Lanes defined for this MAF Sizer
|
|
@@ -14493,6 +14502,10 @@ declare module '@ricado/api-client/Controllers/Packhouse/Site/MAFSizerController
|
|
|
14493
14502
|
outletGroupSummaries: number;
|
|
14494
14503
|
packTypeOutletUtilizationTargets: number;
|
|
14495
14504
|
class1TraysPerHour: number | null;
|
|
14505
|
+
createNewBatchRequest: number | null;
|
|
14506
|
+
createBatchOnPackrunChange: number | null;
|
|
14507
|
+
createBatchOnTimeBatchChange: number | null;
|
|
14508
|
+
restartServiceRequest: number | null;
|
|
14496
14509
|
};
|
|
14497
14510
|
/**
|
|
14498
14511
|
* The Lanes defined for this MAF Sizer
|
|
@@ -22530,7 +22543,7 @@ declare module '@ricado/api-client/Models/Lab/Site/LabModel' {
|
|
|
22530
22543
|
/**
|
|
22531
22544
|
* The Inspect Integration Configuration for this Lab
|
|
22532
22545
|
*
|
|
22533
|
-
* @type {?{points: {sqlServerCommunicationStatus: number, sampleCreationEnabled: number, sampleSchedulingEnabled: number, samplePublishingEnabled: number}, enabled: boolean, labName: string, sqlServerHost: string, sqlServerUsername: string, sqlServerPassword: string}}
|
|
22546
|
+
* @type {?{points: {sqlServerCommunicationStatus: number, sampleCreationEnabled: number, sampleSchedulingEnabled: number, samplePublishingEnabled: number, samplePublishingFilter: number}, enabled: boolean, labName: string, sqlServerHost: string, sqlServerUsername: string, sqlServerPassword: string}}
|
|
22534
22547
|
* @public
|
|
22535
22548
|
*/
|
|
22536
22549
|
inspectIntegration: {
|
|
@@ -22539,6 +22552,7 @@ declare module '@ricado/api-client/Models/Lab/Site/LabModel' {
|
|
|
22539
22552
|
sampleCreationEnabled: number;
|
|
22540
22553
|
sampleSchedulingEnabled: number;
|
|
22541
22554
|
samplePublishingEnabled: number;
|
|
22555
|
+
samplePublishingFilter: number;
|
|
22542
22556
|
};
|
|
22543
22557
|
enabled: boolean;
|
|
22544
22558
|
labName: string;
|
|
@@ -22864,7 +22878,7 @@ declare module '@ricado/api-client/Models/Lab/Site/RackPositionModel' {
|
|
|
22864
22878
|
/**
|
|
22865
22879
|
* The Points used by this Rack Position
|
|
22866
22880
|
*
|
|
22867
|
-
* @type {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentSampleStatus: number, nextSampleId: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}}
|
|
22881
|
+
* @type {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentAdditionalSampleIds: number, currentSampleStatus: number, nextSampleId: number, nextAdditionalSampleIds: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}}
|
|
22868
22882
|
* @public
|
|
22869
22883
|
*/
|
|
22870
22884
|
points: {
|
|
@@ -22874,8 +22888,10 @@ declare module '@ricado/api-client/Models/Lab/Site/RackPositionModel' {
|
|
|
22874
22888
|
calibrationOffset: number;
|
|
22875
22889
|
disabled: number;
|
|
22876
22890
|
currentSampleId: number;
|
|
22891
|
+
currentAdditionalSampleIds: number;
|
|
22877
22892
|
currentSampleStatus: number;
|
|
22878
22893
|
nextSampleId: number;
|
|
22894
|
+
nextAdditionalSampleIds: number;
|
|
22879
22895
|
loadCurrentSampleRequest: number;
|
|
22880
22896
|
startCurrentSampleRequest: number;
|
|
22881
22897
|
finishCurrentSampleRequest: number;
|
|
@@ -25835,7 +25851,7 @@ declare module '@ricado/api-client/Models/Packhouse/Site/MAFSizerModel' {
|
|
|
25835
25851
|
/**
|
|
25836
25852
|
* The Points used by this MAF Sizer
|
|
25837
25853
|
*
|
|
25838
|
-
* @type {{currentBatchId: number, currentBatchName: number, currentBatchGrowerCode: number, currentBatchGrowerName: number, currentBatchVarietyCode: number, currentBatchVarietyName: number, machineAverageFruitWeight: number, machineAverageFruitSize: number, machineCupFill: number, machineRecycledFruitPerMinute: number, machineTotalFruitPerMinute: number, machineTraysPerHour: number, machineTonnesPerHour: number, machineRodsPerMinute: number, outletGroupSummaries: number, packTypeOutletUtilizationTargets: number, class1TraysPerHour: ?number}}
|
|
25854
|
+
* @type {{currentBatchId: number, currentBatchName: number, currentBatchGrowerCode: number, currentBatchGrowerName: number, currentBatchVarietyCode: number, currentBatchVarietyName: number, machineAverageFruitWeight: number, machineAverageFruitSize: number, machineCupFill: number, machineRecycledFruitPerMinute: number, machineTotalFruitPerMinute: number, machineTraysPerHour: number, machineTonnesPerHour: number, machineRodsPerMinute: number, outletGroupSummaries: number, packTypeOutletUtilizationTargets: number, class1TraysPerHour: ?number, createNewBatchRequest: ?number, createBatchOnPackrunChange: ?number, createBatchOnTimeBatchChange: ?number, restartServiceRequest: ?number}}
|
|
25839
25855
|
* @public
|
|
25840
25856
|
*/
|
|
25841
25857
|
points: {
|
|
@@ -25856,6 +25872,10 @@ declare module '@ricado/api-client/Models/Packhouse/Site/MAFSizerModel' {
|
|
|
25856
25872
|
outletGroupSummaries: number;
|
|
25857
25873
|
packTypeOutletUtilizationTargets: number;
|
|
25858
25874
|
class1TraysPerHour: number | null;
|
|
25875
|
+
createNewBatchRequest: number | null;
|
|
25876
|
+
createBatchOnPackrunChange: number | null;
|
|
25877
|
+
createBatchOnTimeBatchChange: number | null;
|
|
25878
|
+
restartServiceRequest: number | null;
|
|
25859
25879
|
};
|
|
25860
25880
|
/**
|
|
25861
25881
|
* The Lanes defined for this MAF Sizer
|
package/package.json
CHANGED
|
@@ -192,7 +192,7 @@ export default LabController;
|
|
|
192
192
|
* A **InspectIntegration** Type
|
|
193
193
|
*
|
|
194
194
|
* @typedef {Object} LabController.InspectIntegration
|
|
195
|
-
* @property {{sqlServerCommunicationStatus: number, sampleCreationEnabled: number, sampleSchedulingEnabled: number, samplePublishingEnabled: number}} points The Points used for this Inspect Integration
|
|
195
|
+
* @property {{sqlServerCommunicationStatus: number, sampleCreationEnabled: number, sampleSchedulingEnabled: number, samplePublishingEnabled: number, samplePublishingFilter: number}} points The Points used for this Inspect Integration
|
|
196
196
|
* @property {boolean} enabled Whether the Inspect Integration is Enabled on this Lab
|
|
197
197
|
* @property {string} labName Name of the Lab referenced by Inspect
|
|
198
198
|
* @property {string} sqlServerHost Host of the Inspect SQL Server
|
|
@@ -162,7 +162,7 @@ export default RackPositionController;
|
|
|
162
162
|
* @typedef {Object} RackPositionController.CreateData
|
|
163
163
|
* @property {?number} [rtuId] The RTU this Rack Position belongs to
|
|
164
164
|
* @property {string} name The Name of this Rack Position
|
|
165
|
-
* @property {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentSampleStatus: number, nextSampleId: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}} points The Points used by this Rack Position
|
|
165
|
+
* @property {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentAdditionalSampleIds: number, currentSampleStatus: number, nextSampleId: number, nextAdditionalSampleIds: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}} points The Points used by this Rack Position
|
|
166
166
|
* @property {string} labId The Lab that owns this Rack Position
|
|
167
167
|
* @property {string} rackId The Rack associated with this Rack Position
|
|
168
168
|
* @property {number} verticalLevelIndex The Index of the Vertical Level in the Rack where this Position resides
|
|
@@ -175,7 +175,7 @@ export default RackPositionController;
|
|
|
175
175
|
*
|
|
176
176
|
* @typedef {Object} RackPositionController.UpdateData
|
|
177
177
|
* @property {string} [name] The Name of this Rack Position
|
|
178
|
-
* @property {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentSampleStatus: number, nextSampleId: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}} [points] The Points used by this Rack Position
|
|
178
|
+
* @property {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentAdditionalSampleIds: number, currentSampleStatus: number, nextSampleId: number, nextAdditionalSampleIds: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}} [points] The Points used by this Rack Position
|
|
179
179
|
* @property {string} [labId] The Lab that owns this Rack Position
|
|
180
180
|
* @property {string} [rackId] The Rack associated with this Rack Position
|
|
181
181
|
* @property {number} [verticalLevelIndex] The Index of the Vertical Level in the Rack where this Position resides
|
|
@@ -163,7 +163,7 @@ export default MAFSizerController;
|
|
|
163
163
|
* @property {string} packingLineId The Packing Line ID that manages this MAF Sizer
|
|
164
164
|
* @property {string} sizerType The Sizer Type
|
|
165
165
|
* @property {number} [autoCreateBatchDelay] The Auto Create Batch Delay in Seconds for this MAF Sizer
|
|
166
|
-
* @property {{currentBatchId: number, currentBatchName: number, currentBatchGrowerCode: number, currentBatchGrowerName: number, currentBatchVarietyCode: number, currentBatchVarietyName: number, machineAverageFruitWeight: number, machineAverageFruitSize: number, machineCupFill: number, machineRecycledFruitPerMinute: number, machineTotalFruitPerMinute: number, machineTraysPerHour: number, machineTonnesPerHour: number, machineRodsPerMinute: number, outletGroupSummaries: number, packTypeOutletUtilizationTargets: number, class1TraysPerHour: ?number}} points The Points used by this MAF Sizer
|
|
166
|
+
* @property {{currentBatchId: number, currentBatchName: number, currentBatchGrowerCode: number, currentBatchGrowerName: number, currentBatchVarietyCode: number, currentBatchVarietyName: number, machineAverageFruitWeight: number, machineAverageFruitSize: number, machineCupFill: number, machineRecycledFruitPerMinute: number, machineTotalFruitPerMinute: number, machineTraysPerHour: number, machineTonnesPerHour: number, machineRodsPerMinute: number, outletGroupSummaries: number, packTypeOutletUtilizationTargets: number, class1TraysPerHour: ?number, createNewBatchRequest: ?number, createBatchOnPackrunChange: ?number, createBatchOnTimeBatchChange: ?number, restartServiceRequest: ?number}} points The Points used by this MAF Sizer
|
|
167
167
|
* @property {Array<MAFSizerController.MAFSizerLane>} [lanes] The Lanes defined for this MAF Sizer
|
|
168
168
|
* @property {Array<MAFSizerController.MAFSizerOutlet>} [outlets] The Outlets defined for this MAF Sizer
|
|
169
169
|
* @property {Array<MAFSizerController.MAFSizerFruitSize>} [fruitSizes] The Fruit Sizes defined and handled by this MAF Sizer
|
|
@@ -182,7 +182,7 @@ export default MAFSizerController;
|
|
|
182
182
|
* @property {string} [packingLineId] The Packing Line ID that manages this MAF Sizer
|
|
183
183
|
* @property {string} [sizerType] The Sizer Type
|
|
184
184
|
* @property {number} [autoCreateBatchDelay] The Auto Create Batch Delay in Seconds for this MAF Sizer
|
|
185
|
-
* @property {{currentBatchId: number, currentBatchName: number, currentBatchGrowerCode: number, currentBatchGrowerName: number, currentBatchVarietyCode: number, currentBatchVarietyName: number, machineAverageFruitWeight: number, machineAverageFruitSize: number, machineCupFill: number, machineRecycledFruitPerMinute: number, machineTotalFruitPerMinute: number, machineTraysPerHour: number, machineTonnesPerHour: number, machineRodsPerMinute: number, outletGroupSummaries: number, packTypeOutletUtilizationTargets: number, class1TraysPerHour: ?number}} [points] The Points used by this MAF Sizer
|
|
185
|
+
* @property {{currentBatchId: number, currentBatchName: number, currentBatchGrowerCode: number, currentBatchGrowerName: number, currentBatchVarietyCode: number, currentBatchVarietyName: number, machineAverageFruitWeight: number, machineAverageFruitSize: number, machineCupFill: number, machineRecycledFruitPerMinute: number, machineTotalFruitPerMinute: number, machineTraysPerHour: number, machineTonnesPerHour: number, machineRodsPerMinute: number, outletGroupSummaries: number, packTypeOutletUtilizationTargets: number, class1TraysPerHour: ?number, createNewBatchRequest: ?number, createBatchOnPackrunChange: ?number, createBatchOnTimeBatchChange: ?number, restartServiceRequest: ?number}} [points] The Points used by this MAF Sizer
|
|
186
186
|
* @property {Array<MAFSizerController.MAFSizerLane>} [lanes] The Lanes defined for this MAF Sizer
|
|
187
187
|
* @property {Array<MAFSizerController.MAFSizerOutlet>} [outlets] The Outlets defined for this MAF Sizer
|
|
188
188
|
* @property {Array<MAFSizerController.MAFSizerFruitSize>} [fruitSizes] The Fruit Sizes defined and handled by this MAF Sizer
|
|
@@ -84,7 +84,7 @@ class LabModel extends BaseModel
|
|
|
84
84
|
/**
|
|
85
85
|
* The Inspect Integration Configuration for this Lab
|
|
86
86
|
*
|
|
87
|
-
* @type {?{points: {sqlServerCommunicationStatus: number, sampleCreationEnabled: number, sampleSchedulingEnabled: number, samplePublishingEnabled: number}, enabled: boolean, labName: string, sqlServerHost: string, sqlServerUsername: string, sqlServerPassword: string}}
|
|
87
|
+
* @type {?{points: {sqlServerCommunicationStatus: number, sampleCreationEnabled: number, sampleSchedulingEnabled: number, samplePublishingEnabled: number, samplePublishingFilter: number}, enabled: boolean, labName: string, sqlServerHost: string, sqlServerUsername: string, sqlServerPassword: string}}
|
|
88
88
|
* @public
|
|
89
89
|
*/
|
|
90
90
|
this.inspectIntegration = null;
|
|
@@ -357,6 +357,22 @@ class LabModel extends BaseModel
|
|
|
357
357
|
{
|
|
358
358
|
pointsObject.samplePublishingEnabled = 0;
|
|
359
359
|
}
|
|
360
|
+
|
|
361
|
+
if(typeof jsonObject['inspectIntegration'].points === 'object' && 'samplePublishingFilter' in jsonObject['inspectIntegration'].points)
|
|
362
|
+
{
|
|
363
|
+
pointsObject.samplePublishingFilter = (function(){
|
|
364
|
+
if(typeof jsonObject['inspectIntegration'].points.samplePublishingFilter !== 'number')
|
|
365
|
+
{
|
|
366
|
+
return Number.isInteger(Number(jsonObject['inspectIntegration'].points.samplePublishingFilter)) ? Number(jsonObject['inspectIntegration'].points.samplePublishingFilter) : Math.floor(Number(jsonObject['inspectIntegration'].points.samplePublishingFilter));
|
|
367
|
+
}
|
|
368
|
+
|
|
369
|
+
return Number.isInteger(jsonObject['inspectIntegration'].points.samplePublishingFilter) ? jsonObject['inspectIntegration'].points.samplePublishingFilter : Math.floor(jsonObject['inspectIntegration'].points.samplePublishingFilter);
|
|
370
|
+
}());
|
|
371
|
+
}
|
|
372
|
+
else
|
|
373
|
+
{
|
|
374
|
+
pointsObject.samplePublishingFilter = 0;
|
|
375
|
+
}
|
|
360
376
|
|
|
361
377
|
return pointsObject;
|
|
362
378
|
}());
|
|
@@ -374,6 +390,8 @@ class LabModel extends BaseModel
|
|
|
374
390
|
|
|
375
391
|
pointsDefaultValue.samplePublishingEnabled = 0;
|
|
376
392
|
|
|
393
|
+
pointsDefaultValue.samplePublishingFilter = 0;
|
|
394
|
+
|
|
377
395
|
return pointsDefaultValue;
|
|
378
396
|
}());
|
|
379
397
|
}
|
|
@@ -52,7 +52,7 @@ class RackPositionModel extends BaseModel
|
|
|
52
52
|
/**
|
|
53
53
|
* The Points used by this Rack Position
|
|
54
54
|
*
|
|
55
|
-
* @type {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentSampleStatus: number, nextSampleId: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}}
|
|
55
|
+
* @type {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentAdditionalSampleIds: number, currentSampleStatus: number, nextSampleId: number, nextAdditionalSampleIds: number, loadCurrentSampleRequest: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, unloadCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpRateOfChange: number, currentSampleWarmUpWarning: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleFinishCriteriaMet: number, currentSampleLatestUnloadTimestamp: number}}
|
|
56
56
|
* @public
|
|
57
57
|
*/
|
|
58
58
|
this.points = (function(){
|
|
@@ -70,10 +70,14 @@ class RackPositionModel extends BaseModel
|
|
|
70
70
|
|
|
71
71
|
pointsDefaultValue.currentSampleId = 0;
|
|
72
72
|
|
|
73
|
+
pointsDefaultValue.currentAdditionalSampleIds = 0;
|
|
74
|
+
|
|
73
75
|
pointsDefaultValue.currentSampleStatus = 0;
|
|
74
76
|
|
|
75
77
|
pointsDefaultValue.nextSampleId = 0;
|
|
76
78
|
|
|
79
|
+
pointsDefaultValue.nextAdditionalSampleIds = 0;
|
|
80
|
+
|
|
77
81
|
pointsDefaultValue.loadCurrentSampleRequest = 0;
|
|
78
82
|
|
|
79
83
|
pointsDefaultValue.startCurrentSampleRequest = 0;
|
|
@@ -333,6 +337,22 @@ class RackPositionModel extends BaseModel
|
|
|
333
337
|
pointsObject.currentSampleId = 0;
|
|
334
338
|
}
|
|
335
339
|
|
|
340
|
+
if(typeof jsonObject['points'] === 'object' && 'currentAdditionalSampleIds' in jsonObject['points'])
|
|
341
|
+
{
|
|
342
|
+
pointsObject.currentAdditionalSampleIds = (function(){
|
|
343
|
+
if(typeof jsonObject['points'].currentAdditionalSampleIds !== 'number')
|
|
344
|
+
{
|
|
345
|
+
return Number.isInteger(Number(jsonObject['points'].currentAdditionalSampleIds)) ? Number(jsonObject['points'].currentAdditionalSampleIds) : Math.floor(Number(jsonObject['points'].currentAdditionalSampleIds));
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
return Number.isInteger(jsonObject['points'].currentAdditionalSampleIds) ? jsonObject['points'].currentAdditionalSampleIds : Math.floor(jsonObject['points'].currentAdditionalSampleIds);
|
|
349
|
+
}());
|
|
350
|
+
}
|
|
351
|
+
else
|
|
352
|
+
{
|
|
353
|
+
pointsObject.currentAdditionalSampleIds = 0;
|
|
354
|
+
}
|
|
355
|
+
|
|
336
356
|
if(typeof jsonObject['points'] === 'object' && 'currentSampleStatus' in jsonObject['points'])
|
|
337
357
|
{
|
|
338
358
|
pointsObject.currentSampleStatus = (function(){
|
|
@@ -365,6 +385,22 @@ class RackPositionModel extends BaseModel
|
|
|
365
385
|
pointsObject.nextSampleId = 0;
|
|
366
386
|
}
|
|
367
387
|
|
|
388
|
+
if(typeof jsonObject['points'] === 'object' && 'nextAdditionalSampleIds' in jsonObject['points'])
|
|
389
|
+
{
|
|
390
|
+
pointsObject.nextAdditionalSampleIds = (function(){
|
|
391
|
+
if(typeof jsonObject['points'].nextAdditionalSampleIds !== 'number')
|
|
392
|
+
{
|
|
393
|
+
return Number.isInteger(Number(jsonObject['points'].nextAdditionalSampleIds)) ? Number(jsonObject['points'].nextAdditionalSampleIds) : Math.floor(Number(jsonObject['points'].nextAdditionalSampleIds));
|
|
394
|
+
}
|
|
395
|
+
|
|
396
|
+
return Number.isInteger(jsonObject['points'].nextAdditionalSampleIds) ? jsonObject['points'].nextAdditionalSampleIds : Math.floor(jsonObject['points'].nextAdditionalSampleIds);
|
|
397
|
+
}());
|
|
398
|
+
}
|
|
399
|
+
else
|
|
400
|
+
{
|
|
401
|
+
pointsObject.nextAdditionalSampleIds = 0;
|
|
402
|
+
}
|
|
403
|
+
|
|
368
404
|
if(typeof jsonObject['points'] === 'object' && 'loadCurrentSampleRequest' in jsonObject['points'])
|
|
369
405
|
{
|
|
370
406
|
pointsObject.loadCurrentSampleRequest = (function(){
|