@ricado/api-client 2.4.1 → 2.5.0

package/src/Controllers/Lab/Site/RackPositionController.js

@@ -162,7 +162,7 @@ export default RackPositionController;
  * @typedef {Object} RackPositionController.CreateData
  * @property {?number} [rtuId] The RTU this Rack Position belongs to
  * @property {string} name The Name of this Rack Position
- * @property {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentSampleStatus: number, nextSampleId: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleSuccessCriteriaMet: number, currentSampleFailureCriteriaMet: number}} points The Points used by this Rack Position
+ * @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
  * @property {string} labId The Lab that owns this Rack Position
  * @property {string} rackId The Rack associated with this Rack Position
  * @property {number} verticalLevelIndex The Index of the Vertical Level in the Rack where this Position resides
@@ -175,7 +175,7 @@ export default RackPositionController;
  * 
  * @typedef {Object} RackPositionController.UpdateData
  * @property {string} [name] The Name of this Rack Position
- * @property {{pushButton: number, indicatorLight: number, temperature: number, calibrationOffset: number, disabled: number, currentSampleId: number, currentSampleStatus: number, nextSampleId: number, startCurrentSampleRequest: number, finishCurrentSampleRequest: number, currentSampleTotalDuration: number, currentSampleWarmUpDuration: number, currentSampleWarmUpCompleted: number, currentSampleBelowTargetDuration: number, currentSampleAboveTargetDuration: number, currentSampleWithinTargetDuration: number, currentSampleSuccessCriteriaMet: number, currentSampleFailureCriteriaMet: number}} [points] The Points used by this Rack Position
+ * @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
  * @property {string} [labId] The Lab that owns this Rack Position
  * @property {string} [rackId] The Rack associated with this Rack Position
  * @property {number} [verticalLevelIndex] The Index of the Vertical Level in the Rack where this Position resides

package/src/Controllers/Lab/Site/SampleController.js

@@ -1054,28 +1054,30 @@ export default SampleController;
  * @property {string} [labId] The Lab ID this Sample is associated with
  * @property {string} [sampleNumber] The Numeric Sample Number
  * @property {string} [createdSource] The Source that Created this Sample
- * @property {?string} [createdUserId] ID of the User who Created this Sample. Only applies if the `createdSource` is 'System'
- * @property {?string} [createdUserName] Name of the User who Created this Sample. Only applies if the `createdSource` is 'System'
- * @property {?string} [publishUserId] ID of the User who Published this Sample
+ * @property {?string} [createdUserName] Name of the User who Created this Sample
+ * @property {?string} [publishSource] The Source that Published this Sample
  * @property {?string} [publishUserName] Name of the User who Published this Sample
  * @property {string} [fruitProfileId] The Fruit Profile for this Sample
  * @property {string} [rackPositionId] The Rack Position used for this Sample
  * @property {string} [dehydratorId] The Dehydrator used for this Sample
- * @property {?string} [outcome] The Outcome of this Sample
- * @property {?string} [failureReasonId] A Sample Failure Reason ID if this Sample Failed
  * @property {?string} [resultId] The Sample Result ID asociated with this Sample
  * @property {Date} [createdTimestampBegin] Filter by the Timestamp when Samples were Created. Results Greater than or Equal to Timestamp
  * @property {Date} [createdTimestampEnd] Filter by the Timestamp when Samples were Created. Results Less than or Equal to Timestamp
  * @property {Date} [scheduledTimestampBegin] Filter by the Timestamp when Samples were Scheduled to Begin. Results Greater than or Equal to Timestamp
  * @property {Date} [scheduledTimestampEnd] Filter by the Timestamp when Samples were Scheduled to Begin. Results Less than or Equal to Timestamp
+ * @property {Date} [loadedTimestampBegin] Filter by the Timestamp when Samples were Loaded. Results Greater than or Equal to Timestamp
+ * @property {Date} [loadedTimestampEnd] Filter by the Timestamp when Samples were Loaded. Results Less than or Equal to Timestamp
  * @property {Date} [startTimestampBegin] Filter by the Timestamp when Samples were Started. Results Greater than or Equal to Timestamp
  * @property {Date} [startTimestampEnd] Filter by the Timestamp when Samples were Started. Results Less than or Equal to Timestamp
  * @property {Date} [finishTimestampBegin] Filter by the Timestamp when Samples were Finished. Results Greater than or Equal to Timestamp
  * @property {Date} [finishTimestampEnd] Filter by the Timestamp when Samples were Finished. Results Less than or Equal to Timestamp
