Completely removed all the old database interaction code, save the database converter form. Updated the formatting in the weekly and taxable areas on the modify record form. Re-enabled holiday checking on the main form.
This commit is contained in:
@@ -38,11 +38,11 @@ namespace AdvertsingProfitControl
|
||||
|
||||
public void GenerateWeeklyInventoryControlPage(int dateId)
|
||||
{
|
||||
var databaseTracker = new DatabaseTracker();
|
||||
var databaseReader = new DatabaseReader();
|
||||
var invoiceTable = databaseReader.ReturnInvoiceTable(dateId, databaseTracker.DatabaseConnectionString);
|
||||
var weeklySalesTable = databaseReader.ReturnWeeklySalesFromDateId(dateId,
|
||||
databaseTracker.DatabaseConnectionString);
|
||||
//var databaseTracker = new DatabaseTracker();
|
||||
//var databaseReader = new DatabaseReader();
|
||||
//var invoiceTable = databaseReader.ReturnInvoiceTable(dateId, databaseTracker.DatabaseConnectionString);
|
||||
//var weeklySalesTable = databaseReader.ReturnWeeklySalesFromDateId(dateId,
|
||||
// databaseTracker.DatabaseConnectionString);
|
||||
var stringWriter = new StringWriter();
|
||||
var writer = new HtmlTextWriter(stringWriter);
|
||||
writer.Write("<!DOCTYPE html>\n");
|
||||
@@ -74,7 +74,7 @@ namespace AdvertsingProfitControl
|
||||
writer.AddAttribute(HtmlTextWriterAttribute.Colspan, "3");
|
||||
writer.AddAttribute(HtmlTextWriterAttribute.Style, "border:none"); //; width:240px
|
||||
writer.RenderBeginTag(HtmlTextWriterTag.Td);
|
||||
writer.Write("Week Ending <u>" + CleanDate(databaseReader.RetrieveDateStringById(dateId, databaseTracker.DatabaseConnectionString)) + "</u>");
|
||||
writer.Write("Week Ending <u>");// + CleanDate(databaseReader.RetrieveDateStringById(dateId, databaseTracker.DatabaseConnectionString)) + "</u>");
|
||||
writer.RenderEndTag();//td
|
||||
writer.RenderEndTag();//tr
|
||||
//Begin rendering the proper header row for the table itself.
|
||||
@@ -123,7 +123,7 @@ namespace AdvertsingProfitControl
|
||||
//Dollar amount for Sunday
|
||||
writer.AddAttribute(HtmlTextWriterAttribute.Style, "text-align:right");
|
||||
writer.RenderBeginTag(HtmlTextWriterTag.Td);
|
||||
var sundaySalesAmount = FormatNumberForDisplay(weeklySalesTable.Rows[0].ItemArray[0]).Split('.');
|
||||
var sundaySalesAmount = "Spam";//FormatNumberForDisplay(weeklySalesTable.Rows[0].ItemArray[0]).Split('.');
|
||||
writer.Write(sundaySalesAmount[0]);
|
||||
writer.RenderEndTag();//td
|
||||
//cents amount td
|
||||
@@ -134,25 +134,25 @@ namespace AdvertsingProfitControl
|
||||
writer.RenderEndTag();//tr
|
||||
//Loop 35 times to build all the rows.
|
||||
double totalCostsOfSales = 0; //holds the total value of all the invoices purchases.
|
||||
foreach (DataRow row in invoiceTable.Rows)
|
||||
{
|
||||
//Index four (4) contains the Net Amount of Invoices Extended Retail values.
|
||||
double parsedString = 0;
|
||||
if (double.TryParse(row.ItemArray[4].ToString(), out parsedString))
|
||||
{
|
||||
totalCostsOfSales += parsedString;
|
||||
}
|
||||
}
|
||||
//foreach (DataRow row in invoiceTable.Rows)
|
||||
//{
|
||||
// //Index four (4) contains the Net Amount of Invoices Extended Retail values.
|
||||
// double parsedString = 0;
|
||||
// if (double.TryParse(row.ItemArray[4].ToString(), out parsedString))
|
||||
// {
|
||||
// totalCostsOfSales += parsedString;
|
||||
// }
|
||||
//}
|
||||
|
||||
for (var i = 0; i < 34; i++)
|
||||
{
|
||||
var purchasesColumnsRendered = false;
|
||||
var salesColumnsRendered = false;
|
||||
writer.RenderBeginTag(HtmlTextWriterTag.Tr);
|
||||
if (i < invoiceTable.Rows.Count)
|
||||
{
|
||||
purchasesColumnsRendered = RenderPurchasesColumns(i, writer, invoiceTable);
|
||||
}
|
||||
//if (i < invoiceTable.Rows.Count)
|
||||
//{
|
||||
// purchasesColumnsRendered = RenderPurchasesColumns(i, writer, invoiceTable);
|
||||
//}
|
||||
if ((i + 1) < 8)
|
||||
{
|
||||
//padding
|
||||
@@ -172,7 +172,7 @@ namespace AdvertsingProfitControl
|
||||
purchasesColumnsRendered = true;
|
||||
}
|
||||
//Generates the SALES columns.
|
||||
salesColumnsRendered = RenderWeeklySalesColumns(i, writer, weeklySalesTable);
|
||||
//salesColumnsRendered = RenderWeeklySalesColumns(i, writer, weeklySalesTable);
|
||||
}
|
||||
if (i == 7)
|
||||
{
|
||||
@@ -267,27 +267,27 @@ namespace AdvertsingProfitControl
|
||||
writer.RenderEndTag();//td
|
||||
double totalSales = 0;
|
||||
|
||||
if (double.TryParse(weeklySalesTable.Rows[0].ItemArray[7].ToString(), out totalSales))
|
||||
{
|
||||
var dollarGrossProfit = totalSales - totalCostsOfSales;
|
||||
var dollarGrossProfitSplit = FormatNumberForDisplay(dollarGrossProfit).Split('.');
|
||||
writer.AddAttribute(HtmlTextWriterAttribute.Style, "text-align:right");
|
||||
writer.RenderBeginTag(HtmlTextWriterTag.Td);
|
||||
writer.Write(dollarGrossProfitSplit[0]);
|
||||
writer.RenderEndTag(); //td
|
||||
writer.RenderBeginTag(HtmlTextWriterTag.Td);
|
||||
writer.Write(dollarGrossProfitSplit[1]);
|
||||
writer.RenderEndTag(); //td
|
||||
}
|
||||
else
|
||||
{
|
||||
writer.RenderBeginTag(HtmlTextWriterTag.Td);
|
||||
writer.RenderEndTag();//td
|
||||
writer.RenderBeginTag(HtmlTextWriterTag.Td);
|
||||
writer.RenderEndTag();//td
|
||||
writer.RenderBeginTag(HtmlTextWriterTag.Td);
|
||||
writer.RenderEndTag();//td
|
||||
}
|
||||
//if (double.TryParse(weeklySalesTable.Rows[0].ItemArray[7].ToString(), out totalSales))
|
||||
//{
|
||||
// var dollarGrossProfit = totalSales - totalCostsOfSales;
|
||||
// var dollarGrossProfitSplit = FormatNumberForDisplay(dollarGrossProfit).Split('.');
|
||||
// writer.AddAttribute(HtmlTextWriterAttribute.Style, "text-align:right");
|
||||
// writer.RenderBeginTag(HtmlTextWriterTag.Td);
|
||||
// writer.Write(dollarGrossProfitSplit[0]);
|
||||
// writer.RenderEndTag(); //td
|
||||
// writer.RenderBeginTag(HtmlTextWriterTag.Td);
|
||||
// writer.Write(dollarGrossProfitSplit[1]);
|
||||
// writer.RenderEndTag(); //td
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// writer.RenderBeginTag(HtmlTextWriterTag.Td);
|
||||
// writer.RenderEndTag();//td
|
||||
// writer.RenderBeginTag(HtmlTextWriterTag.Td);
|
||||
// writer.RenderEndTag();//td
|
||||
// writer.RenderBeginTag(HtmlTextWriterTag.Td);
|
||||
// writer.RenderEndTag();//td
|
||||
//}
|
||||
}
|
||||
if (i == 21)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user