From ce990c938192d2965a81254fc0d4d457e98b9271 Mon Sep 17 00:00:00 2001 From: Evan Langlais Date: Tue, 28 Mar 2017 12:54:13 -0400 Subject: [PATCH] Updated DB functions and created accessors for menu --- Enigma/Popups/resAdd.cs | 12 +++---- Enigma/Popups/waitListAdd.cs | 6 ++-- Enigma/StationsGUI/HostStationView.cs | 12 +++---- EnigmaX/Classes/DBConnect.cs | 51 ++++++++++----------------- EnigmaX/Classes/Menu.cs | 38 +++++++++++++++++++- 5 files changed, 70 insertions(+), 49 deletions(-) diff --git a/Enigma/Popups/resAdd.cs b/Enigma/Popups/resAdd.cs index e98b467..a1cfd25 100644 --- a/Enigma/Popups/resAdd.cs +++ b/Enigma/Popups/resAdd.cs @@ -52,9 +52,9 @@ private void addRes_Click(object sender, EventArgs e) //update the initialWaitTime in the sql table MySqlCommand cmd = new MySqlCommand("UPDATE Seating SET status = @status WHERE tableNumber = @tableNumber and Seats = @Seats", db.getConnection()); //parametrize the variables - cmd.Parameters.Add("@status", hsv.tables[i].getStatus()); - cmd.Parameters.Add("@tableNumber", hsv.tables[i].getTableNumber()); - cmd.Parameters.Add("@Seats", hsv.tables[i].getTableCapacity()); + cmd.Parameters.AddWithValue("@status", hsv.tables[i].getStatus()); + cmd.Parameters.AddWithValue("@tableNumber", hsv.tables[i].getTableNumber()); + cmd.Parameters.AddWithValue("@Seats", hsv.tables[i].getTableCapacity()); cmd.ExecuteNonQuery(); //execute the update db.getConnection().Close(); @@ -70,9 +70,9 @@ private void addRes_Click(object sender, EventArgs e) //update the initialWaitTime in the sql table MySqlCommand cmd = new MySqlCommand("UPDATE Seating SET status = @status WHERE tableNumber = @tableNumber and Seats = @Seats", db.getConnection()); //parametrize the variables - cmd.Parameters.Add("@status", hsv.tables[i].getStatus()); - cmd.Parameters.Add("@tableNumber", hsv.tables[i].getTableNumber()); - cmd.Parameters.Add("@Seats", hsv.tables[i].getTableCapacity()); + cmd.Parameters.AddWithValue("@status", hsv.tables[i].getStatus()); + cmd.Parameters.AddWithValue("@tableNumber", hsv.tables[i].getTableNumber()); + cmd.Parameters.AddWithValue("@Seats", hsv.tables[i].getTableCapacity()); cmd.ExecuteNonQuery(); //execute the update db.getConnection().Close(); diff --git a/Enigma/Popups/waitListAdd.cs b/Enigma/Popups/waitListAdd.cs index 1924bd4..503320e 100644 --- a/Enigma/Popups/waitListAdd.cs +++ b/Enigma/Popups/waitListAdd.cs @@ -40,9 +40,9 @@ private void metroButton1_Click(object sender, EventArgs e) DBConnect db = new DBConnect(); db.getConnection().Open(); MySqlCommand cmd = new MySqlCommand("INSERT INTO Waitlist (Name, Party, initialWaitTime) VALUES (@Name, @Party, @initialWaitTime)", db.getConnection()); - cmd.Parameters.Add("@Name", party.getName()); - cmd.Parameters.Add("@Party", party.getCount()); - cmd.Parameters.Add("@initialWaitTime", party.getWaitTime()); + cmd.Parameters.AddWithValue("@Name", party.getName()); + cmd.Parameters.AddWithValue("@Party", party.getCount()); + cmd.Parameters.AddWithValue("@initialWaitTime", party.getWaitTime()); cmd.ExecuteNonQuery(); db.getConnection().Close(); diff --git a/Enigma/StationsGUI/HostStationView.cs b/Enigma/StationsGUI/HostStationView.cs index aa4f2bb..e9d5c78 100644 --- a/Enigma/StationsGUI/HostStationView.cs +++ b/Enigma/StationsGUI/HostStationView.cs @@ -155,9 +155,9 @@ private void waitListRefresh_Tick(object sender, EventArgs e) //actions when the //update the initialWaitTime in the sql table MySqlCommand cmd = new MySqlCommand("UPDATE Waitlist SET initialWaitTime = @initialWaitTime WHERE Name = @Name and Party = @Party", db.getConnection()); //parametrize the variables - cmd.Parameters.Add("@initialWaitTime", waitList[i].getWaitTime()); - cmd.Parameters.Add("@Name", waitList[i].getName()); - cmd.Parameters.Add("@Party", waitList[i].getCount()); + cmd.Parameters.AddWithValue("@initialWaitTime", waitList[i].getWaitTime()); + cmd.Parameters.AddWithValue("@Name", waitList[i].getName()); + cmd.Parameters.AddWithValue("@Party", waitList[i].getCount()); cmd.ExecuteNonQuery(); //execute the update db.getConnection().Close(); //close the channel dataGridView1.Refresh(); //check if works @@ -200,8 +200,8 @@ private void dataGridView1_RowHeaderMouseDoubleClick(object sender, DataGridView db.getConnection().Open(); //remove the row from the sql table MySqlCommand cmd = new MySqlCommand("DELETE FROM Waitlist WHERE Name = @Name and Party = @Party", db.getConnection()); - cmd.Parameters.Add("@Name", name); - cmd.Parameters.Add("@Party", partySize); + cmd.Parameters.AddWithValue("@Name", name); + cmd.Parameters.AddWithValue("@Party", partySize); cmd.ExecuteNonQuery(); db.getConnection().Close(); } @@ -276,7 +276,7 @@ private void HostStationView_FormClosed(object sender, FormClosedEventArgs e) cmd = new MySqlCommand("UPDATE Seating SET status = @status ", db.getConnection()); //parametrize the variables - cmd.Parameters.Add("@status", 1); + cmd.Parameters.AddWithValue("@status", 1); cmd.ExecuteNonQuery(); db.getConnection().Close(); } diff --git a/EnigmaX/Classes/DBConnect.cs b/EnigmaX/Classes/DBConnect.cs index bcd174c..e1a2359 100644 --- a/EnigmaX/Classes/DBConnect.cs +++ b/EnigmaX/Classes/DBConnect.cs @@ -70,30 +70,36 @@ private bool CloseConnection() public void WriteCommand(string str) { + WriteCommand(new MySqlCommand(str)); + } - if (this.OpenConnection() == true) - { - //create command and assign the query and connection from the constructor - MySqlCommand cmd = new MySqlCommand(str, connection); + public void WriteCommand(MySqlCommand cmd) + { - //Execute command - cmd.ExecuteNonQuery(); + if (this.OpenConnection() == true) + { + //create command and assign the query and connection from the constructor - //close connection - this.CloseConnection(); - } + //Execute command + cmd.ExecuteNonQuery(); + //close connection + this.CloseConnection(); } - public List> ReadCommand(string str, params string[] collect) + } + + public List> ReadCommand(string str, params string[] collect) { + return ReadCommand(new MySqlCommand(str), collect); + } + + public List> ReadCommand(MySqlCommand cmd, params string[] collect) { List> total = new List>(); if (this.OpenConnection() == true) { - //Create Command - MySqlCommand cmd = new MySqlCommand(str, connection); //Create a data reader and Execute the command MySqlDataReader dataReader = cmd.ExecuteReader(); @@ -128,27 +134,6 @@ public MySqlConnection getConnection() { return connection; } - /*public string ReadSingleCommand(string str) { - - if (this.OpenConnection() == true) - { - //Create Mysql Command - MySqlCommand cmd = new MySqlCommand(str, connection); - - //ExecuteScalar will return one value - Count = int.Parse(cmd.ExecuteScalar() + ""); - - //close Connection - this.CloseConnection(); - - return Count; - } - else - { - return Count; - } - - }*/ } } diff --git a/EnigmaX/Classes/Menu.cs b/EnigmaX/Classes/Menu.cs index e66d787..3afd5df 100644 --- a/EnigmaX/Classes/Menu.cs +++ b/EnigmaX/Classes/Menu.cs @@ -8,9 +8,45 @@ namespace EnigmaX.Classes { public class Menu { - + private int _id; private string _title; private List _items; + public Menu(int id, string title, List items) { + _id = id; + _title = title; + _items = items; + } + + public string Title { + get { + return _title; + } + set { + _title = value; + } + } + + public List Items + { + get + { + return _items; + } + set + { + _items = value; + } + } + + public static Menu loadMenuFromDB(int id) { + + return new Menu(id, "", null); + } + + public void updateMenuInDB() { + + } + } }