Index: sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml =================================================================== diff -u -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) +++ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file PreTreatmentBase.qml - * \author (last) Behrouz NematiPour - * \date (last) 01-Mar-2021 + * \author (last) Vy + * \date (last) 18-May-2023 * \author (original) Behrouz NematiPour - * \date (original) 12-Jan-2021 + * \date (original) 01-Mar-2021 * */ @@ -20,36 +20,22 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/pages" /*! - * \brief the parent page of the pretreatment create screens + * \brief the parent page of the pre-treatment screens */ -ScreenItem { id: _root +TreatmentFlowBase { id: _root objectName: "_PreTreatmentBase" - - property alias reasonText : _notification.text - property alias header : _titleBar - - signal backClicked () - - TitleBarCreateTreatment { id: _titleBar - stepIndex: 0 - anchors.top : parent.top - anchors.horizontalCenter : parent.horizontalCenter - width : parent.width - onBackClicked : { - _root.backClicked(); - } - } - - NotificationBar { id: _notification - iconVisible: false - } - - onVisibleChanged: { - _notification.text = "" - if (visible) { - _mainMenu.hidden = true - } - } + header.stepNames: [ + qsTr("Create" ), + qsTr("Sample" ), + qsTr("Consumables" ), + qsTr("Disposables" ), + qsTr("Prime" ), + qsTr("BP/HR" ), + qsTr("Ultrafiltration" ), + qsTr("Connection" ), + qsTr("Start" ), + ] }