diff --git a/.vs/sql2/FileContentIndex/3987d9e6-69a7-463e-b23e-0123093a7cc4.vsidx b/.vs/sql2/FileContentIndex/3987d9e6-69a7-463e-b23e-0123093a7cc4.vsidx deleted file mode 100644 index f8ae502..0000000 Binary files a/.vs/sql2/FileContentIndex/3987d9e6-69a7-463e-b23e-0123093a7cc4.vsidx and /dev/null differ diff --git a/.vs/sql2/FileContentIndex/789594ef-c490-4115-9cdb-574fd9614ff4.vsidx b/.vs/sql2/FileContentIndex/789594ef-c490-4115-9cdb-574fd9614ff4.vsidx deleted file mode 100644 index acd4449..0000000 Binary files a/.vs/sql2/FileContentIndex/789594ef-c490-4115-9cdb-574fd9614ff4.vsidx and /dev/null differ diff --git a/.vs/sql2/FileContentIndex/833ad78b-4e9a-42bb-90d5-653b185fc33c.vsidx b/.vs/sql2/FileContentIndex/833ad78b-4e9a-42bb-90d5-653b185fc33c.vsidx deleted file mode 100644 index 7c749f6..0000000 Binary files a/.vs/sql2/FileContentIndex/833ad78b-4e9a-42bb-90d5-653b185fc33c.vsidx and /dev/null differ diff --git a/.vs/sql2/FileContentIndex/8a7272f1-ac0a-4f80-8d49-a83a02f8719d.vsidx b/.vs/sql2/FileContentIndex/8a7272f1-ac0a-4f80-8d49-a83a02f8719d.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/.vs/sql2/FileContentIndex/8a7272f1-ac0a-4f80-8d49-a83a02f8719d.vsidx differ diff --git a/.vs/sql2/FileContentIndex/a84bdfe0-f810-48d1-b2c5-80726efaf8ce.vsidx b/.vs/sql2/FileContentIndex/a84bdfe0-f810-48d1-b2c5-80726efaf8ce.vsidx new file mode 100644 index 0000000..7dc7e2f Binary files /dev/null and b/.vs/sql2/FileContentIndex/a84bdfe0-f810-48d1-b2c5-80726efaf8ce.vsidx differ diff --git a/.vs/sql2/FileContentIndex/ac3abf1b-19f5-427d-bc24-0887ed83d2bf.vsidx b/.vs/sql2/FileContentIndex/ac3abf1b-19f5-427d-bc24-0887ed83d2bf.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/.vs/sql2/FileContentIndex/ac3abf1b-19f5-427d-bc24-0887ed83d2bf.vsidx differ diff --git a/.vs/sql2/FileContentIndex/b01098b4-13b7-44e1-ac97-3e22daf806ad.vsidx b/.vs/sql2/FileContentIndex/b01098b4-13b7-44e1-ac97-3e22daf806ad.vsidx deleted file mode 100644 index ebfd883..0000000 Binary files a/.vs/sql2/FileContentIndex/b01098b4-13b7-44e1-ac97-3e22daf806ad.vsidx and /dev/null differ diff --git a/.vs/sql2/FileContentIndex/ca25dbab-aca9-44b7-8324-83bff7949e14.vsidx b/.vs/sql2/FileContentIndex/ca25dbab-aca9-44b7-8324-83bff7949e14.vsidx deleted file mode 100644 index 92285cb..0000000 Binary files a/.vs/sql2/FileContentIndex/ca25dbab-aca9-44b7-8324-83bff7949e14.vsidx and /dev/null differ diff --git a/.vs/sql2/FileContentIndex/dd2748b1-9d32-4399-b7ec-33101562157e.vsidx b/.vs/sql2/FileContentIndex/dd2748b1-9d32-4399-b7ec-33101562157e.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/.vs/sql2/FileContentIndex/dd2748b1-9d32-4399-b7ec-33101562157e.vsidx differ diff --git a/.vs/sql2/FileContentIndex/ecd36826-796d-4660-a5c7-0e40ac84a8d8.vsidx b/.vs/sql2/FileContentIndex/ecd36826-796d-4660-a5c7-0e40ac84a8d8.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/.vs/sql2/FileContentIndex/ecd36826-796d-4660-a5c7-0e40ac84a8d8.vsidx differ diff --git a/.vs/sql2/v17/.suo b/.vs/sql2/v17/.suo index 82280c2..9c69e33 100644 Binary files a/.vs/sql2/v17/.suo and b/.vs/sql2/v17/.suo differ diff --git a/sql2/Forms/DataForm.Designer.cs b/sql2/Forms/DataForm.Designer.cs index 1dcf495..919f62c 100644 --- a/sql2/Forms/DataForm.Designer.cs +++ b/sql2/Forms/DataForm.Designer.cs @@ -154,6 +154,7 @@ this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Size = new System.Drawing.Size(126, 29); this.toolStripButton2.Text = "Сохранить"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // // toolStripSeparator3 // diff --git a/sql2/Forms/DataForm.cs b/sql2/Forms/DataForm.cs index ae805e2..292498a 100644 --- a/sql2/Forms/DataForm.cs +++ b/sql2/Forms/DataForm.cs @@ -27,12 +27,14 @@ namespace PaymentLogs dataGridView1.Columns.Add("fcs", "ФИО"); dataGridView1.Columns.Add("course", "Курс"); dataGridView1.Columns.Add("course_price", "Цена"); + dataGridView1.Columns.Add("paid", "Оплачено"); dataGridView1.Columns.Add("debt", "Долг"); /* BindingList list1 = new BindingList(); dataGridView1.DataSource = list1;*/ foreach (Payment payment in Program.PaymentRepository.All()) { - dataGridView1.Rows.Add(payment.Id.ToString(), payment.FCs, Program.CourseRepository.ById(payment.CourseId).Name, payment.CoursePrice.ToString(), payment.Debt.ToString()); + dataGridView1.Rows.Add(payment.Id.ToString(), payment.FCs, Program.CourseRepository.Get(payment.CourseId).Name, + payment.CoursePrice.ToString(), payment.Paid.ToString(), payment.Debt.ToString()); } } @@ -50,5 +52,28 @@ namespace PaymentLogs { } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + foreach (DataGridViewRow row in dataGridView1.Rows) + { + try + { + Payment payment = new Payment + { + Id = Convert.ToInt32(row.Cells["id"].Value), + FCs = row.Cells["fcs"].ToString(), + CourseId = Program.CourseRepository.ByName(row.Cells["course"].Value.ToString()).Id, + CoursePrice = Convert.ToInt32(row.Cells["course_price"].Value), + Paid = Convert.ToInt32(row.Cells["paid"].Value), + Debt = Convert.ToInt32(row.Cells["debt"].Value) + }; + Program.PaymentRepository.Update(payment.Id, payment); + } catch(NullReferenceException ignored) + { } + + } + Program.PaymentRepository.Save(); + } } } diff --git a/sql2/Forms/LoginForm.cs b/sql2/Forms/LoginForm.cs index b2fc2ae..7b15c90 100644 --- a/sql2/Forms/LoginForm.cs +++ b/sql2/Forms/LoginForm.cs @@ -40,7 +40,7 @@ namespace PaymentLogs try { - User user = Program.UserRepository.GetUser(loginUser); + User user = Program.UserRepository.Get(loginUser); string hash = StringUtils.SHA256_hash(passUser); if (hash.Equals(StringUtils.SecureStringToString(user.PasswordHash))) { diff --git a/sql2/bin/Debug/PaymentLogs.exe b/sql2/bin/Debug/PaymentLogs.exe index bf54e21..125e41a 100644 Binary files a/sql2/bin/Debug/PaymentLogs.exe and b/sql2/bin/Debug/PaymentLogs.exe differ diff --git a/sql2/bin/Debug/PaymentLogs.pdb b/sql2/bin/Debug/PaymentLogs.pdb index cd125dc..ca710ea 100644 Binary files a/sql2/bin/Debug/PaymentLogs.pdb and b/sql2/bin/Debug/PaymentLogs.pdb differ diff --git a/sql2/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/sql2/obj/Debug/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..d5da7b9 Binary files /dev/null and b/sql2/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/sql2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/sql2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1bb2490..a3c4dd4 100644 Binary files a/sql2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/sql2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/sql2/obj/Debug/PaymentLogs.exe b/sql2/obj/Debug/PaymentLogs.exe index bf54e21..125e41a 100644 Binary files a/sql2/obj/Debug/PaymentLogs.exe and b/sql2/obj/Debug/PaymentLogs.exe differ diff --git a/sql2/obj/Debug/PaymentLogs.pdb b/sql2/obj/Debug/PaymentLogs.pdb index cd125dc..ca710ea 100644 Binary files a/sql2/obj/Debug/PaymentLogs.pdb and b/sql2/obj/Debug/PaymentLogs.pdb differ diff --git a/sql2/obj/Debug/paymentLogs.csproj.FileListAbsolute.txt b/sql2/obj/Debug/paymentLogs.csproj.FileListAbsolute.txt index d3ccc60..4aa059a 100644 --- a/sql2/obj/Debug/paymentLogs.csproj.FileListAbsolute.txt +++ b/sql2/obj/Debug/paymentLogs.csproj.FileListAbsolute.txt @@ -17,3 +17,22 @@ D:\source\sql2\sql2\bin\Debug\MySql.Data.xml D:\source\sql2\sql2\obj\Debug\paymentL.CB2ACF0F.Up2Date D:\source\sql2\sql2\obj\Debug\PaymentLogs.exe D:\source\sql2\sql2\obj\Debug\PaymentLogs.pdb +D:\VS\PaymentLogs\sql2\obj\Debug\paymentLogs.csproj.AssemblyReference.cache +D:\VS\PaymentLogs\sql2\obj\Debug\PaymentLogs.DataForm.resources +D:\VS\PaymentLogs\sql2\obj\Debug\PaymentLogs.LoginForm.resources +D:\VS\PaymentLogs\sql2\obj\Debug\PaymentLogs.RegisterForm.resources +D:\VS\PaymentLogs\sql2\obj\Debug\PaymentLogs.Properties.Resources.resources +D:\VS\PaymentLogs\sql2\obj\Debug\paymentLogs.csproj.GenerateResource.cache +D:\VS\PaymentLogs\sql2\obj\Debug\paymentLogs.csproj.CoreCompileInputs.cache +D:\VS\PaymentLogs\sql2\obj\Debug\PaymentLogs.exe +D:\VS\PaymentLogs\sql2\obj\Debug\PaymentLogs.pdb +D:\VS\PaymentLogs\sql2\bin\Debug\PaymentLogs.exe.config +D:\VS\PaymentLogs\sql2\bin\Debug\PaymentLogs.exe +D:\VS\PaymentLogs\sql2\bin\Debug\PaymentLogs.pdb +D:\VS\PaymentLogs\sql2\bin\Debug\MySql.Data.dll +D:\VS\PaymentLogs\sql2\bin\Debug\System.Memory.dll +D:\VS\PaymentLogs\sql2\bin\Debug\System.Threading.Tasks.Extensions.dll +D:\VS\PaymentLogs\sql2\bin\Debug\System.Numerics.Vectors.dll +D:\VS\PaymentLogs\sql2\bin\Debug\System.Buffers.dll +D:\VS\PaymentLogs\sql2\bin\Debug\MySql.Data.xml +D:\VS\PaymentLogs\sql2\obj\Debug\paymentL.CB2ACF0F.Up2Date diff --git a/sql2/obj/Debug/paymentLogs.csproj.GenerateResource.cache b/sql2/obj/Debug/paymentLogs.csproj.GenerateResource.cache index 0d1de0d..a749d51 100644 Binary files a/sql2/obj/Debug/paymentLogs.csproj.GenerateResource.cache and b/sql2/obj/Debug/paymentLogs.csproj.GenerateResource.cache differ