Skip to content

Commit

Permalink
Merge branch 'adminStation'
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Langlais authored and Evan Langlais committed Apr 3, 2017
2 parents 9bce610 + 1aeb309 commit 4c16f84
Show file tree
Hide file tree
Showing 18 changed files with 1,726 additions and 53 deletions.
10 changes: 10 additions & 0 deletions Enigma/Enigma.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@
<Compile Include="EnigmaMain.Designer.cs">
<DependentUpon>EnigmaMain.cs</DependentUpon>
</Compile>
<Compile Include="StationsGUI\AdminStationView.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StationsGUI\AdminStationView.Designer.cs">
<DependentUpon>AdminStationView.cs</DependentUpon>
</Compile>
<Compile Include="StationsGUI\DebugStationView.cs">
<SubType>Form</SubType>
</Compile>
Expand All @@ -112,6 +118,7 @@
<Compile Include="StationsGUI\WaiterStationView.Designer.cs">
<DependentUpon>WaiterStationView.cs</DependentUpon>
</Compile>
<Compile Include="Stations\AdminStation.cs" />
<Compile Include="Stations\DebugStation.cs" />
<Compile Include="Stations\WaiterStation.cs" />
<Compile Include="Stations\HostStation.cs" />
Expand All @@ -130,6 +137,9 @@
<EmbeddedResource Include="EnigmaMain.resx">
<DependentUpon>EnigmaMain.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="StationsGUI\AdminStationView.resx">
<DependentUpon>AdminStationView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="StationsGUI\DebugStationView.resx">
<DependentUpon>DebugStationView.cs</DependentUpon>
</EmbeddedResource>
Expand Down
1 change: 1 addition & 0 deletions Enigma/EnigmaMain.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Enigma/EnigmaMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,12 @@ private void metroButton1_Click(object sender, EventArgs e)
PinScreen pinScreen = new PinScreen(EmployeeRole.waiter);
pinScreen.ShowDialog();
}

private void adminButton_Click(object sender, EventArgs e)
{
AdminStation station = new AdminStation("debugadmin");
loadedStations.Add(station);
station.showView();
}
}
}
12 changes: 6 additions & 6 deletions Enigma/Popups/resAdd.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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();

Expand Down
6 changes: 3 additions & 3 deletions Enigma/Popups/waitListAdd.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
21 changes: 21 additions & 0 deletions Enigma/Stations/AdminStation.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using EnigmaX.Classes;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Enigma.Stations
{
class AdminStation : Station
{

public AdminStation(string stationId) : base(StationTypeDef.admin, stationId) {

Employee activeEmployee = SystemFunctions.showPinScreenUntilAuthenticated(EmployeeRole.admin);
view = new StationsGUI.AdminStationView(activeEmployee);

}

}
}
Loading

0 comments on commit 4c16f84

Please sign in to comment.