Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -rb1462640e36df3f567c42aa8c8cbd6dafe865625 -r56381aae237db191956aff493907cd1f0801216b
--- sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision b1462640e36df3f567c42aa8c8cbd6dafe865625)
+++ sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 56381aae237db191956aff493907cd1f0801216b)
@@ -34,7 +34,6 @@
     ACTION_VIEW_CONNECTION(AdjustSerialNumberTDResponseData         )
 }
 
-
 /**
  * \brief VCreateTreatment::doValidation
  * Validates the treatment profile locally, then requests validation of it with FW
@@ -43,25 +42,28 @@
 
     AdjustParametersValidationRequestData data;
 
-    data.mBloodFlowRate                     = _bloodFlowRate                   ;
-    data.mDialysateFlowRate                 = _dialysateFlowRate               ;
-    data.mTreatmentDuration                 = _treatmentDuration               ;
-    data.mSalineBolusVolume                 = _salineBolusVolume               ;
-    data.mHeparinStopTime                   = _heparinStopTime                 ;
-    data.mHeparinType                       = _heparinType                     ;
-    data.mAcidConcentrate                   = _acidConcentrate                 ;
-    data.mBicarbonateConcentrate            = _bicarbonateConcentrate          ;
-    data.mDialyzerType                      = _dialyzerType                    ;
-    data.mBloodPressureMeasureInterval      = _bloodPressureMeasureInterval    ;
-    data.mRinsebackFlowRate                 = _rinsebackFlowRate               ;
-    data.mRinsebackVolume                   = _rinsebackVolume                 ;
-    data.mArterialPressureLimitWindow       = _arterialPressureLimitWindow     ;
-    data.mVenousPressureLimitWindow         = _venousPressureLimitWindow       ;
-    data.mVenousPressureLimitAsymtrc        = _venousPressureLimitAsymtrc      ;
-    data.mTransmembranePressureLimitWindow  = _transmembranePressureLimitWindow;
-    data.mDialysateTemp                     = _dialysateTemp                   ;
-    data.mHeparinDispensingRate             = _heparinDispensingRate           ;
-    data.mHeparinBolusVolume                = _heparinBolusVolume              ;
+    data.mTreatmentModality             = _treatmentModality            ;
+    data.mHDFTreatmentMode              = _hdfTreatmentMode             ;
+    data.mBloodFlowRate                 = _bloodFlowRate                ;
+    data.mDialysateFlowRate             = _dialysateFlowRate            ;
+    data.mTreatmentDuration             = _treatmentDuration            ;
+    data.mHeparinDeliveryDuration       = _heparinDeliveryDuration      ;
+    data.mHeparinType                   = _heparinType                  ;
+    data.mDryBicarbCartSize             = _dryBicarbCartSize            ;
+    data.mSodium                        = _sodium                       ;
+    data.mBicarbonate                   = _bicarbonate                  ;
+    data.mDialyzerType                  = _dialyzerType                 ;
+    data.mFluidBolusVolume              = _fluidBolusVolume             ;
+    data.mBloodPressureMeasureInterval  = _bloodPressureMeasureInterval ;
+    data.mPrimeDiscardVolume            = _primeDiscardVolume           ;
+    data.mRinsebackVolume               = _rinsebackVolume              ;
+    data.mHepatitusBStatus              = _hepatitusBStatus             ;
+    data.mSubstitutionFluidVolume       = _substitutionFluidVolume      ;
+    data.mHeparinBolusVolume            = _heparinBolusVolume           ;
+    data.mHeparinDispensingRate         = _heparinDispensingRate        ;
+    data.mDialysateTemp                 = _dialysateTemp                ;
+//    data.mPotassium                     = _potassium                    ;
+//    data.mCalcium                       = _calcium                      ;
 
     parametersConfirmed(false);
     parametersValidated(false);
@@ -115,30 +117,32 @@
  */
 void VTreatmentCreate::onActionReceive(const AdjustParametersValidationResponseData &data) {
     if (! data.mAccepted) {
-        bloodFlowRateRejectReason                   (data.mBloodFlowRateRejectReason                    );
-        dialysateFlowRateRejectReason               (data.mDialysateFlowRateRejectReason                );
-        treatmentDurationRejectReason               (data.mTreatmentDurationRejectReason                );
-        heparinDispensingRateRejectReason           (data.mHeparinDispensingRateRejectReason            );
-        heparinBolusVolumeRejectReason              (data.mHeparinBolusVolumeRejectReason               );
-        heparinStopTimeRejectReason                 (data.mHeparinStopTimeRejectReason                  );
-        salineBolusVolumeRejectReason               (data.mSalineBolusVolumeRejectReason                );
-        heparinTypeRejectReason                     (data.mHeparinTypeRejectReason                      );
-        acidConcentrateRejectReason                 (data.mAcidConcentrateRejectReason                  );
-        bicarbonateConcentrateRejectReason          (data.mBicarbonateConcentrateRejectReason           );
-        dialyzerTypeRejectReason                    (data.mDialyzerTypeRejectReason                     );
-        dialysateTempRejectReason                   (data.mDialysateTempRejectReason                    );
-        arterialPressureLimitWindowRejectReason     (data.mArterialPressureLimitWindowRejectReason      );
-        venousPressureLimitWindowRejectReason       (data.mVenousPressureLimitWindowRejectReason        );
-        venousPressureLimitAsymtrcRejectReason      (data.mVenousPressureLimitAsymtrcRejectReason       );
-        bloodPressureMeasureIntervalRejectReason    (data.mBloodPressureMeasureIntervalRejectReason     );
-        rinsebackFlowRateRejectReason               (data.mRinsebackFlowRateRejectReason                );
-        rinsebackVolumeRejectReason                 (data.mRinsebackVolumeRejectReason                  );
-        transmembranePressureLimitWindowRejectReason(data.mTransmembranePressureLimitWindowRejectReason );
+        treatmentModalityRejectReason               (data.mTreatmentModalityRejectionReason             );
+        hDFTreatmentModeRejectReason                (data.mHDFTreatmentModeRejectionReason              );
+        bloodFlowRateRejectReason                   (data.mBloodFlowRateRejectionReason                 );
+        dialysateFlowRateRejectReason               (data.mDialysateFlowRateRejectionReason             );
+        treatmentDurationRejectReason               (data.mTreatmentDurationRejectionReason             );
+        heparinDeliveryDurationRejectReason         (data.mHeparinDeliveryDurationRejectionReason       );
+        heparinTypeRejectReason                     (data.mHeparinTypeRejectionReason                   );
+        dryBicarbCartSizeRejectReason               (data.mDryBicarbCartSizeRejectionReason             );
+        sodiumRejectReason                          (data.mSodiumRejectionReason                        );
+        bicarbonateRejectReason                     (data.mBicarbonateRejectionReason                   );
+        dialyzerTypeRejectReason                    (data.mDialyzerTypeRejectionReason                  );
+        fluidBolusVolumeRejectReason                (data.mFluidBolusVolumeRejectionReason              );
+        bloodPressureMeasureIntervalRejectReason    (data.mBloodPressureMeasureIntervalRejectionReason  );
+        primeDiscardVolumeRejectReason              (data.mPrimeDiscardVolumeRejectionReason            );
+        rinsebackVolumeRejectReason                 (data.mRinsebackVolumeRejectionReason               );
+        hepatitusBStatusRejectReason                (data.mHepatitusBStatusRejectionReason              );
+        substitutionFluidVolumeRejectReason         (data.mSubstitutionFluidVolumeRejectionReason       );
+        heparinBolusVolumeRejectReason              (data.mHeparinBolusVolumeRejectionReason            );
+        heparinDispensingRateRejectReason           (data.mHeparinDispensingRateRejectionReason         );
+        dialysateTempRejectReason                   (data.mDialysateTempRejectionReason                 );
+        potassiumRejectReason                       (data.mPotassiumRejectionReason                     );
+        calciumRejectReason                         (data.mCalciumRejectionReason                       );
 
         parametersValidated(false);
     }
     else {
-        if ( _txCode.isEmpty()) { generateTxCode(); }
         parametersValidated(true);
         emit didValidationPass();
     }
@@ -166,67 +170,3 @@
     _TreatmentLog.gTxCode(_txCode);
     LOG_APPED_UI(QString("Generated Treatment Code is %1").arg(_txCode));
 }