+ * @property {Date} [unloadedTimestampBegin] Filter by the Timestamp when Samples were Unloaded. Results Greater than or Equal to Timestamp
+ * @property {Date} [unloadedTimestampEnd] Filter by the Timestamp when Samples were Unloaded. Results Less than or Equal to Timestamp
  * @property {Date} [publishTimestampBegin] Filter by the Timestamp when Samples were Published. Results Greater than or Equal to Timestamp
  * @property {Date} [publishTimestampEnd] Filter by the Timestamp when Samples were Published. Results Less than or Equal to Timestamp
  * @property {Date} [updateTimestampBegin] Filter by the Timestamp when Samples were last Updated. Results Greater than or Equal to Timestamp
  * @property {Date} [updateTimestampEnd] Filter by the Timestamp when Samples were last Updated. Results Less than or Equal to Timestamp
+ * @property {boolean} [publishedState] Filter by Published State of a Sample. `true` = Published, `false` = Not Published
  * @memberof Controllers.Lab.Site
  */
 
@@ -1087,19 +1089,18 @@ export default SampleController;
  * @property {string} [sampleNumber] The Numeric Sample Number
  * @property {Date} [createdTimestamp] When this Sample was Created
  * @property {string} createdSource The Source that Created this Sample
- * @property {?string} [createdUserId] ID of the User who Created this Sample. Only applies if the `createdSource` is 'System'
- * @property {?string} [createdUserName] Name of the User who Created this Sample. Only applies if the `createdSource` is 'System'
+ * @property {?string} [createdUserName] Name of the User who Created this Sample
  * @property {?Date} [scheduledTimestamp] Optional Scheduled Timestamp when this Sample should Begin
+ * @property {?Date} [loadedTimestamp] When this Sample was Loaded into the Dehydrator
  * @property {?Date} [startTimestamp] When this Sample was Started
  * @property {?Date} [finishTimestamp] When this Sample was Finished
+ * @property {?Date} [unloadedTimestamp] When this Sample was Unloaded from the Dehydrator
  * @property {?Date} [publishTimestamp] When this Sample was Published
- * @property {?string} [publishUserId] ID of the User who Published this Sample
+ * @property {?string} [publishSource] The Source that Published this Sample
  * @property {?string} [publishUserName] Name of the User who Published this Sample
  * @property {string} fruitProfileId The Fruit Profile for this Sample
  * @property {string} rackPositionId The Rack Position used for this Sample
  * @property {string} dehydratorId The Dehydrator used for this Sample
- * @property {?string} [outcome] The Outcome of this Sample
- * @property {?string} [failureReasonId] A Sample Failure Reason ID if this Sample Failed
  * @property {?string} [resultId] The Sample Result ID asociated with this Sample
  * @memberof Controllers.Lab.Site
  */
@@ -1111,19 +1112,18 @@ export default SampleController;
  * @property {string} [labId] The Lab ID this Sample is associated with
  * @property {Date} [createdTimestamp] When this Sample was Created
  * @property {string} [createdSource] The Source that Created this Sample
- * @property {?string} [createdUserId] ID of the User who Created this Sample. Only applies if the `createdSource` is 'System'
- * @property {?string} [createdUserName] Name of the User who Created this Sample. Only applies if the `createdSource` is 'System'
+ * @property {?string} [createdUserName] Name of the User who Created this Sample
  * @property {?Date} [scheduledTimestamp] Optional Scheduled Timestamp when this Sample should Begin
+ * @property {?Date} [loadedTimestamp] When this Sample was Loaded into the Dehydrator
  * @property {?Date} [startTimestamp] When this Sample was Started
  * @property {?Date} [finishTimestamp] When this Sample was Finished
+ * @property {?Date} [unloadedTimestamp] When this Sample was Unloaded from the Dehydrator
  * @property {?Date} [publishTimestamp] When this Sample was Published
