Index: leahi.qrc
===================================================================
diff -u -r627062628b60e4d512ee8830c2dbc23eef02fe28 -r735e9e89a99157992fb1ec6e3f0d2953e564346d
--- leahi.qrc (.../leahi.qrc) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
+++ leahi.qrc (.../leahi.qrc) (revision 735e9e89a99157992fb1ec6e3f0d2953e564346d)
@@ -200,7 +200,6 @@
sources/gui/qml/components/SubStepIndicator.qml
sources/gui/qml/components/SDCInfo.qml
sources/gui/qml/components/BaseChart.qml
- sources/gui/qml/components/ReviewContainer.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
@@ -345,5 +344,6 @@
sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml
sources/gui/qml/pages/posttreatment/PostTreatmentDrainConsumables.qml
+ sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml
Fisheye: Tag 735e9e89a99157992fb1ec6e3f0d2953e564346d refers to a dead (removed) revision in file `sources/gui/qml/components/ReviewContainer.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml
===================================================================
diff -u
--- sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml (revision 0)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml (revision 735e9e89a99157992fb1ec6e3f0d2953e564346d)
@@ -0,0 +1,5 @@
+import QtQuick 2.0
+
+Item {
+
+}
Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
===================================================================
diff -u -r627062628b60e4d512ee8830c2dbc23eef02fe28 -r735e9e89a99157992fb1ec6e3f0d2953e564346d
--- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 735e9e89a99157992fb1ec6e3f0d2953e564346d)
@@ -16,6 +16,7 @@
// Qt
import QtQuick 2.12
+
// Project
// Qml imports
import "qrc:/globals"
@@ -27,154 +28,97 @@
* \brief the post treatment Treatment Log review screen
*/
PostTreatmentBase { id: _root
- property int colSpacing: Variables.defaultMargin
+ signal itemClicked(int vIndex)
- Flickable { id: _flickable
- anchors {
- top : header.bottom
- topMargin : Variables.defaultMargin * 2
- bottom : _root.bottom
- bottomMargin : Variables.notificationHeight + Variables.minVGap
- left : parent.left
- leftMargin : Variables.defaultMargin * 4
- right : parent.right
- rightMargin : Variables.defaultMargin * 4
+ readonly property alias itemsText : _parametersGrid.itemsText
+ readonly property alias itemsValue: _parametersGrid.itemsValue
+ readonly property alias itemsUnit : _parametersGrid.itemsUnit
- }
+ ScrollBar {
+ anchors.fill: _flickable
+ flickable : _flickable
+ backColor : Colors.backgroundDialog
+ }
- contentWidth : width
- contentHeight : _row.height
- clip : true
-
- Row { id: _row
- width : _flickable.width
- spacing : Variables.defaultMargin
-
- Column { id: _leftColumn
- width : _flickable.width / 2
- spacing : _root.colSpacing
-
- ReviewContainer { id: _patientInfo
- title : qsTr("Patient Information")
- width : parent.width
-
- label : [ qsTr("Patient ID") ,
- qsTr("Secondary Patient ID")]
-
- initial : [ "initial 1" ,
- "initial 2" ]
-
- actual : [ "" , "" ]
- units : [ "" , "" ]
- }
-
- ReviewContainer { id: _bloodFlowDiaysate
- title : qsTr("Blood Flow Rate and Dialysate Settings")
- width : parent.width
- label : [ qsTr("Blood Flow Rate") ,
- qsTr("Dialysis Flow Rate") ,
- qsTr("Dialyzer Type") ,
- qsTr("Dialysate Temperature") ,
- qsTr("Dialysate Volume Used") ]
-
- initial : [ vTreatmentCreate.bloodFlowRate ,
- vTreatmentCreate.dialysateFlowRate ,
- "ifabef" ,
- vTreatmentCreate.dialysateTemp ,
- "alot " ]
-
- actual : [ "BFR 1" ,
- "DFR 1" ,
- "" ,
- "Temp1" ,
- "" ]
- precision : [0,0,0,Variables.dialysateTempPrecision , Variables.ultrafiltrationPrecision]
-
- units : [ Variables.unitTextFlowRate ,
- Variables.unitTextFlowRate ,
- "" ,
- Variables.unitTextTemperature ,
- Variables.unitVolume ]
-
-
- }
-
+ Label { id: _txCode
+ property string empty : "..."
+ property string txCode : vPostTreatmentAdjustmentTreatmentLog.txCode
+ Timer { id: _waitTxCodeTimer
+ property int count: 0
+ interval: 1000
+ repeat : true
+ running : _txCode.visible && ! _txCode.txCode
+ onTriggered: {
+ _txCode.empty = ".".repeat( count ++ )
+ if ( count == 4 ) count = 0
}
+ }
- Column { id: _rightColumn
- width : _flickable.width / 2
- spacing : _root.colSpacing
+ anchors.bottom : _flickable.top
+ anchors.left : _flickable.left
+ width : _flickable.width
+ text : qsTr("Code: ") + ( txCode ? txCode : empty )
+ font.pixelSize : Fonts.fontPixelButton
+ }
- }
- }
+ QRCode { id: _qrCode
+ // removed for the P1 release, since the code had a big change and cannot be removed entirely
+ // added for the P1B release
+ visible : true
+ anchors.bottom : _flickable.top
+ anchors.right : _flickable.right
+ anchors.margins : 15
+ qrcode : vPostTreatmentAdjustmentTreatmentLog.txCode
+ clear : ! _root.visible
}
- ScrollBar { flickable: _flickable }
+ Flickable { id: _flickable
+ clip: true
+ anchors {
+ top : _root.title.bottom
+ topMargin : Variables.minVGap * 2 // * 2 : it was too close to title and also better with rows not half cut.
+ bottom : _root.bottom
+ bottomMargin : Variables.notificationHeight + Variables.minVGap
+ horizontalCenter: parent.horizontalCenter
+ }
+ width : parent.width - Variables.minVGap2 * 2 // * 2 : for each side
+ contentWidth : width
+ contentHeight: _parametersGrid.height
+ TouchGrid { id: _parametersGrid
+ // TODO: fixed only for this list since it has been used other places.
+ // investigate more to move these readonly properties in the TouchGrid component.
+ readonly property int _itemCount: vPostTreatmentAdjustmentTreatmentLog.parametersTitle.length
+ readonly property int _colCount : 2
+ readonly property int _rowCount : Math.ceil( _itemCount / _colCount )
-// Rectangle { id: _rect
-// anchors {
-// top : header.bottom
-// topMargin : Variables.defaultMargin * 2
-// bottom : _root.bottom
-// bottomMargin : Variables.notificationHeight + Variables.minVGap
-// left : parent.left
-// leftMargin : Variables.defaultMargin * 4
-// right : parent.right
-// rightMargin : Variables.defaultMargin * 4
-
-// }
-
-// color : Colors.panelBackgroundColor
-// radius : 9
-
-// border {
-// width : Variables.panelBorderWidth
-// color : Colors.panelBorderColor
-// }
-
-// Grid { id: _grid
-// property int cellHeight : parent.height / 10
-// property int cellWidth : parent.width / 3 - ( Variables.defaultMargin ) // subtract columnSpacing
-
-// clip: true
-// anchors.fill: parent
-// anchors.leftMargin: Variables.defaultMargin
-// anchors.rightMargin: Variables.defaultMargin
-
-// flow : Grid.TopToBottom
-// columns : 3
-// rows : _repeater.model.count / columns
-// rowSpacing : 0
-// columnSpacing : Variables.defaultMargin
-
-// Repeater { id: _repeater
-// model : vPostTreatmentAdjustmentTreatmentLog.parametersTitle
-
-// LabelUnitText { id: _container
-// height : _grid.cellHeight
-// width : _grid.cellWidth
-// label : modelData
-// unit : vPostTreatmentAdjustmentTreatmentLog.parametersUnit[index] ?? ""
-// value : "123" // vPostTreatmentAdjustmentTreatmentLog.parametersText[index] ?? ""
-// textAlignment: Text.AlignJustify
-// radius : 0
-// color : Colors.transparent
-// border.width: 0
-
-// Line {
-// anchors.bottom: parent.bottom
-// anchors.left : parent.left
-// anchors.right : parent.right
-// visible: index !== 9 && index !== 19 && index !== 29
-// color: Colors.panelBorderColor
-// }
-// }
-// }
-// }
-// }
-
+ height : _rowCount * ( rowSpacing + itemHeight ) + itemHeight
+ width : parent.width
+ colCount : _colCount
+ rowCount : _rowCount
+ itemWidth : 575
+ rowSpacing : 0
+ colSpacing : 50
+ lineColor : Colors.backgroundMain
+ itemsText : vPostTreatmentAdjustmentTreatmentLog.parametersTitle
+ itemsValue : vPostTreatmentAdjustmentTreatmentLog.parametersText
+ itemsUnit : vPostTreatmentAdjustmentTreatmentLog.parametersUnit
+ itemsValueLeftMargin : 350 // if decreased may be covered by title
+ itemsUnitLeftMargin : 470 // if increased will be covered by chevron if touchable
+ // Note: to make the item touchable
+ // set the touchable: true
+ // and set the index ot the touchable item in the itemsTouchable: [] list to 1
+ // like displayed below.
+ touchable : false
+ // itemsTouchable : [
+ // 0,0,0,0,0,0,0,0,0,0,
+ // 0,0,0,0,0,0,0,0,0,0,
+ // 0,0,0,0,0,0,0,0,0,0,
+ // 0,0,0,0,0,0,0,0,0,0,
+ // ]
+ onItemClicked: _root.itemClicked(vIndex)
+ }
+ }
reasonText : vPostTreatmentAdjustmentTreatmentLog.text()
informationText : vPostTreatmentAdjustmentTreatmentLog.notification
}
-
Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h
===================================================================
diff -u -r627062628b60e4d512ee8830c2dbc23eef02fe28 -r735e9e89a99157992fb1ec6e3f0d2953e564346d
--- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
+++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 735e9e89a99157992fb1ec6e3f0d2953e564346d)
@@ -71,67 +71,7 @@
* | 33 - (F32) | \ref Data::mAverageArterialPressure | Average Arterial Pressure | (mmHg) |
* | 34 - (F32) | \ref Data::mAverageVenousPressure | Average Venous Pressure | (mmHg) |
* | 35 - (U32) | \ref Data::mDeviceID | Device ID | |
- * | 36 - (U32) | \ref Data::mWaterSampleTestResult | Water Sample Test Result | |\
- *
- *
- *
- * | 01 - (U32) | \ref Data::mAccepted
- * | 02 - (U32) | \ref Data::mReason
- * | 03 - (U32) | \ref Data::mBloodFlowRate
- * | 04 - (U32) | \ref Data::mDialysateFlowRate
- * | 05 - (U32) | \ref Data::mTreatmentDuration
- * | 06 - (U32) | \ref Data::mActualTreatmentDuration
- * | 07 - (U32) | \ref Data::mAcidConcentrateType
- * | 08 - (U32) | \ref Data::mBicarbonateConcentrateType
- * | 09 - (U32) | \ref Data::mPotassiumConcentration
- * | 10 - (U32) | \ref Data::mCalciumConcentration
- * | 11 - (U32) | \ref Data::mBicarbonateConcentration
- * | 12 - (U32) | \ref Data::mSodiumConcentration
- * | 13 - (F32) | \ref Data::mDialysateTemperature
- * | 14 - (U32) | \ref Data::mDialyzerType
- * | 15 - (U32) | \ref Data::mTreatmentStartEpoch
- * | 16 - (U32) | \ref Data::mTreatmentEndEpoch
- * | 17 - (F32) | \ref Data::mAverageBloodFlow ******* remove
- * | 18 - (F32) | \ref Data::mAverageDialysateFlow ******* remove
- * | 19 - (F32) | \ref Data::mDialysateVolumeUsed
- * | 20 - (F32) | \ref Data::mAverageDialysateTemp ******* remove
- * | 21 - (F32) | \ref Data::mOriginUFVolume
- * | 22 - (F32) | \ref Data::mTargetUFVolume
- * | 23 - (F32) | \ref Data::mActualUFVolume
- * | 24 - (F32) | \ref Data::mOriginUFRate
- * | 25 - (F32) | \ref Data::mTargetUFRate
- * | 26 - (F32) | \ref Data::mActualUFRate
- * | 27 - (U32) | \ref Data::mFluidBolusVolume
- * | 28 - (F32) | \ref Data::mHeparinBolusVolume
- * | 29 - (F32) | \ref Data::mHeparinDispenseRate
- * | 30 - (U32) | \ref Data::mHeparinDeliveryDuration
- * | 31 - (F32) | \ref Data::mHeparinDeliveredVolume
- * | 32 - (U32) | \ref Data::mHeparinType
- * | 33 - (F32) | \ref Data::mAverageArterialPressure ******* remove
- * | 34 - (F32) | \ref Data::mAverageVenousPressure ******* remove
- * | 35 - (U32) | \ref Data::mPatientID
- * | 36 - (U32) | \ref Data::mSecondaryPatientID
- * | 37 (U32) | \ref Data::mVitalsInterval
- * | 38 (U32) | \ref Data::mTreatmentModality
- * | 39 (U32) | \ref Data::mHDFOperatingMode
- * | 40 (F32) | \ref Data::mOriginSubstitutionRate
- * | 41 (F32) | \ref Data::mTargetSubstitutionRate
- * | 42 (F32) | \ref Data::mActualSubstitutionRate
- * | 43 (F32) | \ref Data::mOriginSubstitutionVolume
- * | 44 (F32) | \ref Data::mTargetSubstitutionVolume
- * | 45 (F32) | \ref Data::mActualSubstitutionVolume
- * | 46 (F32) | \ref Data::mOriginIsoUfRate
- * | 47 (F32) | \ref Data::mTargetIsoUfRate
- * | 48 (F32) | \ref Data::mActualIsoUfRate
- * | 49 (F32) | \ref Data::mOriginIsoUfVolume
- * | 50 (F32) | \ref Data::mTargetIsoUfVolume
- * | 51 (F32) | \ref Data::mActualIsoUfVolume
- * | 52 (F32) | \ref Data::mWaterSampleTestResult
- * | 53 (U32) | \ref Data::mHepatitisStatus
-
-
-
-
+ * | 36 - (U32) | \ref Data::mWaterSampleTestResult | Water Sample Test Result | |
* \sa Data
* \sa MAdjustTreatmentLogReq : TreatmentLog Request
* \sa MTreatmentTreatmentLog : TreatmentLog Data
Index: sources/storage/Settings.cpp
===================================================================
diff -u -rd59edcf7fa2a0f096e22d330012dbaefa4bda374 -r735e9e89a99157992fb1ec6e3f0d2953e564346d
--- sources/storage/Settings.cpp (.../Settings.cpp) (revision d59edcf7fa2a0f096e22d330012dbaefa4bda374)
+++ sources/storage/Settings.cpp (.../Settings.cpp) (revision 735e9e89a99157992fb1ec6e3f0d2953e564346d)
@@ -161,8 +161,7 @@
value = convertToRichText(value);
}
else {
- key = line;
- key = convertToRichText(key);
+ key = convertToRichText(line);
}
_Settings.add(vDetail.category, group, key, QVariant(value), enableDuplicateKey);
// DEBUG: qDebug() << group << key << value << location << category;
Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
===================================================================
diff -u -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a -r735e9e89a99157992fb1ec6e3f0d2953e564346d
--- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a)
+++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 735e9e89a99157992fb1ec6e3f0d2953e564346d)
@@ -37,11 +37,14 @@
ACTION_VIEW_CONNECTION(TreatmentLogAlarmData);
ACTION_VIEW_CONNECTION(TreatmentLogEventData);
-// connect(&_TreatmentLog , &TreatmentLog::didTxCodeReceive,
-// [=](const QString &vTxCode) { txCode( vTxCode ); } );
+ connect(&_TreatmentLog , &TreatmentLog::isIdleNotified,
+ [=](bool vIdle) { isIdle(vIdle); } );
+ connect(&_TreatmentLog , &TreatmentLog::didTxCodeReceive,
+ [=](const QString &vTxCode) { txCode( vTxCode ); } );
+
connect(&_TreatmentLog , &TreatmentLog::didNotification,
- [=](const QString &vNotification) { notification(vNotification); } );
+ [=](const QString &vNotification) { notification(vNotification); } );
}
/*!
@@ -57,6 +60,14 @@
}
/*!
+ * \brief View::VPostTreatmentAdjustmentTreatmentLog::doExport
+ * \details the invocable slot to send user's treatment log export request to the controller
+ */
+void View::VPostTreatmentAdjustmentTreatmentLog::doExport() {
+ _TreatmentLog.doExport();
+}
+
+/*!
* \brief VPostTreatmentAdjustmentUltrafiltrationInit::onActionReceive
* \details received response model data handler
* \param vData - model data
Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h
===================================================================
diff -u -r30406c22bb7c3cc33a6c9e9d791e4e0379eff7c9 -r735e9e89a99157992fb1ec6e3f0d2953e564346d
--- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 30406c22bb7c3cc33a6c9e9d791e4e0379eff7c9)
+++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 735e9e89a99157992fb1ec6e3f0d2953e564346d)
@@ -93,7 +93,7 @@
PROPERTY(QStringList , parametersUnit , _TreatmentLog.units ())
PROPERTY(QStringList , parametersText , {})
- PROPERTY(QString , txCode , "TEST-1231123212")
+ PROPERTY(QString , txCode , "")
PROPERTY(QString , notification , "")
PROPERTY(bool , isIdle , true )
@@ -107,6 +107,7 @@
public slots:
void doRequest ();
+ void doExport ();
signals:
/*!