Skip to content
Snippets Groups Projects
Commit b3e11c29 authored by Dmitri Calugari's avatar Dmitri Calugari
Browse files

Fixed hw version updating by type selection.

parent 71574604
No related merge requests found
......@@ -51,5 +51,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.5.0")]
[assembly: AssemblyFileVersion("1.2.5.0")]
[assembly: AssemblyVersion("1.2.5.1")]
[assembly: AssemblyFileVersion("1.2.5.1")]
......@@ -23,7 +23,7 @@ namespace Sensors_Production_Tool.ViewModel
Types.Add(eType.PTS500);
Types.Add(eType.IAC500);
Types.Add(eType.FO510);
Types.Add(eType.FO510);
Types.Add(eType.FL510);
Types.Add(eType.OC500);
Types.Add(eType.OCPCB);
......@@ -133,6 +133,7 @@ namespace Sensors_Production_Tool.ViewModel
private void Type_ComboBox_Selected()
{
update_settings();
init_hwVersions();
}
private void Version_ComboBox_SelectionChanged()
......@@ -176,6 +177,16 @@ namespace Sensors_Production_Tool.ViewModel
}
}
private void init_hwVersions()
{
using (Sensor_Database.DataBaseController dbc = new Sensor_Database.DataBaseController(_settings.SensorDB.SqlServer, _settings.SensorDB.SqlServerPort, _settings.SensorDB.SqlDataBaseName, _settings.SensorDB.SqlUserName, _settings.SensorDB.SqlPassword))
{
init_SensorHwVersions(_settings.SelectedSensorHwVersionID, dbc);
}
}
private void init_SensorExtremes(int restoredId, Sensor_Database.DataBaseController dbc)
{
SensorExtremes.Clear();
......@@ -206,13 +217,13 @@ namespace Sensors_Production_Tool.ViewModel
foreach (Sensor_Database.hwversion item in Sensor_Database.hwversion.GetHW_Versions(dbc))
{
if(item.Type == _settings.SelectedType.ToDescription())
if (item.Type == _settings.SelectedType.ToDescription())
{
SensorHwVersions.Add(new HwVersionModel() { ID = item.idHwVersion, Name = item.Name + "(" + ((DateTime)item.Date).ToShortDateString() + ")" });
}
}
Settings.SelectedSensorHwVersionID = restoredId;
//Settings.SelectedSensorHwVersionID = restoredId;
}
private void init_SensorTesters(int restoredId, Sensor_Database.DataBaseController dbc)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment