diff --git a/Cicm.Database/Operations/Admin.cs b/Cicm.Database/Operations/Admin.cs index 6e091848..d2db374d 100644 --- a/Cicm.Database/Operations/Admin.cs +++ b/Cicm.Database/Operations/Admin.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddAdmin(Admin entry, out long id) { #if DEBUG - Console.Write("Adding admin `{0}`...", entry.user); + Console.Write("Adding admin `{0}`...", entry.Username); #endif IDbCommand dbcmd = GetCommandAdmin(entry); @@ -203,14 +203,14 @@ namespace Cicm.Database public bool UpdateAdmin(Admin entry) { #if DEBUG - Console.WriteLine("Updating admin `{0}`...", entry.user); + Console.WriteLine("Updating admin `{0}`...", entry.Username); #endif IDbCommand dbcmd = GetCommandAdmin(entry); IDbTransaction trans = dbCon.BeginTransaction(); dbcmd.Transaction = trans; - string sql = "UPDATE admin SET user = @user, password = @password " + $"WHERE id = {entry.id}"; + string sql = "UPDATE admin SET user = @user, password = @password " + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -260,8 +260,8 @@ namespace Cicm.Database param1.DbType = DbType.String; param2.DbType = DbType.String; - param1.Value = entry.user; - param2.Value = entry.password; + param1.Value = entry.Username; + param2.Value = entry.Password; dbcmd.Parameters.Add(param1); dbcmd.Parameters.Add(param2); @@ -277,9 +277,9 @@ namespace Cicm.Database { Admin entry = new Admin { - id = int.Parse(dataRow["id"].ToString()), - user = dataRow["user"].ToString(), - password = dataRow["password"].ToString() + Id = int.Parse(dataRow["id"].ToString()), + Username = dataRow["user"].ToString(), + Password = dataRow["password"].ToString() }; entries.Add(entry); diff --git a/Cicm.Database/Operations/BrowserTest.cs b/Cicm.Database/Operations/BrowserTest.cs index d8df6744..d8e6fddc 100644 --- a/Cicm.Database/Operations/BrowserTest.cs +++ b/Cicm.Database/Operations/BrowserTest.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddBrowserTest(BrowserTest entry, out long id) { #if DEBUG - Console.Write("Adding browser test `{0}`...", entry.idstring); + Console.Write("Adding browser test `{0}`...", entry.UserAgent); #endif IDbCommand dbcmd = GetCommandBrowserTest(entry); @@ -205,7 +205,7 @@ namespace Cicm.Database public bool UpdateBrowserTest(BrowserTest entry) { #if DEBUG - Console.WriteLine("Updating browser test `{0}`...", entry.idstring); + Console.WriteLine("Updating browser test `{0}`...", entry.UserAgent); #endif IDbCommand dbcmd = GetCommandBrowserTest(entry); @@ -215,7 +215,7 @@ namespace Cicm.Database string sql = "UPDATE browser_test SET idstring = @idstring, browser = @browser, version = @version, os = @os, platform = @platform, gif87 = @gif87, " + "gif89 = @gif89, jpeg = @jpeg, png = @png, pngt = @pngt, agif = @agif, table = @table, colors = @colors, js = @js, frames = @frames, flash = @flash " + - $"WHERE id = {entry.id}"; + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -307,22 +307,22 @@ namespace Cicm.Database param15.DbType = DbType.Boolean; param16.DbType = DbType.Boolean; - param1.Value = entry.idstring; - param2.Value = entry.browser; - param3.Value = entry.version; - param4.Value = entry.os; - param5.Value = entry.platform; - param6.Value = entry.gif87; - param7.Value = entry.gif89; - param8.Value = entry.jpeg; - param9.Value = entry.png; - param10.Value = entry.pngt; - param11.Value = entry.agif; - param12.Value = entry.table; - param13.Value = entry.colors; - param14.Value = entry.js; - param15.Value = entry.frames; - param16.Value = entry.flash; + param1.Value = entry.UserAgent; + param2.Value = entry.Name; + param3.Value = entry.Version; + param4.Value = entry.OperatingSystem; + param5.Value = entry.Architecture; + param6.Value = entry.Gif87; + param7.Value = entry.Gif89; + param8.Value = entry.Jpeg; + param9.Value = entry.Png; + param10.Value = entry.AlphaPng; + param11.Value = entry.AnimatedGif; + param12.Value = entry.Tables; + param13.Value = entry.Color; + param14.Value = entry.Js; + param15.Value = entry.Frames; + param16.Value = entry.Flash; dbcmd.Parameters.Add(param1); dbcmd.Parameters.Add(param2); @@ -352,23 +352,23 @@ namespace Cicm.Database { BrowserTest entry = new BrowserTest { - id = ushort.Parse(dataRow["id"].ToString()), - idstring = dataRow["idstring"].ToString(), - browser = dataRow["browser"].ToString(), - version = dataRow["version"].ToString(), - os = dataRow["os"].ToString(), - platform = dataRow["platform"].ToString(), - gif87 = bool.Parse(dataRow["gif87"].ToString()), - gif89 = bool.Parse(dataRow["gif89"].ToString()), - jpeg = bool.Parse(dataRow["jpeg"].ToString()), - png = bool.Parse(dataRow["png"].ToString()), - pngt = bool.Parse(dataRow["pngt"].ToString()), - agif = bool.Parse(dataRow["agif"].ToString()), - table = bool.Parse(dataRow["table"].ToString()), - colors = bool.Parse(dataRow["colors"].ToString()), - js = bool.Parse(dataRow["js"].ToString()), - frames = bool.Parse(dataRow["frames"].ToString()), - flash = bool.Parse(dataRow["flash"].ToString()) + Id = ushort.Parse(dataRow["id"].ToString()), + UserAgent = dataRow["idstring"].ToString(), + Name = dataRow["browser"].ToString(), + Version = dataRow["version"].ToString(), + OperatingSystem = dataRow["os"].ToString(), + Architecture = dataRow["platform"].ToString(), + Gif87 = bool.Parse(dataRow["gif87"].ToString()), + Gif89 = bool.Parse(dataRow["gif89"].ToString()), + Jpeg = bool.Parse(dataRow["jpeg"].ToString()), + Png = bool.Parse(dataRow["png"].ToString()), + AlphaPng = bool.Parse(dataRow["pngt"].ToString()), + AnimatedGif = bool.Parse(dataRow["agif"].ToString()), + Tables = bool.Parse(dataRow["table"].ToString()), + Color = bool.Parse(dataRow["colors"].ToString()), + Js = bool.Parse(dataRow["js"].ToString()), + Frames = bool.Parse(dataRow["frames"].ToString()), + Flash = bool.Parse(dataRow["flash"].ToString()) }; entries.Add(entry); diff --git a/Cicm.Database/Operations/Company.cs b/Cicm.Database/Operations/Company.cs index 22189e8d..bbf70a3b 100644 --- a/Cicm.Database/Operations/Company.cs +++ b/Cicm.Database/Operations/Company.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddCompany(Company entry, out long id) { #if DEBUG - Console.Write("Adding company `{0}`...", entry.Compania); + Console.Write("Adding company `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandCompany(entry); @@ -203,14 +203,14 @@ namespace Cicm.Database public bool UpdateCompany(Company entry) { #if DEBUG - Console.WriteLine("Updating company `{0}`...", entry.Compania); + Console.WriteLine("Updating company `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandCompany(entry); IDbTransaction trans = dbCon.BeginTransaction(); dbcmd.Transaction = trans; - string sql = "UPDATE Companias SET Compania = @Compania " + $"WHERE id = {entry.id}"; + string sql = "UPDATE Companias SET Compania = @Compania " + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -257,7 +257,7 @@ namespace Cicm.Database param1.DbType = DbType.String; - param1.Value = entry.Compania; + param1.Value = entry.Name; dbcmd.Parameters.Add(param1); @@ -272,8 +272,8 @@ namespace Cicm.Database { Company entry = new Company { - id = int.Parse(dataRow["id"].ToString()), - Compania = dataRow["Compania"].ToString() + Id = int.Parse(dataRow["id"].ToString()), + Name = dataRow["Compania"].ToString() }; entries.Add(entry); diff --git a/Cicm.Database/Operations/Computer.cs b/Cicm.Database/Operations/Computer.cs index d8a3f563..9c9d6051 100644 --- a/Cicm.Database/Operations/Computer.cs +++ b/Cicm.Database/Operations/Computer.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddComputer(Computer entry, out long id) { #if DEBUG - Console.Write("Adding computer `{0}`...", entry.model); + Console.Write("Adding computer `{0}`...", entry.Model); #endif IDbCommand dbcmd = GetCommandComputer(entry); @@ -205,7 +205,7 @@ namespace Cicm.Database public bool UpdateComputer(Computer entry) { #if DEBUG - Console.WriteLine("Updating computer `{0}`...", entry.model); + Console.WriteLine("Updating computer `{0}`...", entry.Model); #endif IDbCommand dbcmd = GetCommandComputer(entry); @@ -216,7 +216,7 @@ namespace Cicm.Database "UPDATE computers SET company = @company, year = @year, model = @model, cpu1 = @cpu1, mhz1 = @mhz1, cpu2 = @cpu2, " + "mhz2 = @mhz2, bits = @bits, ram = @ram, rom = @rom, gpu = @gpu, vram = @vram, colors = @colors, res = @res, spu = @spu, mpu = @mpu " + "sound_channels = @sound_channels, music_channels = @music_channels, hdd1 = @hdd1, hdd2 = @hdd2, hdd3 = @hdd3, disk1 = @disk1, cap1 = @cap1, disk2 = @disk2, cap2 = @cap2, comment = @comment " + - $"WHERE id = {entry.id}"; + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -338,32 +338,32 @@ namespace Cicm.Database param25.DbType = DbType.String; param26.DbType = DbType.String; - param1.Value = entry.company; - param2.Value = entry.year; - param3.Value = entry.model; - param4.Value = entry.cpu1; - param5.Value = entry.mhz1; - param6.Value = entry.cpu2; - param7.Value = entry.mhz2; - param8.Value = entry.bits; - param9.Value = entry.ram; - param10.Value = entry.rom; - param11.Value = entry.gpu; - param12.Value = entry.vram; - param13.Value = entry.colors; - param14.Value = entry.res; - param15.Value = entry.spu; - param16.Value = entry.mpu; - param17.Value = entry.sound_channels; - param18.Value = entry.music_channels; - param19.Value = entry.hdd1; - param20.Value = entry.hdd2; - param21.Value = entry.hdd3; - param22.Value = entry.disk1; - param23.Value = entry.cap1; - param24.Value = entry.disk2; - param25.Value = entry.cap2; - param26.Value = entry.comment; + param1.Value = entry.Company; + param2.Value = entry.Year; + param3.Value = entry.Model; + param4.Value = entry.Cpu1; + param5.Value = entry.Mhz1; + param6.Value = entry.Cpu2; + param7.Value = entry.Mhz2; + param8.Value = entry.Bits; + param9.Value = entry.Ram; + param10.Value = entry.Rom; + param11.Value = entry.Gpu; + param12.Value = entry.Vram; + param13.Value = entry.Colors; + param14.Value = entry.Resolution; + param15.Value = entry.Spu; + param16.Value = entry.Mpu; + param17.Value = entry.SoundChannels; + param18.Value = entry.MusicChannels; + param19.Value = entry.Hdd1; + param20.Value = entry.Hdd2; + param21.Value = entry.Hdd3; + param22.Value = entry.Disk1; + param23.Value = entry.Cap1; + param24.Value = entry.Disk2; + param25.Value = entry.Cap2; + param26.Value = entry.Comment; dbcmd.Parameters.Add(param1); dbcmd.Parameters.Add(param2); @@ -403,33 +403,33 @@ namespace Cicm.Database { Computer entry = new Computer { - id = int.Parse(dataRow["id"].ToString()), - company = int.Parse(dataRow["company"].ToString()), - year = int.Parse(dataRow["year"].ToString()), - model = dataRow["model"].ToString(), - cpu1 = int.Parse(dataRow["cpu1"].ToString()), - mhz1 = float.Parse(dataRow["mhz1"].ToString()), - cpu2 = int.Parse(dataRow["cpu2"].ToString()), - mhz2 = float.Parse(dataRow["mhz2"].ToString()), - bits = int.Parse(dataRow["bits"].ToString()), - ram = int.Parse(dataRow["ram"].ToString()), - rom = int.Parse(dataRow["rom"].ToString()), - gpu = int.Parse(dataRow["gpu"].ToString()), - vram = int.Parse(dataRow["vram"].ToString()), - colors = int.Parse(dataRow["colors"].ToString()), - res = dataRow["res"].ToString(), - spu = int.Parse(dataRow["spu"].ToString()), - mpu = int.Parse(dataRow["mpu"].ToString()), - sound_channels = int.Parse(dataRow["sound_channels"].ToString()), - music_channels = int.Parse(dataRow["music_channels"].ToString()), - hdd1 = int.Parse(dataRow["hdd1"].ToString()), - hdd2 = int.Parse(dataRow["hdd2"].ToString()), - hdd3 = int.Parse(dataRow["hdd3"].ToString()), - disk1 = int.Parse(dataRow["disk1"].ToString()), - cap1 = dataRow["cap1"].ToString(), - disk2 = int.Parse(dataRow["disk2"].ToString()), - cap2 = dataRow["cap2"].ToString(), - comment = dataRow["comment"].ToString() + Id = int.Parse(dataRow["id"].ToString()), + Company = int.Parse(dataRow["company"].ToString()), + Year = int.Parse(dataRow["year"].ToString()), + Model = dataRow["model"].ToString(), + Cpu1 = int.Parse(dataRow["cpu1"].ToString()), + Mhz1 = float.Parse(dataRow["mhz1"].ToString()), + Cpu2 = int.Parse(dataRow["cpu2"].ToString()), + Mhz2 = float.Parse(dataRow["mhz2"].ToString()), + Bits = int.Parse(dataRow["bits"].ToString()), + Ram = int.Parse(dataRow["ram"].ToString()), + Rom = int.Parse(dataRow["rom"].ToString()), + Gpu = int.Parse(dataRow["gpu"].ToString()), + Vram = int.Parse(dataRow["vram"].ToString()), + Colors = int.Parse(dataRow["colors"].ToString()), + Resolution = dataRow["res"].ToString(), + Spu = int.Parse(dataRow["spu"].ToString()), + Mpu = int.Parse(dataRow["mpu"].ToString()), + SoundChannels = int.Parse(dataRow["sound_channels"].ToString()), + MusicChannels = int.Parse(dataRow["music_channels"].ToString()), + Hdd1 = int.Parse(dataRow["hdd1"].ToString()), + Hdd2 = int.Parse(dataRow["hdd2"].ToString()), + Hdd3 = int.Parse(dataRow["hdd3"].ToString()), + Disk1 = int.Parse(dataRow["disk1"].ToString()), + Cap1 = dataRow["cap1"].ToString(), + Disk2 = int.Parse(dataRow["disk2"].ToString()), + Cap2 = dataRow["cap2"].ToString(), + Comment = dataRow["comment"].ToString() }; entries.Add(entry); diff --git a/Cicm.Database/Operations/Console.cs b/Cicm.Database/Operations/Console.cs index d9204a9c..87c29457 100644 --- a/Cicm.Database/Operations/Console.cs +++ b/Cicm.Database/Operations/Console.cs @@ -170,7 +170,7 @@ namespace Cicm.Database public bool AddConsole(Console entry, out long id) { #if DEBUG - System.Console.Write("Adding console `{0}`...", entry.name); + System.Console.Write("Adding console `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandConsole(entry); @@ -204,7 +204,7 @@ namespace Cicm.Database public bool UpdateConsole(Console entry) { #if DEBUG - System.Console.WriteLine("Updating console `{0}`...", entry.name); + System.Console.WriteLine("Updating console `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandConsole(entry); @@ -215,7 +215,7 @@ namespace Cicm.Database "UPDATE consoles SET company = @company, year = @year, name = @name, cpu1 = @cpu1, mhz1 = @mhz1, cpu2 = @cpu2, " + "mhz2 = @mhz2, bits = @bits, ram = @ram, rom = @rom, gpu = @gpu, vram = @vram, colors = @colors, res = @res, spu = @spu, mpu = @mpu " + "schannels = @schannels, mchannels = @mchannels, palette = @palette, format = @format, cap = @cap, comments = @comments " + - $"WHERE id = {entry.id}"; + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -325,28 +325,28 @@ namespace Cicm.Database param21.DbType = DbType.Int32; param22.DbType = DbType.String; - param1.Value = entry.company; - param2.Value = entry.year; - param3.Value = entry.name; - param4.Value = entry.cpu1; - param5.Value = entry.mhz1; - param6.Value = entry.cpu2; - param7.Value = entry.mhz2; - param8.Value = entry.bits; - param9.Value = entry.ram; - param10.Value = entry.rom; - param11.Value = entry.gpu; - param12.Value = entry.vram; - param13.Value = entry.colors; - param14.Value = entry.res; - param15.Value = entry.spu; - param16.Value = entry.mpu; - param17.Value = entry.schannels; - param18.Value = entry.mchannels; - param19.Value = entry.palette; - param20.Value = entry.format; - param21.Value = entry.cap; - param22.Value = entry.comments; + param1.Value = entry.Company; + param2.Value = entry.Year; + param3.Value = entry.Name; + param4.Value = entry.Cpu1; + param5.Value = entry.Mhz1; + param6.Value = entry.Cpu2; + param7.Value = entry.Mhz2; + param8.Value = entry.Bits; + param9.Value = entry.Ram; + param10.Value = entry.Rom; + param11.Value = entry.Gpu; + param12.Value = entry.Vram; + param13.Value = entry.Colors; + param14.Value = entry.Resolution; + param15.Value = entry.Spu; + param16.Value = entry.Mpu; + param17.Value = entry.SoundChannels; + param18.Value = entry.MusicChannels; + param19.Value = entry.Palette; + param20.Value = entry.Format; + param21.Value = entry.Cap; + param22.Value = entry.Comments; dbcmd.Parameters.Add(param1); dbcmd.Parameters.Add(param2); @@ -382,29 +382,29 @@ namespace Cicm.Database { Console entry = new Console { - id = int.Parse(dataRow["id"].ToString()), - company = int.Parse(dataRow["company"].ToString()), - year = int.Parse(dataRow["year"].ToString()), - name = dataRow["name"].ToString(), - cpu1 = int.Parse(dataRow["cpu1"].ToString()), - mhz1 = float.Parse(dataRow["mhz1"].ToString()), - cpu2 = int.Parse(dataRow["cpu2"].ToString()), - mhz2 = float.Parse(dataRow["mhz2"].ToString()), - bits = int.Parse(dataRow["bits"].ToString()), - ram = int.Parse(dataRow["ram"].ToString()), - rom = int.Parse(dataRow["rom"].ToString()), - gpu = int.Parse(dataRow["gpu"].ToString()), - vram = int.Parse(dataRow["vram"].ToString()), - colors = int.Parse(dataRow["colors"].ToString()), - res = dataRow["res"].ToString(), - spu = int.Parse(dataRow["spu"].ToString()), - mpu = int.Parse(dataRow["mpu"].ToString()), - schannels = int.Parse(dataRow["schannels"].ToString()), - mchannels = int.Parse(dataRow["mchannels"].ToString()), - palette = int.Parse(dataRow["palette"].ToString()), - format = int.Parse(dataRow["format"].ToString()), - cap = int.Parse(dataRow["cap"].ToString()), - comments = dataRow["comments"].ToString() + Id = int.Parse(dataRow["id"].ToString()), + Company = int.Parse(dataRow["company"].ToString()), + Year = int.Parse(dataRow["year"].ToString()), + Name = dataRow["name"].ToString(), + Cpu1 = int.Parse(dataRow["cpu1"].ToString()), + Mhz1 = float.Parse(dataRow["mhz1"].ToString()), + Cpu2 = int.Parse(dataRow["cpu2"].ToString()), + Mhz2 = float.Parse(dataRow["mhz2"].ToString()), + Bits = int.Parse(dataRow["bits"].ToString()), + Ram = int.Parse(dataRow["ram"].ToString()), + Rom = int.Parse(dataRow["rom"].ToString()), + Gpu = int.Parse(dataRow["gpu"].ToString()), + Vram = int.Parse(dataRow["vram"].ToString()), + Colors = int.Parse(dataRow["colors"].ToString()), + Resolution = dataRow["res"].ToString(), + Spu = int.Parse(dataRow["spu"].ToString()), + Mpu = int.Parse(dataRow["mpu"].ToString()), + SoundChannels = int.Parse(dataRow["schannels"].ToString()), + MusicChannels = int.Parse(dataRow["mchannels"].ToString()), + Palette = int.Parse(dataRow["palette"].ToString()), + Format = int.Parse(dataRow["format"].ToString()), + Cap = int.Parse(dataRow["cap"].ToString()), + Comments = dataRow["comments"].ToString() }; entries.Add(entry); diff --git a/Cicm.Database/Operations/ConsoleCompany.cs b/Cicm.Database/Operations/ConsoleCompany.cs index 913ef57e..f364bad3 100644 --- a/Cicm.Database/Operations/ConsoleCompany.cs +++ b/Cicm.Database/Operations/ConsoleCompany.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddConsoleCompany(ConsoleCompany entry, out long id) { #if DEBUG - Console.Write("Adding console company `{0}`...", entry.company); + Console.Write("Adding console company `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandConsoleCompany(entry); @@ -203,14 +203,14 @@ namespace Cicm.Database public bool UpdateConsoleCompany(ConsoleCompany entry) { #if DEBUG - Console.WriteLine("Updating console company `{0}`...", entry.company); + Console.WriteLine("Updating console company `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandConsoleCompany(entry); IDbTransaction trans = dbCon.BeginTransaction(); dbcmd.Transaction = trans; - string sql = "UPDATE console_company SET company = @company " + $"WHERE id = {entry.id}"; + string sql = "UPDATE console_company SET company = @company " + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -257,7 +257,7 @@ namespace Cicm.Database param1.DbType = DbType.String; - param1.Value = entry.company; + param1.Value = entry.Name; dbcmd.Parameters.Add(param1); @@ -272,8 +272,8 @@ namespace Cicm.Database { ConsoleCompany entry = new ConsoleCompany { - id = int.Parse(dataRow["id"].ToString()), - company = dataRow["company"].ToString() + Id = int.Parse(dataRow["id"].ToString()), + Name = dataRow["company"].ToString() }; entries.Add(entry); diff --git a/Cicm.Database/Operations/Cpu.cs b/Cicm.Database/Operations/Cpu.cs index d43c0588..e5f04483 100644 --- a/Cicm.Database/Operations/Cpu.cs +++ b/Cicm.Database/Operations/Cpu.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddCpu(Cpu entry, out long id) { #if DEBUG - Console.Write("Adding CPU `{0}`...", entry.cpu); + Console.Write("Adding CPU `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandCpu(entry); @@ -203,14 +203,14 @@ namespace Cicm.Database public bool UpdateCpu(Cpu entry) { #if DEBUG - Console.WriteLine("Updating CPU `{0}`...", entry.cpu); + Console.WriteLine("Updating CPU `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandCpu(entry); IDbTransaction trans = dbCon.BeginTransaction(); dbcmd.Transaction = trans; - string sql = "UPDATE cpu SET cpu = @cpu " + $"WHERE id = {entry.id}"; + string sql = "UPDATE cpu SET cpu = @cpu " + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -257,7 +257,7 @@ namespace Cicm.Database param1.DbType = DbType.String; - param1.Value = entry.cpu; + param1.Value = entry.Name; dbcmd.Parameters.Add(param1); @@ -270,7 +270,7 @@ namespace Cicm.Database foreach(DataRow dataRow in dataTable.Rows) { - Cpu entry = new Cpu {id = int.Parse(dataRow["id"].ToString()), cpu = dataRow["cpu"].ToString()}; + Cpu entry = new Cpu {Id = int.Parse(dataRow["id"].ToString()), Name = dataRow["cpu"].ToString()}; entries.Add(entry); } diff --git a/Cicm.Database/Operations/DiskFormat.cs b/Cicm.Database/Operations/DiskFormat.cs index b3b71558..4502e64f 100644 --- a/Cicm.Database/Operations/DiskFormat.cs +++ b/Cicm.Database/Operations/DiskFormat.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddDiskFormat(DiskFormat entry, out long id) { #if DEBUG - Console.Write("Adding disk format `{0}`...", entry.Format); + Console.Write("Adding disk format `{0}`...", entry.Description); #endif IDbCommand dbcmd = GetCommandDiskFormat(entry); @@ -203,14 +203,14 @@ namespace Cicm.Database public bool UpdateDiskFormat(DiskFormat entry) { #if DEBUG - Console.WriteLine("Updating disk format `{0}`...", entry.Format); + Console.WriteLine("Updating disk format `{0}`...", entry.Description); #endif IDbCommand dbcmd = GetCommandDiskFormat(entry); IDbTransaction trans = dbCon.BeginTransaction(); dbcmd.Transaction = trans; - string sql = "UPDATE Formatos_de_disco SET Format = @Format " + $"WHERE id = {entry.id}"; + string sql = "UPDATE Formatos_de_disco SET Format = @Format " + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -257,7 +257,7 @@ namespace Cicm.Database param1.DbType = DbType.String; - param1.Value = entry.Format; + param1.Value = entry.Description; dbcmd.Parameters.Add(param1); @@ -272,8 +272,8 @@ namespace Cicm.Database { DiskFormat entry = new DiskFormat { - id = int.Parse(dataRow["id"].ToString()), - Format = dataRow["Format"].ToString() + Id = int.Parse(dataRow["id"].ToString()), + Description = dataRow["Format"].ToString() }; entries.Add(entry); diff --git a/Cicm.Database/Operations/Dsp.cs b/Cicm.Database/Operations/Dsp.cs index 52f6eb09..e2baef70 100644 --- a/Cicm.Database/Operations/Dsp.cs +++ b/Cicm.Database/Operations/Dsp.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddDsp(Dsp entry, out long id) { #if DEBUG - Console.Write("Adding DSP `{0}`...", entry.DSP); + Console.Write("Adding DSP `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandDsp(entry); @@ -203,14 +203,14 @@ namespace Cicm.Database public bool UpdateDsp(Dsp entry) { #if DEBUG - Console.WriteLine("Updating DSP `{0}`...", entry.DSP); + Console.WriteLine("Updating DSP `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandDsp(entry); IDbTransaction trans = dbCon.BeginTransaction(); dbcmd.Transaction = trans; - string sql = "UPDATE DSPs SET DSP = @DSP " + $"WHERE id = {entry.id}"; + string sql = "UPDATE DSPs SET DSP = @DSP " + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -257,7 +257,7 @@ namespace Cicm.Database param1.DbType = DbType.String; - param1.Value = entry.DSP; + param1.Value = entry.Name; dbcmd.Parameters.Add(param1); @@ -270,7 +270,7 @@ namespace Cicm.Database foreach(DataRow dataRow in dataTable.Rows) { - Dsp entry = new Dsp {id = int.Parse(dataRow["id"].ToString()), DSP = dataRow["DSP"].ToString()}; + Dsp entry = new Dsp {Id = int.Parse(dataRow["id"].ToString()), Name = dataRow["DSP"].ToString()}; entries.Add(entry); } diff --git a/Cicm.Database/Operations/Forbidden.cs b/Cicm.Database/Operations/Forbidden.cs index f92d7ca1..f72441d5 100644 --- a/Cicm.Database/Operations/Forbidden.cs +++ b/Cicm.Database/Operations/Forbidden.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddForbidden(Forbidden entry, out long id) { #if DEBUG - Console.Write("Adding forbidden `{0}`...", entry.browser); + Console.Write("Adding forbidden `{0}`...", entry.UserAgent); #endif IDbCommand dbcmd = GetCommandForbidden(entry); @@ -204,7 +204,7 @@ namespace Cicm.Database public bool UpdateForbidden(Forbidden entry) { #if DEBUG - Console.WriteLine("Updating forbidden `{0}`...", entry.browser); + Console.WriteLine("Updating forbidden `{0}`...", entry.UserAgent); #endif IDbCommand dbcmd = GetCommandForbidden(entry); @@ -212,7 +212,7 @@ namespace Cicm.Database dbcmd.Transaction = trans; string sql = "UPDATE forbidden SET browser = @browser, date = @date, ip = @ip, referer = @referer " + - $"WHERE id = {entry.id}"; + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -268,10 +268,10 @@ namespace Cicm.Database param3.DbType = DbType.String; param4.DbType = DbType.String; - param1.Value = entry.browser; - param2.Value = entry.date; - param3.Value = entry.ip; - param4.Value = entry.referer; + param1.Value = entry.UserAgent; + param2.Value = entry.Date; + param3.Value = entry.Ip; + param4.Value = entry.Referer; dbcmd.Parameters.Add(param1); dbcmd.Parameters.Add(param2); @@ -289,11 +289,11 @@ namespace Cicm.Database { Forbidden entry = new Forbidden { - id = int.Parse(dataRow["id"].ToString()), - browser = dataRow["browser"].ToString(), - date = dataRow["date"].ToString(), - ip = dataRow["ip"].ToString(), - referer = dataRow["referer"].ToString() + Id = int.Parse(dataRow["id"].ToString()), + UserAgent = dataRow["browser"].ToString(), + Date = dataRow["date"].ToString(), + Ip = dataRow["ip"].ToString(), + Referer = dataRow["referer"].ToString() }; entries.Add(entry); diff --git a/Cicm.Database/Operations/Gpu.cs b/Cicm.Database/Operations/Gpu.cs index a8116303..55466481 100644 --- a/Cicm.Database/Operations/Gpu.cs +++ b/Cicm.Database/Operations/Gpu.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddGpu(Gpu entry, out long id) { #if DEBUG - Console.Write("Adding GPU `{0}`...", entry.gpu); + Console.Write("Adding GPU `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandGpu(entry); @@ -203,14 +203,14 @@ namespace Cicm.Database public bool UpdateGpu(Gpu entry) { #if DEBUG - Console.WriteLine("Updating GPU `{0}`...", entry.gpu); + Console.WriteLine("Updating GPU `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandGpu(entry); IDbTransaction trans = dbCon.BeginTransaction(); dbcmd.Transaction = trans; - string sql = "UPDATE gpus SET GPU = @GPU " + $"WHERE id = {entry.id}"; + string sql = "UPDATE gpus SET GPU = @GPU " + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -257,7 +257,7 @@ namespace Cicm.Database param1.DbType = DbType.String; - param1.Value = entry.gpu; + param1.Value = entry.Name; dbcmd.Parameters.Add(param1); @@ -270,7 +270,7 @@ namespace Cicm.Database foreach(DataRow dataRow in dataTable.Rows) { - Gpu entry = new Gpu {id = int.Parse(dataRow["id"].ToString()), gpu = dataRow["GPU"].ToString()}; + Gpu entry = new Gpu {Id = int.Parse(dataRow["id"].ToString()), Name = dataRow["GPU"].ToString()}; entries.Add(entry); } diff --git a/Cicm.Database/Operations/Log.cs b/Cicm.Database/Operations/Log.cs index 9899a1e2..fc660a3a 100644 --- a/Cicm.Database/Operations/Log.cs +++ b/Cicm.Database/Operations/Log.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddLog(Log entry, out long id) { #if DEBUG - Console.Write("Adding log `{0}`...", entry.browser); + Console.Write("Adding log `{0}`...", entry.UserAgent); #endif IDbCommand dbcmd = GetCommandLog(entry); @@ -204,7 +204,7 @@ namespace Cicm.Database public bool UpdateLog(Log entry) { #if DEBUG - Console.WriteLine("Updating log `{0}`...", entry.browser); + Console.WriteLine("Updating log `{0}`...", entry.UserAgent); #endif IDbCommand dbcmd = GetCommandLog(entry); @@ -212,7 +212,7 @@ namespace Cicm.Database dbcmd.Transaction = trans; string sql = "UPDATE log SET browser = @browser, date = @date, ip = @ip, referer = @referer " + - $"WHERE id = {entry.id}"; + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -268,10 +268,10 @@ namespace Cicm.Database param3.DbType = DbType.String; param4.DbType = DbType.String; - param1.Value = entry.browser; - param2.Value = entry.date; - param3.Value = entry.ip; - param4.Value = entry.referer; + param1.Value = entry.UserAgent; + param2.Value = entry.Date; + param3.Value = entry.Ip; + param4.Value = entry.Referer; dbcmd.Parameters.Add(param1); dbcmd.Parameters.Add(param2); @@ -289,11 +289,11 @@ namespace Cicm.Database { Log entry = new Log { - id = int.Parse(dataRow["id"].ToString()), - browser = dataRow["browser"].ToString(), - date = dataRow["date"].ToString(), - ip = dataRow["ip"].ToString(), - referer = dataRow["referer"].ToString() + Id = int.Parse(dataRow["id"].ToString()), + UserAgent = dataRow["browser"].ToString(), + Date = dataRow["date"].ToString(), + Ip = dataRow["ip"].ToString(), + Referer = dataRow["referer"].ToString() }; entries.Add(entry); diff --git a/Cicm.Database/Operations/MoneyDonation.cs b/Cicm.Database/Operations/MoneyDonation.cs index 56231a1d..9478847b 100644 --- a/Cicm.Database/Operations/MoneyDonation.cs +++ b/Cicm.Database/Operations/MoneyDonation.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddMoneyDonation(MoneyDonation entry, out long id) { #if DEBUG - Console.Write("Adding money_donation `{0}` for `{1}`...", entry.donator, entry.quantity); + Console.Write("Adding money_donation `{0}` for `{1}`...", entry.Donator, entry.Quantity); #endif IDbCommand dbcmd = GetCommandMoneyDonation(entry); @@ -203,7 +203,7 @@ namespace Cicm.Database public bool UpdateMoneyDonation(MoneyDonation entry) { #if DEBUG - Console.WriteLine("Updating money_donation `{0}`...", entry.donator); + Console.WriteLine("Updating money_donation `{0}`...", entry.Donator); #endif IDbCommand dbcmd = GetCommandMoneyDonation(entry); @@ -211,7 +211,7 @@ namespace Cicm.Database dbcmd.Transaction = trans; string sql = "UPDATE money_donation SET donator = @donator, quantity = @quantity " + - $"WHERE id = {entry.id}"; + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -261,8 +261,8 @@ namespace Cicm.Database param1.DbType = DbType.String; param2.DbType = DbType.Double; - param1.Value = entry.donator; - param2.Value = entry.quantity; + param1.Value = entry.Donator; + param2.Value = entry.Quantity; dbcmd.Parameters.Add(param1); dbcmd.Parameters.Add(param2); @@ -278,9 +278,9 @@ namespace Cicm.Database { MoneyDonation entry = new MoneyDonation { - id = int.Parse(dataRow["id"].ToString()), - donator = dataRow["browser"].ToString(), - quantity = float.Parse(dataRow["date"].ToString()) + Id = int.Parse(dataRow["id"].ToString()), + Donator = dataRow["browser"].ToString(), + Quantity = float.Parse(dataRow["date"].ToString()) }; entries.Add(entry); diff --git a/Cicm.Database/Operations/Mpu.cs b/Cicm.Database/Operations/Mpu.cs index b1dd19cf..83e1d784 100644 --- a/Cicm.Database/Operations/Mpu.cs +++ b/Cicm.Database/Operations/Mpu.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddMpu(Mpu entry, out long id) { #if DEBUG - Console.Write("Adding MPU `{0}`...", entry.mpu); + Console.Write("Adding MPU `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandMpu(entry); @@ -203,14 +203,14 @@ namespace Cicm.Database public bool UpdateMpu(Mpu entry) { #if DEBUG - Console.WriteLine("Updating MPU `{0}`...", entry.mpu); + Console.WriteLine("Updating MPU `{0}`...", entry.Name); #endif IDbCommand dbcmd = GetCommandMpu(entry); IDbTransaction trans = dbCon.BeginTransaction(); dbcmd.Transaction = trans; - string sql = "UPDATE mpus SET MPU = @MPU " + $"WHERE id = {entry.id}"; + string sql = "UPDATE mpus SET MPU = @MPU " + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -252,7 +252,7 @@ namespace Cicm.Database param1.DbType = DbType.String; - param1.Value = entry.mpu; + param1.Value = entry.Name; dbcmd.Parameters.Add(param1); @@ -265,7 +265,7 @@ namespace Cicm.Database foreach(DataRow dataRow in dataTable.Rows) { - Mpu entry = new Mpu {id = int.Parse(dataRow["id"].ToString()), mpu = dataRow["MPU"].ToString()}; + Mpu entry = new Mpu {Id = int.Parse(dataRow["id"].ToString()), Name = dataRow["MPU"].ToString()}; entries.Add(entry); } diff --git a/Cicm.Database/Operations/News.cs b/Cicm.Database/Operations/News.cs index c550e747..2184bd06 100644 --- a/Cicm.Database/Operations/News.cs +++ b/Cicm.Database/Operations/News.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddNews(News entry, out long id) { #if DEBUG - Console.Write("Adding news `{0}`...", entry.date); + Console.Write("Adding news `{0}`...", entry.Date); #endif IDbCommand dbcmd = GetCommandNews(entry); @@ -203,14 +203,14 @@ namespace Cicm.Database public bool UpdateNews(News entry) { #if DEBUG - Console.WriteLine("Updating news `{0}`...", entry.date); + Console.WriteLine("Updating news `{0}`...", entry.Date); #endif IDbCommand dbcmd = GetCommandNews(entry); IDbTransaction trans = dbCon.BeginTransaction(); dbcmd.Transaction = trans; - string sql = "UPDATE news SET date = @date, type = @type, added_id = @added_id " + $"WHERE id = {entry.id}"; + string sql = "UPDATE news SET date = @date, type = @type, added_id = @added_id " + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -263,9 +263,9 @@ namespace Cicm.Database param2.DbType = DbType.Int32; param3.DbType = DbType.Int32; - param1.Value = entry.date; - param2.Value = entry.type; - param3.Value = entry.added_id; + param1.Value = entry.Date; + param2.Value = entry.Type; + param3.Value = entry.AffectedId; dbcmd.Parameters.Add(param1); dbcmd.Parameters.Add(param2); @@ -282,10 +282,10 @@ namespace Cicm.Database { News entry = new News { - id = int.Parse(dataRow["id"].ToString()), - date = dataRow["date"].ToString(), - type = int.Parse(dataRow["type"].ToString()), - added_id = int.Parse(dataRow["added_id"].ToString()) + Id = int.Parse(dataRow["id"].ToString()), + Date = dataRow["date"].ToString(), + Type = int.Parse(dataRow["type"].ToString()), + AffectedId = int.Parse(dataRow["added_id"].ToString()) }; entries.Add(entry); diff --git a/Cicm.Database/Operations/OwnComputer.cs b/Cicm.Database/Operations/OwnComputer.cs index 77f5a1c2..adea4c52 100644 --- a/Cicm.Database/Operations/OwnComputer.cs +++ b/Cicm.Database/Operations/OwnComputer.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddOwnComputer(OwnComputer entry, out long id) { #if DEBUG - Console.Write("Adding owned computer `{0}`...", entry.db_id); + Console.Write("Adding owned computer `{0}`...", entry.ComputerId); #endif IDbCommand dbcmd = GetCommandOwnComputer(entry); @@ -205,7 +205,7 @@ namespace Cicm.Database public bool UpdateOwnComputer(OwnComputer entry) { #if DEBUG - Console.WriteLine("Updating computer `{0}`...", entry.db_id); + Console.WriteLine("Updating computer `{0}`...", entry.ComputerId); #endif IDbCommand dbcmd = GetCommandOwnComputer(entry); @@ -215,7 +215,7 @@ namespace Cicm.Database string sql = "UPDATE own_computer SET db_id = @db_id, date = @date, status = @status, trade = @trade, boxed = @boxed, manuals = @manuals, cpu1 = @cpu1" + "mhz1 = @mhz1, cpu2 = @cpu2, mhz2 = @mhz2, ram = @ram, vram = @vram, rigid = @rigid, disk1 = @disk1, cap1 = @cap1, disk2 = @disk2, cap2 = @cap2 " + - $"WHERE id = {entry.id}"; + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -310,23 +310,23 @@ namespace Cicm.Database param16.DbType = DbType.Int32; param17.DbType = DbType.Int32; - param1.Value = entry.db_id; - param2.Value = entry.date; - param3.Value = entry.status; - param4.Value = entry.trade; - param5.Value = entry.boxed; - param6.Value = entry.manuals; - param7.Value = entry.cpu1; - param8.Value = entry.mhz1; - param9.Value = entry.cpu2; - param10.Value = entry.mhz2; - param11.Value = entry.ram; - param12.Value = entry.vram; - param13.Value = entry.rigid; - param14.Value = entry.disk1; - param15.Value = entry.cap1; - param16.Value = entry.disk2; - param17.Value = entry.cap2; + param1.Value = entry.ComputerId; + param2.Value = entry.Acquired; + param3.Value = entry.Status; + param4.Value = entry.Trade; + param5.Value = entry.Boxed; + param6.Value = entry.Manuals; + param7.Value = entry.Cpu1; + param8.Value = entry.Mhz1; + param9.Value = entry.Cpu2; + param10.Value = entry.Mhz2; + param11.Value = entry.Ram; + param12.Value = entry.Vram; + param13.Value = entry.Rigid; + param14.Value = entry.Disk1; + param15.Value = entry.Cap1; + param16.Value = entry.Disk2; + param17.Value = entry.Cap2; dbcmd.Parameters.Add(param1); dbcmd.Parameters.Add(param2); @@ -357,24 +357,24 @@ namespace Cicm.Database { OwnComputer entry = new OwnComputer { - id = int.Parse(dataRow["id"].ToString()), - db_id = int.Parse(dataRow["db_id"].ToString()), - date = dataRow["date"].ToString(), - status = int.Parse(dataRow["status"].ToString()), - trade = bool.Parse(dataRow["trade"].ToString()), - boxed = bool.Parse(dataRow["boxed"].ToString()), - manuals = bool.Parse(dataRow["manuals"].ToString()), - cpu1 = int.Parse(dataRow["cpu1"].ToString()), - mhz1 = float.Parse(dataRow["mhz1"].ToString()), - cpu2 = int.Parse(dataRow["cpu1"].ToString()), - mhz2 = float.Parse(dataRow["mhz2"].ToString()), - ram = int.Parse(dataRow["ram"].ToString()), - vram = int.Parse(dataRow["vram"].ToString()), - rigid = dataRow["rigid"].ToString(), - disk1 = int.Parse(dataRow["disk1"].ToString()), - cap1 = int.Parse(dataRow["cap1"].ToString()), - disk2 = int.Parse(dataRow["disk2"].ToString()), - cap2 = int.Parse(dataRow["cap2"].ToString()) + Id = int.Parse(dataRow["id"].ToString()), + ComputerId = int.Parse(dataRow["db_id"].ToString()), + Acquired = dataRow["date"].ToString(), + Status = int.Parse(dataRow["status"].ToString()), + Trade = bool.Parse(dataRow["trade"].ToString()), + Boxed = bool.Parse(dataRow["boxed"].ToString()), + Manuals = bool.Parse(dataRow["manuals"].ToString()), + Cpu1 = int.Parse(dataRow["cpu1"].ToString()), + Mhz1 = float.Parse(dataRow["mhz1"].ToString()), + Cpu2 = int.Parse(dataRow["cpu1"].ToString()), + Mhz2 = float.Parse(dataRow["mhz2"].ToString()), + Ram = int.Parse(dataRow["ram"].ToString()), + Vram = int.Parse(dataRow["vram"].ToString()), + Rigid = dataRow["rigid"].ToString(), + Disk1 = int.Parse(dataRow["disk1"].ToString()), + Cap1 = int.Parse(dataRow["cap1"].ToString()), + Disk2 = int.Parse(dataRow["disk2"].ToString()), + Cap2 = int.Parse(dataRow["cap2"].ToString()) }; entries.Add(entry); diff --git a/Cicm.Database/Operations/OwnConsole.cs b/Cicm.Database/Operations/OwnConsole.cs index 9eda9c77..127b7175 100644 --- a/Cicm.Database/Operations/OwnConsole.cs +++ b/Cicm.Database/Operations/OwnConsole.cs @@ -171,7 +171,7 @@ namespace Cicm.Database public bool AddOwnConsole(OwnConsole entry, out long id) { #if DEBUG - Console.Write("Adding owned console `{0}`...", entry.db_id); + Console.Write("Adding owned console `{0}`...", entry.ConsoleId); #endif IDbCommand dbcmd = GetCommandOwnConsole(entry); @@ -204,7 +204,7 @@ namespace Cicm.Database public bool UpdateOwnConsole(OwnConsole entry) { #if DEBUG - Console.WriteLine("Updating console `{0}`...", entry.db_id); + Console.WriteLine("Updating console `{0}`...", entry.ConsoleId); #endif IDbCommand dbcmd = GetCommandOwnConsole(entry); @@ -213,7 +213,7 @@ namespace Cicm.Database string sql = "UPDATE own_consoles SET db_id = @db_id, date = @date, status = @status, trade = @trade, boxed = @boxed, manuals = @manuals " + - $"WHERE id = {entry.id}"; + $"WHERE id = {entry.Id}"; dbcmd.CommandText = sql; @@ -275,12 +275,12 @@ namespace Cicm.Database param5.DbType = DbType.Boolean; param6.DbType = DbType.Boolean; - param1.Value = entry.db_id; - param2.Value = entry.date; - param3.Value = entry.status; - param4.Value = entry.trade; - param5.Value = entry.boxed; - param6.Value = entry.manuals; + param1.Value = entry.ConsoleId; + param2.Value = entry.Acquired; + param3.Value = entry.Status; + param4.Value = entry.Trade; + param5.Value = entry.Boxed; + param6.Value = entry.Manuals; dbcmd.Parameters.Add(param1); dbcmd.Parameters.Add(param2); @@ -300,13 +300,13 @@ namespace Cicm.Database { OwnConsole entry = new OwnConsole { - id = int.Parse(dataRow["id"].ToString()), - db_id = int.Parse(dataRow["db_id"].ToString()), - date = dataRow["date"].ToString(), - status = int.Parse(dataRow["status"].ToString()), - trade = bool.Parse(dataRow["trade"].ToString()), - boxed = bool.Parse(dataRow["boxed"].ToString()), - manuals = bool.Parse(dataRow["manuals"].ToString()) + Id = int.Parse(dataRow["id"].ToString()), + ConsoleId = int.Parse(dataRow["db_id"].ToString()), + Acquired = dataRow["date"].ToString(), + Status = int.Parse(dataRow["status"].ToString()), + Trade = bool.Parse(dataRow["trade"].ToString()), + Boxed = bool.Parse(dataRow["boxed"].ToString()), + Manuals = bool.Parse(dataRow["manuals"].ToString()) }; entries.Add(entry); diff --git a/Cicm.Database/Schemas/Admin.cs b/Cicm.Database/Schemas/Admin.cs index f75a55b0..797dc666 100644 --- a/Cicm.Database/Schemas/Admin.cs +++ b/Cicm.Database/Schemas/Admin.cs @@ -34,10 +34,10 @@ namespace Cicm.Database.Schemas public class Admin { /// ID - public int id; + public int Id; /// Hashed password - public string password; + public string Password; /// Username - public string user; + public string Username; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/BrowserTest.cs b/Cicm.Database/Schemas/BrowserTest.cs index fc698291..a82b0f01 100644 --- a/Cicm.Database/Schemas/BrowserTest.cs +++ b/Cicm.Database/Schemas/BrowserTest.cs @@ -33,39 +33,39 @@ namespace Cicm.Database.Schemas /// Browser test public class BrowserTest { - /// Supports animated GIF - public bool agif; - /// Browser name - public string browser; - /// Supports colors - public bool colors; - /// Supports Adobe Flash - public bool flash; - /// Supports IFRAMEs - public bool frames; - /// Supports GIF87 - public bool gif87; - /// Supports GIF with transparency (GIF89) - public bool gif89; - /// ID - public ushort id; - /// User agent string - public string idstring; - /// Supports JPEG - public bool jpeg; - /// Supports JavaScript - public bool js; - /// Browser operating system - public string os; - /// Browser architecture - public string platform; - /// Supports PNG - public bool png; /// Supports PNG with alpha channel - public bool pngt; + public bool AlphaPng; + /// Supports animated GIF + public bool AnimatedGif; + /// Browser architecture + public string Architecture; + /// Supports colors + public bool Color; + /// Supports Adobe Flash + public bool Flash; + /// Supports IFRAMEs + public bool Frames; + /// Supports GIF87 + public bool Gif87; + /// Supports GIF with transparency (GIF89) + public bool Gif89; + /// ID + public ushort Id; + /// Supports JPEG + public bool Jpeg; + /// Supports JavaScript + public bool Js; + /// Browser name + public string Name; + /// Browser operating system + public string OperatingSystem; + /// Supports PNG + public bool Png; /// Supports HTML tables - public bool table; + public bool Tables; + /// User agent string + public string UserAgent; /// Browser version - public string version; + public string Version; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/Company.cs b/Cicm.Database/Schemas/Company.cs index 5a6b7502..d437d6e4 100644 --- a/Cicm.Database/Schemas/Company.cs +++ b/Cicm.Database/Schemas/Company.cs @@ -33,9 +33,9 @@ namespace Cicm.Database.Schemas /// Company public class Company { - /// Name - public string Compania; /// ID - public int id; + public int Id; + /// Name + public string Name; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/Computer.cs b/Cicm.Database/Schemas/Computer.cs index 49ba4148..1bf68e8e 100644 --- a/Cicm.Database/Schemas/Computer.cs +++ b/Cicm.Database/Schemas/Computer.cs @@ -34,58 +34,58 @@ namespace Cicm.Database.Schemas public class Computer { /// Bits of GPRs of primary CPU - public int bits; + public int Bits; /// Capacity of first removable disk format - public string cap1; + public string Cap1; /// Capacity of second removable disk format - public string cap2; + public string Cap2; /// Maximum colors on screen - public int colors; + public int Colors; /// Free-form comments - public string comment; + public string Comment; /// Manufacturer's company ID - public int company; + public int Company; /// Primary CPU - public int cpu1; + public int Cpu1; /// Secondary CPU - public int cpu2; + public int Cpu2; /// ID of first removable disk format - public int disk1; + public int Disk1; /// ID of second removable disk format - public int disk2; + public int Disk2; /// ID of GPU - public int gpu; + public int Gpu; /// ID of first hard disk format - public int hdd1; + public int Hdd1; /// ID of second hard disk format - public int hdd2; + public int Hdd2; /// ID of third hard disk format - public int hdd3; + public int Hdd3; /// ID - public int id; + public int Id; /// Frequency in MHz of primary CPU - public float mhz1; + public float Mhz1; /// Frequency in MHz of secondary CPU - public float mhz2; + public float Mhz2; /// Model name - public string model; + public string Model; /// ID of MPU - public int mpu; + public int Mpu; /// Audio channels supported by the MPU - public int music_channels; + public int MusicChannels; /// Size in kibibytes of program RAM - public int ram; + public int Ram; /// Resolution in WxH pixels - public string res; + public string Resolution; /// Size in kibibytes of firmware - public int rom; + public int Rom; /// Audio channels supported by the DSP - public int sound_channels; + public int SoundChannels; /// ID of DSP - public int spu; + public int Spu; /// Size in kibibytes for video RAM - public int vram; + public int Vram; /// Introduction date, 0 if unknown - public int year; + public int Year; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/Console.cs b/Cicm.Database/Schemas/Console.cs index 97383883..62285a27 100644 --- a/Cicm.Database/Schemas/Console.cs +++ b/Cicm.Database/Schemas/Console.cs @@ -33,50 +33,50 @@ namespace Cicm.Database.Schemas public class Console { /// Bits of GPRs of primary CPU - public int bits; + public int Bits; /// Capacity in kibibytes of storage format - public int cap; + public int Cap; /// Maximum colors on screen - public int colors; + public int Colors; /// Free-form comments - public string comments; + public string Comments; /// Manufacturer's company ID - public int company; + public int Company; /// Primary CPU - public int cpu1; + public int Cpu1; /// Secondary CPU - public int cpu2; + public int Cpu2; /// ID of storage format - public int format; + public int Format; /// ID of GPU - public int gpu; + public int Gpu; /// ID - public int id; - /// Audio channels supported by the MPU - public int mchannels; + public int Id; /// Frequency in MHz of primary CPU - public float mhz1; + public float Mhz1; /// Frequency in MHz of secondary CPU - public float mhz2; + public float Mhz2; /// ID of MPU - public int mpu; + public int Mpu; + /// Audio channels supported by the MPU + public int MusicChannels; /// Model name - public string name; + public string Name; /// Colors on palette - public int palette; + public int Palette; /// Size in kibibytes of program RAM - public int ram; + public int Ram; /// Resolution in WxH pixels - public string res; + public string Resolution; /// Size in kibibytes of firmware - public int rom; + public int Rom; /// Audio channels supported by the DSP - public int schannels; + public int SoundChannels; /// ID of DSP - public int spu; + public int Spu; /// Size in kibibytes for video RAM - public int vram; + public int Vram; /// Introduction date, 0 if unknown - public int year; + public int Year; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/ConsoleCompany.cs b/Cicm.Database/Schemas/ConsoleCompany.cs index 4de2e722..fcbd899d 100644 --- a/Cicm.Database/Schemas/ConsoleCompany.cs +++ b/Cicm.Database/Schemas/ConsoleCompany.cs @@ -35,9 +35,9 @@ namespace Cicm.Database.Schemas /// public class ConsoleCompany { - /// Name - public string company; /// ID - public int id; + public int Id; + /// Name + public string Name; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/Cpu.cs b/Cicm.Database/Schemas/Cpu.cs index 8fed45c7..6d481c6b 100644 --- a/Cicm.Database/Schemas/Cpu.cs +++ b/Cicm.Database/Schemas/Cpu.cs @@ -33,9 +33,9 @@ namespace Cicm.Database.Schemas /// Central Processing Unit public class Cpu { - /// Name - public string cpu; /// ID - public int id; + public int Id; + /// Name + public string Name; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/DiskFormat.cs b/Cicm.Database/Schemas/DiskFormat.cs index ee9b2541..13255086 100644 --- a/Cicm.Database/Schemas/DiskFormat.cs +++ b/Cicm.Database/Schemas/DiskFormat.cs @@ -34,8 +34,8 @@ namespace Cicm.Database.Schemas public class DiskFormat { /// Description - public string Format; + public string Description; /// ID - public int id; + public int Id; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/Dsp.cs b/Cicm.Database/Schemas/Dsp.cs index fc5f7320..76f47296 100644 --- a/Cicm.Database/Schemas/Dsp.cs +++ b/Cicm.Database/Schemas/Dsp.cs @@ -33,9 +33,9 @@ namespace Cicm.Database.Schemas /// Digital Sound Processor public class Dsp { - /// Name - public string DSP; /// ID - public int id; + public int Id; + /// Name + public string Name; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/Forbidden.cs b/Cicm.Database/Schemas/Forbidden.cs index 4d63e46b..24c185d4 100644 --- a/Cicm.Database/Schemas/Forbidden.cs +++ b/Cicm.Database/Schemas/Forbidden.cs @@ -33,15 +33,15 @@ namespace Cicm.Database.Schemas /// Accesses forbidden with HTTP STATUS 403 public class Forbidden { - /// User agent - public string browser; /// Date of access - public string date; + public string Date; /// ID - public int id; + public int Id; /// Access IP - public string ip; + public string Ip; /// Referer - public string referer; + public string Referer; + /// User agent + public string UserAgent; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/Gpu.cs b/Cicm.Database/Schemas/Gpu.cs index acedc736..133f4bb1 100644 --- a/Cicm.Database/Schemas/Gpu.cs +++ b/Cicm.Database/Schemas/Gpu.cs @@ -33,9 +33,9 @@ namespace Cicm.Database.Schemas /// Graphics Processing Unit public class Gpu { - /// Name - public string gpu; /// ID - public int id; + public int Id; + /// Name + public string Name; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/Log.cs b/Cicm.Database/Schemas/Log.cs index 9de14404..93443cb8 100644 --- a/Cicm.Database/Schemas/Log.cs +++ b/Cicm.Database/Schemas/Log.cs @@ -35,15 +35,15 @@ namespace Cicm.Database.Schemas /// public class Log { - /// User agent string - public string browser; /// Access date - public string date; + public string Date; /// ID - public int id; + public int Id; /// Access IP - public string ip; + public string Ip; /// Referer - public string referer; + public string Referer; + /// User agent string + public string UserAgent; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/MoneyDonation.cs b/Cicm.Database/Schemas/MoneyDonation.cs index 75e715f4..27768fe3 100644 --- a/Cicm.Database/Schemas/MoneyDonation.cs +++ b/Cicm.Database/Schemas/MoneyDonation.cs @@ -34,10 +34,10 @@ namespace Cicm.Database.Schemas public class MoneyDonation { /// Donator - public string donator; + public string Donator; /// ID - public int id; + public int Id; /// Donation quantity in euros - public float quantity; + public float Quantity; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/Mpu.cs b/Cicm.Database/Schemas/Mpu.cs index c51a2a07..30e319d9 100644 --- a/Cicm.Database/Schemas/Mpu.cs +++ b/Cicm.Database/Schemas/Mpu.cs @@ -34,8 +34,8 @@ namespace Cicm.Database.Schemas public class Mpu { /// ID - public int id; + public int Id; /// Name - public string mpu; + public string Name; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/News.cs b/Cicm.Database/Schemas/News.cs index c21bfbfe..6e6a0f67 100644 --- a/Cicm.Database/Schemas/News.cs +++ b/Cicm.Database/Schemas/News.cs @@ -34,12 +34,12 @@ namespace Cicm.Database.Schemas public class News { /// Affected ID - public int added_id; + public int AffectedId; /// Date - public string date; + public string Date; /// ID - public int id; + public int Id; /// News type - public int type; + public int Type; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/OwnComputer.cs b/Cicm.Database/Schemas/OwnComputer.cs index 3dcd2142..fed93710 100644 --- a/Cicm.Database/Schemas/OwnComputer.cs +++ b/Cicm.Database/Schemas/OwnComputer.cs @@ -33,41 +33,41 @@ namespace Cicm.Database.Schemas /// Owned computer public class OwnComputer { + /// Acquired date + public string Acquired; /// Box present in collection - public bool boxed; + public bool Boxed; /// Capacity of first removable disk format - public int cap1; + public int Cap1; /// Capacity of second removable disk format - public int cap2; - /// Primary CPU - public int cpu1; - /// Secondary CPU - public int cpu2; - /// Adquired date - public string date; + public int Cap2; /// Computer's ID - public int db_id; + public int ComputerId; + /// Primary CPU + public int Cpu1; + /// Secondary CPU + public int Cpu2; /// ID of first removable disk format - public int disk1; + public int Disk1; /// ID of second removable disk format - public int disk2; + public int Disk2; /// ID - public int id; + public int Id; /// Original manuals present in collection - public bool manuals; + public bool Manuals; /// Frequency in MHz of primary CPU - public float mhz1; + public float Mhz1; /// Frequency in MHz of secondary CPU - public float mhz2; + public float Mhz2; /// Size in kibibytes of program RAM - public int ram; + public int Ram; /// Rigid disk - public string rigid; + public string Rigid; /// Status - public int status; + public int Status; /// Available for trade - public bool trade; + public bool Trade; /// Size in kibibytes for video RAM - public int vram; + public int Vram; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/OwnConsole.cs b/Cicm.Database/Schemas/OwnConsole.cs index ba7520c0..ef5495eb 100644 --- a/Cicm.Database/Schemas/OwnConsole.cs +++ b/Cicm.Database/Schemas/OwnConsole.cs @@ -33,19 +33,19 @@ namespace Cicm.Database.Schemas /// Owned videogame console public class OwnConsole { + /// Acquired date + public string Acquired; /// Box present in collection - public bool boxed; - /// Adquired date - public string date; + public bool Boxed; /// Videogame console's ID - public int db_id; + public int ConsoleId; /// ID - public int id; + public int Id; /// Original manuals present in collection - public bool manuals; + public bool Manuals; /// Status - public int status; + public int Status; /// Available for trade - public bool trade; + public bool Trade; } } \ No newline at end of file