Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r0975a67dd4e4673b9a7b226bfea02cbfa489c418 -re595a959b32e1bd1532b942481230a09496d6f08 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 0975a67dd4e4673b9a7b226bfea02cbfa489c418) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision e595a959b32e1bd1532b942481230a09496d6f08) @@ -270,6 +270,9 @@ // weight readonly property int weightPrecision : 1 + // water sample + readonly property int waterSamplePrecision : 1 + function sizeConverted(vSize, vSizePowers, vRound = 2) { return ( vSize / vSizePowers // convert from byte to Giga byte @@ -340,5 +343,6 @@ // Concentration readonly property string unitTextConcentration : qsTr("mEq/L") readonly property string unitTextHeparinConcentration : qsTr("IU/mL") - + // - hepatitis + readonly property string hepatitis : qsTr("HbsAg") } Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -re73106aa3e46a036269cb95fadc1010eb1bfe818 -re595a959b32e1bd1532b942481230a09496d6f08 --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision e73106aa3e46a036269cb95fadc1010eb1bfe818) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision e595a959b32e1bd1532b942481230a09496d6f08) @@ -27,7 +27,8 @@ * \brief the post treatment Treatment Log review screen */ PostTreatmentBase { id: _root - property int colSpacing: Variables.defaultMargin + property int colSpacing : Variables.defaultMargin + property int columnWidth: ( _flickable.width / 2 ) - (colSpacing) Flickable { id: _flickable anchors { @@ -51,7 +52,7 @@ spacing : Variables.defaultMargin Column { id: _leftColumn - width : _flickable.width / 2 + width : _root.columnWidth spacing : _root.colSpacing ReviewContainer { id: _patientInfo @@ -126,21 +127,210 @@ vPostTreatmentAdjustmentTreatmentLog.bicarbonateConcentrationActual , vPostTreatmentAdjustmentTreatmentLog.sodiumConcentrationActual ] - precision : Array(label.count).fill(0) - units : [ "" , "" , Variables.unitTextConcentration , Variables.unitTextConcentration , Variables.unitTextConcentration , Variables.unitTextConcentration ] } + + ReviewContainer { id: _vitalsFluidBolus + title : qsTr("Vitals and Fluid Bolus") + width : parent.width + + label : [ qsTr("Vitals Interval") , + qsTr("Fluid Bolus Volume") ] + + initial : [ vPostTreatmentAdjustmentTreatmentLog.vitalsInterval , + vPostTreatmentAdjustmentTreatmentLog.fluidBolusVolume ] + + actual : [ vPostTreatmentAdjustmentTreatmentLog.vitalsIntervalActual , + vPostTreatmentAdjustmentTreatmentLog.fluidBolusVolumeActual ] + + units : [ Variables.unitTextMins , + Variables.unitTextFluid ] + } + + ReviewContainer { id: _heparin + title : qsTr("Heparin") + width : parent.width + + label : [ qsTr("Heparin Type") , + qsTr("Heparin Bolus Volume") , + qsTr("Heparin Delivery Rate") , + qsTr("Heparin Delivered Volume") , + qsTr("Heparin Delivery Durraion") ] + + initial : [ vTreatmentRanges.heparinTypeOptions[vPostTreatmentAdjustmentTreatmentLog.heparinType] , + vPostTreatmentAdjustmentTreatmentLog.heparinBolusVolume , + vPostTreatmentAdjustmentTreatmentLog.heparinDispenseRate , + vPostTreatmentAdjustmentTreatmentLog.heparinDeliveredVolume , + vPostTreatmentAdjustmentTreatmentLog.heparinDeliveryDuration ] + + actual : [ "" , + vPostTreatmentAdjustmentTreatmentLog.heparinBolusVolumeActual , + vPostTreatmentAdjustmentTreatmentLog.heparinDispenseRateActual , + "" , + vPostTreatmentAdjustmentTreatmentLog.heparinDeliveryDurationActual ] + + precision : [ 0 , + Variables.heparinPrecision , + Variables.heparinPrecision , + Variables.heparinPrecision , + 0 ] + + units : [ Variables.unitHeparinType , + Variables.unitTextFluid , + Variables.unitTextDispensingRate, + Variables.unitTextFluid , + Variables.unitTextMins ] + } } Column { id: _rightColumn - width : _flickable.width / 2 + width : _root.columnWidth spacing : _root.colSpacing + ReviewContainer { id: _treatmentDateTime + title : qsTr("Treatment Date and Time") + width : parent.width + + label : [ qsTr("Treatment Start Date, Time") , + qsTr("Treatment End Date, Time") ] + + initial : [ Qt.formatDateTime(new Date(vPostTreatmentAdjustmentTreatmentLog.treatmentStartEpoch), "yyyy/MM/dd, HH:mm") , + Qt.formatDateTime(new Date(vPostTreatmentAdjustmentTreatmentLog.treatmentEndEpoch) , "yyyy/MM/dd, HH:mm") ] + + actual : [ "" , "" ] + units : [ "" , ""] + } + + ReviewContainer { id: _treatmentInformation + title : qsTr("Treatment Information") + width : parent.width + + label : [ qsTr("Treatment Modality") , + qsTr("HDF Operating Mode") , + qsTr("Duration") ] + + initial : [ vTreatmentRanges.treatmentModalityOptions[vPostTreatmentAdjustmentTreatmentLog.treatmentModality] , + vTreatmentRanges.hdfTreatmentModeOptions[vPostTreatmentAdjustmentTreatmentLog.hDFOperatingMode ] , + vPostTreatmentAdjustmentTreatmentLog.treatmentDuration ] + + actual : [ vTreatmentRanges.treatmentModalityOptions[vPostTreatmentAdjustmentTreatmentLog.treatmentModalityActual] , + vTreatmentRanges.hdfTreatmentModeOptions[vPostTreatmentAdjustmentTreatmentLog.hDFOperatingModeActual ] , + vPostTreatmentAdjustmentTreatmentLog.treatmentDurationActual ] + + units : [ "" , "" , Variables.unitTextMins ] + } + + ReviewContainer { id: _ultrafiltration + title : qsTr("Ultrafiltration") + width : parent.width + + label : [ qsTr("Prescribed Ultrafiltration Volume") , + qsTr("Final Target Ultrafiltration Volume") , + qsTr("Prescribed Ultrafiltration Rate") , + qsTr("Final Target Ultrafiltration Rate") ] + + initial : [ vPostTreatmentAdjustmentTreatmentLog.uFVolume , + vPostTreatmentAdjustmentTreatmentLog.uFVolumeTarget , + vPostTreatmentAdjustmentTreatmentLog.uFRate , + vPostTreatmentAdjustmentTreatmentLog.uFRateTarget ] + + actual : [ vPostTreatmentAdjustmentTreatmentLog.uFVolumeActual , + "" , + vPostTreatmentAdjustmentTreatmentLog.uFRateActual , + "" ] + + precision : [ Variables.ultrafiltrationPrecision , + Variables.ultrafiltrationPrecision , + Variables.ultrafiltrationPrecision , + Variables.ultrafiltrationPrecision ] + + units : [ Variables.unitVolume , + Variables.unitVolume , + Variables.unitTextRate , + Variables.unitTextRate ] + } + + ReviewContainer { id: _substitutionFluid + title : qsTr("Substitution Fluid") + width : parent.width + + label : [ qsTr("Prescribed Substitution Fluid Volume") , + qsTr("Final Target Substitution Fluid Volume") , + qsTr("Prescribed Substitution Fluid Rate") , + qsTr("Final Target Substitution Fluid Rate") ] + + initial : [ vPostTreatmentAdjustmentTreatmentLog.substitutionVolume , + vPostTreatmentAdjustmentTreatmentLog.substitutionVolumeTarget , + vPostTreatmentAdjustmentTreatmentLog.substitutionRate , + vPostTreatmentAdjustmentTreatmentLog.substitutionRateTarget ] + + actual : [ vPostTreatmentAdjustmentTreatmentLog.substitutionVolumeActual , + "" , + vPostTreatmentAdjustmentTreatmentLog.substitutionRateActual , + "" ] + + precision : [ Variables.substitutionPrecision , + Variables.substitutionPrecision , + Variables.substitutionPrecision , + Variables.substitutionPrecision ] + + units : [ Variables.unitVolume , + Variables.unitVolume , + Variables.unitTextFlowRate , + Variables.unitTextFlowRate ] + } + + ReviewContainer { id: _isolatedUltrafiltration + title : qsTr("Isolated Ultrafiltration") + width : parent.width + + label : [ qsTr("Prescribed Isolated Ultrafiltration Volume") , + qsTr("Final Target Isolated Ultrafiltration Volume") , + qsTr("Prescribed Isolated Ultrafiltration Rate") , + qsTr("Final Target Isolated Ultrafiltration Rate") ] + + initial : [ vPostTreatmentAdjustmentTreatmentLog.isoUfVolume , + vPostTreatmentAdjustmentTreatmentLog.isoUfVolumeTarget , + vPostTreatmentAdjustmentTreatmentLog.isoUfRate , + vPostTreatmentAdjustmentTreatmentLog.isoUfRateTarget ] + + actual : [ vPostTreatmentAdjustmentTreatmentLog.isoUfVolumeActual , + "" , + vPostTreatmentAdjustmentTreatmentLog.isoUfRateActual , + "" ] + + precision : [ Variables.ultrafiltrationPrecision , + Variables.ultrafiltrationPrecision , + Variables.ultrafiltrationPrecision , + Variables.ultrafiltrationPrecision ] + + units : [ Variables.unitVolume , + Variables.unitVolume , + Variables.unitTextRate , + Variables.unitTextRate ] + } + + ReviewContainer { id: _additionalSettings + title : qsTr("Additional Settings") + width : parent.width + + label : [ qsTr("Water Sample Test Result") , + qsTr("Hepatitis B") ] + + initial : [ vPostTreatmentAdjustmentTreatmentLog.waterSampleTestResult , + vTreatmentRanges.hepatitisStatus[vPostTreatmentAdjustmentTreatmentLog.hepatitisStatus] ] + + actual : [ "" , "" ] + precision : [ Variables.waterSamplePrecision , + 0 ] + units : [ Variables.unitTextChlorine , + Variables.hepatitis ] + } } } } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r14d7345260cdc47d8308da4fff127fbd97837fe4 -re595a959b32e1bd1532b942481230a09496d6f08 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision e595a959b32e1bd1532b942481230a09496d6f08) @@ -115,8 +115,8 @@ } function validate () { - vTreatmentCreate .patientID = _preTreatmentCreateTreatmentSettings.patientID - vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreateTreatmentSettings.patientID // store for the TreatmentLog + vTreatmentCreate .patientID = _preTreatmentCreatePatientPrescription.patientID + vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreatePatientPrescription.patientID // store for the TreatmentLog vTreatmentCreate.doValidation ( ) } Index: sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp =================================================================== diff -u -rc16cfee6212ad1ba9f788c41d4a4c916daa43c9c -re595a959b32e1bd1532b942481230a09496d6f08 --- sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision c16cfee6212ad1ba9f788c41d4a4c916daa43c9c) +++ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision e595a959b32e1bd1532b942481230a09496d6f08) @@ -41,7 +41,8 @@ // [=](const QString &vTxCode) { txCode( vTxCode ); } ); connect(&_TreatmentLog , &TreatmentLog::didTxCodeReceive, - [=](const QString &vTxCode) { txCode( vTxCode ); } ); + [=](const QString &vTxCode) { txCode( vTxCode + " Test Code 123-456" ); } ); +// [=](const QString &vTxCode) { txCode( vTxCode ); } ); // TODO Update connect(&_TreatmentLog , &TreatmentLog::didNotification, [=](const QString &vNotification) { notification(vNotification); } ); Index: sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h =================================================================== diff -u -rc16cfee6212ad1ba9f788c41d4a4c916daa43c9c -re595a959b32e1bd1532b942481230a09496d6f08 --- sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision c16cfee6212ad1ba9f788c41d4a4c916daa43c9c) +++ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision e595a959b32e1bd1532b942481230a09496d6f08) @@ -114,7 +114,7 @@ PROPERTY(float , isoUfRateTarget , 0 ) PROPERTY(float , waterSampleTestResult , 0 ) - PROPERTY(QString , txCode , "TEST-1231123212") + PROPERTY(QString , txCode , "") PROPERTY(QString , notification , "")