wesley/feanor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Wesley Hofman
2025-08-29 17:28:56 +02:00
parent 6a44bd4fd2
commit 07753f3984
26 changed files with 220 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Feanor ServerCopy/FeanorClient.exe
View File

Binary file not shown.

BIN
Feanor ServerCopy/FeanorConfig.exe
View File

Binary file not shown.

BIN
Feanor ServerCopy/FeanorProjects.exe
View File

Binary file not shown.

BIN
Feanor ServerCopy/HalCheck.exe
View File

Binary file not shown.

BIN
Feanor ServerCopy/HalCheck.exe - Snelkoppeling.lnk
View File

Binary file not shown.

BIN
Feanor ServerCopy/MIDSComm.dll
View File

Binary file not shown.

BIN
Feanor ServerCopy/Maser.Feanor.Biz.dll
View File

Binary file not shown.

2
Feanor ServerCopy/Maser.Feanor.Biz.dll.config
View File

@@ -3,6 +3,6 @@
<configSections>
</configSections>
<connectionStrings>
<add name="Maser.Feanor.Biz.Properties.Settings.FeanorConnStr" connectionString="Data Source=.\FEANOR; Initial Catalog = FEANOR; Persist Security Info=True; User ID = sa; Password=resam; connection timeout=15" providerName="System.Data.SqlClient"/>
<add name="Maser.Feanor.Biz.Properties.Settings.FeanorConnStr" connectionString="Data Source=.\FEANOR; Initial Catalog = FEANOR; Persist Security Info=True; User ID = sa; Password=resam@123resam; connection timeout=15" providerName="System.Data.SqlClient"/>
</connectionStrings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>

BIN
Feanor ServerCopy/Maser.Feanor.dll
View File

Binary file not shown.

BIN
Feanor ServerCopy/Server.dll
View File

Binary file not shown.

BIN
Feanor ServerCopy/musl-x64/libHarfBuzzSharp.so Normal file
View File

Binary file not shown.

BIN
Feanor ServerCopy/musl-x64/libSkiaSharp.so Normal file
View File

Binary file not shown.

17
FeanorConfig/Manager.cs
View File

