Index: sources/view/td/data/VTreatmentRanges.cpp
===================================================================
diff -u -r863906f104a18dbe6020b939b739214679d49d8a -raf80aaa1c114eab78444e973c86b3c42dd85ef52
--- sources/view/td/data/VTreatmentRanges.cpp	(.../VTreatmentRanges.cpp)	(revision 863906f104a18dbe6020b939b739214679d49d8a)
+++ sources/view/td/data/VTreatmentRanges.cpp	(.../VTreatmentRanges.cpp)	(revision af80aaa1c114eab78444e973c86b3c42dd85ef52)
@@ -28,6 +28,11 @@
     ACTION_VIEW_CONNECTION(SettingsData);
     ACTION_VIEW_CONNECTION(InstitutionalRecordResponseData);
 
+    _acidConcentrateModel.setRoleNames( {
+                                        { eRole_Key     , "key"     },
+                                        { eRole_Value   , "value"   },
+                                     });
+
     // since we do not have access to this object because it is created in QML.
     // Connection to the GuiController made here
     // It should be defined in the class which wants to connect to signal.
@@ -237,16 +242,26 @@
     FROMVARIANT_WITHRETURN              ( salineBolusVolumeMax              , "Saline Bolus Volume Ranges"              , "Saline_Bolus_Volume_Max"             , UInt  , isConfigsOk );
     FROMVARIANT_WITHRETURN              ( salineBolusVolumeRes              , "Saline Bolus Volume Ranges"              , "Saline_Bolus_Volume_Res"             , UInt  , isConfigsOk );
 
-    heparinTypeOptions                  ( _Settings.keys(mCategory          , "Heparin Type Options"                                                                                 ));
-    acidConcentrateOptions              ( _Settings.keys(mCategory          , "Acid Concentrate Options"                                                                             ));
-    bicarbonateConcentrateOptions       ( _Settings.keys(mCategory          , "Bicarbonate Concentrate Options"                                                                      ));
-    dialyzerTypeOptions                 ( _Settings.keys(mCategory          , "Dialyzer Type Options"                                                                                ));
-    bloodPressureMeasureInterval        ( _Settings.keys(mCategory          , "Vitals Measurement Interval Options"                                                                  ));
-    treatmentModalityOptions            ( _Settings.keys(mCategory          , "Treatment Modality"                                                                                   ));
-    hdfTreatmentModeOptions             ( _Settings.keys(mCategory          , "HDF Treatment Mode"                                                                                   ));
-    dryBicabCartridgeSizeOptions        ( _Settings.keys(mCategory          , "Dry Bicarb Cartridge Size"                                                                            ));
-    waterSampleTestResultRequired       ( _Settings.keys(mCategory          , "Water Sample Test Result Required"                                                                    ));
+    heparinTypeOptions                  ( _Settings.keys(mCategory          , "Heparin Type Options"                                                                                    ));
+    bicarbonateConcentrateOptions       ( _Settings.keys(mCategory          , "Bicarbonate Concentrate Options"                                                                         ));
+    dialyzerTypeOptions                 ( _Settings.keys(mCategory          , "Dialyzer Type Options"                                                                                   ));
+    bloodPressureMeasureInterval        ( _Settings.keys(mCategory          , "Vitals Measurement Interval Options"                                                                     ));
+    treatmentModalityOptions            ( _Settings.keys(mCategory          , "Treatment Modality"                                                                                      ));
+    hdfTreatmentModeOptions             ( _Settings.keys(mCategory          , "HDF Treatment Mode"                                                                                      ));
+    dryBicabCartridgeSizeOptions        ( _Settings.keys(mCategory          , "Dry Bicarb Cartridge Size"                                                                               ));
+    waterSampleTestResultRequired       ( _Settings.keys(mCategory          , "Water Sample Test Result Required"                                                                       ));
+    hepatitisStatus                     ( _Settings.keys(mCategory          , "Hepatitis Status"                                                                                        ));
+    QStringList mAcidConcentrateKeys    = _Settings.keys(mCategory          , "Acid Concentrate Options"                                                                                );
+    QVariantList mAcidConcentrateValues = _Settings.values(mCategory        , "Acid Concentrate Options"                                                                                );
 
+    for (int i = 0; i < mAcidConcentrateKeys.size(); ++i) {
+        bool ok = false;
+        _acidConcentrateModel.insertRow( i, {{  eRole_Key, mAcidConcentrateKeys[i]},  { eRole_Value, mAcidConcentrateValues[i].toFloat(&ok) }});
+        isConfigsOk = isConfigsOk && ok;
+    }
+
+    acidConcentrateOptions (_acidConcentrateModel.getAllRoles(eRole_Key));
+
     isConfigsOk = isConfigsOk && !_heparinTypeOptions           .isEmpty();
     if ( _heparinTypeOptions.isEmpty() ) { heparinTypeOptions({"-- --"}); }
     isConfigsOk = isConfigsOk && !_acidConcentrateOptions       .isEmpty();
@@ -257,6 +272,7 @@
     isConfigsOk = isConfigsOk && !_hdfTreatmentModeOptions      .isEmpty();
     isConfigsOk = isConfigsOk && !_dryBicabCartridgeSizeOptions .isEmpty();
     isConfigsOk = isConfigsOk && !_waterSampleTestResultRequired.isEmpty();
+    isConfigsOk = isConfigsOk && !_hepatitisStatus              .isEmpty();
 
     vitalsInterval(_bloodPressureMeasureInterval.indexOf(_vitalsDef));
 
@@ -360,5 +376,15 @@
     FROMVARIANT_WITHRETURN              ( isolatedUFDurationMax             , "Isolated UF Duration Ranges"             , "Isolated_UF_Duration_Max"            , UInt  , isConfigsOk );
     FROMVARIANT_WITHRETURN              ( isolatedUFDurationRes             , "Isolated UF Duration Ranges"             , "Isolated_UF_Duration_Res"            , UInt  , isConfigsOk );
 
+    FROMVARIANT_WITHRETURN              ( weightDef                         , "Weight Ranges"                           , "Weight_Def"                          , Float , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( weightMin                         , "Weight Ranges"                           , "Weight_Min"                          , Float , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( weightMax                         , "Weight Ranges"                           , "Weight_Max"                          , Float , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( weightRes                         , "Weight Ranges"                           , "Weight_Res"                          , Float , isConfigsOk );
+
+    FROMVARIANT_WITHRETURN              ( primeDiscardVolumeDef             , "Prime Discard Volume Ranges"             , "Prime_Discard_Volume_Def"            , UInt , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( primeDiscardVolumeMin             , "Prime Discard Volume Ranges"             , "Prime_Discard_Volume_Min"            , UInt , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( primeDiscardVolumeMax             , "Prime Discard Volume Ranges"             , "Prime_Discard_Volume_Max"            , UInt , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( primeDiscardVolumeRes             , "Prime Discard Volume Ranges"             , "Prime_Discard_Volume_Res"            , UInt , isConfigsOk );
+
     emit didTreatmentRangesDone( isConfigsOk );
 }