diff --git a/Remontor/.vs/Remontor/FileContentIndex/2299c033-dc8c-436c-8ce6-aaef6c7684c8.vsidx b/Remontor/.vs/Remontor/FileContentIndex/2299c033-dc8c-436c-8ce6-aaef6c7684c8.vsidx new file mode 100644 index 0000000..6ad1917 Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/2299c033-dc8c-436c-8ce6-aaef6c7684c8.vsidx differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/3dec04ad-cdf3-4c0d-a702-2cd6a3bf48f6.vsidx b/Remontor/.vs/Remontor/FileContentIndex/3dec04ad-cdf3-4c0d-a702-2cd6a3bf48f6.vsidx new file mode 100644 index 0000000..679a534 Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/3dec04ad-cdf3-4c0d-a702-2cd6a3bf48f6.vsidx differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/6a10c53d-114a-42d6-9be8-dea699283021.vsidx b/Remontor/.vs/Remontor/FileContentIndex/6a10c53d-114a-42d6-9be8-dea699283021.vsidx deleted file mode 100644 index 8f812b7..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/6a10c53d-114a-42d6-9be8-dea699283021.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/d850cd25-d807-47d1-b9b5-07931d365f47.vsidx b/Remontor/.vs/Remontor/FileContentIndex/9f288de6-1887-4c84-a00e-a8759ed7a967.vsidx similarity index 90% rename from Remontor/.vs/Remontor/FileContentIndex/d850cd25-d807-47d1-b9b5-07931d365f47.vsidx rename to Remontor/.vs/Remontor/FileContentIndex/9f288de6-1887-4c84-a00e-a8759ed7a967.vsidx index 1f1bd18..1bf52cd 100644 Binary files a/Remontor/.vs/Remontor/FileContentIndex/d850cd25-d807-47d1-b9b5-07931d365f47.vsidx and b/Remontor/.vs/Remontor/FileContentIndex/9f288de6-1887-4c84-a00e-a8759ed7a967.vsidx differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/aa52844a-2ac0-4f7f-aafa-63730132a2b5.vsidx b/Remontor/.vs/Remontor/FileContentIndex/aa52844a-2ac0-4f7f-aafa-63730132a2b5.vsidx deleted file mode 100644 index f191465..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/aa52844a-2ac0-4f7f-aafa-63730132a2b5.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/af207ab6-de44-447d-86a2-e2a02cfa55be.vsidx b/Remontor/.vs/Remontor/FileContentIndex/af207ab6-de44-447d-86a2-e2a02cfa55be.vsidx deleted file mode 100644 index 17b67d0..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/af207ab6-de44-447d-86a2-e2a02cfa55be.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/cf99afb8-1dc3-46d6-9a7a-fd9f78b801a0.vsidx b/Remontor/.vs/Remontor/FileContentIndex/cf99afb8-1dc3-46d6-9a7a-fd9f78b801a0.vsidx new file mode 100644 index 0000000..c2a8dd9 Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/cf99afb8-1dc3-46d6-9a7a-fd9f78b801a0.vsidx differ diff --git a/Remontor/.vs/Remontor/v17/.suo b/Remontor/.vs/Remontor/v17/.suo index 754ecdd..7c55d48 100644 Binary files a/Remontor/.vs/Remontor/v17/.suo and b/Remontor/.vs/Remontor/v17/.suo differ diff --git a/Remontor/Comp/CompName.cs b/Remontor/Comp/CompName.cs index 81467b1..74e33d8 100644 --- a/Remontor/Comp/CompName.cs +++ b/Remontor/Comp/CompName.cs @@ -5,7 +5,7 @@ using System.Net; using System.Text; using System.Threading.Tasks; -namespace Reseter2 +namespace Remontor { [Serializable] internal class CompId : IComp diff --git a/Remontor/Comp/IComp.cs b/Remontor/Comp/IComp.cs index 7c4e4ac..86e89a3 100644 --- a/Remontor/Comp/IComp.cs +++ b/Remontor/Comp/IComp.cs @@ -5,7 +5,7 @@ using System.Net; using System.Text; using System.Threading.Tasks; -namespace Reseter2 +namespace Remontor { internal interface IComp { diff --git a/Remontor/Connector/Connect.cs b/Remontor/Connector/Connect.cs index a8bf5f5..7e5e121 100644 --- a/Remontor/Connector/Connect.cs +++ b/Remontor/Connector/Connect.cs @@ -7,6 +7,16 @@ using System.Threading.Tasks; namespace Remontor.Connector { internal class Connect - { + { + public IComp Comp; + + + public Connect(IComp comp) + { + Comp = comp; + + } + + } } diff --git a/Remontor/Connector/SConnector.cs b/Remontor/Connector/SConnector.cs index 05379eb..326722b 100644 --- a/Remontor/Connector/SConnector.cs +++ b/Remontor/Connector/SConnector.cs @@ -6,7 +6,12 @@ using System.Threading.Tasks; namespace Remontor.Connector { - internal class SConnector + internal static class SConnector { + private static List Connects = new List(); + public static void NewConnect(IComp comp) + { + Connects.Add(new Connect(comp)); + } } } diff --git a/Remontor/Form1.Designer.cs b/Remontor/Form1.Designer.cs index db4bc85..2c2aae8 100644 --- a/Remontor/Form1.Designer.cs +++ b/Remontor/Form1.Designer.cs @@ -29,9 +29,9 @@ private void InitializeComponent() { this.panel3 = new System.Windows.Forms.Panel(); + this.label1 = new System.Windows.Forms.Label(); this.barSessionControl1 = new Remontor.BarSessionControl(); this.flowContainer1 = new Remontor.FlowContainer(); - this.label1 = new System.Windows.Forms.Label(); this.panel3.SuspendLayout(); this.SuspendLayout(); // @@ -47,6 +47,15 @@ this.panel3.TabIndex = 1; this.panel3.Paint += new System.Windows.Forms.PaintEventHandler(this.panel3_Paint); // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(467, 361); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(151, 13); + this.label1.TabIndex = 0; + this.label1.Text = "Нету активныйх соединений"; + // // barSessionControl1 // this.barSessionControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -54,6 +63,7 @@ this.barSessionControl1.Name = "barSessionControl1"; this.barSessionControl1.Size = new System.Drawing.Size(694, 21); this.barSessionControl1.TabIndex = 1; + this.barSessionControl1.Load += new System.EventHandler(this.barSessionControl1_Load); // // flowContainer1 // @@ -67,15 +77,6 @@ this.flowContainer1.Size = new System.Drawing.Size(245, 674); this.flowContainer1.TabIndex = 1; // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(467, 361); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(151, 13); - this.label1.TabIndex = 0; - this.label1.Text = "Нету активныйх соединений"; - // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Remontor/Form1.cs b/Remontor/Form1.cs index b11c19d..e3525e1 100644 --- a/Remontor/Form1.cs +++ b/Remontor/Form1.cs @@ -97,6 +97,11 @@ namespace Remontor { } + + private void barSessionControl1_Load(object sender, EventArgs e) + { + + } } } diff --git a/Remontor/History/HistoryItem.cs b/Remontor/History/HistoryItem.cs new file mode 100644 index 0000000..72d63d1 --- /dev/null +++ b/Remontor/History/HistoryItem.cs @@ -0,0 +1,69 @@ +using Remontor.Connector; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml; + +namespace Remontor.History +{ + + [Serializable] + internal class HistoryItem + { + private IComp comp; + private DateTime startTime; + private string statusName; + + public HistoryItem(IComp comp, DateTime startTime) + { + this.comp = comp; + this.startTime = startTime; + } + + public HistoryItem(Connect connect) + { + this.comp = connect.Comp; + this.startTime = DateTime.Now; + } + + public SHistory GetData() + { + return new SHistory(comp.GetName(), startTime.ToShortTimeString()); + + } + + public IComp GetComp() + { + return comp; + + } + + public string NameNode() + { + string buf; + if (comp.GetName() == null) + { + buf = comp.GetNetNameStr(); + } + else + { + buf = comp.GetName(); + if (comp.GetNetNameStr() != null) buf += "(" + comp.GetNetNameStr() + ")"; + + } + return buf; + } + public string ToStr + { + + get { + string name = NameNode(); + name = name.Length > 25 ? name.Substring(0,25): name; + string output = string.Format("{0,17:dd.MM.yy HH:mm:ss} {1,-25} {2,-9}", startTime, name, this.statusName); + return output; + } + } + } +} diff --git a/Remontor/History/HistoryList.cs b/Remontor/History/HistoryList.cs new file mode 100644 index 0000000..8613111 --- /dev/null +++ b/Remontor/History/HistoryList.cs @@ -0,0 +1,54 @@ +using Remontor.Connector; +using Remontor.Setting; +using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Remontor.History +{ + [Serializable] + internal static class HistoryList + { + static public List Hitem = new List(); + //static private FormHistory formHistory; + + public delegate void UpdateMethod(); + static public event UpdateMethod Update; + static public HistoryItem Add(Connect connect) + { + + HistoryItem historyItem = new HistoryItem(connect); + Hitem.Insert(0, historyItem); + ClearFirst(); + Update(); + + return historyItem; + + } + static public void Updated() + { + Update(); + } + static public void Clear() + { + Hitem.Clear(); + } + + static public void ClearFirst() + { + if(Hitem.Count > SGlobalSetting.settingReboot.sizeHistoryItem) + { + Hitem.RemoveAt(Hitem.Count() - 1); + ClearFirst(); + } + + + } + } +} diff --git a/Remontor/History/SHistory.cs b/Remontor/History/SHistory.cs new file mode 100644 index 0000000..04546a1 --- /dev/null +++ b/Remontor/History/SHistory.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Remontor.History +{ + internal struct SHistory + { + public string Name; + public string StartTime; + public SHistory(string name, string startTime) + { + Name = name; + StartTime = startTime; + } + } +} diff --git a/Remontor/Remontor.csproj b/Remontor/Remontor.csproj index 659e9ca..6acf995 100644 --- a/Remontor/Remontor.csproj +++ b/Remontor/Remontor.csproj @@ -52,6 +52,10 @@ BarSessionControl.cs + + + + Form @@ -70,14 +74,83 @@ Form1.cs + + + + + + + + + + UserControl SessionItemControl.cs + + + + UserControl + + + SettingRebootControl.cs + + + + UserControl + + + SettingSCCMControl.cs + + + + UserControl + + + SettingWordsControl.cs + + + + + Form + + + BilderWords.cs + + + + + + UserControl + + + WordsCategoryControl.cs + + + + UserControl + + + WordsEditCategoryControl.cs + + + UserControl + + + WordsEditCompControl.cs + + + UserControl + + + WordsItemControl.cs + + BarSessionControl.cs @@ -103,6 +176,30 @@ SessionItemControl.cs + + SettingRebootControl.cs + + + SettingSCCMControl.cs + + + SettingWordsControl.cs + + + BilderWords.cs + + + WordsCategoryControl.cs + + + WordsEditCategoryControl.cs + + + WordsEditCompControl.cs + + + WordsItemControl.cs + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Remontor/SCCMsearch/IAuthType.cs b/Remontor/SCCMsearch/IAuthType.cs index 84d7281..c18e162 100644 --- a/Remontor/SCCMsearch/IAuthType.cs +++ b/Remontor/SCCMsearch/IAuthType.cs @@ -8,8 +8,8 @@ namespace Remontor.SCCMsearch { internal interface IAuthType { - public string Name { get; } - public string Password { get; } - public string AuthString(); + string Name { get; } + string Password { get; } + string AuthString(); } } diff --git a/Remontor/Seacher/ISeaherMetod.cs b/Remontor/Seacher/ISeaherMetod.cs index 9fbd75b..77ae2c9 100644 --- a/Remontor/Seacher/ISeaherMetod.cs +++ b/Remontor/Seacher/ISeaherMetod.cs @@ -9,9 +9,9 @@ namespace Remontor.Seacher { internal interface ISeaherMetod { - public void Change(ResultUpdate sender, string seach); - public IComp Result(int index); - public string ResultString(int index); + void Change(ResultUpdate sender, string seach); + IComp Result(int index); + string ResultString(int index); } } diff --git a/Remontor/Seacher/SeachSCCM.cs b/Remontor/Seacher/SeachSCCM.cs index c8d95f0..fdd666b 100644 --- a/Remontor/Seacher/SeachSCCM.cs +++ b/Remontor/Seacher/SeachSCCM.cs @@ -91,8 +91,8 @@ namespace Remontor.Seacher private string QueryBilder(string query) { string result; - Regex regexCyrillic = new(@"\p{IsCyrillic}+", RegexOptions.IgnoreCase); - Regex regexNumrable = new(@"\d+", RegexOptions.IgnoreCase); + Regex regexCyrillic = new Regex(@"\p{IsCyrillic}+", RegexOptions.IgnoreCase); + Regex regexNumrable = new Regex(@"\d+", RegexOptions.IgnoreCase); MatchCollection jjj = regexNumrable.Matches(query); if (regexCyrillic.Matches(query).Count > 0) { diff --git a/Remontor/Setting/SettingSCCMControl.cs b/Remontor/Setting/SettingSCCMControl.cs index 1560d16..75efee0 100644 --- a/Remontor/Setting/SettingSCCMControl.cs +++ b/Remontor/Setting/SettingSCCMControl.cs @@ -82,7 +82,7 @@ namespace Remontor.Setting private void bt_checkConnect_Click(object sender, EventArgs e) { - SeachSCCM SeacherCheck = new(cb_windowsAuth.Checked, ib_username.Text, ib_password.Text); + SeachSCCM SeacherCheck = new SeachSCCM(cb_windowsAuth.Checked, ib_username.Text, ib_password.Text); MessageBox.Show(SeacherCheck.CheckConnect(ib_server.Text,ib_dataBase.Text)); } } diff --git a/Remontor/Words/IWordsContol.cs b/Remontor/Words/IWordsContol.cs index 28fb57b..e41ed84 100644 --- a/Remontor/Words/IWordsContol.cs +++ b/Remontor/Words/IWordsContol.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Reseter2.Words +namespace Remontor.Words { internal interface IWordsContol { diff --git a/Remontor/Words/IWordsItem.cs b/Remontor/Words/IWordsItem.cs index ff16c94..d1d780f 100644 --- a/Remontor/Words/IWordsItem.cs +++ b/Remontor/Words/IWordsItem.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace Reseter2.Words +namespace Remontor.Words { [Serializable] internal abstract class IWordsItem diff --git a/Remontor/Words/WordsCategory.cs b/Remontor/Words/WordsCategory.cs index c0fa054..edc1045 100644 --- a/Remontor/Words/WordsCategory.cs +++ b/Remontor/Words/WordsCategory.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace Reseter2.Words +namespace Remontor.Words { [Serializable] internal class WordsCategory : IWordsItem diff --git a/Remontor/bin/Debug/Remontor.exe b/Remontor/bin/Debug/Remontor.exe index a5de831..3838f52 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 433831d..99e6c50 100644 Binary files a/Remontor/bin/Debug/Remontor.pdb and b/Remontor/bin/Debug/Remontor.pdb differ diff --git a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 3ca7d05..f7576a9 100644 Binary files a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Remontor/obj/Debug/Remontor.Setting.SettingRebootControl.resources b/Remontor/obj/Debug/Remontor.Setting.SettingRebootControl.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Remontor/obj/Debug/Remontor.Setting.SettingRebootControl.resources differ diff --git a/Remontor/obj/Debug/Remontor.Setting.SettingSCCMControl.resources b/Remontor/obj/Debug/Remontor.Setting.SettingSCCMControl.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Remontor/obj/Debug/Remontor.Setting.SettingSCCMControl.resources differ diff --git a/Remontor/obj/Debug/Remontor.Setting.SettingWordsControl.resources b/Remontor/obj/Debug/Remontor.Setting.SettingWordsControl.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Remontor/obj/Debug/Remontor.Setting.SettingWordsControl.resources differ diff --git a/Remontor/obj/Debug/Remontor.Words.BilderWords.resources b/Remontor/obj/Debug/Remontor.Words.BilderWords.resources new file mode 100644 index 0000000..8b8ed98 Binary files /dev/null and b/Remontor/obj/Debug/Remontor.Words.BilderWords.resources differ diff --git a/Remontor/obj/Debug/Remontor.Words.WordsCategoryControl.resources b/Remontor/obj/Debug/Remontor.Words.WordsCategoryControl.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Remontor/obj/Debug/Remontor.Words.WordsCategoryControl.resources differ diff --git a/Remontor/obj/Debug/Remontor.Words.WordsEditCategoryControl.resources b/Remontor/obj/Debug/Remontor.Words.WordsEditCategoryControl.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Remontor/obj/Debug/Remontor.Words.WordsEditCategoryControl.resources differ diff --git a/Remontor/obj/Debug/Remontor.Words.WordsEditCompControl.resources b/Remontor/obj/Debug/Remontor.Words.WordsEditCompControl.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Remontor/obj/Debug/Remontor.Words.WordsEditCompControl.resources differ diff --git a/Remontor/obj/Debug/Remontor.Words.WordsItemControl.resources b/Remontor/obj/Debug/Remontor.Words.WordsItemControl.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Remontor/obj/Debug/Remontor.Words.WordsItemControl.resources differ diff --git a/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache b/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache index 344d54f..30d814a 100644 --- a/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache +++ b/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -5dbc82744c739a57c33771a80f9ca9244fbf42fb +a242571a09c5a9eb69787b6862e9dfdf49e5e5fd diff --git a/Remontor/obj/Debug/Remontor.csproj.FileListAbsolute.txt b/Remontor/obj/Debug/Remontor.csproj.FileListAbsolute.txt index 508c30c..83da36e 100644 --- a/Remontor/obj/Debug/Remontor.csproj.FileListAbsolute.txt +++ b/Remontor/obj/Debug/Remontor.csproj.FileListAbsolute.txt @@ -13,3 +13,11 @@ C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Flow C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.SessionItemControl.resources C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.BarSessionControl.resources C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Finder.Finder.resources +C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Setting.SettingRebootControl.resources +C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Setting.SettingSCCMControl.resources +C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Setting.SettingWordsControl.resources +C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Words.BilderWords.resources +C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Words.WordsCategoryControl.resources +C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Words.WordsEditCategoryControl.resources +C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Words.WordsEditCompControl.resources +C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Words.WordsItemControl.resources diff --git a/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache b/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache index 73653db..aa4cba2 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 a5de831..3838f52 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 433831d..99e6c50 100644 Binary files a/Remontor/obj/Debug/Remontor.pdb and b/Remontor/obj/Debug/Remontor.pdb differ