diff --git a/Remontor/.vs/Remontor/FileContentIndex/0e2d1faa-13b7-44a3-8033-23709c1069aa.vsidx b/Remontor/.vs/Remontor/FileContentIndex/0e2d1faa-13b7-44a3-8033-23709c1069aa.vsidx deleted file mode 100644 index 08bf054..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/0e2d1faa-13b7-44a3-8033-23709c1069aa.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/185f8a93-aeb7-4493-ab9e-2e84fac17a15.vsidx b/Remontor/.vs/Remontor/FileContentIndex/185f8a93-aeb7-4493-ab9e-2e84fac17a15.vsidx deleted file mode 100644 index fdbc1fc..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/185f8a93-aeb7-4493-ab9e-2e84fac17a15.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/20e335d5-46e4-4814-b533-78edaa1359db.vsidx b/Remontor/.vs/Remontor/FileContentIndex/20e335d5-46e4-4814-b533-78edaa1359db.vsidx deleted file mode 100644 index bf3e394..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/20e335d5-46e4-4814-b533-78edaa1359db.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/342db1f9-b822-47c6-8906-4f32734ad2e2.vsidx b/Remontor/.vs/Remontor/FileContentIndex/342db1f9-b822-47c6-8906-4f32734ad2e2.vsidx deleted file mode 100644 index a8d74a1..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/342db1f9-b822-47c6-8906-4f32734ad2e2.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/3a145c8a-af63-4d54-b335-fabb896da18f.vsidx b/Remontor/.vs/Remontor/FileContentIndex/3a145c8a-af63-4d54-b335-fabb896da18f.vsidx new file mode 100644 index 0000000..97faae3 Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/3a145c8a-af63-4d54-b335-fabb896da18f.vsidx differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/5d1ca4e3-e52a-463a-bbe8-2b770540fa93.vsidx b/Remontor/.vs/Remontor/FileContentIndex/5d1ca4e3-e52a-463a-bbe8-2b770540fa93.vsidx new file mode 100644 index 0000000..6b2b203 Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/5d1ca4e3-e52a-463a-bbe8-2b770540fa93.vsidx differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/92985faa-8945-4dd5-bcb5-30915ed1691d.vsidx b/Remontor/.vs/Remontor/FileContentIndex/92985faa-8945-4dd5-bcb5-30915ed1691d.vsidx deleted file mode 100644 index 698f564..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/92985faa-8945-4dd5-bcb5-30915ed1691d.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/a2d1a40b-2304-4881-af9d-8e51cda2b388.vsidx b/Remontor/.vs/Remontor/FileContentIndex/a2d1a40b-2304-4881-af9d-8e51cda2b388.vsidx new file mode 100644 index 0000000..8b96928 Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/a2d1a40b-2304-4881-af9d-8e51cda2b388.vsidx differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/b9f4d2a4-c9d4-4f48-b67b-884688df3656.vsidx b/Remontor/.vs/Remontor/FileContentIndex/b9f4d2a4-c9d4-4f48-b67b-884688df3656.vsidx new file mode 100644 index 0000000..f817c69 Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/b9f4d2a4-c9d4-4f48-b67b-884688df3656.vsidx differ diff --git a/Remontor/.vs/Remontor/v17/.suo b/Remontor/.vs/Remontor/v17/.suo index 7e44509..7d6a9c8 100644 Binary files a/Remontor/.vs/Remontor/v17/.suo and b/Remontor/.vs/Remontor/v17/.suo differ diff --git a/Remontor/FlowConteinerSetting.cs b/Remontor/FlowConteinerSetting.cs index 9e709fa..3197cc0 100644 --- a/Remontor/FlowConteinerSetting.cs +++ b/Remontor/FlowConteinerSetting.cs @@ -42,7 +42,7 @@ namespace Remontor } else { - if (!SConnector.FormMain.CloseOn && !unSave && (settingAppControl1.edited() || + if (!SConnector.FormMain.ShowOn && !SConnector.FormMain.CloseOn && !unSave && (settingAppControl1.edited() || settingSCCMControl1.edited() || settingWordsControl1.edited())) { @@ -61,6 +61,10 @@ namespace Remontor } } + else if(SConnector.FormMain.ShowOn) + { + this.Visible = true; + } else { this.Visible = false; diff --git a/Remontor/Form1.cs b/Remontor/Form1.cs index ac54944..a898603 100644 --- a/Remontor/Form1.cs +++ b/Remontor/Form1.cs @@ -22,6 +22,7 @@ namespace Remontor { public bool CloseOn = false; + public bool ShowOn = false; public Form1() { diff --git a/Remontor/Picter/PicBase.cs b/Remontor/Picter/PicBase.cs new file mode 100644 index 0000000..fcd2b81 --- /dev/null +++ b/Remontor/Picter/PicBase.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Remontor.Picter +{ + internal class PicBase + { + } +} diff --git a/Remontor/Picter/PicLoaderTask.cs b/Remontor/Picter/PicLoaderTask.cs new file mode 100644 index 0000000..75790da --- /dev/null +++ b/Remontor/Picter/PicLoaderTask.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Remontor.Picter +{ + internal class PicLoaderTask + { + } +} diff --git a/Remontor/Picter/SPicManager.cs b/Remontor/Picter/SPicManager.cs new file mode 100644 index 0000000..b895261 --- /dev/null +++ b/Remontor/Picter/SPicManager.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Remontor.Picter +{ + internal class SPicManager + { + Dictionary PicList = new Dictionary(); + public void PictureSet(PictureBox image, IComp comp) + { + + } + } +} diff --git a/Remontor/Remontor.csproj b/Remontor/Remontor.csproj index 01a6931..895ffe0 100644 --- a/Remontor/Remontor.csproj +++ b/Remontor/Remontor.csproj @@ -107,6 +107,9 @@ + + + diff --git a/Remontor/Seacher/SeachSCCM.cs b/Remontor/Seacher/SeachSCCM.cs index 803e157..1c205ea 100644 --- a/Remontor/Seacher/SeachSCCM.cs +++ b/Remontor/Seacher/SeachSCCM.cs @@ -60,6 +60,30 @@ namespace Remontor.Seacher } public void Change(ResultUpdate sender, string seach) { + + Activate(); + Update = sender; + if (Connection != null && Connection.State == ConnectionState.Open) + { + List result; + if (seach.Length > 2) + { + result = ResultSeach(seach); + Update(result); + } + else + { + result = new List(); + result.Add(new NoResult("Введите запрос, к бд подключенно")); + Update(result); + } + } + else + { + List result = new List(); + result.Add(new NoResult(error)); + Update(result); + } //Activate(); //Update = sender; //if (Connection != null && Connection.State == ConnectionState.Open) @@ -85,7 +109,7 @@ namespace Remontor.Seacher // result.Add(error); // Update(result, false,14); //} - + } private string QueryBilder(string query) diff --git a/Remontor/SessionItemControl.Designer.cs b/Remontor/SessionItemControl.Designer.cs index 99ba393..0c9d3c0 100644 --- a/Remontor/SessionItemControl.Designer.cs +++ b/Remontor/SessionItemControl.Designer.cs @@ -34,6 +34,8 @@ this.LbNetName = new System.Windows.Forms.Label(); this.PbPerson = new System.Windows.Forms.PictureBox(); this.PPingStat = new System.Windows.Forms.Panel(); + this.LbLoginStatic = new System.Windows.Forms.Label(); + this.LbLogin = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.PbPerson)).BeginInit(); this.SuspendLayout(); // @@ -96,11 +98,31 @@ this.PPingStat.TabIndex = 5; this.PPingStat.Click += new System.EventHandler(this.SessionItemControl_Click); // + // LbLoginStatic + // + this.LbLoginStatic.AutoSize = true; + this.LbLoginStatic.Location = new System.Drawing.Point(204, 20); + this.LbLoginStatic.Name = "LbLoginStatic"; + this.LbLoginStatic.Size = new System.Drawing.Size(38, 13); + this.LbLoginStatic.TabIndex = 6; + this.LbLoginStatic.Text = "Логин"; + // + // LbLogin + // + this.LbLogin.AutoSize = true; + this.LbLogin.Location = new System.Drawing.Point(248, 20); + this.LbLogin.Name = "LbLogin"; + this.LbLogin.Size = new System.Drawing.Size(10, 13); + this.LbLogin.TabIndex = 7; + this.LbLogin.Text = "-"; + // // SessionItemControl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.Controls.Add(this.LbLogin); + this.Controls.Add(this.LbLoginStatic); this.Controls.Add(this.PPingStat); this.Controls.Add(this.LbNetName); this.Controls.Add(this.LbName); @@ -126,5 +148,7 @@ private System.Windows.Forms.Label LbName; private System.Windows.Forms.Label LbNetName; private System.Windows.Forms.Panel PPingStat; + private System.Windows.Forms.Label LbLoginStatic; + private System.Windows.Forms.Label LbLogin; } } diff --git a/Remontor/SessionItemControl.cs b/Remontor/SessionItemControl.cs index 94b40c9..d7dea50 100644 --- a/Remontor/SessionItemControl.cs +++ b/Remontor/SessionItemControl.cs @@ -42,12 +42,16 @@ namespace Remontor LbNetName.Visible = false; LbNetNameStatic.Visible = false; PPingStat.Visible = false; - + LbLogin.Visible = false; + LbLoginStatic.Visible = false; + + } else if(seacherResult is HistoryResult) { HistoryResult result = (HistoryResult) seacherResult; - LbName.Text = result.GetComp().GetName(); + LbName.Text = result.GetComp().GetDescription(); + LbLogin.Text = result.GetComp().GetName(); LbNetName.Text = result.GetComp().GetNetName(); LbData.Text = "last connect:" + result.GetLastConnect(); Select += UpdateAct; @@ -58,8 +62,9 @@ namespace Remontor else if (seacherResult is SCCMResult) { SCCMResult result = (SCCMResult)seacherResult; - LbName.Text = result.GetComp().GetName(); + LbName.Text = result.GetComp().GetDescription(); LbNetName.Text = result.GetComp().GetNetName(); + LbLogin.Text = result.GetComp().GetName(); LbData.Text = "last login:" + result.GetLastConnect(); Select += UpdateAct; Index = index; @@ -120,6 +125,10 @@ namespace Remontor { HistoryResult result = (HistoryResult)seacherResult; PingManager.NewTaskPing(PPingStat, result.GetComp()); + }else if (seacherResult is SCCMResult) + { + SCCMResult result = (SCCMResult)seacherResult; + PingManager.NewTaskPing(PPingStat, result.GetComp()); } } diff --git a/Remontor/Setting/SettingAppControl.cs b/Remontor/Setting/SettingAppControl.cs index 8a07749..e070645 100644 --- a/Remontor/Setting/SettingAppControl.cs +++ b/Remontor/Setting/SettingAppControl.cs @@ -1,4 +1,5 @@ -using System; +using Remontor.Connector; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -46,11 +47,13 @@ namespace Remontor.Setting private void bt_path_open_Click(object sender, EventArgs e) { - openFileDialog1.ShowDialog(); - if (openFileDialog1.FileName != null) + SConnector.FormMain.ShowOn = true; + DialogResult result = openFileDialog1.ShowDialog(); + if (result == DialogResult.OK) { path.Text = openFileDialog1.FileName; } + SConnector.FormMain.ShowOn = false; } } } diff --git a/Remontor/Setting/SettingSCCMControl.cs b/Remontor/Setting/SettingSCCMControl.cs index 5232276..2fcc280 100644 --- a/Remontor/Setting/SettingSCCMControl.cs +++ b/Remontor/Setting/SettingSCCMControl.cs @@ -1,4 +1,5 @@ -using Remontor.Seacher; +using Remontor.Connector; +using Remontor.Seacher; using System; using System.Collections.Generic; using System.ComponentModel; @@ -82,8 +83,10 @@ namespace Remontor.Setting private void bt_checkConnect_Click(object sender, EventArgs e) { + SConnector.FormMain.ShowOn = true; SeachSCCM SeacherCheck = new SeachSCCM(cb_windowsAuth.Checked, ib_username.Text, ib_password.Text); MessageBox.Show(SeacherCheck.CheckConnect(ib_server.Text,ib_dataBase.Text)); + SConnector.FormMain.ShowOn = false; } private void groupBox2_Enter(object sender, EventArgs e) diff --git a/Remontor/Setting/SettingWordsControl.cs b/Remontor/Setting/SettingWordsControl.cs index 6ca1d2e..258763e 100644 --- a/Remontor/Setting/SettingWordsControl.cs +++ b/Remontor/Setting/SettingWordsControl.cs @@ -1,4 +1,5 @@ -using Remontor.Words; +using Remontor.Connector; +using Remontor.Words; using System; using System.Collections.Generic; using System.ComponentModel; @@ -35,21 +36,25 @@ namespace Remontor.Setting private void bt_wordsBilder_Click(object sender, EventArgs e) { + SConnector.FormMain.ShowOn = true; BilderWords bilderWords = new BilderWords(); DialogResult result = bilderWords.ShowDialog(); if (result == DialogResult.OK) { UpdateTree(); } + SConnector.FormMain.ShowOn = false; } private void bt_path_open_Click(object sender, EventArgs e) { - openFileDialog1.ShowDialog(); - if(openFileDialog1.FileName != null) + SConnector.FormMain.ShowOn = true; + DialogResult result = openFileDialog1.ShowDialog(); + if (result == DialogResult.OK) { path.Text = openFileDialog1.FileName; } + SConnector.FormMain.ShowOn = false; } public bool edited() diff --git a/Remontor/bin/Debug/Remontor.exe b/Remontor/bin/Debug/Remontor.exe index 8868c1e..44c6c4d 100644 Binary files a/Remontor/bin/Debug/Remontor.exe and b/Remontor/bin/Debug/Remontor.exe differ diff --git a/Remontor/bin/Debug/Remontor.pdb b/Remontor/bin/Debug/Remontor.pdb index 31d92be..7b1d93a 100644 Binary files a/Remontor/bin/Debug/Remontor.pdb and b/Remontor/bin/Debug/Remontor.pdb differ diff --git a/Remontor/bin/Debug/res.dat b/Remontor/bin/Debug/res.dat index 7c84156..54035ba 100644 Binary files a/Remontor/bin/Debug/res.dat and b/Remontor/bin/Debug/res.dat differ diff --git a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 525f8ad..d5f051a 100644 Binary files a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache b/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache index 558cb61..e6b7d98 100644 --- a/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache +++ b/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8715987b8e28705d0f46bc923af3b41a4afd1d49 +09d76672eda20daf058c432a32f616590893aaa4 diff --git a/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache b/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache index 1c68251..8ae0d67 100644 Binary files a/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache and b/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache differ diff --git a/Remontor/obj/Debug/Remontor.exe b/Remontor/obj/Debug/Remontor.exe index 8868c1e..44c6c4d 100644 Binary files a/Remontor/obj/Debug/Remontor.exe and b/Remontor/obj/Debug/Remontor.exe differ diff --git a/Remontor/obj/Debug/Remontor.pdb b/Remontor/obj/Debug/Remontor.pdb index 31d92be..7b1d93a 100644 Binary files a/Remontor/obj/Debug/Remontor.pdb and b/Remontor/obj/Debug/Remontor.pdb differ