glm94/advertisingprofitcontrol-alpha
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor UI changes after testing on the laptop. The add record form now selects Saturday based on the current date on start up.

Browse Source
This commit is contained in:
glm94
2017-01-23 03:41:47 -06:00
parent 739c4c179d
commit d7229c9499
19 changed files with 68 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AdvertsingProfitControl/DatabaseReader.cs
+3 -3
View File
@@ -13,7 +13,7 @@ namespace AdvertsingProfitControl
var versionNumber = "0.0.0.0";
var oleDbCommand = new OleDbCommand()
{
CommandText = "SELECT VersionNumber FROM Version"
CommandText = "SELECT Version.VersionNumber FROM Version"
};
var connection = new OleDbConnection(connectionString);
oleDbCommand.Connection = connection;
@@ -743,9 +743,9 @@ namespace AdvertsingProfitControl
public DataTable ReturnApcTableForReport(int dateId, string connectionString)
{
var dataTable = new DataTable();
var oleDbCommand = new OleDbCommand()
var oleDbCommand = new OleDbCommand
{
CommandText = "SELECT AdItem.AdItem, APC.ProjectionSold, APC.ProjectionSalePrice, APC.ProjectionTotalSales, APC.ProjectionCost, APC.ProjectionProfitReturn, APC.ProjectionTotalProfitReturn, APC.BeginingInventory, APC.Received, APC.TotalInventory, APC.EndingInventory, APC.ActualSold, APC.ActualSalePrice, APC.ActualTotalSales, APC.ActualCost, APC.ActualProfitReturn, APC.ActualTotalProfitReturn, APC.GroupNumber, APC.FK_AdSpecialName FROM (AdItem INNER JOIN APC ON AdItem.ID = APC.FK_AdItemID) WHERE FK_DateID = ? ORDER BY RowPosition ASC"
CommandText = "SELECT AdItem.AdItem, Projections.Sold, Projections.SalePrice, Projections.TotalSales, Projections.Cost, Projections.ProfitReturn, Projections.TotalProfitReturn, Inventory.BeginingInventory, Inventory.Received, Inventory.TotalInventory, Inventory.EndingInventory, ActualSales.Sold, ActualSales.SalePrice, ActualSales.TotalSales, ActualSales.Cost, ActualSales.ProfitReturn, ActualSales.TotalProfitReturn, ActualSales.FK_AdSpecialGroupName FROM (AdItem INNER JOIN Projections ON AdItem.ID = Projections.FK_AdItemID INNER JOIN Inventory ON Inventory.ID = Projections.ID INNER JOIN ActualSales ON ActualSales.ID = Projections.ID) WHERE Projections.FK_DateID = ? ORDER BY Projections.RowPosition ASC"
};
oleDbCommand.Parameters.AddWithValue("DateID", dateId);
var connection = new OleDbConnection(connectionString);