Index: sources/gui/qml/pages/ManagerStack.qml =================================================================== diff -u -r1c25cfb59ad74cc5ad8ee79fed33b3cbf9ba9b30 -rf5805685bfe1d7dcc22799e2fd6a07b8181cd349 --- sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision 1c25cfb59ad74cc5ad8ee79fed33b3cbf9ba9b30) +++ sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision f5805685bfe1d7dcc22799e2fd6a07b8181cd349) @@ -127,7 +127,7 @@ clip: true spacing: Variables.defaultMargin id: _listView - model: _dummy + model: vRxProfiles.rxProfilesList delegate: _rxProfile } } @@ -143,12 +143,12 @@ height: 370 color: Colors.mainTreatmentLighterBlue radius: 5 - required property string name - required property string number - required property int index - required property string param1 - required property string value1 - required property string unit1 + property string name + property string number + property int index + property string param1 + property string value1 + property string unit1 Column { id: _componentColumn @@ -159,7 +159,7 @@ rightMargin: Variables.defaultMargin * 2 } Text { - text: rxItem.name + text: modelData font.pointSize : Fonts.fontPixelButton * 1.4 width: parent.width horizontalAlignment: Text.AlignLeft Index: sources/gui/qml/pages/rxmanager/RxManagerHeader.qml =================================================================== diff -u -r4cba74ae9ca492298bb87edf3b4810e29f2e2e3e -rf5805685bfe1d7dcc22799e2fd6a07b8181cd349 --- sources/gui/qml/pages/rxmanager/RxManagerHeader.qml (.../RxManagerHeader.qml) (revision 4cba74ae9ca492298bb87edf3b4810e29f2e2e3e) +++ sources/gui/qml/pages/rxmanager/RxManagerHeader.qml (.../RxManagerHeader.qml) (revision f5805685bfe1d7dcc22799e2fd6a07b8181cd349) @@ -32,7 +32,7 @@ spacing: Variables.defaultMargin * 2 Text { id : headerText - text : qsTr("Saved Prescriptions (#/10)") + text : qsTr("Saved Prescriptions") + " (" + vRxProfiles.rxProfilesList.length + "/10)" color : Colors.textButton font.pointSize : Fonts.fontPixelButton * 1.4 verticalAlignment : Text.AlignVCenter Index: sources/storage/RxProfiles.h =================================================================== diff -u -r1c25cfb59ad74cc5ad8ee79fed33b3cbf9ba9b30 -rf5805685bfe1d7dcc22799e2fd6a07b8181cd349 --- sources/storage/RxProfiles.h (.../RxProfiles.h) (revision 1c25cfb59ad74cc5ad8ee79fed33b3cbf9ba9b30) +++ sources/storage/RxProfiles.h (.../RxProfiles.h) (revision f5805685bfe1d7dcc22799e2fd6a07b8181cd349) @@ -177,7 +177,6 @@ // void timerEvent(QTimerEvent *) override; public: - void doInitRxProfiles(); void initModel(const QString &vFile); void clearModel() { _values.clear(); @@ -204,6 +203,7 @@ void doSave (const QString &fileName); void doExport (); void doImport (); + void doInitRxProfiles(); signals: void didNotification ( const QString &vNotification ); Index: sources/view/VRxProfiles.cpp =================================================================== diff -u -r1c25cfb59ad74cc5ad8ee79fed33b3cbf9ba9b30 -rf5805685bfe1d7dcc22799e2fd6a07b8181cd349 --- sources/view/VRxProfiles.cpp (.../VRxProfiles.cpp) (revision 1c25cfb59ad74cc5ad8ee79fed33b3cbf9ba9b30) +++ sources/view/VRxProfiles.cpp (.../VRxProfiles.cpp) (revision f5805685bfe1d7dcc22799e2fd6a07b8181cd349) @@ -33,7 +33,7 @@ ADJUST_VIEW_CONNECTION(AdjustParametersValidationRequestData ) ACTION_VIEW_CONNECTION(AdjustParametersValidationResponseData ) ADJUST_VIEW_CONNECTION(AdjustParametersConfirmRequestData ) - connect (this, SIGNAL(didRxProfileList()), &_RxProfilesController, SIGNAL(doInitRxProfiles())); + connect (this, SIGNAL(didRxProfileList()), &_RxProfilesController, SLOT(doInitRxProfiles())); // ACTION_METHOD_BRIDGE_CONNECTION(RxProfileList, _RxProfilesController, QFileInfoList) connect(&_RxProfilesController, SIGNAL(didRxProfileList(QFileInfoList)), this, SLOT(onRxProfileList(QFileInfoList))); @@ -103,6 +103,12 @@ void VRxProfiles::onRxProfileList(const QFileInfoList &vRxProfiles) { qDebug() << "-meow-" << vRxProfiles; + QStringList fileNames; + for (const QFileInfo fileInfo:vRxProfiles){ + fileNames << fileInfo.baseName().replace("_", " "); + } + rxProfilesList(fileNames); + qDebug() << _rxProfilesList; } /** Index: sources/view/VRxProfiles.h =================================================================== diff -u -r1c25cfb59ad74cc5ad8ee79fed33b3cbf9ba9b30 -rf5805685bfe1d7dcc22799e2fd6a07b8181cd349 --- sources/view/VRxProfiles.h (.../VRxProfiles.h) (revision 1c25cfb59ad74cc5ad8ee79fed33b3cbf9ba9b30) +++ sources/view/VRxProfiles.h (.../VRxProfiles.h) (revision f5805685bfe1d7dcc22799e2fd6a07b8181cd349) @@ -45,6 +45,8 @@ // friends friend class::tst_views; + PROPERTY(QStringList , rxProfilesList , {}) + PROPERTY(bool , heparinDispensingRateOff , true) PROPERTY(bool , heparinBolusVolumeOff , true)