diff --git a/Tariffs/Form1.Designer.cs b/Tariffs/Form1.Designer.cs index 702b582..083d347 100644 --- a/Tariffs/Form1.Designer.cs +++ b/Tariffs/Form1.Designer.cs @@ -32,6 +32,7 @@ this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.тарифToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.обновитьToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.фильтрToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.выходToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.параметрыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.регионToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -63,12 +64,44 @@ this.button4 = new System.Windows.Forms.Button(); this.button5 = new System.Windows.Forms.Button(); this.button6 = new System.Windows.Forms.Button(); + this.numericUpDown8 = new System.Windows.Forms.NumericUpDown(); + this.label12 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.numericUpDown7 = new System.Windows.Forms.NumericUpDown(); + this.label11 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown3 = new System.Windows.Forms.NumericUpDown(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.numericUpDown4 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown5 = new System.Windows.Forms.NumericUpDown(); + this.label9 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.numericUpDown6 = new System.Windows.Forms.NumericUpDown(); + this.checkedListBox1 = new System.Windows.Forms.CheckedListBox(); + this.button7 = new System.Windows.Forms.Button(); + this.фильтрацияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.tabPage3.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).BeginInit(); this.SuspendLayout(); // // menuStrip1 @@ -79,7 +112,7 @@ this.справкаToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(807, 24); + this.menuStrip1.Size = new System.Drawing.Size(981, 24); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; // @@ -87,6 +120,7 @@ // this.тарифToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.обновитьToolStripMenuItem, + this.фильтрToolStripMenuItem, this.выходToolStripMenuItem}); this.тарифToolStripMenuItem.Name = "тарифToolStripMenuItem"; this.тарифToolStripMenuItem.Size = new System.Drawing.Size(54, 20); @@ -95,13 +129,22 @@ // обновитьToolStripMenuItem // this.обновитьToolStripMenuItem.Name = "обновитьToolStripMenuItem"; - this.обновитьToolStripMenuItem.Size = new System.Drawing.Size(128, 22); + this.обновитьToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.обновитьToolStripMenuItem.Text = "Обновить"; + this.обновитьToolStripMenuItem.Click += new System.EventHandler(this.обновитьToolStripMenuItem_Click); + // + // фильтрToolStripMenuItem + // + this.фильтрToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.фильтрацияToolStripMenuItem}); + this.фильтрToolStripMenuItem.Name = "фильтрToolStripMenuItem"; + this.фильтрToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.фильтрToolStripMenuItem.Text = "Фильтр"; // // выходToolStripMenuItem // this.выходToolStripMenuItem.Name = "выходToolStripMenuItem"; - this.выходToolStripMenuItem.Size = new System.Drawing.Size(128, 22); + this.выходToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.выходToolStripMenuItem.Text = "Выход"; this.выходToolStripMenuItem.Click += new System.EventHandler(this.CloseProgram); // @@ -176,10 +219,10 @@ this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage3); - this.tabControl1.Location = new System.Drawing.Point(12, 27); + this.tabControl1.Location = new System.Drawing.Point(201, 27); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(783, 313); + this.tabControl1.Size = new System.Drawing.Size(768, 313); this.tabControl1.TabIndex = 1; // // tabPage1 @@ -188,7 +231,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(775, 287); + this.tabPage1.Size = new System.Drawing.Size(760, 287); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Просмотр тарифов"; this.tabPage1.UseVisualStyleBackColor = true; @@ -208,7 +251,7 @@ this.Column8}); this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.Size = new System.Drawing.Size(779, 287); + this.dataGridView1.Size = new System.Drawing.Size(764, 287); this.dataGridView1.TabIndex = 0; // // toCompare @@ -383,11 +426,355 @@ this.button6.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.button6.UseVisualStyleBackColor = true; // + // numericUpDown8 + // + this.numericUpDown8.Location = new System.Drawing.Point(126, 236); + this.numericUpDown8.Maximum = new decimal(new int[] { + 2000, + 0, + 0, + 0}); + this.numericUpDown8.Minimum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.numericUpDown8.Name = "numericUpDown8"; + this.numericUpDown8.Size = new System.Drawing.Size(52, 20); + this.numericUpDown8.TabIndex = 43; + this.numericUpDown8.Value = new decimal(new int[] { + 500, + 0, + 0, + 0}); + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(101, 238); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(19, 13); + this.label12.TabIndex = 42; + this.label12.Text = "до"; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(19, 238); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(18, 13); + this.label13.TabIndex = 41; + this.label13.Text = "от"; + // + // numericUpDown7 + // + this.numericUpDown7.Location = new System.Drawing.Point(43, 236); + this.numericUpDown7.Maximum = new decimal(new int[] { + 2000, + 0, + 0, + 0}); + this.numericUpDown7.Minimum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.numericUpDown7.Name = "numericUpDown7"; + this.numericUpDown7.Size = new System.Drawing.Size(52, 20); + this.numericUpDown7.TabIndex = 40; + this.numericUpDown7.Value = new decimal(new int[] { + 250, + 0, + 0, + 0}); + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(12, 220); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(67, 13); + this.label11.TabIndex = 39; + this.label11.Text = "Абон. плата"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(12, 179); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(98, 13); + this.label8.TabIndex = 34; + this.label8.Text = "Интернет (МБ/ГБ)"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(12, 139); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(67, 13); + this.label5.TabIndex = 29; + this.label5.Text = "Кол-во SMS"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(12, 100); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(74, 13); + this.label2.TabIndex = 24; + this.label2.Text = "Кол-во минут"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 27); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(56, 13); + this.label1.TabIndex = 22; + this.label1.Text = "Оператор"; + // + // numericUpDown1 + // + this.numericUpDown1.Location = new System.Drawing.Point(126, 116); + this.numericUpDown1.Maximum = new decimal(new int[] { + 2000, + 0, + 0, + 0}); + this.numericUpDown1.Minimum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.numericUpDown1.Name = "numericUpDown1"; + this.numericUpDown1.Size = new System.Drawing.Size(52, 20); + this.numericUpDown1.TabIndex = 47; + this.numericUpDown1.Value = new decimal(new int[] { + 500, + 0, + 0, + 0}); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(101, 118); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(19, 13); + this.label3.TabIndex = 46; + this.label3.Text = "до"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(19, 118); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(18, 13); + this.label4.TabIndex = 45; + this.label4.Text = "от"; + // + // numericUpDown2 + // + this.numericUpDown2.Location = new System.Drawing.Point(43, 116); + this.numericUpDown2.Maximum = new decimal(new int[] { + 2000, + 0, + 0, + 0}); + this.numericUpDown2.Minimum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.numericUpDown2.Name = "numericUpDown2"; + this.numericUpDown2.Size = new System.Drawing.Size(52, 20); + this.numericUpDown2.TabIndex = 44; + this.numericUpDown2.Value = new decimal(new int[] { + 250, + 0, + 0, + 0}); + // + // numericUpDown3 + // + this.numericUpDown3.Location = new System.Drawing.Point(126, 155); + this.numericUpDown3.Maximum = new decimal(new int[] { + 2000, + 0, + 0, + 0}); + this.numericUpDown3.Minimum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.numericUpDown3.Name = "numericUpDown3"; + this.numericUpDown3.Size = new System.Drawing.Size(52, 20); + this.numericUpDown3.TabIndex = 51; + this.numericUpDown3.Value = new decimal(new int[] { + 500, + 0, + 0, + 0}); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(101, 157); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(19, 13); + this.label6.TabIndex = 50; + this.label6.Text = "до"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(19, 157); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(18, 13); + this.label7.TabIndex = 49; + this.label7.Text = "от"; + // + // numericUpDown4 + // + this.numericUpDown4.Location = new System.Drawing.Point(43, 155); + this.numericUpDown4.Maximum = new decimal(new int[] { + 2000, + 0, + 0, + 0}); + this.numericUpDown4.Minimum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.numericUpDown4.Name = "numericUpDown4"; + this.numericUpDown4.Size = new System.Drawing.Size(52, 20); + this.numericUpDown4.TabIndex = 48; + this.numericUpDown4.Value = new decimal(new int[] { + 250, + 0, + 0, + 0}); + // + // numericUpDown5 + // + this.numericUpDown5.Location = new System.Drawing.Point(126, 195); + this.numericUpDown5.Maximum = new decimal(new int[] { + 2000, + 0, + 0, + 0}); + this.numericUpDown5.Minimum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.numericUpDown5.Name = "numericUpDown5"; + this.numericUpDown5.Size = new System.Drawing.Size(52, 20); + this.numericUpDown5.TabIndex = 55; + this.numericUpDown5.Value = new decimal(new int[] { + 500, + 0, + 0, + 0}); + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(101, 197); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(19, 13); + this.label9.TabIndex = 54; + this.label9.Text = "до"; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(19, 197); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(18, 13); + this.label10.TabIndex = 53; + this.label10.Text = "от"; + // + // numericUpDown6 + // + this.numericUpDown6.Location = new System.Drawing.Point(43, 195); + this.numericUpDown6.Maximum = new decimal(new int[] { + 2000, + 0, + 0, + 0}); + this.numericUpDown6.Minimum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.numericUpDown6.Name = "numericUpDown6"; + this.numericUpDown6.Size = new System.Drawing.Size(52, 20); + this.numericUpDown6.TabIndex = 52; + this.numericUpDown6.Value = new decimal(new int[] { + 250, + 0, + 0, + 0}); + // + // checkedListBox1 + // + this.checkedListBox1.FormattingEnabled = true; + this.checkedListBox1.Items.AddRange(new object[] { + "Мегафон", + "Билайн", + "МТС", + "Теле2"}); + this.checkedListBox1.Location = new System.Drawing.Point(74, 27); + this.checkedListBox1.Name = "checkedListBox1"; + this.checkedListBox1.Size = new System.Drawing.Size(120, 64); + this.checkedListBox1.TabIndex = 1; + // + // button7 + // + this.button7.Location = new System.Drawing.Point(92, 262); + this.button7.Name = "button7"; + this.button7.Size = new System.Drawing.Size(86, 23); + this.button7.TabIndex = 56; + this.button7.Text = "Фильтрация"; + this.button7.UseVisualStyleBackColor = true; + // + // фильтрацияToolStripMenuItem + // + this.фильтрацияToolStripMenuItem.Name = "фильтрацияToolStripMenuItem"; + this.фильтрацияToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.фильтрацияToolStripMenuItem.Text = "Фильтрация"; + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(807, 352); + this.ClientSize = new System.Drawing.Size(981, 352); + this.Controls.Add(this.button7); + this.Controls.Add(this.checkedListBox1); + this.Controls.Add(this.numericUpDown5); + this.Controls.Add(this.label9); + this.Controls.Add(this.label10); + this.Controls.Add(this.numericUpDown6); + this.Controls.Add(this.numericUpDown3); + this.Controls.Add(this.label6); + this.Controls.Add(this.label7); + this.Controls.Add(this.numericUpDown4); + this.Controls.Add(this.numericUpDown1); + this.Controls.Add(this.label3); + this.Controls.Add(this.label4); + this.Controls.Add(this.numericUpDown2); + this.Controls.Add(this.numericUpDown8); + this.Controls.Add(this.label12); + this.Controls.Add(this.label13); + this.Controls.Add(this.numericUpDown7); + this.Controls.Add(this.label11); + this.Controls.Add(this.label8); + this.Controls.Add(this.label5); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); this.Controls.Add(this.tabControl1); this.Controls.Add(this.menuStrip1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -402,6 +789,14 @@ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.tabPage3.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -412,7 +807,7 @@ private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.ToolStripMenuItem тарифToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem обновитьToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem выходToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem фильтрToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem параметрыToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem регионToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem московскаяОбластьToolStripMenuItem; @@ -443,6 +838,31 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column6; private System.Windows.Forms.DataGridViewTextBoxColumn Column7; private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.ToolStripMenuItem выходToolStripMenuItem; + private System.Windows.Forms.NumericUpDown numericUpDown8; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.NumericUpDown numericUpDown7; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.NumericUpDown numericUpDown1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.NumericUpDown numericUpDown2; + private System.Windows.Forms.NumericUpDown numericUpDown3; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.NumericUpDown numericUpDown4; + private System.Windows.Forms.NumericUpDown numericUpDown5; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.NumericUpDown numericUpDown6; + private System.Windows.Forms.CheckedListBox checkedListBox1; + private System.Windows.Forms.Button button7; + private System.Windows.Forms.ToolStripMenuItem фильтрацияToolStripMenuItem; } } diff --git a/Tariffs/Form1.cs b/Tariffs/Form1.cs index 49cb526..4dfbb1d 100644 --- a/Tariffs/Form1.cs +++ b/Tariffs/Form1.cs @@ -7,6 +7,22 @@ namespace Tariffs { public partial class Form1 : Form { + private int arrlenght = 50; + + private struct Filter + { + String[] operators; + + int min_minutes; + int max_minutes; + + int min_sms; + int max_sms; + + int min_pay; + int max_pay; + } + public Form1() { InitializeComponent(); @@ -33,7 +49,6 @@ namespace Tariffs private void Form1_Load(object sender, EventArgs e) { - int arrlenght = 50; WebClient client = new WebClient(); String remoteFile = "https://tariffslist.000webhostapp.com/list.txt"; @@ -119,6 +134,11 @@ namespace Tariffs } } + ReadListFile(); + } + + private void ReadListFile() + { StreamReader listfile = new StreamReader("list.txt"); String firststr = listfile.ReadLine(); String[,] tariffsArr = new String[arrlenght, 8]; @@ -145,7 +165,65 @@ namespace Tariffs { for (int ind = 1; ind < 7; ind++) { - tariffsArr[i, ind] = line.Split(new char[] { ',' })[ind-1]; + tariffsArr[i, ind] = line.Split(new char[] { ',' })[ind - 1]; + } + } + + line = listfile.ReadLine(); + i++; + } + + for (int rowind = 0; rowind < 50; rowind++) + { + tariffsArr[rowind, 0] = "false"; + } + + listfile.Close(); + + String[] rowsArray = new String[8]; + + dataGridView1.Rows.Clear(); + + for (int elind = 0; elind < 50; elind++) + { + for (int propind = 0; propind < 8; propind++) + { + rowsArray[propind] = tariffsArr[elind, propind]; + } + _ = dataGridView1.Rows.Add(rowsArray); + } + } + + private void ReadListFile(Filter filt_params) + { + StreamReader listfile = new StreamReader("list.txt"); + String firststr = listfile.ReadLine(); + String[,] tariffsArr = new String[arrlenght, 8]; + String line; + int propind = 0; + int i = 0; + + if (!(firststr == "Tariffs")) + { + MessageBox.Show("Неверный тип файла!\n\n" + + "Так как невозможно загрузить тарифы,\n" + + "приложение будет закрыто.", + "Ошибка", + MessageBoxButtons.OK, + MessageBoxIcon.Error); + listfile.Close(); + Close(); + } + + line = listfile.ReadLine(); + + while (line != "End") + { + if (!(line.StartsWith("#")) && line != "" && line != null) + { + for (int ind = 1; ind < 7; ind++) + { + tariffsArr[i, ind] = line.Split(new char[] { ',' })[ind - 1]; } } @@ -164,9 +242,10 @@ namespace Tariffs for (int elind = 0; elind < 50; elind++) { - for (int propind = 0; propind < 8; propind++) + while (propind < 8) { rowsArray[propind] = tariffsArr[elind, propind]; + propind++; } _ = dataGridView1.Rows.Add(rowsArray); } @@ -202,5 +281,10 @@ namespace Tariffs { openBrowser("https://www.tinkoff.ru/mobile-operator/"); } + + private void обновитьToolStripMenuItem_Click(object sender, EventArgs e) + { + ReadListFile(); + } } } diff --git a/Tariffs/bin/Debug/Tariffs.exe b/Tariffs/bin/Debug/Tariffs.exe index 65241a1..bb721b6 100644 Binary files a/Tariffs/bin/Debug/Tariffs.exe and b/Tariffs/bin/Debug/Tariffs.exe differ diff --git a/Tariffs/bin/Debug/Tariffs.pdb b/Tariffs/bin/Debug/Tariffs.pdb index 5528c22..7ab2b70 100644 Binary files a/Tariffs/bin/Debug/Tariffs.pdb and b/Tariffs/bin/Debug/Tariffs.pdb differ diff --git a/Tariffs/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Tariffs/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 77a6846..9ab6e35 100644 Binary files a/Tariffs/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Tariffs/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Tariffs/obj/Debug/Tariffs.csproj.FileListAbsolute.txt b/Tariffs/obj/Debug/Tariffs.csproj.FileListAbsolute.txt index b892f4e..bbf6109 100644 --- a/Tariffs/obj/Debug/Tariffs.csproj.FileListAbsolute.txt +++ b/Tariffs/obj/Debug/Tariffs.csproj.FileListAbsolute.txt @@ -29,3 +29,4 @@ C:\Users\Acer\VisualStudio\source\repos\Tariffs\Tariffs\obj\Debug\Tariffs.csproj C:\Users\Acer\VisualStudio\source\repos\Tariffs\Tariffs\obj\Debug\Tariffs.exe C:\Users\Acer\VisualStudio\source\repos\Tariffs\Tariffs\obj\Debug\Tariffs.pdb C:\Users\Acer\VisualStudio\source\repos\Tariffs\Tariffs\obj\Debug\Tariffs.Browser.resources +C:\Users\user\source\repos\Tariffs\Tariffs\obj\Debug\Tariffs.Browser.resources diff --git a/Tariffs/obj/Debug/Tariffs.csproj.GenerateResource.cache b/Tariffs/obj/Debug/Tariffs.csproj.GenerateResource.cache index 29a4b37..bb6b475 100644 Binary files a/Tariffs/obj/Debug/Tariffs.csproj.GenerateResource.cache and b/Tariffs/obj/Debug/Tariffs.csproj.GenerateResource.cache differ diff --git a/Tariffs/obj/Debug/Tariffs.csprojAssemblyReference.cache b/Tariffs/obj/Debug/Tariffs.csprojAssemblyReference.cache index 4896bfe..d1e7f2d 100644 Binary files a/Tariffs/obj/Debug/Tariffs.csprojAssemblyReference.cache and b/Tariffs/obj/Debug/Tariffs.csprojAssemblyReference.cache differ diff --git a/Tariffs/obj/Debug/Tariffs.exe b/Tariffs/obj/Debug/Tariffs.exe index 65241a1..bb721b6 100644 Binary files a/Tariffs/obj/Debug/Tariffs.exe and b/Tariffs/obj/Debug/Tariffs.exe differ diff --git a/Tariffs/obj/Debug/Tariffs.pdb b/Tariffs/obj/Debug/Tariffs.pdb index 5528c22..7ab2b70 100644 Binary files a/Tariffs/obj/Debug/Tariffs.pdb and b/Tariffs/obj/Debug/Tariffs.pdb differ