Index: sources/gui/qml/dialogs/PatientIdEntry.qml =================================================================== diff -u -rdc8969f6c7bbdb46d2de22622e58e457ceb37df4 -r1eedad37ea1cad5c9aa41ac082614d082f525a7f --- sources/gui/qml/dialogs/PatientIdEntry.qml (.../PatientIdEntry.qml) (revision dc8969f6c7bbdb46d2de22622e58e457ceb37df4) +++ sources/gui/qml/dialogs/PatientIdEntry.qml (.../PatientIdEntry.qml) (revision 1eedad37ea1cad5c9aa41ac082614d082f525a7f) @@ -33,7 +33,7 @@ anchors { top : _root.contentItem.top - topMargin : Variables.defaultMargin * 2 + topMargin : Variables.defaultMargin / 2 horizontalCenter: _root.contentItem.horizontalCenter } @@ -75,7 +75,7 @@ contentItem : TextEntry { id: _pretreatmentSecondaryPatientIDEntry clip : true textInput.width : parent.width - Variables.defaultMargin * 4 - text : vTreatmentCreate.patientID + text : vTreatmentCreate.secondaryPatientID anchors.centerIn : parent textInput.maximumLength : 20 // LEAHI-PRS-236 textInput.rightPadding : Variables.defaultMargin Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml =================================================================== diff -u -rdc8969f6c7bbdb46d2de22622e58e457ceb37df4 -r1eedad37ea1cad5c9aa41ac082614d082f525a7f --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision dc8969f6c7bbdb46d2de22622e58e457ceb37df4) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 1eedad37ea1cad5c9aa41ac082614d082f525a7f) @@ -89,7 +89,7 @@ LabelUnitContainer { id: _patientID text : qsTr("Patient ID") - showEdit : _root.editingEnabled + showEdit : true onEditClicked : _patientIdEntry.open() contentItem : Text { id: _patientIDText Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -rdc8969f6c7bbdb46d2de22622e58e457ceb37df4 -r1eedad37ea1cad5c9aa41ac082614d082f525a7f --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision dc8969f6c7bbdb46d2de22622e58e457ceb37df4) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 1eedad37ea1cad5c9aa41ac082614d082f525a7f) @@ -222,29 +222,22 @@ { // Formatted values QString mStrText = "%1"; - // DEBUG: qDebug() << _Settings.groups(); - // SRSUI910 : PRS178 : Clinical - Data - Order - - // 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.mTreatmentDurationActual / 60 ); // Converted seconds to minutes. QString mTreatmentStartDateTime = Format::fromEpoch( vData.mTreatmentStartEpoch , _datetimeFormat); QString mTreatmentEndDateTime = Format::fromEpoch( vData.mTreatmentEndEpoch , _datetimeFormat); -// // TODO : The settings needs modification not only to define the category and groups in a common header but also the settings itself needs some mods. -// // - the category shall become as part of the group -// // - the structure of the settings should become horizontal which vertical now. + // TODO : The settings needs modification not only to define the category and groups in a common header but also the settings itself needs some mods. + // - the category shall become as part of the group + // - the structure of the settings should become horizontal which vertical now. QString mCategory = Storage::Settings_Category_DataList; QString mAcidConcentrateType = _Settings.key(mCategory, "Acid Concentrate Options" , vData.mAcidConcentrateType ); QString mBicarbonateConcentrateType = _Settings.key(mCategory, "Bicarbonate Concentrate Options" , vData.mBicarbonateCartridgeSize ); QString mDialyzerType = _Settings.key(mCategory, "Dialyzer Type Options" , vData.mDialyzerType ); QString mHeparinType = _Settings.key(mCategory, "Heparin Type Options" , vData.mHeparinType ); - QString mWaterSampleTestResult = _Settings.key(mCategory, "Water Sample Result" , vData.mWaterSampleTestResult ); - bool isHeparinOff = vData.mHeparinBolusVolume == 0; - bool isHeparinDispensingRateOff = vData.mHeparinDispenseRate == 0; + bool isHeparinOff = vData.mHeparinBolusVolume == 0; + bool isHeparinDispensingRateOff = vData.mHeparinDispenseRate == 0; // init/fill/clear the _values clearModel(); @@ -267,21 +260,20 @@ _values[eDialyzerType ] = mDialyzerType ; _values[eTreatmentStartDateTime ] = mTreatmentStartDateTime ; _values[eTreatmentEndDateTime ] = mTreatmentEndDateTime ; - _values[eWaterSampleTestResult ] = mWaterSampleTestResult ; + _values[eWaterSampleTestResult ] = mStrText.arg(vData.mWaterSampleTestResult ); _values[eDialysateVolumeUsed ] = mStrText.arg(vData.mDialysateVolumeUsed ,FLOAT3 ); _values[eOriginUFVolume ] = mStrText.arg(vData.mUFVolume ,FLOAT3 ); _values[eTargetUFVolume ] = mStrText.arg(vData.mUFVolumeTarget ,FLOAT3 ); _values[eActualUFVolume ] = mStrText.arg(vData.mUFVolumeActual ,FLOAT3 ); _values[eOriginUFRate ] = mStrText.arg(vData.mUFRate ,FLOAT3 ); _values[eTargetUFRate ] = mStrText.arg(vData.mUFRateTarget ,FLOAT3 ); _values[eActualUFRate ] = mStrText.arg(vData.mUFRateActual ,FLOAT3 ); - _values[eSalineBolusVolume ] = mStrText.arg(vData.mFluidBolusVolume ); + _values[eFluidBolusVolume ] = mStrText.arg(vData.mFluidBolusVolume ); _values[eHeparinBolusVolume ] = mStrText.arg(vData.mHeparinBolusVolume ,FLOAT3 ); _values[eHeparinType ] = isHeparinOff ? tr("NONE") : mHeparinType ; - _values[eHeparinConcentration ] = isHeparinOff ? tr("NONE") : mStrText.arg(vData.mHeparinType ); _values[eHeparinDispenseRate ] = isHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinDispenseRate ,FLOAT3 ); - _values[eHeparinStop ] = isHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinDeliveryDuration ); + _values[eHeparinDeliveryDuration ] = isHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinDeliveryDuration ); _values[eHeparinDeliveredVolume ] = isHeparinOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinDeliveredVolume ,FLOAT3 ); emit didTxCodeReceive(""); @@ -291,7 +283,7 @@ * \brief TreatmentLog::append * \param vData - the received data to be kept in the list to be appended at the end of the Treatment Log */ -void TreatmentLog::append(const TreatmentLogAvrgeData &vData) { _treatmentLogAvrgeData.append(vData); qDebug("TreatmentLogAvrgeData");} +void TreatmentLog::append(const TreatmentLogAvrgeData &vData) { _treatmentLogAvrgeData.append(vData); } void TreatmentLog::append(const TreatmentLogAlarmData &vData) { _treatmentLogAlarmData.append(vData); } void TreatmentLog::append(const TreatmentLogEventData &vData) { _treatmentLogEventData.append(vData); } @@ -390,12 +382,11 @@ ADDTOLOG( eDialysateTemperature ); ADDTOLOG( eDialyzerType ); ADDTOLOG( eHeparinType ); - ADDTOLOG( eHeparinConcentration ); ADDTOLOG( eHeparinBolusVolume ); ADDTOLOG( eHeparinDispenseRate ); - ADDTOLOG( eHeparinStop ); + ADDTOLOG( eHeparinDeliveryDuration ); - ADDTITLE("Treatment Report" ); + ADDTITLE("Treatment Report" ); ADDTOLOG( eTreatmentStartDateTime ); ADDTOLOG( eTreatmentEndDateTime ); ADDTOLOG( eActualTreatmentDuration ); @@ -407,7 +398,7 @@ ADDTOLOG( eOriginUFRate ); ADDTOLOG( eTargetUFRate ); ADDTOLOG( eActualUFRate ); - ADDTOLOG( eSalineBolusVolume ); + ADDTOLOG( eFluidBolusVolume ); ADDTOLOG( eHeparinDeliveredVolume ); ADDTOLOG( eWaterSampleTestResult ); Index: sources/storage/TreatmentLog.h =================================================================== diff -u -rdc8969f6c7bbdb46d2de22622e58e457ceb37df4 -r1eedad37ea1cad5c9aa41ac082614d082f525a7f --- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision dc8969f6c7bbdb46d2de22622e58e457ceb37df4) +++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 1eedad37ea1cad5c9aa41ac082614d082f525a7f) @@ -70,6 +70,7 @@ QString _unitTextHeparinConcentration = tr("IU/mL" ); QString _unitTextDispensingRate = tr("mL/hr" ); QString _unitTextBloodPressure = tr("mmHg" ); + QString _unitTextWatertSample = tr("mg/L" ); struct TxInfo { void clear() { @@ -117,10 +118,9 @@ eDialysateTemperature , eDialyzerType , eHeparinType , - eHeparinConcentration , eHeparinBolusVolume , eHeparinDispenseRate , - eHeparinStop , + eHeparinDeliveryDuration , eHeparinDeliveredVolume , eTreatmentStartDateTime , eTreatmentEndDateTime , @@ -132,7 +132,7 @@ eOriginUFRate , eTargetUFRate , eActualUFRate , - eSalineBolusVolume , + eFluidBolusVolume , eTreatmentLogIndexCount , }; @@ -152,10 +152,9 @@ tr("Dialysate Temperature" ), // eDialysateTemperature tr("Dialyzer Type" ), // eDialyzerType tr("Heparin Type" ), // eHeparinType - tr("Heparin Concentration" ), // eHeparinConcentration tr("Heparin Bolus Volume" ), // eHeparinBolusVolume tr("Heparin Dispense Rate" ), // eHeparinDispenseRate - tr("Heparin Stop" ), // eHeparinStop + tr("Heparin Delivery Duration" ), // eHeparinDeliveryDuration tr("Heparin Delivered Volume" ), // eHeparinDeliveredVolume tr("Treatment Start DateTime" ), // eTreatmentStartDateTime tr("Treatment End DateTime" ), // eTreatmentEndDateTime @@ -167,7 +166,7 @@ tr("Prescribed UF Rate" ), // eOriginUFRate tr("Target UF Rate" ), // eTargetUFRate tr("Actual UF Rate" ), // eActualUFRate - tr("Saline Bolus Volume" ), // eSalineBolusVolume + tr("Fluid Bolus Volume" ), // eFluidBolusVolume }; const QStringList _units { @@ -185,23 +184,22 @@ _unitTextConcentration , // eSodiumConcentration _unitTextTemperature , // eDialysateTemperature "" , // eDialyzerType - "" , // eHeparinType - _unitTextHeparinConcentration , // eHeparinConcentration + _unitTextHeparinConcentration , // eHeparinType _unitTextFluid , // eHeparinBolusVolume _unitTextDispensingRate , // eHeparinDispenseRate - _unitTextDurationMin , // eHeparinStop + _unitTextDurationMin , // eHeparinDeliveryDuration _unitTextFluid , // eHeparinDeliveredVolume "" , // eTreatmentStartDateTime "" , // eTreatmentEndDateTime - "" , // eWaterSampleTestResult + _unitTextWatertSample , // eWaterSampleTestResult _unitTextVolume , // eDialysateVolumeUsed _unitTextVolume , // eOriginUFVolume _unitTextVolume , // eTargetUFVolume _unitTextVolume , // eActualUFVolume _unitTextFlowRate , // eOriginUFRate _unitTextFlowRate , // eTargetUFRate _unitTextFlowRate , // eActualUFRate - _unitTextFluid , // eSalineBolusVolume + _unitTextFluid , // eFluidBolusVolume }; QString string(quint8 vIndex , const QStringList &vStringList) const {