Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -62,7 +62,6 @@ * - The continue button is enabled upon success so FW can validate the parameter selection * * \sa Model::MAdjustParametersValidationResponse - * \sa Model::MAdjustParametersConfirmReq * \sa Model::MInitTreatmentReq * \sa Model::MConfirmTreatmentReq * \sa Model::MAdjustInitTreatmentResponse @@ -95,6 +94,7 @@ VALUESET(quint32 , rinsebackVolume , 0) VALUESET(quint32 , hepatitusBStatus , 0) VALUESET(quint32 , acidConcentrate , 0) + VALUESET(quint32 , finalConfirmation , 0) VALUESET(float , substitutionFluidVolume , 0) VALUESET(float , heparinBolusVolume , 0) VALUESET(float , heparinDispensingRate , 0) @@ -107,8 +107,6 @@ VALUESET(QString , patientID ,"") VALUESET(bool , parametersValidated , 0) - VALUESET(qint32 , actualRORejectionPercentage , 0) // TODO comes from FP Update Later - PROPERTY(QString , txCode ,"") TRIGGER(quint32 , treatmentModalityRejectReason , 0) @@ -140,20 +138,14 @@ VIEW_DEC_SLOT(AdjustParametersValidationResponseData) VIEW_DEC_SLOT(AdjustSerialNumberTDResponseData) -private: - QString enumToString(GuiRequestReasons vEnum); - signals: void didAdjustment(const AdjustParametersValidationRequestData &data); - void didAdjustment(const AdjustParametersConfirmRequestData &data); void didValidationPass (); public slots: void doValidation (); - void doConfirm (); - void doCancel (); void generateTxCode(); };