Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r0681b6cf3d718e1129388115de19f57dac5e32cf -r676ec71574416b57c5263b1a4acc66d6904751e7 --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 0681b6cf3d718e1129388115de19f57dac5e32cf) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 676ec71574416b57c5263b1a4acc66d6904751e7) @@ -227,10 +227,11 @@ bool isHeparinOff = vHeparinBolusVolumeOff && vHeparinDispensingRateOff; - QString mTreatmentDurationFmt = QTime (0, 0).addSecs(int(vData.mTreatmentDuration )).toString(_timeFormat); - QString mActualTreatmentDurationFmt = QTime (0, 0).addSecs(int(vData.mActualTreatmentDuration )).toString(_timeFormat); - QString mTreatmentDuration = QString::number(vData.mTreatmentDuration / 60 ); // Converted seconds to minutes. - QString mActualTreatmentDuration = QString::number(vData.mActualTreatmentDuration / 60 ); // Converted seconds to minutes. + // TODO LDT-2500 or LDT-2506 +// QString mTreatmentDurationFmt = QTime (0, 0).addSecs(int(vData.mTreatmentDuration )).toString(_timeFormat); +// QString mActualTreatmentDurationFmt = QTime (0, 0).addSecs(int(vData.mActualTreatmentDuration )).toString(_timeFormat); +// QString mTreatmentDuration = QString::number(vData.mTreatmentDuration / 60 ); // Converted seconds to minutes. +// QString mActualTreatmentDuration = QString::number(vData.mActualTreatmentDuration / 60 ); // Converted seconds to minutes. QString mTreatmentStartDateTime = Format::fromEpoch( vData.mTreatmentStartEpoch , _datetimeFormat); QString mTreatmentEndDateTime = Format::fromEpoch( vData.mTreatmentEndEpoch , _datetimeFormat); @@ -248,36 +249,37 @@ // init/fill/clear the _values clearModel(); + // TODO in treatment log story LDT-2500 or LDT-2506 _values[ePatientID ] = vPatientID.trimmed() ; - _values[eBloodFlowRate ] = mStrText.arg(vData.mBloodFlowRate ); - _values[eDialysateFlowRate ] = mStrText.arg(vData.mDialysateFlowRate ); - _values[eTreatmentDuration ] = mTreatmentDuration ; - _values[eActualTreatmentDuration ] = mActualTreatmentDuration ; - _values[eAcidConcentrateType ] = mAcidConcentrateType ; - _values[eBicarbonateConcentrateType ] = mBicarbonateConcentrateType ; - _values[ePotassiumConcentration ] = mStrText.arg(vData.mPotassiumConcentration ); - _values[eCalciumConcentration ] = mStrText.arg(vData.mCalciumConcentration ); - _values[eBicarbonateConcentration ] = mStrText.arg(vData.mBicarbonateConcentration ); - _values[eSodiumConcentration ] = mStrText.arg(vData.mSodiumConcentration ); - _values[eDialysateTemperature ] = mStrText.arg(vData.mDialysateTemperature ,FLOAT3 ); - _values[eDialyzerType ] = mDialyzerType ; - _values[eTreatmentStartDateTime ] = mTreatmentStartDateTime ; - _values[eTreatmentEndDateTime ] = mTreatmentEndDateTime ; - _values[eWaterSampleTestResult ] = mWaterSampleTestResult ; - _values[eDialysateVolumeUsed ] = mStrText.arg(vData.mDialysateVolumeUsed ,FLOAT3 ); - _values[eOriginUFVolume ] = mStrText.arg(vData.mOriginUFVolume ,FLOAT3 ); - _values[eTargetUFVolume ] = mStrText.arg(vData.mTargetUFVolume ,FLOAT3 ); - _values[eActualUFVolume ] = mStrText.arg(vData.mActualUFVolume ,FLOAT3 ); - _values[eOriginUFRate ] = mStrText.arg(vData.mOriginUFRate ,FLOAT3 ); - _values[eTargetUFRate ] = mStrText.arg(vData.mTargetUFRate ,FLOAT3 ); - _values[eActualUFRate ] = mStrText.arg(vData.mActualUFRate ,FLOAT3 ); - _values[eSalineBolusVolume ] = mStrText.arg(vData.mSalineBolusVolume ); +// _values[eBloodFlowRate ] = mStrText.arg(vData.mBloodFlowRate ); +// _values[eDialysateFlowRate ] = mStrText.arg(vData.mDialysateFlowRate ); +// _values[eTreatmentDuration ] = mTreatmentDuration ; +// _values[eActualTreatmentDuration ] = mActualTreatmentDuration ; +// _values[eAcidConcentrateType ] = mAcidConcentrateType ; +// _values[eBicarbonateConcentrateType ] = mBicarbonateConcentrateType ; +// _values[ePotassiumConcentration ] = mStrText.arg(vData.mPotassiumConcentration ); +// _values[eCalciumConcentration ] = mStrText.arg(vData.mCalciumConcentration ); +// _values[eBicarbonateConcentration ] = mStrText.arg(vData.mBicarbonateConcentration ); +// _values[eSodiumConcentration ] = mStrText.arg(vData.mSodiumConcentration ); +// _values[eDialysateTemperature ] = mStrText.arg(vData.mDialysateTemperature ,FLOAT3 ); +// _values[eDialyzerType ] = mDialyzerType ; +// _values[eTreatmentStartDateTime ] = mTreatmentStartDateTime ; +// _values[eTreatmentEndDateTime ] = mTreatmentEndDateTime ; +// _values[eWaterSampleTestResult ] = mWaterSampleTestResult ; +// _values[eDialysateVolumeUsed ] = mStrText.arg(vData.mDialysateVolumeUsed ,FLOAT3 ); +// _values[eOriginUFVolume ] = mStrText.arg(vData.mOriginUFVolume ,FLOAT3 ); +// _values[eTargetUFVolume ] = mStrText.arg(vData.mTargetUFVolume ,FLOAT3 ); +// _values[eActualUFVolume ] = mStrText.arg(vData.mActualUFVolume ,FLOAT3 ); +// _values[eOriginUFRate ] = mStrText.arg(vData.mOriginUFRate ,FLOAT3 ); +// _values[eTargetUFRate ] = mStrText.arg(vData.mTargetUFRate ,FLOAT3 ); +// _values[eActualUFRate ] = mStrText.arg(vData.mActualUFRate ,FLOAT3 ); +// _values[eSalineBolusVolume ] = mStrText.arg(vData.mSalineBolusVolume ); _values[eHeparinType ] = isHeparinOff ? tr("NONE") : mHeparinType ; - _values[eHeparinConcentration ] = isHeparinOff ? tr("NONE") : mStrText.arg(vData.mHeparinConcentration ); +// _values[eHeparinConcentration ] = isHeparinOff ? tr("NONE") : mStrText.arg(vData.mHeparinConcentration ); _values[eHeparinBolusVolume ] = vHeparinBolusVolumeOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinBolusVolume ,FLOAT3 ); _values[eHeparinDispenseRate ] = vHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinDispenseRate ,FLOAT3 ); - _values[eHeparinStop ] = vHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinStop ); +// _values[eHeparinStop ] = vHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinStop ); _values[eHeparinDeliveredVolume ] = isHeparinOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinDeliveredVolume ,FLOAT3 ); emit didTxCodeReceive("");