-
-/*!
- * \brief   VCreateTreatment::doGetPrescriptionParameterValues
- * \details Gets a list of the prescription parameter values
- * \return  (QStringList) The list of parameter values with units
- */
-QStringList VTreatmentCreate::doGetPrescriptionParameterValues() {
-    return QStringList() <<                             QString("%1 mL/min" ).arg(_bloodFlowRate        )
-                         <<                             QString("%1 mL/min" ).arg(_dialysateFlowRate    )
-                         <<                             QString("%1 min"    ).arg(_treatmentDuration    )
-                         << ( _heparinDispensingRate  ? QString("%1 mL/hr"  ).arg(_heparinDispensingRate) : tr("OFF") )
-                         << ( _heparinBolusVolume     ? QString("%1 mL"     ).arg(_heparinBolusVolume   ) : tr("OFF") )
-                         << ( _heparinDispensingRate  ? QString("%1 min"    ).arg(_heparinStopTime      ) : tr("OFF") )
-                         <<                             QString("%1 mL"     ).arg(_salineBolusVolume    )               ;
-}
-
-/*!
- * \brief   VCreateTreatment::doGetOperatingParameterValues
- * \details Gets the operating parameter values
- * \return  (QStringList) The list of operating parameter values with units where applicable
- */
-QStringList VTreatmentCreate::doGetOperatingParameterValues()
-{
-    QString    mHeparinType             ;
-    QString    mAcidConcentrate         ;
-    QString    mBicarbonateConcentrate  ;
-    QString    mDialyzerType            ;
-
-    QStringList mHeparinTypeOptions                 ;
-    QStringList mAcidConcentrateOptions             ;
-    QStringList mBicarbonateConcentrateOptions      ;
-    QStringList mDialyzerTypeOptions                ;
-
-    QString mCategory = Storage::Settings_Category_DataList;
-
-    if ( heparinTypeSet             () ) { // this is managed on UI with heparinTypeSet() // && ( _heparinDispensingRate || _heparinBolusVolume )
-        mHeparinTypeOptions                 = _Settings.keys(mCategory, "Heparin Type Options"            );
-        if ((int) _heparinType              < mHeparinTypeOptions               .length()) mHeparinType             = mHeparinTypeOptions               .at( _heparinType            );
-    } else {                                                                               mHeparinType             = tr("NONE");                                                       }
-
-    if ( acidConcentrateSet         () ) {
-        mAcidConcentrateOptions             = _Settings.keys(mCategory, "Acid Concentrate Options"        );
-        if ((int) _acidConcentrate          < mAcidConcentrateOptions           .length()) mAcidConcentrate         = mAcidConcentrateOptions           .at( _acidConcentrate        );
-    } else {                                                                               mAcidConcentrate         = tr("NONE");                                                       }
-
-    if ( bicarbonateConcentrateSet  () ) {
-        mBicarbonateConcentrateOptions      = _Settings.keys(mCategory, "Bicarbonate Concentrate Options" );
-        if ((int) _bicarbonateConcentrate   < mBicarbonateConcentrateOptions    .length()) mBicarbonateConcentrate  = mBicarbonateConcentrateOptions    .at( _bicarbonateConcentrate );
-    } else {                                                                               mBicarbonateConcentrate  = tr("NONE");                                                       }
-
-    if ( dialyzerTypeSet            () ) {
-        mDialyzerTypeOptions                = _Settings.keys(mCategory, "Dialyzer Type Options"           );
-        if ((int) _dialyzerType             < mDialyzerTypeOptions              .length()) mDialyzerType            = mDialyzerTypeOptions              .at( _dialyzerType           );
-    } else {                                                                               mDialyzerType            = tr("NONE");                                                       }
-
-
-    return QStringList() << mHeparinType
-                         << mAcidConcentrate
-                         << mBicarbonateConcentrate
-                         << mDialyzerType
-                         << QString("%0 °C"     ).arg(_dialysateTemp                )
-                         << ( _bloodPressureMeasureInterval  ? QString("%0 min").arg(_bloodPressureMeasureInterval) : tr("OFF") )
-        ;
-}