@@ -838,8 +838,7 @@ namespace FeanorConfig
groupBox1.Visible = true;
//SqlConnection connection = new SqlConnection("Data Source=tcp:192.168.0.241\\FEANOR,1434; Initial Catalog = FEANOR; Persist Security Info=True; User " +"ID = sa; Password= ; connection timeout=15");
SqlConnection connection = new SqlConnection("Data Source=tcp:192.168.0.241,1434; Initial Catalog = FEANOR; Persist Security Info=True; User " +
"ID = sa; Password=resam; connection timeout=15; TrustServerCertificate=True");
SqlConnection connection = new SqlConnection("Data Source=tcp:10.126.21.47\\FEANOR,1434; Initial Catalog=FEANOR; User ID=sa; Password=resam@123resam; timeout=15; Persist Security Info=True; TrustServerCertificate=True");
DateTime st;
try
@@ -861,15 +860,14 @@ namespace FeanorConfig
}
txtbBackupFile.Text = "C:\\FeanorDB_Backup\\CMS2backup (period " + st.ToString("yyyy dd MM") + " to " + DateTime.Now.ToString("yyyy dd MM") + ").bak";
txtbBackupFileCopy.Text = @"\\silicium\projects\2020\P201339\sub1\4. Software\6. CMS2_Database_Backup\CMS2backup (period " + st.ToString("yyyy dd MM") + " to " + DateTime.Now.ToString("yyyy dd MM") + ").bak";
txtbBackupFileCopy.Text = @"Z:\projects\2020\P201339\sub1\4. Software\6. CMS2_Database_Backup\CMS2backup (period " + st.ToString("yyyy dd MM") + " to " + DateTime.Now.ToString("yyyy dd MM") + ").bak";
}
private void btnDatabaseBackup_Click(object sender, EventArgs e)
{
SqlConnection myConnection = new SqlConnection("Data Source=tcp:192.168.0.241,1434; Initial Catalog = FEANOR; Persist Security Info=True; User " +
"ID = sa; Password=resam; connection timeout=15; TrustServerCertificate=True");
SqlConnection myConnection = new SqlConnection("Data Source=tcp:10.126.21.47\\FEANOR,1434; Initial Catalog=FEANOR; User ID=sa; Password=resam@123resam; timeout=15; Persist Security Info=True; TrustServerCertificate=True");
while (File.Exists(txtbBackupFile.Text) == false)
{
@@ -984,8 +982,7 @@ namespace FeanorConfig
DialogResult dialogResult = MessageBox.Show("Are you sure you want to delete Database results older than 1 year?", "Delete Results", MessageBoxButtons.YesNo);
if (dialogResult == DialogResult.Yes)
{
SqlConnection myConnection = new SqlConnection("Data Source=tcp:192.168.0.241,1434; Initial Catalog = FEANOR; Persist Security Info=True; User " +
"ID = sa; Password=resam; connection timeout=15; TrustServerCertificate=True");
SqlConnection myConnection = new SqlConnection("Data Source=tcp:10.126.21.47\\FEANOR,1434; Initial Catalog=FEANOR; User ID=sa; Password=resam@123resam; timeout=15; Persist Security Info=True; TrustServerCertificate=True");
try
{
@@ -1019,8 +1016,7 @@ namespace FeanorConfig
DialogResult dialogResult = MessageBox.Show("Are you sure you want to delete Database results older than half a year?", "Delete Results", MessageBoxButtons.YesNo);
if (dialogResult == DialogResult.Yes)
{
SqlConnection myConnection = new SqlConnection("Data Source=tcp:192.168.0.241,1434; Initial Catalog = FEANOR; Persist Security Info=True; User " +
"ID = sa; Password=resam; connection timeout=15; TrustServerCertificate=True");
SqlConnection myConnection = new SqlConnection("Data Source=tcp:10.126.21.47\\FEANOR,1434; Initial Catalog=FEANOR; User ID=sa; Password=resam@123resam; timeout=15; Persist Security Info=True; TrustServerCertificate=True");
try
{
@@ -1053,8 +1049,7 @@ namespace FeanorConfig
DialogResult dialogResult = MessageBox.Show("Are you sure you want to delete Database results older than 2 years?", "Delete Results", MessageBoxButtons.YesNo);
if (dialogResult == DialogResult.Yes)
{
SqlConnection myConnection = new SqlConnection("Data Source=tcp:192.168.0.241,1434; Initial Catalog = FEANOR; Persist Security Info=True; User " +
"ID = sa; Password=resam; connection timeout=15; TrustServerCertificate=True");
SqlConnection myConnection = new SqlConnection("Data Source=tcp:10.126.21.47\\FEANOR,1434; Initial Catalog=FEANOR; User ID=sa; Password=resam@123resam; timeout=15; Persist Security Info=True; TrustServerCertificate=True");
try
{

2
FeanorProjects/FeanorProjects.Designer.cs generated
View File

@@ -1631,9 +1631,9 @@
this.BackColor = System.Drawing.Color.DimGray;
this.ClientSize = new System.Drawing.Size(1452, 1013);
this.Controls.Add(this.pnlViewProjects);
this.Controls.Add(this.pnlExport);
this.Controls.Add(this.pnlNewProject);
this.Controls.Add(this.menu);
this.Controls.Add(this.pnlExport);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menu;
this.Name = "FeanorProjects";

61
FeanorProjects/FeanorProjects.cs
View File

@@ -43,13 +43,28 @@ namespace FeanorProjects
public FeanorProjects()
{
try
{
using (SqlConnection connection = new SqlConnection("Data Source=tcp:10.126.21.47\\FEANOR,1434; Initial Catalog=FEANOR; User ID=sa; Password=resam@123resam; timeout=15; Persist Security Info=True; TrustServerCertificate=True"))
{
connection.Open();
Console.WriteLine("Succesvolle verbinding!");
}
}
catch (Exception ex)
{
Console.WriteLine("Fout bij verbinden: " + ex.Message);
}
InitializeComponent();
try
{
string hostName = Dns.GetHostName(); // retrieve host name
Console.WriteLine(hostName);
if (hostName != "MASER-02874") // only show NodeStatus button for CMS2 PC
if (hostName != "MEEU010LAB00003") // only show NodeStatus button for CMS2 PC
CMS2PC = false;
}
@@ -669,9 +684,9 @@ namespace FeanorProjects
{
Console.WriteLine("Calibration");
Console.WriteLine(String.Format("\\\\silicium\\inventory\\{0:00000}\\calibration\\{1}.{2} calibration", Int32.Parse(devID), project, sub));
Console.WriteLine(String.Format("Z:\\inventory\\{0:00000}\\calibration\\{1}.{2} calibration", Int32.Parse(devID), project, sub));
if (!Directory.Exists(String.Format("\\\\silicium\\inventory\\{0:00000}\\calibration", Int32.Parse(devID), project, project, sub)))
if (!Directory.Exists(String.Format("Z:\\inventory\\{0:00000}\\calibration", Int32.Parse(devID), project, project, sub)))
{
DialogResult dr_path = MessageBox.Show("The inventory project folder is not found.\nAre you sure the project information is correct?", "New project", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Warning);
if (dr_path != DialogResult.Yes)
@@ -683,10 +698,10 @@ namespace FeanorProjects
else // service project
{
Console.WriteLine("Service");
Console.WriteLine(String.Format("\\\\silicium\\inventory\\{0:00000}\\service", Int32.Parse(devID), project, sub));
Console.WriteLine(String.Format("Z:\\inventory\\{0:00000}\\service", Int32.Parse(devID), project, sub));
if (!Directory.Exists(String.Format("\\\\silicium\\inventory\\{0:00000}\\service", Int32.Parse(devID), project, sub)))
if (!Directory.Exists(String.Format("Z:\\inventory\\{0:00000}\\service", Int32.Parse(devID), project, sub)))
{
DialogResult dr_path = MessageBox.Show("The inventory project folder is not found.\nAre you sure the project information is correct?", "New project", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Warning);
if (dr_path != DialogResult.Yes)
@@ -702,10 +717,10 @@ namespace FeanorProjects
Console.WriteLine("Check directory for Project (P)");
// Check if map exists on server, if not is project info ok?
Int32 Year = (Int32)Math.Floor((double)project / 10000) + 2000;
Console.WriteLine((String.Format("\\\\silicium\\projects\\{0}\\P{1:00000}\\sub{2}", Year, project, sub)));
if (!Directory.Exists(String.Format("\\\\silicium\\projects\\{0}\\P{1:00000}\\sub{2}",Year, project, sub)))
Console.WriteLine((String.Format("Z:\\projects\\{0}\\P{1:00000}\\sub{2}", Year, project, sub)));
if (!Directory.Exists(String.Format("Z:\\projects\\{0}\\P{1:00000}\\sub{2}",Year, project, sub)))
{
DialogResult dr_path = MessageBox.Show("The inventory project folder is not found.\nAre you sure the project information is correct?", "New project", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Warning);
DialogResult dr_path = MessageBox.Show("The project folder is not found.\nAre you sure the project information is correct?", "New project", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Warning);
if (dr_path != DialogResult.Yes)
{
return;
@@ -1065,13 +1080,13 @@ namespace FeanorProjects
{
string devID = SelectedProject.ProjectID.ToString();
devID = devID.Substring(2);
System.Diagnostics.Process.Start(String.Format("\\\\silicium\\inventory\\{0:00000}\\service", Int32.Parse(devID)));
System.Diagnostics.Process.Start(String.Format("Z:\\inventory\\{0:00000}\\service", Int32.Parse(devID)));
}
else
{
string devID = SelectedProject.ProjectID.ToString();
devID = devID.Substring(2);
System.Diagnostics.Process.Start(String.Format("\\\\silicium\\inventory\\{0:00000}\\calibration", Int32.Parse(devID)));
System.Diagnostics.Process.Start(String.Format("Z:\\inventory\\{0:00000}\\calibration", Int32.Parse(devID)));
}
}
@@ -1269,8 +1284,9 @@ namespace FeanorProjects
{
if (_SensorsContent[i].Type == SensorType.Voltage)
{
SqlConnection connection = new SqlConnection("Data Source=tcp:192.168.0.241,1434; Initial Catalog = FEANOR; Persist Security Info=True; User " +
"ID = sa; Password=resam; connection timeout=15; TrustServerCertificate=True");
//SqlConnection connection = new SqlConnection("Data Source=MEEU010LAB00003\\FEANOR; Initial Catalog = FEANOR; Persist Security Info=True; User " +
//"ID = sa; Password=resam@123resam; connection timeout=15; TrustServerCertificate=True");
SqlConnection connection = new SqlConnection("Data Source=tcp:10.126.21.47\\FEANOR,1434; Initial Catalog=FEANOR; User ID=sa; Password=resam@123resam; timeout=15; Persist Security Info=True; TrustServerCertificate=True");
try
{
@@ -1343,15 +1359,15 @@ namespace FeanorProjects
if (project.SubProjectDescription == "Calibration" || project.SubProjectDescription == "calibration")
{
Console.WriteLine("Calibration");
Console.WriteLine(String.Format("\\\\silicium\\inventory\\{0:00000}\\calibration\\I{1}.{2} calibration", Int32.Parse(devID), project.ProjectID, project.SubProject));
txtbExportPath.Text = String.Format("\\\\silicium\\inventory\\{0:00000}\\calibration\\I{1}.{2} calibration", Int32.Parse(devID), project.ProjectID, project.SubProject);
Console.WriteLine(String.Format("Z:\\inventory\\{0:00000}\\calibration\\I{1}.{2} calibration", Int32.Parse(devID), project.ProjectID, project.SubProject));
txtbExportPath.Text = String.Format("Z:\\inventory\\{0:00000}\\calibration\\I{1}.{2} calibration", Int32.Parse(devID), project.ProjectID, project.SubProject);
txtbFilename.Text = String.Format("I{0}.{1} step {2} calibration.csv",project.ProjectID, project.SubProject, project.Step);
}
else if (project.SubProjectDescription == "Service" || project.SubProjectDescription == "service")
{
Console.WriteLine("Service");
Console.WriteLine(String.Format("\\\\silicium\\inventory\\{0:00000}\\service\\I{1}.{2} service", Int32.Parse(devID), project.ProjectID, project.SubProject));
txtbExportPath.Text = String.Format("\\\\silicium\\inventory\\{0:00000}\\service\\I{1}.{2} service", Int32.Parse(devID), project.ProjectID, project.SubProject);
Console.WriteLine(String.Format("Z:\\inventory\\{0:00000}\\service\\I{1}.{2} service", Int32.Parse(devID), project.ProjectID, project.SubProject));
txtbExportPath.Text = String.Format("Z:\\inventory\\{0:00000}\\service\\I{1}.{2} service", Int32.Parse(devID), project.ProjectID, project.SubProject);
txtbFilename.Text = String.Format("I{0}.{1} step {2} service.csv", project.ProjectID, project.SubProject, project.Step);
}
}
@@ -1609,7 +1625,7 @@ namespace FeanorProjects
private void btnExportPath_Click(object sender, EventArgs e)
{
string folder = String.Format("\\\\silicium\\projects\\{0}", DateTime.Now.Year);
string folder = String.Format("Z:\\projects\\{0}", DateTime.Now.Year);
if (Directory.Exists(folder))
FolderBrowserDialog.SelectedPath = folder;
@@ -1789,7 +1805,7 @@ namespace FeanorProjects
try
{
Project project = SelectedProject;
String target = "https://mids.maser.nl/legacy/index.php?section=projects&subsection=subprojects&action=view&action=view&id=";
String target = "https://mids.itiz-me-eu.local/legacy/index.php?section=projects&subsection=subprojects&action=view&action=view&id=";
Int32 MIDStableID = MIDSinterface.SubINVProjectMIDSTableID(Convert.ToInt32(project.ProjectID), Convert.ToInt32(project.SubProject));
target += MIDStableID.ToString();
Console.WriteLine(target);
@@ -1804,7 +1820,7 @@ namespace FeanorProjects
try
{
Project project = SelectedProject;
String target = "https://mids.maser.nl/legacy/index.php?section=projects&subsection=subprojects&action=view&action=view&id=";
String target = "https://mids.itiz-me-eu.local/legacy/index.php?section=projects&subsection=subprojects&action=view&action=view&id=";
Int32 MIDStableID = MIDSinterface.SubProjectMIDSTableID(Convert.ToInt32(project.ProjectID), Convert.ToInt32(project.SubProject));
target += MIDStableID.ToString();
Console.WriteLine(target);
@@ -2086,13 +2102,13 @@ namespace FeanorProjects
String UrlString = "http://" + chamber.Network + ":8080/status";
// voor niet CMS2 PC's kan de NodeStatus niet direct opgehaald worden (omweg door de Nodestatus html op te slaan op silicium)
// voor niet CMS2 PC's kan de NodeStatus niet direct opgehaald worden (omweg door de Nodestatus html op te slaan op Z:)
if (CMS2PC == false)
{
try
{
string fileName = $"Node_{chamber.MIDS}_status.html";
string filePath = Path.Combine("\\\\silicium\\projects\\2020\\P201339\\sub1\\4. Software\\8. Nodestatus\\", fileName);
string filePath = Path.Combine("Z:\\projects\\2020\\P201339\\sub1\\4. Software\\8. Nodestatus\\", fileName);
if (File.Exists(filePath))
{
@@ -2337,8 +2353,7 @@ namespace FeanorProjects
for (int i = 0; i < sensors.Count; i++)
{
SqlConnection connection = new SqlConnection("Data Source=tcp:192.168.0.241,1434; Initial Catalog = FEANOR; Persist Security Info=True; User " +
"ID = sa; Password=resam; connection timeout=15; TrustServerCertificate=True");
SqlConnection connection = new SqlConnection("Data Source=tcp:10.126.21.47\\FEANOR,1434; Initial Catalog=FEANOR; User ID=sa; Password=resam@123resam; timeout=15; Persist Security Info=True; TrustServerCertificate=True");
try
{

13
HalCheck/HalControle.Designer.cs generated
View File

@@ -613,7 +613,7 @@ namespace HalCheck
this.tpProjectData.Margin = new System.Windows.Forms.Padding(2);
this.tpProjectData.Name = "tpProjectData";
this.tpProjectData.Padding = new System.Windows.Forms.Padding(2);
this.tpProjectData.Size = new System.Drawing.Size(1680, 972);
this.tpProjectData.Size = new System.Drawing.Size(1680, 1003);
this.tpProjectData.TabIndex = 0;
this.tpProjectData.Text = "Project data check";
this.tpProjectData.UseVisualStyleBackColor = true;
@@ -812,7 +812,7 @@ namespace HalCheck
this.tpGeneralDataCheck.Margin = new System.Windows.Forms.Padding(2);
this.tpGeneralDataCheck.Name = "tpGeneralDataCheck";
this.tpGeneralDataCheck.Padding = new System.Windows.Forms.Padding(2);
this.tpGeneralDataCheck.Size = new System.Drawing.Size(1680, 972);
this.tpGeneralDataCheck.Size = new System.Drawing.Size(1680, 1003);
this.tpGeneralDataCheck.TabIndex = 1;
this.tpGeneralDataCheck.Text = "General data check";
this.tpGeneralDataCheck.UseVisualStyleBackColor = true;
@@ -911,7 +911,7 @@ namespace HalCheck
this.tpDataView.Margin = new System.Windows.Forms.Padding(2);
this.tpDataView.Name = "tpDataView";
this.tpDataView.Padding = new System.Windows.Forms.Padding(2);
this.tpDataView.Size = new System.Drawing.Size(1680, 972);
this.tpDataView.Size = new System.Drawing.Size(1680, 1003);
this.tpDataView.TabIndex = 2;
this.tpDataView.Text = "Data viewer";
this.tpDataView.UseVisualStyleBackColor = true;
@@ -1196,10 +1196,10 @@ namespace HalCheck
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(10, 1058);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(727, 13);
this.label3.Size = new System.Drawing.Size(694, 13);
this.label3.TabIndex = 33;
this.label3.Text = "Nieuw aangesloten kamers op CMS2 verwijderen uit txt bestand: \\\\silicium\\projects" +
"\\2020\\P201339\\sub1\\4. Software\\1. Feanor\\excluded_chambers.txt";
this.label3.Text = "Nieuw aangesloten kamers op CMS2 verwijderen uit txt bestand: Z:\\projects\\2020\\P2" +
"01339\\sub1\\4. Software\\1. Feanor\\excluded_chambers.txt";
//
// HalControle
//
@@ -1211,6 +1211,7 @@ namespace HalCheck
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "HalControle";
this.Text = "Feanor - HalControle";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.HalControle_Load);
((System.ComponentModel.ISupportInitialize)(this.dgvProjects)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fileSystemWatcher1)).EndInit();

41
HalCheck/HalControle.cs
View File

@@ -51,7 +51,7 @@ namespace HalCheck
private Dictionary<object, int> sensorAttempts = new Dictionary<object, int>();
// save location for dgvProjects information xml file
string filePath = @"\\silicium.maser.nl\projects\2025\P250082\sub1\dgvProjects.xml";
string filePath = @"Z:\projects\2025\P250082\sub1\dgvProjects.xml";
bool isLoadingData = true; // Vlag om aan te geven of data wordt geladen
@@ -67,11 +67,11 @@ namespace HalCheck
new CabinetStatus { Name = "3097", Position = new Point(160, 470), StatusColor = Color.Purple },
new CabinetStatus { Name = "986", Position = new Point(340, 470), StatusColor = Color.Purple },
new CabinetStatus { Name = "1593", Position = new Point(260, 320), StatusColor = Color.Purple },
new CabinetStatus { Name = "1593", Position = new Point(260, 330), StatusColor = Color.Purple },
new CabinetStatus { Name = "1586", Position = new Point(260, 380), StatusColor = Color.Purple },
new CabinetStatus { Name = "2249", Position = new Point(340, 320), StatusColor = Color.Purple },
new CabinetStatus { Name = "2249", Position = new Point(340, 330), StatusColor = Color.Purple },
new CabinetStatus { Name = "2250", Position = new Point(340, 380), StatusColor = Color.Purple },
new CabinetStatus { Name = "2798", Position = new Point(415, 320), StatusColor = Color.Purple },
new CabinetStatus { Name = "2798", Position = new Point(415, 330), StatusColor = Color.Purple },
new CabinetStatus { Name = "2799", Position = new Point(415, 380), StatusColor = Color.Purple },
new CabinetStatus { Name = "2443", Position = new Point(490, 370), StatusColor = Color.Purple },
new CabinetStatus { Name = "77", Position = new Point(560, 370), StatusColor = Color.Purple },
@@ -86,6 +86,9 @@ namespace HalCheck
new CabinetStatus { Name = "3095", Position = new Point(530, 630), StatusColor = Color.Purple },
new CabinetStatus { Name = "1056", Position = new Point(620, 630), StatusColor = Color.Purple },
new CabinetStatus { Name = "3098", Position = new Point(530, 700), StatusColor = Color.Purple },
new CabinetStatus { Name = "3140", Position = new Point(430, 700), StatusColor = Color.Purple },
new CabinetStatus { Name = "38", Position = new Point(830, 300), StatusColor = Color.Purple },
new CabinetStatus { Name = "1232", Position = new Point(830, 400), StatusColor = Color.Purple },
new CabinetStatus { Name = "1233", Position = new Point(830, 500), StatusColor = Color.Purple },
@@ -93,8 +96,10 @@ namespace HalCheck
new CabinetStatus { Name = "1238", Position = new Point(1020, 50), StatusColor = Color.Purple },
new CabinetStatus { Name = "1728", Position = new Point(1020, 150), StatusColor = Color.Purple },
new CabinetStatus { Name = "2222", Position = new Point(1020, 260), StatusColor = Color.Purple },
new CabinetStatus { Name = "25467", Position = new Point(1020, 360), StatusColor = Color.Purple },
new CabinetStatus { Name = "30501", Position = new Point(1020,510), StatusColor = Color.Purple },
new CabinetStatus { Name = "2546", Position = new Point(1020, 360), StatusColor = Color.Purple },//
new CabinetStatus { Name = "2547", Position = new Point(1020, 410), StatusColor = Color.Purple },//
new CabinetStatus { Name = "3050", Position = new Point(1020,490), StatusColor = Color.Purple },//
new CabinetStatus { Name = "3051", Position = new Point(1020,540), StatusColor = Color.Purple },//
new CabinetStatus { Name = "1880", Position = new Point(1120, 80), StatusColor = Color.Purple },
new CabinetStatus { Name = "987", Position = new Point(1120, 160), StatusColor = Color.Purple },
@@ -107,8 +112,12 @@ namespace HalCheck
new CabinetStatus { Name = "1991", Position = new Point(1280, 80), StatusColor = Color.Purple },
new CabinetStatus { Name = "2183", Position = new Point(1280, 160), StatusColor = Color.Purple },
new CabinetStatus { Name = "2420", Position = new Point(1280, 250), StatusColor = Color.Purple },
new CabinetStatus { Name = "3111", Position = new Point(1280, 330), StatusColor = Color.Purple },
new CabinetStatus { Name = "3112", Position = new Point(1280, 380), StatusColor = Color.Purple },
new CabinetStatus { Name = "2745", Position = new Point(1380, 250), StatusColor = Color.Purple },
new CabinetStatus { Name = "2998", Position = new Point(1380, 160), StatusColor = Color.Purple },
new CabinetStatus { Name = "1999", Position = new Point(1185, 630), StatusColor = Color.Purple },
@@ -485,8 +494,7 @@ namespace HalCheck
selectedSensorList.Add(sensor.PK.ToString());
SqlConnection connection = new SqlConnection("Data Source=tcp:192.168.0.241,1434; Initial Catalog = FEANOR; Persist Security Info=True; User " +
"ID = sa; Password=resam; connection timeout=15; TrustServerCertificate=True");
SqlConnection connection = new SqlConnection("Data Source=tcp:10.126.21.47\\FEANOR,1434; Initial Catalog=FEANOR; User ID=sa; Password=resam@123resam; timeout=15; Persist Security Info=True; TrustServerCertificate=True");
try
{
using (connection)
@@ -996,8 +1004,7 @@ namespace HalCheck
foreach (var sensor in sensors)
{
SqlConnection connection = new SqlConnection("Data Source=tcp:192.168.0.241,1434; Initial Catalog = FEANOR; Persist Security Info=True; User " +
"ID = sa; Password=resam; connection timeout=15; TrustServerCertificate=True");
SqlConnection connection = new SqlConnection("Data Source=tcp:10.126.21.47\\FEANOR,1434; Initial Catalog=FEANOR; User ID=sa; Password=resam@123resam; timeout=15; Persist Security Info=True; TrustServerCertificate=True");
try
{
using (connection)
@@ -1148,7 +1155,7 @@ namespace HalCheck
try
{
// Lees uitgesloten kamernummers vanuit bestand
var excludedChambers = File.ReadAllLines(@"\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\excluded_chambers.txt")
var excludedChambers = File.ReadAllLines(@"Z:\projects\2020\P201339\sub1\4. Software\1. Feanor\excluded_chambers.txt")
.Select(line => line.Trim())
.Where(line => !string.IsNullOrEmpty(line))
.ToHashSet(); // Snelle lookup
@@ -1252,8 +1259,7 @@ namespace HalCheck
foreach (var sensor in sensors)
{
SqlConnection connection = new SqlConnection("Data Source=tcp:192.168.0.241,1434; Initial Catalog = FEANOR; Persist Security Info=True; User " +
"ID = sa; Password=resam; connection timeout=15; TrustServerCertificate=True");
SqlConnection connection = new SqlConnection("Data Source=tcp:10.126.21.47\\FEANOR,1434; Initial Catalog=FEANOR; User ID=sa; Password=resam@123resam; timeout=15; Persist Security Info=True; TrustServerCertificate=True");
try
{
using (connection)
@@ -1461,9 +1467,12 @@ namespace HalCheck
previousValue = value;
}
try
{
DateTime mostRecentTimestamp = mostRecentReading.Timestamp;
// controleer of spanning wegzakt naar 0
DateTime mostRecentTimestamp = mostRecentReading.Timestamp;
if (readings.Count > 0)
{
DateTime lastTimestamp = readings.Last().Timestamp; // Haal de timestamp van de laatste reading
@@ -1476,6 +1485,8 @@ namespace HalCheck
}
}
}
catch { }
}
}
@@ -2178,7 +2189,7 @@ namespace HalCheck
const string UserID = "mids_userquery";
const string Password = "23uRUVfq6dXXHMWN";
const string Catalog = "mids_maser";
const string Server = "enterprise.maser.nl";
const string Server = "meeu001sqvp007.itiz-me-eu.local";
private static MySqlConnection GetConnection()
{

13
MIDSComm/Class1.cs
View File

@@ -16,7 +16,7 @@ namespace Maser.Feanor.MIDSInterface
const string UserID = "mids_userquery";
const string Password = "23uRUVfq6dXXHMWN";
const string Catalog = "mids_maser";
const string Server = "enterprise.maser.nl";
const string Server = "meeu001sqvp007.itiz-me-eu.local"; // was enterprise.maser.nl
// Help variables, not accessible
private static Int32 _DB_project_id;
@@ -518,11 +518,18 @@ namespace Maser.Feanor.MIDSInterface
//SubProjectNumber
);
Connection = GetConnection();
Console.WriteLine(Connection.ConnectionString.ToString());
MySqlCommand cmd = new MySqlCommand(query);
Console.WriteLine("query " + query.ToString());
cmd.Connection = Connection;
Console.WriteLine(Connection.ConnectionString.ToString());
Connection.Open();
Int64 result = (Int64)cmd.ExecuteScalar();
Console.WriteLine("result " + result.ToString());
return result;
}
catch
@@ -859,10 +866,12 @@ namespace Maser.Feanor.MIDSInterface
);
Connection = GetConnection();
MySqlCommand cmd = new MySqlCommand(query);
Console.WriteLine("query " + query.ToString());
cmd.Connection = Connection;
Connection.Open();
Int64 result = (Int64)cmd.ExecuteScalar();
Console.WriteLine("result "+result.ToString());
return result;
}
catch

3
Maser.Feanor.Biz/Properties/Settings.Designer.cs generated
View File

@@ -26,8 +26,7 @@ namespace Maser.Feanor.Biz.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=tcp:192.168.0.241,1434; Initial Catalog = FEANOR; Persist Security Info=True; User " +
"ID = sa; Password=resam; connection timeout=15; TrustServerCertificate=True")]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=tcp:10.126.21.47\\FEANOR,1434; Initial Catalog=FEANOR; User ID=sa; Password=resam@123resam; timeout=15; Persist Security Info=True; TrustServerCertificate=True")]
public string FeanorConnStr {
get {
return ((string)(this["FeanorConnStr"]));

4
Maser.Feanor.Biz/Properties/Settings.settings
View File

@@ -5,10 +5,10 @@
<Setting Name="FeanorConnStr" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;ConnectionString&gt;Data Source=.\FEANOR; Initial Catalog = FEANOR; Persist Security Info=True; User ID = sa; Password=resam; connection timeout=15&lt;/ConnectionString&gt;
&lt;ConnectionString&gt;Data Source=.\FEANOR; Initial Catalog = FEANOR; Persist Security Info=True; User ID = sa; Password=resam@123resam; connection timeout=15&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=.\FEANOR; Initial Catalog = FEANOR; Persist Security Info=True; User ID = sa; Password=resam; connection timeout=15</Value>
<Value Profile="(Default)">Data Source=.\FEANOR; Initial Catalog = FEANOR; Persist Security Info=True; User ID = sa; Password=resam@123resam; connection timeout=15</Value>
</Setting>
</Settings>
</SettingsFile>

2
Maser.Feanor.Biz/app.config
View File

@@ -3,6 +3,6 @@
<configSections>
</configSections>
<connectionStrings>
<add name="Maser.Feanor.Biz.Properties.Settings.FeanorConnStr" connectionString="Data Source=.\FEANOR; Initial Catalog = FEANOR; Persist Security Info=True; User ID = sa; Password=resam; connection timeout=15" providerName="System.Data.SqlClient"/>
<add name="Maser.Feanor.Biz.Properties.Settings.FeanorConnStr" connectionString="Data Source=.\FEANOR; Initial Catalog = FEANOR; Persist Security Info=True; User ID = sa; Password=resam@123resam; connection timeout=15" providerName="System.Data.SqlClient"/>
</connectionStrings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>

2
Maser.Feanor/Chamber.cs
View File

@@ -110,7 +110,7 @@ namespace Maser.Feanor.Model
{
get
{
return String.Format("\\\\silicium\\quality-calibration-service\\{0:00000}", _mIDS);
return String.Format("Z:\\inventory\\{0:00000}", _mIDS);
}
}
}

13
Maser.Feanor/Project.cs
View File

@@ -129,19 +129,10 @@ namespace Maser.Feanor.Model
{
get
{
// \\silicium\projects\2008\P080104\sub1
// Z:\projects\2008\P080104\sub1
Int32 Year = (Int32)Math.Floor((double)_ProjectID / 10000) + 2000;
return String.Format("\\\\silicium\\projects\\{0}\\P{1:000000}\\sub{2}", Year, _ProjectID, _SubProject);
return String.Format("Z:\\projects\\{0}\\P{1:000000}\\sub{2}", Year, _ProjectID, _SubProject);
}
}
}
}

24
create Servercopy.bat
View File

@@ -1,8 +1,8 @@
@echo off
echo.
echo.
rd /s /q "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Feanor ServerCopy"
md "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Feanor ServerCopy"
rd /s /q "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Feanor ServerCopy"
md "\C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Feanor ServerCopy"
cls
@@ -11,43 +11,43 @@ echo.
echo.
echo FeanorClient
xcopy "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\FeanorClient\bin\Release\*.*" "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Feanor ServerCopy" /q /y
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\FeanorClient\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo FeanorConfig
xcopy "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\FeanorConfig\bin\Release\*.*" "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Feanor ServerCopy" /q /y
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\FeanorConfig\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo FeanorProjects
xcopy "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\FeanorProjects\bin\Release\*.*" "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Feanor ServerCopy" /q /y
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\FeanorProjects\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo Maser.Feanor
xcopy "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Maser.Feanor\bin\Release\*.*" "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Feanor ServerCopy" /q /y
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Maser.Feanor\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo Maser.Feanor.Biz
xcopy "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Maser.Feanor.Biz\bin\Release\*.*" "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Feanor ServerCopy" /q /y
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Maser.Feanor.Biz\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo MIDSComm
xcopy "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\MIDSComm\bin\Release\*.*" "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Feanor ServerCopy" /q /y
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\MIDSComm\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo Server
xcopy "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Server\bin\Release\*.*" "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Feanor ServerCopy" /q /y
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Server\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo HalCheck
xcopy "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\HalCheck\bin\Release\*.*" "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Feanor ServerCopy" /q /y
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\HalCheck\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo SQLLib
xcopy "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\SQLLib\bin\Release\*.*" "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Feanor ServerCopy" /q /y
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\SQLLib\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Feanor ServerCopy" /q /y
echo.
del "\\silicium\projects\2020\P201339\sub1\4. Software\1. Feanor\Feanor ServerCopy\*.pdb"
del "C:\Users\MEEU010_USR_INS00001\Desktop\1. Feanor\Feanor ServerCopy\*.pdb"
pause

54
create Servercopy_CMS2PC_desktop.bat Normal file
View File

@@ -0,0 +1,54 @@
@echo off
echo.
echo.
rd /s /q "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Feanor ServerCopy"
md "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Feanor ServerCopy"
cls
C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor
echo Creating a server copy of FEANOR.
echo.
echo.
echo FeanorClient
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\FeanorClient\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo FeanorConfig
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\FeanorConfig\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo FeanorProjects
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\FeanorProjects\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo Maser.Feanor
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Maser.Feanor\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo Maser.Feanor.Biz
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Maser.Feanor.Biz\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo MIDSComm
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\MIDSComm\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo Server
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Server\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo HalCheck
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\HalCheck\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo SQLLib
xcopy "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\SQLLib\bin\Release\*.*" "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Feanor ServerCopy" /q /y
echo.
del "C:\Users\MEEU010_USR_INS00001\Desktop\CMS2_SEGREGATIE_2\1. Feanor\Feanor ServerCopy\*.pdb"
pause

53
create Servercopy_MDSPC_desktop.bat Normal file
View File

@@ -0,0 +1,53 @@
@echo off
echo.
echo.
rd /s /q "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Feanor ServerCopy"
md "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Feanor ServerCopy"
cls
echo Creating a server copy of FEANOR.
echo.
echo.
echo FeanorClient
xcopy "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\FeanorClient\bin\Release\*.*" "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo FeanorConfig
xcopy "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\FeanorConfig\bin\Release\*.*" "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo FeanorProjects
xcopy "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\FeanorProjects\bin\Release\*.*" "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo Maser.Feanor
xcopy "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Maser.Feanor\bin\Release\*.*" "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo Maser.Feanor.Biz
xcopy "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Maser.Feanor.Biz\bin\Release\*.*" "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo MIDSComm
xcopy "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\MIDSComm\bin\Release\*.*" "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo Server
xcopy "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Server\bin\Release\*.*" "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo HalCheck
xcopy "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\HalCheck\bin\Release\*.*" "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Feanor ServerCopy" /q /y
echo.
echo SQLLib
xcopy "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\SQLLib\bin\Release\*.*" "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Feanor ServerCopy" /q /y
echo.
del "C:\Users\QHH7\Desktop\CMS2_SEGREGATIE\1. Feanor\Feanor ServerCopy\*.pdb"
pause