- * @property {?string} [publishUserId] ID of the User who Published this Sample
+ * @property {?string} [publishSource] The Source that Published this Sample
  * @property {?string} [publishUserName] Name of the User who Published this Sample
  * @property {string} [fruitProfileId] The Fruit Profile for this Sample
  * @property {string} [rackPositionId] The Rack Position used for this Sample
  * @property {string} [dehydratorId] The Dehydrator used for this Sample
- * @property {?string} [outcome] The Outcome of this Sample
- * @property {?string} [failureReasonId] A Sample Failure Reason ID if this Sample Failed
  * @property {?string} [resultId] The Sample Result ID asociated with this Sample
  * @memberof Controllers.Lab.Site
  */

package/src/Controllers/Lab/Site/SampleResultController.js

@@ -8,19 +8,19 @@ import RequestHelper from '../../../RequestHelper';
 import SampleResultModel from '../../../Models/Lab/Site/SampleResultModel';
 
 /**
- * Controller Class for Sample Resultss
+ * Controller Class for Sample Results
  * 
  * @class
  */
 class SampleResultController
 {
     /**
-     * Retrieve a Sample Results [GET /lab/sites/{siteId}/sample-results/{id}]
+     * Retrieve a Sample Result [GET /lab/sites/{siteId}/sample-results/{id}]
      * 
      * @static
      * @public
      * @param {number} siteId The Site ID
-     * @param {string} id The Sample Results ID
+     * @param {string} id The Sample Result ID
      * @return {Promise<SampleResultModel>}
      */
     static getOne(siteId, id)
@@ -39,13 +39,13 @@ class SampleResultController
     }
 
     /**
-     * Update a Sample Results [PATCH /lab/sites/{siteId}/sample-results/{id}]
+     * Update a Sample Result [PATCH /lab/sites/{siteId}/sample-results/{id}]
      * 
      * @static
      * @public
      * @param {number} siteId The Site ID
-     * @param {string} id The Sample Results ID
-     * @param {SampleResultController.UpdateData} updateData The Sample Results Update Data
+     * @param {string} id The Sample Result ID
+     * @param {SampleResultController.UpdateData} updateData The Sample Result Update Data
      * @return {Promise<SampleResultModel>}
      */
     static update(siteId, id, updateData)
@@ -64,12 +64,12 @@ class SampleResultController
     }
 
     /**
-     * Delete a Sample Results [DELETE /lab/sites/{siteId}/sample-results/{id}]
+     * Delete a Sample Result [DELETE /lab/sites/{siteId}/sample-results/{id}]
      * 
      * @static
      * @public
      * @param {number} siteId The Site ID
-     * @param {string} id The Sample Results ID
+     * @param {string} id The Sample Result ID
      * @return {Promise<boolean>}
      */
     static delete(siteId, id)
@@ -86,12 +86,12 @@ class SampleResultController
     /**
      * Retrieve Comments [GET /lab/sites/{siteId}/sample-results/{id}/comments]
      * 
-     * Retrieves Comments for a Sample Results
+     * Retrieves Comments for a Sample Result
      * 
      * @static
      * @public
      * @param {number} siteId The Site ID
-     * @param {string} id The Sample Results ID
+     * @param {string} id The Sample Result ID
      * @return {Promise<Array<SampleResultController.CommentItem>>}
      */
     static getComments(siteId, id)
@@ -288,12 +288,12 @@ class SampleResultController
     /**
      * Create a Comment [POST /lab/sites/{siteId}/sample-results/{id}/comments]
      * 
-     * Create a Comment for a Sample Results
+     * Create a Comment for a Sample Result
      * 
      * @static
      * @public
      * @param {number} siteId The Site ID
-     * @param {string} id The Sample Results ID
+     * @param {string} id The Sample Result ID
      * @param {string} content The Content of the New Comment
      * @return {Promise<SampleResultController.CommentItem>}
      */
@@ -482,12 +482,12 @@ class SampleResultController
     /**
      * Retrieve a Comment [GET /lab/sites/{siteId}/sample-results/{id}/comments/{commentId}]
      * 
-     * Retrieves Comments for a Sample Results
+     * Retrieves Comments for a Sample Result
      * 
      * @static
      * @public
      * @param {number} siteId The Site ID
-     * @param {string} id The Sample Results ID
+     * @param {string} id The Sample Result ID
      * @param {string} commentId The Comment ID
      * @return {Promise<SampleResultController.CommentItem>}
      */
@@ -676,12 +676,12 @@ class SampleResultController
     /**
      * Update a Comment [PATCH /lab/sites/{siteId}/sample-results/{id}/comments/{commentId}]
      * 
-     * Update a Comment for a Sample Results
+     * Update a Comment for a Sample Result
      * 
      * @static
      * @public
      * @param {number} siteId The Site ID
-     * @param {string} id The Sample Results ID
+     * @param {string} id The Sample Result ID
      * @param {string} commentId The Comment ID
      * @param {string} content The Updated Content for the Comment
      * @return {Promise<SampleResultController.CommentItem>}
@@ -871,12 +871,12 @@ class SampleResultController
     /**
      * Delete a Comment [DELETE /lab/sites/{siteId}/sample-results/{id}/comments/{commentId}]
      * 
-     * Delete a Comment for a Sample Results
+     * Delete a Comment for a Sample Result
      * 
      * @static
      * @public
      * @param {number} siteId The Site ID
-     * @param {string} id The Sample Results ID
+     * @param {string} id The Sample Result ID
      * @param {string} commentId The Comment ID
      * @return {Promise<boolean>}
      */
@@ -892,7 +892,7 @@ class SampleResultController
     }
 
     /**
-     * List all Sample Resultss [GET /lab/sites/{siteId}/sample-results]
+     * List all Sample Results [GET /lab/sites/{siteId}/sample-results]
      * 
      * @static
      * @public
@@ -925,12 +925,12 @@ class SampleResultController
     }
 
     /**
-     * Create a Sample Results [POST /lab/sites/{siteId}/sample-results]
+     * Create a Sample Result [POST /lab/sites/{siteId}/sample-results]
      * 
      * @static
      * @public
      * @param {number} siteId The Site ID
-     * @param {SampleResultController.CreateData} createData The Sample Results Create Data
+     * @param {SampleResultController.CreateData} createData The Sample Result Create Data
      * @return {Promise<SampleResultModel>}
      */
     static create(siteId, createData)
