Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rf77d1595d633632cdedc5095a0cac07a7cca1251 -r8f8fc462e36e2ea9fbd236b86aaab5f048c17509 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 8f8fc462e36e2ea9fbd236b86aaab5f048c17509) @@ -669,8 +669,8 @@ /*! * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Disconnection Notification Adjustment Denali message. - * \param vData - Data model contains Patient Disconnection Confirm adjustment. + * \details This method transmits the Patient Disconnection Notify Adjustment Denali message. + * \param vData - Data model contains Patient Disconnection Notify adjustment. * \return void */ void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionNotifyRequestData &) @@ -681,6 +681,18 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Patient Disconnection Confirm Adjustment Denali message. + * \param vData - Data model contains Patient Disconnection Confirm adjustment. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionConfirmRequestData &) +{ + QVariantList mData; + onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectionConfirmReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. * \param vData - Data model contains Disposables Removal Confirm adjustment. * \return void Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -rf77d1595d633632cdedc5095a0cac07a7cca1251 -r8f8fc462e36e2ea9fbd236b86aaab5f048c17509 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 8f8fc462e36e2ea9fbd236b86aaab5f048c17509) @@ -145,6 +145,7 @@ GuiActionType::ID_AdjustTreatmentEndReq , // Post-Treatment GuiActionType::ID_AdjustPatientDisconnectionNotifyReq , + GuiActionType::ID_AdjustPatientDisconnectionConfirmReq , GuiActionType::ID_AdjustDisposablesRemovalConfirmReq , // Disinfect GuiActionType::ID_AdjustDisinfectModeReq , Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rf77d1595d633632cdedc5095a0cac07a7cca1251 -r8f8fc462e36e2ea9fbd236b86aaab5f048c17509 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 8f8fc462e36e2ea9fbd236b86aaab5f048c17509) @@ -210,6 +210,8 @@ // ---- Post-Treatment // ---- Patient Disconnect {Gui::GuiActionType::ID_AdjustPatientDisconnectionNotifyReq , 0 * 4 }, // 0 parameter + {Gui::GuiActionType::ID_AdjustPatientDisconnectionConfirmReq , 0 * 4 }, // 0 parameter + {Gui::GuiActionType::ID_AdjustPatientDisconnectionConfirmRsp , 2 * 4 }, // 2 parameter each 4bytes // ---- Disposables Removal {Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq , 0 * 4 }, // 0 parameter Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rf77d1595d633632cdedc5095a0cac07a7cca1251 -r8f8fc462e36e2ea9fbd236b86aaab5f048c17509 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 8f8fc462e36e2ea9fbd236b86aaab5f048c17509) @@ -266,6 +266,7 @@ case Gui::GuiActionType::ID_AdjustTreatmentEndReq : INTERPRET_TRANSMIT_MESSAGE(AdjustTreatmentEndRequestData ); break; // Post-Treatment case Gui::GuiActionType::ID_AdjustPatientDisconnectionNotifyReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionNotifyRequestData ); break; + case Gui::GuiActionType::ID_AdjustPatientDisconnectionConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionConfirmRequestData ); break; case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesRemovalConfirmRequestData ); break; case Gui::GuiActionType::ID_AdjustTreatmentLogReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentLogRequestData ); break; // Disinfection Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rf77d1595d633632cdedc5095a0cac07a7cca1251 -r8f8fc462e36e2ea9fbd236b86aaab5f048c17509 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 8f8fc462e36e2ea9fbd236b86aaab5f048c17509) @@ -253,6 +253,8 @@ // Post-Treatment // Patient Disconnect ID_AdjustPatientDisconnectionNotifyReq = 0x4A00, // 74 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + ID_AdjustPatientDisconnectionConfirmReq = 0x0600, // 6 + ID_AdjustPatientDisconnectionConfirmRsp = 0x7E00, // 126 // Disposables Removal ID_AdjustDisposablesRemovalConfirmReq = 0x7300, // 115 Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r1d3e80dd50bfe08502c8e52de126a2b809370211 -r8f8fc462e36e2ea9fbd236b86aaab5f048c17509 --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 1d3e80dd50bfe08502c8e52de126a2b809370211) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 8f8fc462e36e2ea9fbd236b86aaab5f048c17509) @@ -35,10 +35,11 @@ signal disposablesRemovalConfirm () signal disposablesRemovalBack () - onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm( ) + onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doNotify ( ) /* No wait for Rsp, so navigates => */ page( _treatmentReviewConfirm ) /* After navigation ask for Tx data */ vPostTreatmentAdjustmentTreatmentLog .doRequest( )} - onTreatmentReviewConfirm : page( _disposablesRemovalConfirm ) + onTreatmentReviewConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm( )} + // page( _disposablesRemovalConfirm ) onDisposablesRemovalConfirm : vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( ) onDisposablesRemovalBack : page( _treatmentReviewConfirm ) onVisibleChanged: { Index: sources/model/MModel.h =================================================================== diff -u -rf77d1595d633632cdedc5095a0cac07a7cca1251 -r8f8fc462e36e2ea9fbd236b86aaab5f048c17509 --- sources/model/MModel.h (.../MModel.h) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) +++ sources/model/MModel.h (.../MModel.h) (revision 8f8fc462e36e2ea9fbd236b86aaab5f048c17509) @@ -360,6 +360,7 @@ /* Request */ \ /* Post-Treatment */ \ REGISTER_METATYPE( AdjustPatientDisconnectionNotifyRequestData ) \ + REGISTER_METATYPE( AdjustPatientDisconnectionConfirmRequestData ) \ REGISTER_METATYPE( AdjustDisposablesRemovalConfirmRequestData ) \ REGISTER_METATYPE( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ @@ -612,6 +613,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionNotifyRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesRemovalConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ @@ -781,6 +783,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientDisconnectionNotifyRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientDisconnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisposablesRemovalConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ @@ -838,6 +841,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientDisconnectionNotifyRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientDisconnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisposablesRemovalConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ @@ -895,6 +899,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientDisconnectionNotifyRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientDisconnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisposablesRemovalConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h =================================================================== diff -u -rf77d1595d633632cdedc5095a0cac07a7cca1251 -r8f8fc462e36e2ea9fbd236b86aaab5f048c17509 --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h (.../MPostTreatmentAdjustRequests.h) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h (.../MPostTreatmentAdjustRequests.h) (revision 8f8fc462e36e2ea9fbd236b86aaab5f048c17509) @@ -39,7 +39,7 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:| - * |0x4A00| 0x100 | 9 | Req | Y | UI | HD | Patient Connection Begin Request | + * |0x4A00| 0x100 | 9 | Req | Y | UI | HD | Patient Disconnection Notify Request | * * | Payload || * | || @@ -48,18 +48,38 @@ */ class MAdjustPatientDisconnectionNotifyReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("PatientDisconnectionNotify", vParameters); } }; /*! + * \brief The MAdjustPatientDisconnectionConfirmReq class + * \details The model to Confirm Patient Disconnection + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * |0x0600| 0x100 | Req | Y | UI | HD | Patient Disconnection Confirm Request | + * + * | Payload || + * | || + * | None || + * + */ +class MAdjustPatientDisconnectionConfirmReq : public MModel { +public: + QString toString() { + return toString({}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("PatientDisconnectionConfirm", vParameters); + } +}; + +/*! * \brief The MAdjustDisposablesRemovalConfirmReq class * \details The model to Confirm Disposables Removal * @@ -74,12 +94,9 @@ */ class MAdjustDisposablesRemovalConfirmReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("DisposablesRemovalConfirm", vParameters); } @@ -100,19 +117,17 @@ */ class MAdjustTreatmentLogReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("TreatmentLog", vParameters); } }; } -typedef Model:: MAdjustPatientDisconnectionNotifyReq AdjustPatientDisconnectionNotifyRequestData; +typedef Model:: MAdjustPatientDisconnectionNotifyReq AdjustPatientDisconnectionNotifyRequestData; +typedef Model:: MAdjustPatientDisconnectionConfirmReq AdjustPatientDisconnectionConfirmRequestData; typedef Model:: MAdjustDisposablesRemovalConfirmReq AdjustDisposablesRemovalConfirmRequestData; typedef Model:: MAdjustTreatmentLogReq AdjustTreatmentLogRequestData; Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp =================================================================== diff -u -rf77d1595d633632cdedc5095a0cac07a7cca1251 -r8f8fc462e36e2ea9fbd236b86aaab5f048c17509 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp (.../VPostTreatmentAdjustPatientDisconnectionConfirm.cpp) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp (.../VPostTreatmentAdjustPatientDisconnectionConfirm.cpp) (revision 8f8fc462e36e2ea9fbd236b86aaab5f048c17509) @@ -23,14 +23,24 @@ \details All the class signal/slot connections are defined here. */ void View::VPostTreatmentAdjustmentPatientDisconnectionConfirm::initConnections() { - ADJUST_VIEW_CONNECTION(AdjustPatientDisconnectionNotifyRequestData); + ADJUST_VIEW_CONNECTION( AdjustPatientDisconnectionNotifyRequestData); + ADJUST_VIEW_CONNECTION(AdjustPatientDisconnectionConfirmRequestData); } /*! + * \brief View::VPostTreatmentAdjustmentPatientDisconnectionConfirm::doNotify + * \details the invocable slot to send user's Patient Disconnection notify + */ +void View::VPostTreatmentAdjustmentPatientDisconnectionConfirm::doNotify() { + AdjustPatientDisconnectionNotifyRequestData data; + emit didAdjustment(data); +} + +/*! * \brief View::VPostTreatmentAdjustmentPatientDisconnectionConfirm::doConfirm * \details the invocable slot to send user's Patient Disconnection confirm */ void View::VPostTreatmentAdjustmentPatientDisconnectionConfirm::doConfirm() { - AdjustPatientDisconnectionNotifyRequestData data; + AdjustPatientDisconnectionConfirmRequestData data; emit didAdjustment(data); } Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h =================================================================== diff -u -rf77d1595d633632cdedc5095a0cac07a7cca1251 -r8f8fc462e36e2ea9fbd236b86aaab5f048c17509 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h (.../VPostTreatmentAdjustPatientDisconnectionConfirm.h) (revision f77d1595d633632cdedc5095a0cac07a7cca1251) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h (.../VPostTreatmentAdjustPatientDisconnectionConfirm.h) (revision 8f8fc462e36e2ea9fbd236b86aaab5f048c17509) @@ -46,6 +46,7 @@ VIEW_DEC_CLASS(VPostTreatmentAdjustmentPatientDisconnectionConfirm) public slots: + void doNotify (); void doConfirm(); signals: @@ -54,6 +55,7 @@ * \details the notification signal to send the user's Patient Disconnection confirm * \param vData - data model includes request information */ - void didAdjustment(const AdjustPatientDisconnectionNotifyRequestData &vData); + void didAdjustment(const AdjustPatientDisconnectionNotifyRequestData &vData); + void didAdjustment(const AdjustPatientDisconnectionConfirmRequestData &vData); }; }