@@ -963,7 +963,7 @@ export default SampleResultController;
  */
 
 /**
- * The Create Data for a Sample Results
+ * The Create Data for a Sample Result
  * 
  * @typedef {Object} SampleResultController.CreateData
  * @property {string} labId The Lab ID this Sample Result is associated with
@@ -975,9 +975,10 @@ export default SampleResultController;
  * @property {number} belowTargetDuration The Below Temperature Target Duration (in seconds) of the Sample
  * @property {number} aboveTargetDuration The Above Temperature Target Duration (in seconds) of the Sample
  * @property {number} withinTargetDuration The Within Temperature Target Duration (in seconds) of the Sample
- * @property {?Date} [successCriteriaMetTimestamp] Timestamp of when the Success Criteria was Met for the Sample - `null` if not Met
- * @property {?Date} [failureCriteriaMetTimestamp] Timestamp of when the Failure Criteria was Met for the Sample - `null` if not Met
+ * @property {?Date} [finishCriteriaMetTimestamp] Timestamp of when the Finish Criteria was Met for the Sample - `null` if not Met
+ * @property {?Date} [latestUnloadTimestamp] Latest Possible Timestamp of when the Sample should have been Unloaded to remain Compliant
  * @property {?number} [totalAverageTemperature] The Average Temperature for the Total Duration of the Sample
+ * @property {?number} [warmUpRateOfChangeTemperature] The Average Temperature Rate-of-Change seen during the Warm Up process for the Sample
  * @property {?number} [belowTargetMinimumTemperature] The Minimum Temperature seen Below the Temperature Target for the Sample
  * @property {?number} [belowTargetAverageTemperature] The Average Temperature seen Below the Temperature Target for the Sample
  * @property {?number} [aboveTargetMaximumTemperature] The Maximum Temperature seen Above the Temperature Target for the Sample
@@ -989,7 +990,7 @@ export default SampleResultController;
  */
 
 /**
- * The Update Data for a Sample Results
+ * The Update Data for a Sample Result
  * 
  * @typedef {Object} SampleResultController.UpdateData
  * @property {string} [labId] The Lab ID this Sample Result is associated with
@@ -1000,9 +1001,10 @@ export default SampleResultController;
  * @property {number} [belowTargetDuration] The Below Temperature Target Duration (in seconds) of the Sample
  * @property {number} [aboveTargetDuration] The Above Temperature Target Duration (in seconds) of the Sample
  * @property {number} [withinTargetDuration] The Within Temperature Target Duration (in seconds) of the Sample
- * @property {?Date} [successCriteriaMetTimestamp] Timestamp of when the Success Criteria was Met for the Sample - `null` if not Met
- * @property {?Date} [failureCriteriaMetTimestamp] Timestamp of when the Failure Criteria was Met for the Sample - `null` if not Met
+ * @property {?Date} [finishCriteriaMetTimestamp] Timestamp of when the Finish Criteria was Met for the Sample - `null` if not Met
+ * @property {?Date} [latestUnloadTimestamp] Latest Possible Timestamp of when the Sample should have been Unloaded to remain Compliant
  * @property {?number} [totalAverageTemperature] The Average Temperature for the Total Duration of the Sample
+ * @property {?number} [warmUpRateOfChangeTemperature] The Average Temperature Rate-of-Change seen during the Warm Up process for the Sample
  * @property {?number} [belowTargetMinimumTemperature] The Minimum Temperature seen Below the Temperature Target for the Sample
  * @property {?number} [belowTargetAverageTemperature] The Average Temperature seen Below the Temperature Target for the Sample
  * @property {?number} [aboveTargetMaximumTemperature] The Maximum Temperature seen Above the Temperature Target for the Sample

package/src/Controllers/Lab/Site/index.js

@@ -10,20 +10,20 @@
 import DehydratorController from './DehydratorController';
 import FruitProfileController from './FruitProfileController';
 import LabController from './LabController';
+import ProbeCalibrationController from './ProbeCalibrationController';
 import RackController from './RackController';
 import RackPositionController from './RackPositionController';
 import SampleController from './SampleController';
-import SampleFailureReasonController from './SampleFailureReasonController';
 import SampleResultController from './SampleResultController';
 
 const Site = {
     DehydratorController,
     FruitProfileController,
     LabController,
+    ProbeCalibrationController,
     RackController,
     RackPositionController,
     SampleController,
-    SampleFailureReasonController,
     SampleResultController,
 };
 

package/src/Models/Lab/Site/FruitProfileModel.js

@@ -66,7 +66,7 @@ class FruitProfileModel extends BaseModel
         this.nominalWarmUpDuration = 0;
         
         /**
-         * The Minimum Duration (in seconds) that a Sample should be within the Min and Max Target Temperatures be Successful
+         * The Minimum Duration (in seconds) that a Sample should be within the Min and Max Target Temperatures to be Compliant
          * 
          * @type {number}
          * @public
@@ -74,7 +74,15 @@ class FruitProfileModel extends BaseModel
         this.minimumWithinTargetDuration = 0;
         
         /**
-         * The Maximum Duration (in seconds) that a Sample should be Dehydrated for before it Fails
+         * The Minimum Duration (in seconds) that a Sample must be Dehydrated for to be Compliant
+         * 
+         * @type {number}
+         * @public
+         */
+        this.minimumTotalDuration = 0;
+        
+        /**
+         * The Maximum Duration (in seconds) that a Sample can be Dehydrated for before it is Considered Non-Compliant
          * 
          * @type {number}
          * @public
@@ -82,7 +90,7 @@ class FruitProfileModel extends BaseModel
         this.maximumTotalDuration = 0;
         
         /**
-         * The Minimum Target Temperature for a Sample to be Successful
+         * The Minimum Target Temperature for a Sample to be Compliant
          * 
          * @type {number}
          * @public
@@ -90,7 +98,7 @@ class FruitProfileModel extends BaseModel
         this.minimumTargetTemperature = 0;
         
         /**
-         * The Maximum Target Temperature for a Sample to be Successful
+         * The Maximum Target Temperature for a Sample to be Compliant
          * 
          * @type {number}
          * @public
@@ -223,6 +231,18 @@ class FruitProfileModel extends BaseModel
             }());
         }
         
+        if('minimumTotalDuration' in jsonObject)
+        {
+            model.minimumTotalDuration = (function(){
+                if(typeof jsonObject['minimumTotalDuration'] !== 'number')
+                {
+                    return Number.isInteger(Number(jsonObject['minimumTotalDuration'])) ? Number(jsonObject['minimumTotalDuration']) : Math.floor(Number(jsonObject['minimumTotalDuration']));
+                }
+        
+                return Number.isInteger(jsonObject['minimumTotalDuration']) ? jsonObject['minimumTotalDuration'] : Math.floor(jsonObject['minimumTotalDuration']);
+            }());
+        }
+        
         if('maximumTotalDuration' in jsonObject)
         {
             model.maximumTotalDuration = (function(){

package/src/Models/Lab/Site/ProbeCalibrationModel.js

@@ -0,0 +1,290 @@
+/**
+ * File Auto-Generated by the RICADO Gen 4 PHP API Project
+ * 
+ * Do Not Edit this File Manually!
+ */
+
+import BaseModel from '../../../Models/BaseModel';
+
+/**
+ * Model Class for a Probe Calibration
+ * 
+ * @class
+ * @hideconstructor
+ * @extends BaseModel
+ */
+class ProbeCalibrationModel extends BaseModel
+{
+    /**
+     * ProbeCalibrationModel Constructor
+     * 
+     * @protected
+     * @param {number} siteId The Site ID associated with this Probe Calibration
+     */
+    constructor(siteId)
+    {
+        super();
+        
+        /**
+         * The Probe Calibration ID
+         * 
+         * @type {string}
+         * @public
+         */
+        this.id = "";
+        
+        /**
+         * The Rack Position ID this Probe Calibration is associated with
+         * 
+         * @type {string}
+         * @public
+         */
+        this.rackPositionId = "";
+        
+        /**
+         * When this Probe Calibration was Created
+         * 
+         * @type {Date}
+         * @public
+         */
+        this.createdTimestamp = new Date();
+        
+        /**
+         * ID of the User who Completed this Probe Calibration
+         * 
+         * @type {string}
+         * @public
+         */
+        this.userId = "";
+        
+        /**
+         * Name of the User who Completed this Probe Calibration
+         * 
+         * @type {string}
+         * @public
+         */
+        this.userName = "";
+        
+        /**
+         * The Calibration Offset prior to this Probe Calibration being Created
+         * 
+         * @type {number}
+         * @public
+         */
+        this.preCalibrationOffset = 0;
+        
+        /**
+         * The Calibration Offset after this Probe Calibration was Created
+         * 
+         * @type {number}
+         * @public
+         */
+        this.postCalibrationOffset = 0;
+        
+        /**
+         * The Temperature Probe reading prior to this Probe Calibration being Created
+         * 
+         * @type {number}
+         * @public
+         */
+        this.preCalibrationTemperature = 0;
+        
+        /**
+         * The Temperature Probe reading after this Probe Calibration was Created
+         * 
+         * @type {number}
+         * @public
+         */
+        this.postCalibrationTemperature = 0;
+        
+        /**
+         * Whether the Probe Calibration has been deleted
+         * 
+         * @type {boolean}
+         * @public
+         */
+        this.deleted = false;
+        
+        /**
+         * When the Probe Calibration was last updated
+         * 
+         * @type {Date}
+         * @public
+         */
+        this.updateTimestamp = new Date();
+        
+        /**
+         * The Site ID associated with this Probe Calibration
+         * 
+         * @type {number}
+         * @public
+         */
+        this.siteId = siteId;
+    }
+
+    /**
+     * Create a new **ProbeCalibrationModel** from a JSON Object or JSON String
+     * 
+     * @static
+     * @public
+     * @param {Object<string, any>|string} json A JSON Object or JSON String
+     * @param {number} siteId The Site ID associated with this Probe Calibration
+     * @return {ProbeCalibrationModel}
+     */
+    static fromJSON(json, siteId)
+    {
+        let model = new ProbeCalibrationModel(siteId);
+        
+        /**
+         * The JSON Object
+         * 
+         * @type {Object<string, any>}
+         */
+        let jsonObject = {};
+        
+        if(typeof json === 'string')
+        {
+            jsonObject = JSON.parse(json);
+        }
+        else if(typeof json === 'object')
+        {
+            jsonObject = json;
+        }
+        
+        if('id' in jsonObject)
+        {
+            model.id = (function(){
+                if(typeof jsonObject['id'] !== 'string')
+                {
+                    return String(jsonObject['id']);
+                }
+        
+                return jsonObject['id'];
+            }());
+        }
+        
+        if('rackPositionId' in jsonObject)
+        {
+            model.rackPositionId = (function(){
+                if(typeof jsonObject['rackPositionId'] !== 'string')
+                {
+                    return String(jsonObject['rackPositionId']);
+                }
+        
+                return jsonObject['rackPositionId'];
+            }());
+        }
+        
+        if('createdTimestamp' in jsonObject)
+        {
+            model.createdTimestamp = (function(){
+                if(typeof jsonObject['createdTimestamp'] !== 'string')
+                {
+                    return new Date(String(jsonObject['createdTimestamp']));
+                }
+        
+                return new Date(jsonObject['createdTimestamp']);
+            }());
+        }
+        
+        if('userId' in jsonObject)
+        {
+            model.userId = (function(){
+                if(typeof jsonObject['userId'] !== 'string')
+                {
+                    return String(jsonObject['userId']);
+                }
+        
+                return jsonObject['userId'];
+            }());
+        }
+        
+        if('userName' in jsonObject)
+        {
+            model.userName = (function(){
+                if(typeof jsonObject['userName'] !== 'string')
+                {
+                    return String(jsonObject['userName']);
+                }
+        
+                return jsonObject['userName'];
+            }());
+        }
+        
+        if('preCalibrationOffset' in jsonObject)
+        {
+            model.preCalibrationOffset = (function(){
+                if(typeof jsonObject['preCalibrationOffset'] !== 'number')
+                {
+                    return Number(jsonObject['preCalibrationOffset']);
+                }
+        
+                return jsonObject['preCalibrationOffset'];
+            }());
+        }
+        
+        if('postCalibrationOffset' in jsonObject)
+        {
+            model.postCalibrationOffset = (function(){
+                if(typeof jsonObject['postCalibrationOffset'] !== 'number')
+                {
+                    return Number(jsonObject['postCalibrationOffset']);
+                }
+        
+                return jsonObject['postCalibrationOffset'];
+            }());
+        }
+        
+        if('preCalibrationTemperature' in jsonObject)
+        {
+            model.preCalibrationTemperature = (function(){
+                if(typeof jsonObject['preCalibrationTemperature'] !== 'number')
+                {
+                    return Number(jsonObject['preCalibrationTemperature']);
+                }
+        
+                return jsonObject['preCalibrationTemperature'];
+            }());
+        }
+        
+        if('postCalibrationTemperature' in jsonObject)
+        {
+            model.postCalibrationTemperature = (function(){
+                if(typeof jsonObject['postCalibrationTemperature'] !== 'number')
+                {
+                    return Number(jsonObject['postCalibrationTemperature']);
+                }
+        
+                return jsonObject['postCalibrationTemperature'];
+            }());
+        }
+        
+        if('deleted' in jsonObject)
+        {
+            model.deleted = (function(){
+                if(typeof jsonObject['deleted'] !== 'boolean')
+                {
+                    return Boolean(jsonObject['deleted']);
+                }
+        
+                return jsonObject['deleted'];
+            }());
+        }
+        
+        if('updateTimestamp' in jsonObject)
+        {
+            model.updateTimestamp = (function(){
+                if(typeof jsonObject['updateTimestamp'] !== 'string')
+                {
+                    return new Date(String(jsonObject['updateTimestamp']));
+                }
+        
+                return new Date(jsonObject['updateTimestamp']);
+            }());
+        }
+        
+        return model;
+    }
+}
+
+export default ProbeCalibrationModel;