Marked as 'AdvertsingProfitControl (New Add Form)' by its folder name. I think this was one of the first appearences of a modify record form, however I may have gotten the order mixed up here with the previous commit. Reguardless, this version still introduced the first appearence of a new 'Modify Record' form.

This commit is contained in:
2021-01-28 20:02:35 -06:00
parent 21eaae4d67
commit 676a9dd890
24 changed files with 7495 additions and 491 deletions
Binary file not shown.
+7 -1
View File
@@ -1,10 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.24720.0 VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvertsingProfitControl", "AdvertsingProfitControl\AdvertsingProfitControl.csproj", "{4A45C665-5D02-4724-9CC5-C0C50CA44760}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvertsingProfitControl", "AdvertsingProfitControl\AdvertsingProfitControl.csproj", "{4A45C665-5D02-4724-9CC5-C0C50CA44760}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StringInputParseTester", "StringInputParseTester\StringInputParseTester.csproj", "{2663661B-3D90-4D42-B05E-8038923A2891}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
{4A45C665-5D02-4724-9CC5-C0C50CA44760}.Debug|Any CPU.Build.0 = Debug|Any CPU {4A45C665-5D02-4724-9CC5-C0C50CA44760}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A45C665-5D02-4724-9CC5-C0C50CA44760}.Release|Any CPU.ActiveCfg = Release|Any CPU {4A45C665-5D02-4724-9CC5-C0C50CA44760}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A45C665-5D02-4724-9CC5-C0C50CA44760}.Release|Any CPU.Build.0 = Release|Any CPU {4A45C665-5D02-4724-9CC5-C0C50CA44760}.Release|Any CPU.Build.0 = Release|Any CPU
{2663661B-3D90-4D42-B05E-8038923A2891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2663661B-3D90-4D42-B05E-8038923A2891}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2663661B-3D90-4D42-B05E-8038923A2891}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2663661B-3D90-4D42-B05E-8038923A2891}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@@ -56,9 +56,7 @@
<PropertyGroup> <PropertyGroup>
<GenerateManifests>true</GenerateManifests> <GenerateManifests>true</GenerateManifests>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup />
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<StartupObject>AdvertsingProfitControl.Program</StartupObject> <StartupObject>AdvertsingProfitControl.Program</StartupObject>
</PropertyGroup> </PropertyGroup>
@@ -80,6 +78,9 @@
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>Stretched Logo Collection.ico</ApplicationIcon> <ApplicationIcon>Stretched Logo Collection.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="HtmlRenderer, Version=1.5.0.5, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="HtmlRenderer, Version=1.5.0.5, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HtmlRenderer.Core.1.5.0.5\lib\net45\HtmlRenderer.dll</HintPath> <HintPath>..\packages\HtmlRenderer.Core.1.5.0.5\lib\net45\HtmlRenderer.dll</HintPath>
@@ -103,6 +104,7 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="TextFormat.cs" />
<Compile Include="APCDatabaseWriter.cs" /> <Compile Include="APCDatabaseWriter.cs" />
<Compile Include="BackPageGenerator.cs" /> <Compile Include="BackPageGenerator.cs" />
<Compile Include="DatabaseReader.cs" /> <Compile Include="DatabaseReader.cs" />
@@ -197,9 +199,8 @@
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
</Compile> </Compile>
<None Include="AdvertsingProfitControl_TemporaryKey.pfx" /> <None Include="AdvertsingProfitControl_TemporaryKey.pfx" />
<None Include="app.config" /> <None Include="app.manifest" />
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="Properties\app.manifest" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -10,4 +10,7 @@
<FallbackCulture>en-US</FallbackCulture> <FallbackCulture>en-US</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles> <VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<EnableSecurityDebugging>false</EnableSecurityDebugging>
</PropertyGroup>
</Project> </Project>
+7 -6
View File
@@ -50,7 +50,7 @@ namespace AdvertsingProfitControl
writer.RenderBeginTag(HtmlTextWriterTag.Head); writer.RenderBeginTag(HtmlTextWriterTag.Head);
writer.AddAttribute(HtmlTextWriterAttribute.Type, "text/css"); writer.AddAttribute(HtmlTextWriterAttribute.Type, "text/css");
writer.RenderBeginTag(HtmlTextWriterTag.Style); writer.RenderBeginTag(HtmlTextWriterTag.Style);
writer.Write("td{margins:0px; padding:0; border:1px solid black; text-align:left}"); writer.Write("td{margins:0px; padding:0; border:1px solid black; text-align:left} table{table-layout:fixed;} td{ width: 1px; white-space:nowrap; }");
writer.RenderEndTag();//style writer.RenderEndTag();//style
writer.RenderEndTag();//Head writer.RenderEndTag();//Head
writer.RenderBeginTag(HtmlTextWriterTag.Body); writer.RenderBeginTag(HtmlTextWriterTag.Body);
@@ -63,15 +63,16 @@ namespace AdvertsingProfitControl
writer.RenderBeginTag(HtmlTextWriterTag.Td); writer.RenderBeginTag(HtmlTextWriterTag.Td);
writer.Write("<center>Weekly Inventory Control</center>"); writer.Write("<center>Weekly Inventory Control</center>");
writer.RenderEndTag();//td writer.RenderEndTag();//td
//New row for Name & Location
writer.RenderEndTag();//tr (header row) writer.RenderEndTag();//tr (header row)
writer.RenderBeginTag(HtmlTextWriterTag.Tr); writer.RenderBeginTag(HtmlTextWriterTag.Tr);
writer.AddAttribute(HtmlTextWriterAttribute.Colspan, "5"); writer.AddAttribute(HtmlTextWriterAttribute.Colspan, "5");
writer.AddAttribute(HtmlTextWriterAttribute.Style, "border:none; text-align:left; width:560px"); writer.AddAttribute(HtmlTextWriterAttribute.Style, "border:none; text-align:left"); //; width:560px
writer.RenderBeginTag(HtmlTextWriterTag.Td); writer.RenderBeginTag(HtmlTextWriterTag.Td);
writer.Write("Name & Location"); writer.Write("Name & Location");
writer.RenderEndTag();//td writer.RenderEndTag();//td
writer.AddAttribute(HtmlTextWriterAttribute.Colspan, "3"); writer.AddAttribute(HtmlTextWriterAttribute.Colspan, "3");
writer.AddAttribute(HtmlTextWriterAttribute.Style, "border:none; width:240px"); writer.AddAttribute(HtmlTextWriterAttribute.Style, "border:none"); //; width:240px
writer.RenderBeginTag(HtmlTextWriterTag.Td); 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();//td
@@ -94,12 +95,12 @@ namespace AdvertsingProfitControl
//Begin rendering the description row and the Sunday row in the sales table. //Begin rendering the description row and the Sunday row in the sales table.
writer.RenderBeginTag(HtmlTextWriterTag.Tr); writer.RenderBeginTag(HtmlTextWriterTag.Tr);
//Date td //Date td
writer.AddAttribute(HtmlTextWriterAttribute.Style, "text-align:center; width:100px"); //; width:100px writer.AddAttribute(HtmlTextWriterAttribute.Style, "text-align:center"); //; width:100px
writer.RenderBeginTag(HtmlTextWriterTag.Td); writer.RenderBeginTag(HtmlTextWriterTag.Td);
writer.Write("Date"); writer.Write("Date");
writer.RenderEndTag();//td writer.RenderEndTag();//td
//Supplier and invoices td //Supplier and invoices td
writer.AddAttribute(HtmlTextWriterAttribute.Style, "font-size:10px; text-align:center; width:250px"); //width:250px; writer.AddAttribute(HtmlTextWriterAttribute.Style, "font-size:10px; text-align:center"); //width:250px;
writer.RenderBeginTag(HtmlTextWriterTag.Td); writer.RenderBeginTag(HtmlTextWriterTag.Td);
writer.Write("Suppliers and Invoice Number"); writer.Write("Suppliers and Invoice Number");
writer.RenderEndTag();//td writer.RenderEndTag();//td
@@ -109,7 +110,7 @@ namespace AdvertsingProfitControl
writer.Write("Net Amount of Invoices At Cost"); writer.Write("Net Amount of Invoices At Cost");
writer.RenderEndTag();//td writer.RenderEndTag();//td
//Net amount extended retail //Net amount extended retail
writer.AddAttribute(HtmlTextWriterAttribute.Style, "font-size:10px; text-align:center; width:25px"); //width:50px writer.AddAttribute(HtmlTextWriterAttribute.Style, "font-size:10px; text-align:center"); //width:50px
writer.AddAttribute(HtmlTextWriterAttribute.Colspan, "2"); writer.AddAttribute(HtmlTextWriterAttribute.Colspan, "2");
writer.RenderBeginTag(HtmlTextWriterTag.Td); writer.RenderBeginTag(HtmlTextWriterTag.Td);
writer.Write("Net Amount of <br>Invoices<br> Extended Retail"); writer.Write("Net Amount of <br>Invoices<br> Extended Retail");
+65 -39
View File
@@ -255,7 +255,7 @@ namespace AdvertsingProfitControl
var id = "0"; var id = "0";
var oleDbCommand = new OleDbCommand() var oleDbCommand = new OleDbCommand()
{ {
CommandText = "SELECT AdItem.ID FROM AdItem WHERE UCASE(AdItem.AdItem) = UCASE(?)" CommandText = "SELECT AdItem.ID FROM AdItem WHERE UCASE(AdItem.AdItem) = UCASE(?)" //JUST MAKE A CUSTOM PARSING ENGINE
}; };
oleDbCommand.Parameters.AddWithValue("AdItemName", adItemName); oleDbCommand.Parameters.AddWithValue("AdItemName", adItemName);
var connection = new OleDbConnection(connectionString); var connection = new OleDbConnection(connectionString);
@@ -283,7 +283,7 @@ namespace AdvertsingProfitControl
var adItemList = new List<string>(); var adItemList = new List<string>();
var oleDbCommand = new OleDbCommand var oleDbCommand = new OleDbCommand
{ {
CommandText = "SELECT AdItem.AdItem, APC.RowAttribute, APC.FK_GroupID FROM (APC INNER JOIN AdItem ON APC.FK_AdItemID = AdItem.ID) WHERE FK_DateID = ? ORDER BY RowPosition ASC" CommandText = "SELECT AdItem.AdItem, APC.RowAttribute, APC.FK_AdSpecialName FROM (APC INNER JOIN AdItem ON APC.FK_AdItemID = AdItem.ID) WHERE FK_DateID = ? ORDER BY RowPosition ASC"
}; };
oleDbCommand.Parameters.AddWithValue("DateID", dateId); oleDbCommand.Parameters.AddWithValue("DateID", dateId);
var connection = new OleDbConnection(connectionString); var connection = new OleDbConnection(connectionString);
@@ -297,7 +297,7 @@ namespace AdvertsingProfitControl
{ {
while (reader != null && reader.Read()) while (reader != null && reader.Read())
{ {
if (reader["FK_GroupID"].ToString() != "" && int.Parse(reader["FK_GroupID"].ToString()) >= 3) if (reader["FK_AdSpecialName"].ToString() != "" && int.Parse(reader["FK_AdSpecialName"].ToString()) >= 3)
{ {
adItemList.Add(reader[0] + ":2"); adItemList.Add(reader[0] + ":2");
} }
@@ -390,9 +390,9 @@ namespace AdvertsingProfitControl
var groupId = "0"; var groupId = "0";
var oleDbCommand = new OleDbCommand() var oleDbCommand = new OleDbCommand()
{ {
CommandText = "SELECT GroupCategory.ID FROM GroupCategory WHERE GroupCategory.GroupDescription = ?" CommandText = "SELECT AdSpecialName.ID FROM AdSpecialName WHERE AdSpecialName.AdSpecialName = ?"
}; };
oleDbCommand.Parameters.AddWithValue("GroupName", groupName); oleDbCommand.Parameters.AddWithValue("AdSpecialName", groupName);
var connection = new OleDbConnection(connectionString); var connection = new OleDbConnection(connectionString);
oleDbCommand.Connection = connection; oleDbCommand.Connection = connection;
@@ -414,12 +414,40 @@ namespace AdvertsingProfitControl
return groupId; return groupId;
} }
public string ReturnAdSpecialDescriptionByAdSpecialName(string adSpecialString, string connectionString)
{
var descriptionString = "";
var oleDbCommand = new OleDbCommand()
{
CommandText = "SELECT AdSpecialName.AdSpecialDescription FROM AdSpecialName WHERE AdSpecialName.AdSpecialDescription = ?"
};
oleDbCommand.Parameters.AddWithValue("AdspecialName", adSpecialString);
var connection = new OleDbConnection(connectionString);
oleDbCommand.Connection = connection;
using (connection)
{
using (oleDbCommand)
{
connection.Open();
using (var reader = oleDbCommand.ExecuteReader())
{
while (reader != null && reader.Read())
{
descriptionString = reader[0].ToString();
}
}
}
}
return descriptionString;
}
public List<string> ReturnGroupNameList(string connectionString) public List<string> ReturnGroupNameList(string connectionString)
{ {
var groupNames = new List<string>(); var groupNames = new List<string>();
var oleDbCommand = new OleDbCommand() var oleDbCommand = new OleDbCommand()
{ {
CommandText = "SELECT GroupCategory.GroupDescription FROM GroupCategory WHERE NOT GroupDescription = 'HeaderRow' AND NOT GroupDescription = 'MemberRow'" CommandText = "SELECT AdSpecialName.AdSpecialName FROM AdSpecialName"
}; };
var connection = new OleDbConnection(connectionString); var connection = new OleDbConnection(connectionString);
oleDbCommand.Connection = connection; oleDbCommand.Connection = connection;
@@ -442,40 +470,14 @@ namespace AdvertsingProfitControl
return groupNames; return groupNames;
} }
public DataTable ReturnGroupIdTable(string dateId, string connectionString)
{
var dataTable = new DataTable();
var oleDbCommand = new OleDbCommand()
{
CommandText = "SELECT APC.FK_GroupID FROM APC WHERE FK_DateID = ?"
};
oleDbCommand.Parameters.AddWithValue("DateID", dateId);
var connection = new OleDbConnection(connectionString);
oleDbCommand.Connection = connection;
using (connection)
{
using (oleDbCommand)
{
connection.Open();
using (var dataAdapter = new OleDbDataAdapter(oleDbCommand))
{
dataAdapter.Fill(dataTable);
}
}
}
return dataTable;
}
public string ReturnGroupNameFromGroupId(string id, string connectionString) public string ReturnGroupNameFromGroupId(string id, string connectionString)
{ {
var name = ""; var name = "";
var oleDbCommand = new OleDbCommand() var oleDbCommand = new OleDbCommand()
{ {
CommandText = "SELECT GroupDescription FROM GroupCategory WHERE ID = ?" CommandText = "SELECT AdSpecialName FROM AdSpecialName WHERE ID = ?"
}; };
oleDbCommand.Parameters.AddWithValue("GroupID", id); oleDbCommand.Parameters.AddWithValue("AdspecialName", id);
var connection = new OleDbConnection(connectionString); var connection = new OleDbConnection(connectionString);
oleDbCommand.Connection = connection; oleDbCommand.Connection = connection;
@@ -502,7 +504,7 @@ namespace AdvertsingProfitControl
var adSpecialList = new AutoCompleteStringCollection(); var adSpecialList = new AutoCompleteStringCollection();
var oleDbCommand = new OleDbCommand() var oleDbCommand = new OleDbCommand()
{ {
CommandText = "Select GroupDescription FROM GroupCategory WHERE NOT GroupDescription = 'HeaderRow' AND NOT GroupDescription = 'MemberRow'" CommandText = "Select AdSpecialName FROM AdSpecialName"
}; };
var connection = new OleDbConnection(connectionString); var connection = new OleDbConnection(connectionString);
oleDbCommand.Connection = connection; oleDbCommand.Connection = connection;
@@ -592,7 +594,7 @@ namespace AdvertsingProfitControl
var dataTable = new DataTable(); 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, RowAttribute, FK_GroupID FROM (AdItem INNER JOIN APC ON AdItem.ID = APC.FK_AdItemID) WHERE FK_DateID = ? ORDER BY RowPosition ASC" 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"
}; };
oleDbCommand.Parameters.AddWithValue("DateID", dateId); oleDbCommand.Parameters.AddWithValue("DateID", dateId);
var connection = new OleDbConnection(connectionString); var connection = new OleDbConnection(connectionString);
@@ -618,7 +620,7 @@ namespace AdvertsingProfitControl
var dataTable = new DataTable(); 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, RowAttribute, FK_GroupID FROM (AdItem INNER JOIN APC ON AdItem.ID = APC.FK_AdItemID) WHERE FK_DateID = ? ORDER BY RowPosition ASC" CommandText = "SELECT AdItem.AdItem, APC.ProjectionSold, APC.ProjectionSalePrice, APC.ProjectionTotalSales, APC.ProjectionCost, APC.ProjectionProfitReturn, APC.ProjectionTotalProfitReturn, APC.GroupNumber, APC.FK_AdSpecialName FROM (AdItem INNER JOIN APC ON AdItem.ID = APC.FK_AdItemID) WHERE FK_DateID = ? ORDER BY RowPosition ASC"
}; };
oleDbCommand.Parameters.AddWithValue("DateID", dateId); oleDbCommand.Parameters.AddWithValue("DateID", dateId);
var connection = new OleDbConnection(connectionString); var connection = new OleDbConnection(connectionString);
@@ -643,7 +645,7 @@ namespace AdvertsingProfitControl
var dataTable = new DataTable(); var dataTable = new DataTable();
var oleDbCommand = new OleDbCommand() var oleDbCommand = new OleDbCommand()
{ {
CommandText = "SELECT AdItem.AdItem, APC.ActualSold, APC.ActualSalePrice, APC.ActualTotalSales, APC.ActualCost, APC.ActualProfitReturn, APC.ActualTotalProfitReturn, RowAttribute, FK_GroupID FROM (AdItem INNER JOIN APC ON AdItem.ID = APC.FK_AdItemID) WHERE FK_DateID = ? ORDER BY RowPosition ASC" CommandText = "SELECT AdItem.AdItem, 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"
}; };
oleDbCommand.Parameters.AddWithValue("DateID", dateId); oleDbCommand.Parameters.AddWithValue("DateID", dateId);
var connection = new OleDbConnection(connectionString); var connection = new OleDbConnection(connectionString);
@@ -668,7 +670,7 @@ namespace AdvertsingProfitControl
var dataTable = new DataTable(); var dataTable = new DataTable();
var oleDbCommand = new OleDbCommand() var oleDbCommand = new OleDbCommand()
{ {
CommandText = "SELECT AdItem.AdItem, APC.BeginingInventory, APC.Received, APC.TotalInventory, APC.EndingInventory, RowAttribute, FK_GroupID FROM (AdItem INNER JOIN APC ON AdItem.ID = APC.FK_AdItemID) WHERE FK_DateID = ? ORDER BY RowPosition ASC" CommandText = "SELECT AdItem.AdItem, APC.BeginingInventory, APC.Received, APC.TotalInventory, APC.EndingInventory, APC.GroupNumber, APC.FK_AdSpecialName FROM (AdItem INNER JOIN APC ON AdItem.ID = APC.FK_AdItemID) WHERE FK_DateID = ? ORDER BY RowPosition ASC"
}; };
oleDbCommand.Parameters.AddWithValue("DateID", dateId); oleDbCommand.Parameters.AddWithValue("DateID", dateId);
var connection = new OleDbConnection(connectionString); var connection = new OleDbConnection(connectionString);
@@ -739,6 +741,30 @@ namespace AdvertsingProfitControl
return dataTable; return dataTable;
} }
public DataTable ReturnTaxableFromDateId(string dateId, string connectionString)
{
var dataTable = new DataTable();
var oleDbCommand = new OleDbCommand()
{
CommandText = "SELECT Taxable.Sunday, Taxable.Monday, Taxable.Tuesday, Taxable.Wednesday, Taxable.Thursday, Taxable.Friday, Taxable.Saturday, Taxable.Total FROM Taxable WHERE FK_DateID = ?"
};
oleDbCommand.Parameters.AddWithValue("DateID", dateId);
var connection = new OleDbConnection(connectionString);
oleDbCommand.Connection = connection;
using (connection)
{
using (oleDbCommand)
{
connection.Open();
using (var dataAdapter = new OleDbDataAdapter(oleDbCommand))
{
dataAdapter.Fill(dataTable);
}
}
}
return dataTable;
}
public DataTable ReturnWeekEndingTable(string connectionString) public DataTable ReturnWeekEndingTable(string connectionString)
{ {
+71 -70
View File
@@ -71,19 +71,19 @@
// //
this.mainLayoutPanel.ColumnCount = 1; this.mainLayoutPanel.ColumnCount = 1;
this.mainLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.mainLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.mainLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30F)); this.mainLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F));
this.mainLayoutPanel.Controls.Add(this.addRecordTabControl, 0, 1); this.mainLayoutPanel.Controls.Add(this.addRecordTabControl, 0, 1);
this.mainLayoutPanel.Controls.Add(this.mainMenu, 0, 0); this.mainLayoutPanel.Controls.Add(this.mainMenu, 0, 0);
this.mainLayoutPanel.Controls.Add(this.commentsAndDateLayoutPanel, 0, 2); this.mainLayoutPanel.Controls.Add(this.commentsAndDateLayoutPanel, 0, 2);
this.mainLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.mainLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.mainLayoutPanel.Location = new System.Drawing.Point(0, 0); this.mainLayoutPanel.Location = new System.Drawing.Point(0, 0);
this.mainLayoutPanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.mainLayoutPanel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.mainLayoutPanel.Name = "mainLayoutPanel"; this.mainLayoutPanel.Name = "mainLayoutPanel";
this.mainLayoutPanel.RowCount = 3; this.mainLayoutPanel.RowCount = 3;
this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 46F));
this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80F)); this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80F));
this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.mainLayoutPanel.Size = new System.Drawing.Size(1278, 745); this.mainLayoutPanel.Size = new System.Drawing.Size(1562, 894);
this.mainLayoutPanel.TabIndex = 0; this.mainLayoutPanel.TabIndex = 0;
// //
// addRecordTabControl // addRecordTabControl
@@ -93,21 +93,21 @@
this.addRecordTabControl.Controls.Add(this.suppliersTabPage); this.addRecordTabControl.Controls.Add(this.suppliersTabPage);
this.addRecordTabControl.Controls.Add(this.weeklySalesTabPage); this.addRecordTabControl.Controls.Add(this.weeklySalesTabPage);
this.addRecordTabControl.Dock = System.Windows.Forms.DockStyle.Fill; this.addRecordTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.addRecordTabControl.Location = new System.Drawing.Point(4, 43); this.addRecordTabControl.Location = new System.Drawing.Point(5, 52);
this.addRecordTabControl.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.addRecordTabControl.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.addRecordTabControl.Name = "addRecordTabControl"; this.addRecordTabControl.Name = "addRecordTabControl";
this.addRecordTabControl.SelectedIndex = 0; this.addRecordTabControl.SelectedIndex = 0;
this.addRecordTabControl.Size = new System.Drawing.Size(1270, 555); this.addRecordTabControl.Size = new System.Drawing.Size(1552, 666);
this.addRecordTabControl.TabIndex = 1; this.addRecordTabControl.TabIndex = 1;
// //
// projectionsTabPage // projectionsTabPage
// //
this.projectionsTabPage.Controls.Add(this.projectionsDataGridView); this.projectionsTabPage.Controls.Add(this.projectionsDataGridView);
this.projectionsTabPage.Location = new System.Drawing.Point(4, 29); this.projectionsTabPage.Location = new System.Drawing.Point(4, 33);
this.projectionsTabPage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.projectionsTabPage.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.projectionsTabPage.Name = "projectionsTabPage"; this.projectionsTabPage.Name = "projectionsTabPage";
this.projectionsTabPage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.projectionsTabPage.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.projectionsTabPage.Size = new System.Drawing.Size(1262, 522); this.projectionsTabPage.Size = new System.Drawing.Size(1544, 629);
this.projectionsTabPage.TabIndex = 0; this.projectionsTabPage.TabIndex = 0;
this.projectionsTabPage.Text = "Projections"; this.projectionsTabPage.Text = "Projections";
this.projectionsTabPage.UseVisualStyleBackColor = true; this.projectionsTabPage.UseVisualStyleBackColor = true;
@@ -119,21 +119,21 @@
this.projectionsDataGridView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.projectionsDataGridView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.projectionsDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.projectionsDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.projectionsDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.projectionsDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
this.projectionsDataGridView.Location = new System.Drawing.Point(4, 5); this.projectionsDataGridView.Location = new System.Drawing.Point(5, 6);
this.projectionsDataGridView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.projectionsDataGridView.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.projectionsDataGridView.MultiSelect = false; this.projectionsDataGridView.MultiSelect = false;
this.projectionsDataGridView.Name = "projectionsDataGridView"; this.projectionsDataGridView.Name = "projectionsDataGridView";
this.projectionsDataGridView.Size = new System.Drawing.Size(1254, 512); this.projectionsDataGridView.Size = new System.Drawing.Size(1534, 617);
this.projectionsDataGridView.TabIndex = 0; this.projectionsDataGridView.TabIndex = 0;
// //
// actualSalesTabPage // actualSalesTabPage
// //
this.actualSalesTabPage.Controls.Add(this.actualSalesDataGridView); this.actualSalesTabPage.Controls.Add(this.actualSalesDataGridView);
this.actualSalesTabPage.Location = new System.Drawing.Point(4, 29); this.actualSalesTabPage.Location = new System.Drawing.Point(4, 33);
this.actualSalesTabPage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.actualSalesTabPage.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.actualSalesTabPage.Name = "actualSalesTabPage"; this.actualSalesTabPage.Name = "actualSalesTabPage";
this.actualSalesTabPage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.actualSalesTabPage.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.actualSalesTabPage.Size = new System.Drawing.Size(1262, 522); this.actualSalesTabPage.Size = new System.Drawing.Size(1544, 629);
this.actualSalesTabPage.TabIndex = 1; this.actualSalesTabPage.TabIndex = 1;
this.actualSalesTabPage.Text = "Actual Sales"; this.actualSalesTabPage.Text = "Actual Sales";
this.actualSalesTabPage.UseVisualStyleBackColor = true; this.actualSalesTabPage.UseVisualStyleBackColor = true;
@@ -145,21 +145,21 @@
this.actualSalesDataGridView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.actualSalesDataGridView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.actualSalesDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.actualSalesDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.actualSalesDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.actualSalesDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
this.actualSalesDataGridView.Location = new System.Drawing.Point(4, 5); this.actualSalesDataGridView.Location = new System.Drawing.Point(5, 6);
this.actualSalesDataGridView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.actualSalesDataGridView.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.actualSalesDataGridView.MultiSelect = false; this.actualSalesDataGridView.MultiSelect = false;
this.actualSalesDataGridView.Name = "actualSalesDataGridView"; this.actualSalesDataGridView.Name = "actualSalesDataGridView";
this.actualSalesDataGridView.Size = new System.Drawing.Size(1254, 512); this.actualSalesDataGridView.Size = new System.Drawing.Size(1534, 617);
this.actualSalesDataGridView.TabIndex = 0; this.actualSalesDataGridView.TabIndex = 0;
// //
// suppliersTabPage // suppliersTabPage
// //
this.suppliersTabPage.Controls.Add(this.suppliersDataGridView); this.suppliersTabPage.Controls.Add(this.suppliersDataGridView);
this.suppliersTabPage.Location = new System.Drawing.Point(4, 29); this.suppliersTabPage.Location = new System.Drawing.Point(4, 33);
this.suppliersTabPage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.suppliersTabPage.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.suppliersTabPage.Name = "suppliersTabPage"; this.suppliersTabPage.Name = "suppliersTabPage";
this.suppliersTabPage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.suppliersTabPage.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.suppliersTabPage.Size = new System.Drawing.Size(1262, 522); this.suppliersTabPage.Size = new System.Drawing.Size(1544, 629);
this.suppliersTabPage.TabIndex = 2; this.suppliersTabPage.TabIndex = 2;
this.suppliersTabPage.Text = "Suppliers"; this.suppliersTabPage.Text = "Suppliers";
this.suppliersTabPage.UseVisualStyleBackColor = true; this.suppliersTabPage.UseVisualStyleBackColor = true;
@@ -171,21 +171,21 @@
this.suppliersDataGridView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.suppliersDataGridView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.suppliersDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.suppliersDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.suppliersDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.suppliersDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
this.suppliersDataGridView.Location = new System.Drawing.Point(4, 5); this.suppliersDataGridView.Location = new System.Drawing.Point(5, 6);
this.suppliersDataGridView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.suppliersDataGridView.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.suppliersDataGridView.MultiSelect = false; this.suppliersDataGridView.MultiSelect = false;
this.suppliersDataGridView.Name = "suppliersDataGridView"; this.suppliersDataGridView.Name = "suppliersDataGridView";
this.suppliersDataGridView.Size = new System.Drawing.Size(1254, 512); this.suppliersDataGridView.Size = new System.Drawing.Size(1534, 617);
this.suppliersDataGridView.TabIndex = 0; this.suppliersDataGridView.TabIndex = 0;
// //
// weeklySalesTabPage // weeklySalesTabPage
// //
this.weeklySalesTabPage.Controls.Add(this.weeklySalesDataGridView); this.weeklySalesTabPage.Controls.Add(this.weeklySalesDataGridView);
this.weeklySalesTabPage.Location = new System.Drawing.Point(4, 29); this.weeklySalesTabPage.Location = new System.Drawing.Point(4, 33);
this.weeklySalesTabPage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.weeklySalesTabPage.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.weeklySalesTabPage.Name = "weeklySalesTabPage"; this.weeklySalesTabPage.Name = "weeklySalesTabPage";
this.weeklySalesTabPage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.weeklySalesTabPage.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.weeklySalesTabPage.Size = new System.Drawing.Size(1262, 522); this.weeklySalesTabPage.Size = new System.Drawing.Size(1544, 629);
this.weeklySalesTabPage.TabIndex = 3; this.weeklySalesTabPage.TabIndex = 3;
this.weeklySalesTabPage.Text = "Weekly Sales"; this.weeklySalesTabPage.Text = "Weekly Sales";
this.weeklySalesTabPage.UseVisualStyleBackColor = true; this.weeklySalesTabPage.UseVisualStyleBackColor = true;
@@ -199,11 +199,11 @@
this.weeklySalesDataGridView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.weeklySalesDataGridView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.weeklySalesDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.weeklySalesDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.weeklySalesDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.weeklySalesDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
this.weeklySalesDataGridView.Location = new System.Drawing.Point(4, 5); this.weeklySalesDataGridView.Location = new System.Drawing.Point(5, 6);
this.weeklySalesDataGridView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.weeklySalesDataGridView.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.weeklySalesDataGridView.MultiSelect = false; this.weeklySalesDataGridView.MultiSelect = false;
this.weeklySalesDataGridView.Name = "weeklySalesDataGridView"; this.weeklySalesDataGridView.Name = "weeklySalesDataGridView";
this.weeklySalesDataGridView.Size = new System.Drawing.Size(1254, 512); this.weeklySalesDataGridView.Size = new System.Drawing.Size(1534, 617);
this.weeklySalesDataGridView.TabIndex = 0; this.weeklySalesDataGridView.TabIndex = 0;
// //
// mainMenu // mainMenu
@@ -213,8 +213,8 @@
this.fileMainMenu}); this.fileMainMenu});
this.mainMenu.Location = new System.Drawing.Point(0, 0); this.mainMenu.Location = new System.Drawing.Point(0, 0);
this.mainMenu.Name = "mainMenu"; this.mainMenu.Name = "mainMenu";
this.mainMenu.Padding = new System.Windows.Forms.Padding(9, 3, 0, 3); this.mainMenu.Padding = new System.Windows.Forms.Padding(11, 4, 0, 4);
this.mainMenu.Size = new System.Drawing.Size(1278, 35); this.mainMenu.Size = new System.Drawing.Size(1562, 42);
this.mainMenu.TabIndex = 2; this.mainMenu.TabIndex = 2;
this.mainMenu.Text = "menuStrip1"; this.mainMenu.Text = "menuStrip1";
// //
@@ -224,20 +224,20 @@
this.clearFormFileMainMenu, this.clearFormFileMainMenu,
this.closeFormFileMainMenu}); this.closeFormFileMainMenu});
this.fileMainMenu.Name = "fileMainMenu"; this.fileMainMenu.Name = "fileMainMenu";
this.fileMainMenu.Size = new System.Drawing.Size(50, 29); this.fileMainMenu.Size = new System.Drawing.Size(56, 34);
this.fileMainMenu.Text = "&File"; this.fileMainMenu.Text = "&File";
// //
// clearFormFileMainMenu // clearFormFileMainMenu
// //
this.clearFormFileMainMenu.Name = "clearFormFileMainMenu"; this.clearFormFileMainMenu.Name = "clearFormFileMainMenu";
this.clearFormFileMainMenu.Size = new System.Drawing.Size(187, 30); this.clearFormFileMainMenu.Size = new System.Drawing.Size(208, 34);
this.clearFormFileMainMenu.Text = "C&lear Form"; this.clearFormFileMainMenu.Text = "C&lear Form";
this.clearFormFileMainMenu.Click += new System.EventHandler(this.clearFormFileMainMenu_Click); this.clearFormFileMainMenu.Click += new System.EventHandler(this.clearFormFileMainMenu_Click);
// //
// closeFormFileMainMenu // closeFormFileMainMenu
// //
this.closeFormFileMainMenu.Name = "closeFormFileMainMenu"; this.closeFormFileMainMenu.Name = "closeFormFileMainMenu";
this.closeFormFileMainMenu.Size = new System.Drawing.Size(187, 30); this.closeFormFileMainMenu.Size = new System.Drawing.Size(208, 34);
this.closeFormFileMainMenu.Text = "&Close Form"; this.closeFormFileMainMenu.Text = "&Close Form";
this.closeFormFileMainMenu.Click += new System.EventHandler(this.closeFileMainMenu_Click); this.closeFormFileMainMenu.Click += new System.EventHandler(this.closeFileMainMenu_Click);
// //
@@ -254,12 +254,12 @@
this.commentsAndDateLayoutPanel.Controls.Add(this.errorReportingLabel, 2, 0); this.commentsAndDateLayoutPanel.Controls.Add(this.errorReportingLabel, 2, 0);
this.commentsAndDateLayoutPanel.Controls.Add(this.addRecordsButton, 3, 0); this.commentsAndDateLayoutPanel.Controls.Add(this.addRecordsButton, 3, 0);
this.commentsAndDateLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.commentsAndDateLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.commentsAndDateLayoutPanel.Location = new System.Drawing.Point(4, 608); this.commentsAndDateLayoutPanel.Location = new System.Drawing.Point(5, 730);
this.commentsAndDateLayoutPanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.commentsAndDateLayoutPanel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.commentsAndDateLayoutPanel.Name = "commentsAndDateLayoutPanel"; this.commentsAndDateLayoutPanel.Name = "commentsAndDateLayoutPanel";
this.commentsAndDateLayoutPanel.RowCount = 1; this.commentsAndDateLayoutPanel.RowCount = 1;
this.commentsAndDateLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.commentsAndDateLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.commentsAndDateLayoutPanel.Size = new System.Drawing.Size(1270, 132); this.commentsAndDateLayoutPanel.Size = new System.Drawing.Size(1552, 158);
this.commentsAndDateLayoutPanel.TabIndex = 3; this.commentsAndDateLayoutPanel.TabIndex = 3;
// //
// dateGroupBox // dateGroupBox
@@ -267,11 +267,11 @@
this.dateGroupBox.Controls.Add(this.dateFormatLabel); this.dateGroupBox.Controls.Add(this.dateFormatLabel);
this.dateGroupBox.Controls.Add(this.weekEndingDateMaskedTextBox); this.dateGroupBox.Controls.Add(this.weekEndingDateMaskedTextBox);
this.dateGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; this.dateGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.dateGroupBox.Location = new System.Drawing.Point(4, 5); this.dateGroupBox.Location = new System.Drawing.Point(5, 6);
this.dateGroupBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dateGroupBox.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.dateGroupBox.Name = "dateGroupBox"; this.dateGroupBox.Name = "dateGroupBox";
this.dateGroupBox.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dateGroupBox.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.dateGroupBox.Size = new System.Drawing.Size(182, 122); this.dateGroupBox.Size = new System.Drawing.Size(222, 146);
this.dateGroupBox.TabIndex = 0; this.dateGroupBox.TabIndex = 0;
this.dateGroupBox.TabStop = false; this.dateGroupBox.TabStop = false;
this.dateGroupBox.Text = "Week Ending Date"; this.dateGroupBox.Text = "Week Ending Date";
@@ -279,20 +279,21 @@
// dateFormatLabel // dateFormatLabel
// //
this.dateFormatLabel.AutoSize = true; this.dateFormatLabel.AutoSize = true;
this.dateFormatLabel.Location = new System.Drawing.Point(29, 27); this.dateFormatLabel.Location = new System.Drawing.Point(35, 32);
this.dateFormatLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.dateFormatLabel.Name = "dateFormatLabel"; this.dateFormatLabel.Name = "dateFormatLabel";
this.dateFormatLabel.Size = new System.Drawing.Size(111, 40); this.dateFormatLabel.Size = new System.Drawing.Size(138, 50);
this.dateFormatLabel.TabIndex = 1; this.dateFormatLabel.TabIndex = 1;
this.dateFormatLabel.Text = "Date Format: \r\nMM/DD/YYYY"; this.dateFormatLabel.Text = "Date Format: \r\nMM/DD/YYYY";
// //
// weekEndingDateMaskedTextBox // weekEndingDateMaskedTextBox
// //
this.weekEndingDateMaskedTextBox.Font = new System.Drawing.Font("Times New Roman", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.weekEndingDateMaskedTextBox.Font = new System.Drawing.Font("Times New Roman", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.weekEndingDateMaskedTextBox.Location = new System.Drawing.Point(26, 77); this.weekEndingDateMaskedTextBox.Location = new System.Drawing.Point(32, 92);
this.weekEndingDateMaskedTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.weekEndingDateMaskedTextBox.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.weekEndingDateMaskedTextBox.Mask = "00/00/0000"; this.weekEndingDateMaskedTextBox.Mask = "00/00/0000";
this.weekEndingDateMaskedTextBox.Name = "weekEndingDateMaskedTextBox"; this.weekEndingDateMaskedTextBox.Name = "weekEndingDateMaskedTextBox";
this.weekEndingDateMaskedTextBox.Size = new System.Drawing.Size(116, 35); this.weekEndingDateMaskedTextBox.Size = new System.Drawing.Size(141, 40);
this.weekEndingDateMaskedTextBox.TabIndex = 0; this.weekEndingDateMaskedTextBox.TabIndex = 0;
this.weekEndingDateMaskedTextBox.ValidatingType = typeof(System.DateTime); this.weekEndingDateMaskedTextBox.ValidatingType = typeof(System.DateTime);
// //
@@ -300,11 +301,11 @@
// //
this.commentsGroupBox.Controls.Add(this.commentsTextBox); this.commentsGroupBox.Controls.Add(this.commentsTextBox);
this.commentsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; this.commentsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.commentsGroupBox.Location = new System.Drawing.Point(194, 5); this.commentsGroupBox.Location = new System.Drawing.Point(237, 6);
this.commentsGroupBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.commentsGroupBox.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.commentsGroupBox.Name = "commentsGroupBox"; this.commentsGroupBox.Name = "commentsGroupBox";
this.commentsGroupBox.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.commentsGroupBox.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.commentsGroupBox.Size = new System.Drawing.Size(436, 122); this.commentsGroupBox.Size = new System.Drawing.Size(533, 146);
this.commentsGroupBox.TabIndex = 1; this.commentsGroupBox.TabIndex = 1;
this.commentsGroupBox.TabStop = false; this.commentsGroupBox.TabStop = false;
this.commentsGroupBox.Text = "Comments"; this.commentsGroupBox.Text = "Comments";
@@ -312,30 +313,30 @@
// commentsTextBox // commentsTextBox
// //
this.commentsTextBox.Dock = System.Windows.Forms.DockStyle.Fill; this.commentsTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.commentsTextBox.Location = new System.Drawing.Point(4, 24); this.commentsTextBox.Location = new System.Drawing.Point(5, 28);
this.commentsTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.commentsTextBox.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.commentsTextBox.Multiline = true; this.commentsTextBox.Multiline = true;
this.commentsTextBox.Name = "commentsTextBox"; this.commentsTextBox.Name = "commentsTextBox";
this.commentsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; this.commentsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.commentsTextBox.Size = new System.Drawing.Size(428, 93); this.commentsTextBox.Size = new System.Drawing.Size(523, 112);
this.commentsTextBox.TabIndex = 0; this.commentsTextBox.TabIndex = 0;
// //
// errorReportingLabel // errorReportingLabel
// //
this.errorReportingLabel.AutoSize = true; this.errorReportingLabel.AutoSize = true;
this.errorReportingLabel.Location = new System.Drawing.Point(638, 0); this.errorReportingLabel.Location = new System.Drawing.Point(780, 0);
this.errorReportingLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.errorReportingLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.errorReportingLabel.Name = "errorReportingLabel"; this.errorReportingLabel.Name = "errorReportingLabel";
this.errorReportingLabel.Size = new System.Drawing.Size(0, 20); this.errorReportingLabel.Size = new System.Drawing.Size(0, 25);
this.errorReportingLabel.TabIndex = 2; this.errorReportingLabel.TabIndex = 2;
// //
// addRecordsButton // addRecordsButton
// //
this.addRecordsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.addRecordsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.addRecordsButton.Location = new System.Drawing.Point(1146, 92); this.addRecordsButton.Location = new System.Drawing.Point(1400, 110);
this.addRecordsButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.addRecordsButton.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.addRecordsButton.Name = "addRecordsButton"; this.addRecordsButton.Name = "addRecordsButton";
this.addRecordsButton.Size = new System.Drawing.Size(120, 35); this.addRecordsButton.Size = new System.Drawing.Size(147, 42);
this.addRecordsButton.TabIndex = 3; this.addRecordsButton.TabIndex = 3;
this.addRecordsButton.Text = "Add Records"; this.addRecordsButton.Text = "Add Records";
this.addRecordsButton.UseVisualStyleBackColor = true; this.addRecordsButton.UseVisualStyleBackColor = true;
@@ -343,15 +344,15 @@
// //
// FrmAddRecord // FrmAddRecord
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1278, 745); this.ClientSize = new System.Drawing.Size(1562, 894);
this.Controls.Add(this.mainLayoutPanel); this.Controls.Add(this.mainLayoutPanel);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.mainMenu; this.MainMenuStrip = this.mainMenu;
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.MaximumSize = new System.Drawing.Size(1339, 893); this.MaximumSize = new System.Drawing.Size(1631, 1059);
this.MinimumSize = new System.Drawing.Size(1189, 739); this.MinimumSize = new System.Drawing.Size(1448, 874);
this.Name = "FrmAddRecord"; this.Name = "FrmAddRecord";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Add New Records"; this.Text = "Add New Records";
+17 -8
View File
@@ -567,7 +567,7 @@ namespace AdvertsingProfitControl
{ {
customAutoComplete.Add(item); customAutoComplete.Add(item);
} }
autoText.KeyPress += AutoText_KeyPress; autoText.KeyDown += AutoText_KeyPress;
_CustomAdItemCollection = customAutoComplete; //Make a temporary copy of the list for use with the TextBox event handler. _CustomAdItemCollection = customAutoComplete; //Make a temporary copy of the list for use with the TextBox event handler.
autoText.AutoCompleteMode = AutoCompleteMode.Suggest; autoText.AutoCompleteMode = AutoCompleteMode.Suggest;
autoText.AutoCompleteSource = AutoCompleteSource.CustomSource; autoText.AutoCompleteSource = AutoCompleteSource.CustomSource;
@@ -579,20 +579,29 @@ namespace AdvertsingProfitControl
} }
}//End DisplayAutoCompleteOnEditingControlShowing }//End DisplayAutoCompleteOnEditingControlShowing
private void AutoText_KeyPress(object sender, KeyPressEventArgs e) private void AutoText_KeyPress(object sender, KeyEventArgs e)
{ {
var textBox = (TextBox) sender; var textBox = (TextBox)sender;
errorReportingLabel.Text = ""; errorReportingLabel.Text = "";
if (e.KeyChar == ':' && textBox.Text.Length == 0)
if (e.Modifiers == Keys.Shift && e.KeyCode == Keys.Up)
{ {
textBox.AutoCompleteCustomSource = _AdSpecialList; if (_gAdSpecialIndex == -1)
errorReportingLabel.Text = "Auto complete mode changed to Ad Special."; {
textBox.AutoCompleteCustomSource = _AdSpecialList;
errorReportingLabel.Text = "Auto complete mode changed to Ad Special.";
}
else
{
errorReportingLabel.Text = "An Ad Special row already exists, auto complete mode\n can not be changed.";
}
} }
else if (e.KeyChar == ';' && textBox.Text.Length == 0) else if (e.Modifiers == Keys.Shift && e.KeyCode == Keys.Down)
{ {
textBox.AutoCompleteCustomSource = _CustomAdItemCollection; textBox.AutoCompleteCustomSource = _CustomAdItemCollection;
errorReportingLabel.Text = "Auto complete mode changed to Ad Items only."; errorReportingLabel.Text = "Auto complete mode changed to Ad Items.";
} }
e.Handled = false;
} }
/// <summary> /// <summary>
+129 -146
View File
@@ -37,6 +37,7 @@
this.addRecordsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.addRecordsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.modifyRecordMainMenu = new System.Windows.Forms.ToolStripMenuItem(); this.modifyRecordMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.deleteRecordsMainMenu = new System.Windows.Forms.ToolStripMenuItem(); this.deleteRecordsMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.newFormTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolsMainMenu = new System.Windows.Forms.ToolStripMenuItem(); this.toolsMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.adSpecialKeyWordsToolsMainMenu = new System.Windows.Forms.ToolStripMenuItem(); this.adSpecialKeyWordsToolsMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.manageItemsToolsMainMenu = new System.Windows.Forms.ToolStripMenuItem(); this.manageItemsToolsMainMenu = new System.Windows.Forms.ToolStripMenuItem();
@@ -47,7 +48,6 @@
this.commentMainGroupBox = new System.Windows.Forms.GroupBox(); this.commentMainGroupBox = new System.Windows.Forms.GroupBox();
this.commentsTextBox = new System.Windows.Forms.TextBox(); this.commentsTextBox = new System.Windows.Forms.TextBox();
this.profitAnalysisMainGroupBox = new System.Windows.Forms.GroupBox(); this.profitAnalysisMainGroupBox = new System.Windows.Forms.GroupBox();
this.changeShrinkLinkLabel = new System.Windows.Forms.LinkLabel();
this.shrinkLabel = new System.Windows.Forms.Label(); this.shrinkLabel = new System.Windows.Forms.Label();
this.totalProfitReturnLabel = new System.Windows.Forms.Label(); this.totalProfitReturnLabel = new System.Windows.Forms.Label();
this.totalProfitReturnFromRemaingLabel = new System.Windows.Forms.Label(); this.totalProfitReturnFromRemaingLabel = new System.Windows.Forms.Label();
@@ -81,7 +81,6 @@
this.suppliersDataGridView = new System.Windows.Forms.DataGridView(); this.suppliersDataGridView = new System.Windows.Forms.DataGridView();
this.WeeklySalesTabPage = new System.Windows.Forms.TabPage(); this.WeeklySalesTabPage = new System.Windows.Forms.TabPage();
this.weeklySalesDataGridView = new System.Windows.Forms.DataGridView(); this.weeklySalesDataGridView = new System.Windows.Forms.DataGridView();
this.newFormTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mainTableLayoutPanel.SuspendLayout(); this.mainTableLayoutPanel.SuspendLayout();
this.mainMenu.SuspendLayout(); this.mainMenu.SuspendLayout();
this.commentMainTableLayoutPanel.SuspendLayout(); this.commentMainTableLayoutPanel.SuspendLayout();
@@ -113,13 +112,13 @@
this.mainTableLayoutPanel.Controls.Add(this.mainViewTabControl, 0, 1); this.mainTableLayoutPanel.Controls.Add(this.mainViewTabControl, 0, 1);
this.mainTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.mainTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.mainTableLayoutPanel.Location = new System.Drawing.Point(0, 0); this.mainTableLayoutPanel.Location = new System.Drawing.Point(0, 0);
this.mainTableLayoutPanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.mainTableLayoutPanel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.mainTableLayoutPanel.Name = "mainTableLayoutPanel"; this.mainTableLayoutPanel.Name = "mainTableLayoutPanel";
this.mainTableLayoutPanel.RowCount = 3; this.mainTableLayoutPanel.RowCount = 3;
this.mainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F)); this.mainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 41F));
this.mainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 65F)); this.mainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 65F));
this.mainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 35F)); this.mainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 35F));
this.mainTableLayoutPanel.Size = new System.Drawing.Size(1486, 765); this.mainTableLayoutPanel.Size = new System.Drawing.Size(1734, 892);
this.mainTableLayoutPanel.TabIndex = 0; this.mainTableLayoutPanel.TabIndex = 0;
// //
// mainMenu // mainMenu
@@ -133,8 +132,8 @@
this.helpMainMenu}); this.helpMainMenu});
this.mainMenu.Location = new System.Drawing.Point(0, 0); this.mainMenu.Location = new System.Drawing.Point(0, 0);
this.mainMenu.Name = "mainMenu"; this.mainMenu.Name = "mainMenu";
this.mainMenu.Padding = new System.Windows.Forms.Padding(9, 3, 0, 3); this.mainMenu.Padding = new System.Windows.Forms.Padding(10, 3, 0, 3);
this.mainMenu.Size = new System.Drawing.Size(1486, 35); this.mainMenu.Size = new System.Drawing.Size(1734, 41);
this.mainMenu.TabIndex = 1; this.mainMenu.TabIndex = 1;
this.mainMenu.Text = "menuStrip1"; this.mainMenu.Text = "menuStrip1";
// //
@@ -143,13 +142,13 @@
this.fileMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.exitFileMainMenu}); this.exitFileMainMenu});
this.fileMainMenu.Name = "fileMainMenu"; this.fileMainMenu.Name = "fileMainMenu";
this.fileMainMenu.Size = new System.Drawing.Size(50, 29); this.fileMainMenu.Size = new System.Drawing.Size(56, 35);
this.fileMainMenu.Text = "&File"; this.fileMainMenu.Text = "&File";
// //
// exitFileMainMenu // exitFileMainMenu
// //
this.exitFileMainMenu.Name = "exitFileMainMenu"; this.exitFileMainMenu.Name = "exitFileMainMenu";
this.exitFileMainMenu.Size = new System.Drawing.Size(124, 30); this.exitFileMainMenu.Size = new System.Drawing.Size(138, 34);
this.exitFileMainMenu.Text = "E&xit"; this.exitFileMainMenu.Text = "E&xit";
// //
// recordsToolStripMenuItem // recordsToolStripMenuItem
@@ -160,50 +159,57 @@
this.deleteRecordsMainMenu, this.deleteRecordsMainMenu,
this.newFormTestToolStripMenuItem}); this.newFormTestToolStripMenuItem});
this.recordsToolStripMenuItem.Name = "recordsToolStripMenuItem"; this.recordsToolStripMenuItem.Name = "recordsToolStripMenuItem";
this.recordsToolStripMenuItem.Size = new System.Drawing.Size(87, 29); this.recordsToolStripMenuItem.Size = new System.Drawing.Size(98, 35);
this.recordsToolStripMenuItem.Text = "&Records"; this.recordsToolStripMenuItem.Text = "&Records";
// //
// addRecordsToolStripMenuItem // addRecordsToolStripMenuItem
// //
this.addRecordsToolStripMenuItem.Name = "addRecordsToolStripMenuItem"; this.addRecordsToolStripMenuItem.Name = "addRecordsToolStripMenuItem";
this.addRecordsToolStripMenuItem.Size = new System.Drawing.Size(284, 30); this.addRecordsToolStripMenuItem.Size = new System.Drawing.Size(323, 34);
this.addRecordsToolStripMenuItem.Text = "&Add New Record"; this.addRecordsToolStripMenuItem.Text = "&Add New Record";
this.addRecordsToolStripMenuItem.Click += new System.EventHandler(this.addRecordToolStripMenuItem_Click); this.addRecordsToolStripMenuItem.Click += new System.EventHandler(this.addRecordToolStripMenuItem_Click);
// //
// modifyRecordMainMenu // modifyRecordMainMenu
// //
this.modifyRecordMainMenu.Name = "modifyRecordMainMenu"; this.modifyRecordMainMenu.Name = "modifyRecordMainMenu";
this.modifyRecordMainMenu.Size = new System.Drawing.Size(284, 30); this.modifyRecordMainMenu.Size = new System.Drawing.Size(323, 34);
this.modifyRecordMainMenu.Text = "&Modify Existing Record "; this.modifyRecordMainMenu.Text = "&Modify Existing Record ";
this.modifyRecordMainMenu.Click += new System.EventHandler(this.modifyRecordMainMenu_Click); this.modifyRecordMainMenu.Click += new System.EventHandler(this.modifyRecordMainMenu_Click);
// //
// deleteRecordsMainMenu // deleteRecordsMainMenu
// //
this.deleteRecordsMainMenu.Name = "deleteRecordsMainMenu"; this.deleteRecordsMainMenu.Name = "deleteRecordsMainMenu";
this.deleteRecordsMainMenu.Size = new System.Drawing.Size(284, 30); this.deleteRecordsMainMenu.Size = new System.Drawing.Size(323, 34);
this.deleteRecordsMainMenu.Text = "&Delete Existing record"; this.deleteRecordsMainMenu.Text = "&Delete Existing record";
this.deleteRecordsMainMenu.Click += new System.EventHandler(this.deleteRecordsMainMenu_Click); this.deleteRecordsMainMenu.Click += new System.EventHandler(this.deleteRecordsMainMenu_Click);
// //
// newFormTestToolStripMenuItem
//
this.newFormTestToolStripMenuItem.Name = "newFormTestToolStripMenuItem";
this.newFormTestToolStripMenuItem.Size = new System.Drawing.Size(323, 34);
this.newFormTestToolStripMenuItem.Text = "&New Form Test";
this.newFormTestToolStripMenuItem.Click += new System.EventHandler(this.newFormTestToolStripMenuItem_Click);
//
// toolsMainMenu // toolsMainMenu
// //
this.toolsMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolsMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.adSpecialKeyWordsToolsMainMenu, this.adSpecialKeyWordsToolsMainMenu,
this.manageItemsToolsMainMenu}); this.manageItemsToolsMainMenu});
this.toolsMainMenu.Name = "toolsMainMenu"; this.toolsMainMenu.Name = "toolsMainMenu";
this.toolsMainMenu.Size = new System.Drawing.Size(65, 29); this.toolsMainMenu.Size = new System.Drawing.Size(72, 35);
this.toolsMainMenu.Text = "&Tools"; this.toolsMainMenu.Text = "&Tools";
// //
// adSpecialKeyWordsToolsMainMenu // adSpecialKeyWordsToolsMainMenu
// //
this.adSpecialKeyWordsToolsMainMenu.Name = "adSpecialKeyWordsToolsMainMenu"; this.adSpecialKeyWordsToolsMainMenu.Name = "adSpecialKeyWordsToolsMainMenu";
this.adSpecialKeyWordsToolsMainMenu.Size = new System.Drawing.Size(248, 30); this.adSpecialKeyWordsToolsMainMenu.Size = new System.Drawing.Size(282, 34);
this.adSpecialKeyWordsToolsMainMenu.Text = "&Register Ad Special"; this.adSpecialKeyWordsToolsMainMenu.Text = "&Register Ad Special";
this.adSpecialKeyWordsToolsMainMenu.Click += new System.EventHandler(this.adSpecialKeyWordsToolsMainMenu_Click); this.adSpecialKeyWordsToolsMainMenu.Click += new System.EventHandler(this.adSpecialKeyWordsToolsMainMenu_Click);
// //
// manageItemsToolsMainMenu // manageItemsToolsMainMenu
// //
this.manageItemsToolsMainMenu.Name = "manageItemsToolsMainMenu"; this.manageItemsToolsMainMenu.Name = "manageItemsToolsMainMenu";
this.manageItemsToolsMainMenu.Size = new System.Drawing.Size(248, 30); this.manageItemsToolsMainMenu.Size = new System.Drawing.Size(282, 34);
this.manageItemsToolsMainMenu.Text = "&Manage Ad Items"; this.manageItemsToolsMainMenu.Text = "&Manage Ad Items";
this.manageItemsToolsMainMenu.Click += new System.EventHandler(this.manageItemsToolsMainMenu_Click); this.manageItemsToolsMainMenu.Click += new System.EventHandler(this.manageItemsToolsMainMenu_Click);
// //
@@ -213,20 +219,20 @@
this.showHideConsoleHelpMainMenu, this.showHideConsoleHelpMainMenu,
this.dbVersionHelpMainMenu}); this.dbVersionHelpMainMenu});
this.helpMainMenu.Name = "helpMainMenu"; this.helpMainMenu.Name = "helpMainMenu";
this.helpMainMenu.Size = new System.Drawing.Size(61, 29); this.helpMainMenu.Size = new System.Drawing.Size(68, 35);
this.helpMainMenu.Text = "&Help"; this.helpMainMenu.Text = "&Help";
// //
// showHideConsoleHelpMainMenu // showHideConsoleHelpMainMenu
// //
this.showHideConsoleHelpMainMenu.Name = "showHideConsoleHelpMainMenu"; this.showHideConsoleHelpMainMenu.Name = "showHideConsoleHelpMainMenu";
this.showHideConsoleHelpMainMenu.Size = new System.Drawing.Size(266, 30); this.showHideConsoleHelpMainMenu.Size = new System.Drawing.Size(304, 34);
this.showHideConsoleHelpMainMenu.Text = "&Show/Hide Console"; this.showHideConsoleHelpMainMenu.Text = "&Show/Hide Console";
this.showHideConsoleHelpMainMenu.Click += new System.EventHandler(this.showHideConsoleHelpMainMenu_Click); this.showHideConsoleHelpMainMenu.Click += new System.EventHandler(this.showHideConsoleHelpMainMenu_Click);
// //
// dbVersionHelpMainMenu // dbVersionHelpMainMenu
// //
this.dbVersionHelpMainMenu.Name = "dbVersionHelpMainMenu"; this.dbVersionHelpMainMenu.Name = "dbVersionHelpMainMenu";
this.dbVersionHelpMainMenu.Size = new System.Drawing.Size(266, 30); this.dbVersionHelpMainMenu.Size = new System.Drawing.Size(304, 34);
this.dbVersionHelpMainMenu.Text = "Get &Database Version"; this.dbVersionHelpMainMenu.Text = "Get &Database Version";
this.dbVersionHelpMainMenu.Click += new System.EventHandler(this.dbVersionHelpMainMenu_Click); this.dbVersionHelpMainMenu.Click += new System.EventHandler(this.dbVersionHelpMainMenu_Click);
// //
@@ -243,26 +249,26 @@
this.commentMainTableLayoutPanel.Controls.Add(this.taxableGroupBox, 3, 0); this.commentMainTableLayoutPanel.Controls.Add(this.taxableGroupBox, 3, 0);
this.commentMainTableLayoutPanel.Controls.Add(this.dateSelectorPanel, 2, 1); this.commentMainTableLayoutPanel.Controls.Add(this.dateSelectorPanel, 2, 1);
this.commentMainTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.commentMainTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.commentMainTableLayoutPanel.Location = new System.Drawing.Point(4, 514); this.commentMainTableLayoutPanel.Location = new System.Drawing.Point(5, 600);
this.commentMainTableLayoutPanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.commentMainTableLayoutPanel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.commentMainTableLayoutPanel.Name = "commentMainTableLayoutPanel"; this.commentMainTableLayoutPanel.Name = "commentMainTableLayoutPanel";
this.commentMainTableLayoutPanel.RowCount = 2; this.commentMainTableLayoutPanel.RowCount = 2;
this.commentMainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80F)); this.commentMainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80F));
this.commentMainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.commentMainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.commentMainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.commentMainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
this.commentMainTableLayoutPanel.Size = new System.Drawing.Size(1478, 246); this.commentMainTableLayoutPanel.Size = new System.Drawing.Size(1724, 286);
this.commentMainTableLayoutPanel.TabIndex = 2; this.commentMainTableLayoutPanel.TabIndex = 2;
// //
// commentMainGroupBox // commentMainGroupBox
// //
this.commentMainGroupBox.Controls.Add(this.commentsTextBox); this.commentMainGroupBox.Controls.Add(this.commentsTextBox);
this.commentMainGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; this.commentMainGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.commentMainGroupBox.Location = new System.Drawing.Point(4, 5); this.commentMainGroupBox.Location = new System.Drawing.Point(5, 6);
this.commentMainGroupBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.commentMainGroupBox.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.commentMainGroupBox.Name = "commentMainGroupBox"; this.commentMainGroupBox.Name = "commentMainGroupBox";
this.commentMainGroupBox.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.commentMainGroupBox.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.commentMainTableLayoutPanel.SetRowSpan(this.commentMainGroupBox, 2); this.commentMainTableLayoutPanel.SetRowSpan(this.commentMainGroupBox, 2);
this.commentMainGroupBox.Size = new System.Drawing.Size(287, 236); this.commentMainGroupBox.Size = new System.Drawing.Size(334, 274);
this.commentMainGroupBox.TabIndex = 0; this.commentMainGroupBox.TabIndex = 0;
this.commentMainGroupBox.TabStop = false; this.commentMainGroupBox.TabStop = false;
this.commentMainGroupBox.Text = "Comments"; this.commentMainGroupBox.Text = "Comments";
@@ -271,16 +277,15 @@
// //
this.commentsTextBox.Dock = System.Windows.Forms.DockStyle.Fill; this.commentsTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.commentsTextBox.Enabled = false; this.commentsTextBox.Enabled = false;
this.commentsTextBox.Location = new System.Drawing.Point(4, 24); this.commentsTextBox.Location = new System.Drawing.Point(5, 28);
this.commentsTextBox.Multiline = true; this.commentsTextBox.Multiline = true;
this.commentsTextBox.Name = "commentsTextBox"; this.commentsTextBox.Name = "commentsTextBox";
this.commentsTextBox.ReadOnly = true; this.commentsTextBox.ReadOnly = true;
this.commentsTextBox.Size = new System.Drawing.Size(279, 207); this.commentsTextBox.Size = new System.Drawing.Size(324, 240);
this.commentsTextBox.TabIndex = 0; this.commentsTextBox.TabIndex = 0;
// //
// profitAnalysisMainGroupBox // profitAnalysisMainGroupBox
// //
this.profitAnalysisMainGroupBox.Controls.Add(this.changeShrinkLinkLabel);
this.profitAnalysisMainGroupBox.Controls.Add(this.shrinkLabel); this.profitAnalysisMainGroupBox.Controls.Add(this.shrinkLabel);
this.profitAnalysisMainGroupBox.Controls.Add(this.totalProfitReturnLabel); this.profitAnalysisMainGroupBox.Controls.Add(this.totalProfitReturnLabel);
this.profitAnalysisMainGroupBox.Controls.Add(this.totalProfitReturnFromRemaingLabel); this.profitAnalysisMainGroupBox.Controls.Add(this.totalProfitReturnFromRemaingLabel);
@@ -289,96 +294,83 @@
this.profitAnalysisMainGroupBox.Controls.Add(this.salesProducedLabel); this.profitAnalysisMainGroupBox.Controls.Add(this.salesProducedLabel);
this.profitAnalysisMainGroupBox.Controls.Add(this.departmentSalesLabel); this.profitAnalysisMainGroupBox.Controls.Add(this.departmentSalesLabel);
this.profitAnalysisMainGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; this.profitAnalysisMainGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.profitAnalysisMainGroupBox.Location = new System.Drawing.Point(299, 5); this.profitAnalysisMainGroupBox.Location = new System.Drawing.Point(349, 6);
this.profitAnalysisMainGroupBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.profitAnalysisMainGroupBox.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.profitAnalysisMainGroupBox.Name = "profitAnalysisMainGroupBox"; this.profitAnalysisMainGroupBox.Name = "profitAnalysisMainGroupBox";
this.profitAnalysisMainGroupBox.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.profitAnalysisMainGroupBox.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.commentMainTableLayoutPanel.SetRowSpan(this.profitAnalysisMainGroupBox, 2); this.commentMainTableLayoutPanel.SetRowSpan(this.profitAnalysisMainGroupBox, 2);
this.profitAnalysisMainGroupBox.Size = new System.Drawing.Size(405, 236); this.profitAnalysisMainGroupBox.Size = new System.Drawing.Size(472, 274);
this.profitAnalysisMainGroupBox.TabIndex = 1; this.profitAnalysisMainGroupBox.TabIndex = 1;
this.profitAnalysisMainGroupBox.TabStop = false; this.profitAnalysisMainGroupBox.TabStop = false;
this.profitAnalysisMainGroupBox.Text = "Profit Analysis"; this.profitAnalysisMainGroupBox.Text = "Profit Analysis";
// //
// changeShrinkLinkLabel
//
this.changeShrinkLinkLabel.AutoSize = true;
this.changeShrinkLinkLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.changeShrinkLinkLabel.Location = new System.Drawing.Point(166, 29);
this.changeShrinkLinkLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.changeShrinkLinkLabel.Name = "changeShrinkLinkLabel";
this.changeShrinkLinkLabel.Size = new System.Drawing.Size(57, 17);
this.changeShrinkLinkLabel.TabIndex = 7;
this.changeShrinkLinkLabel.TabStop = true;
this.changeShrinkLinkLabel.Text = "Change";
this.changeShrinkLinkLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// shrinkLabel // shrinkLabel
// //
this.shrinkLabel.AutoSize = true; this.shrinkLabel.AutoSize = true;
this.shrinkLabel.Location = new System.Drawing.Point(9, 31); this.shrinkLabel.Location = new System.Drawing.Point(0, 36);
this.shrinkLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.shrinkLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.shrinkLabel.Name = "shrinkLabel"; this.shrinkLabel.Name = "shrinkLabel";
this.shrinkLabel.Size = new System.Drawing.Size(164, 20); this.shrinkLabel.Size = new System.Drawing.Size(205, 25);
this.shrinkLabel.TabIndex = 6; this.shrinkLabel.TabIndex = 6;
this.shrinkLabel.Text = "Assuming 30% Shrink"; this.shrinkLabel.Text = "Assuming 30% Shrink";
// //
// totalProfitReturnLabel // totalProfitReturnLabel
// //
this.totalProfitReturnLabel.AutoSize = true; this.totalProfitReturnLabel.AutoSize = true;
this.totalProfitReturnLabel.Location = new System.Drawing.Point(9, 215); this.totalProfitReturnLabel.Location = new System.Drawing.Point(0, 251);
this.totalProfitReturnLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.totalProfitReturnLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.totalProfitReturnLabel.Name = "totalProfitReturnLabel"; this.totalProfitReturnLabel.Name = "totalProfitReturnLabel";
this.totalProfitReturnLabel.Size = new System.Drawing.Size(146, 20); this.totalProfitReturnLabel.Size = new System.Drawing.Size(178, 25);
this.totalProfitReturnLabel.TabIndex = 5; this.totalProfitReturnLabel.TabIndex = 5;
this.totalProfitReturnLabel.Text = "Total Profit Return: "; this.totalProfitReturnLabel.Text = "Total Profit Return: ";
// //
// totalProfitReturnFromRemaingLabel // totalProfitReturnFromRemaingLabel
// //
this.totalProfitReturnFromRemaingLabel.AutoSize = true; this.totalProfitReturnFromRemaingLabel.AutoSize = true;
this.totalProfitReturnFromRemaingLabel.Location = new System.Drawing.Point(9, 185); this.totalProfitReturnFromRemaingLabel.Location = new System.Drawing.Point(0, 216);
this.totalProfitReturnFromRemaingLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.totalProfitReturnFromRemaingLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.totalProfitReturnFromRemaingLabel.Name = "totalProfitReturnFromRemaingLabel"; this.totalProfitReturnFromRemaingLabel.Name = "totalProfitReturnFromRemaingLabel";
this.totalProfitReturnFromRemaingLabel.Size = new System.Drawing.Size(311, 20); this.totalProfitReturnFromRemaingLabel.Size = new System.Drawing.Size(380, 25);
this.totalProfitReturnFromRemaingLabel.TabIndex = 4; this.totalProfitReturnFromRemaingLabel.TabIndex = 4;
this.totalProfitReturnFromRemaingLabel.Text = "Total Profit Return From Remaining Sales: "; this.totalProfitReturnFromRemaingLabel.Text = "Total Profit Return From Remaining Sales: ";
// //
// totalProfitFromAdItemsLabel // totalProfitFromAdItemsLabel
// //
this.totalProfitFromAdItemsLabel.AutoSize = true; this.totalProfitFromAdItemsLabel.AutoSize = true;
this.totalProfitFromAdItemsLabel.Location = new System.Drawing.Point(9, 154); this.totalProfitFromAdItemsLabel.Location = new System.Drawing.Point(0, 180);
this.totalProfitFromAdItemsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.totalProfitFromAdItemsLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.totalProfitFromAdItemsLabel.Name = "totalProfitFromAdItemsLabel"; this.totalProfitFromAdItemsLabel.Name = "totalProfitFromAdItemsLabel";
this.totalProfitFromAdItemsLabel.Size = new System.Drawing.Size(280, 20); this.totalProfitFromAdItemsLabel.Size = new System.Drawing.Size(342, 25);
this.totalProfitFromAdItemsLabel.TabIndex = 3; this.totalProfitFromAdItemsLabel.TabIndex = 3;
this.totalProfitFromAdItemsLabel.Text = "Total Profit Return From Ad Items (B): "; this.totalProfitFromAdItemsLabel.Text = "Total Profit Return From Ad Items (B): ";
// //
// remainingSalesLabel // remainingSalesLabel
// //
this.remainingSalesLabel.AutoSize = true; this.remainingSalesLabel.AutoSize = true;
this.remainingSalesLabel.Location = new System.Drawing.Point(9, 123); this.remainingSalesLabel.Location = new System.Drawing.Point(0, 143);
this.remainingSalesLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.remainingSalesLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.remainingSalesLabel.Name = "remainingSalesLabel"; this.remainingSalesLabel.Name = "remainingSalesLabel";
this.remainingSalesLabel.Size = new System.Drawing.Size(137, 20); this.remainingSalesLabel.Size = new System.Drawing.Size(170, 25);
this.remainingSalesLabel.TabIndex = 2; this.remainingSalesLabel.TabIndex = 2;
this.remainingSalesLabel.Text = "Remaining Sales: "; this.remainingSalesLabel.Text = "Remaining Sales: ";
// //
// salesProducedLabel // salesProducedLabel
// //
this.salesProducedLabel.AutoSize = true; this.salesProducedLabel.AutoSize = true;
this.salesProducedLabel.Location = new System.Drawing.Point(9, 92); this.salesProducedLabel.Location = new System.Drawing.Point(0, 107);
this.salesProducedLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.salesProducedLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.salesProducedLabel.Name = "salesProducedLabel"; this.salesProducedLabel.Name = "salesProducedLabel";
this.salesProducedLabel.Size = new System.Drawing.Size(240, 20); this.salesProducedLabel.Size = new System.Drawing.Size(300, 25);
this.salesProducedLabel.TabIndex = 1; this.salesProducedLabel.TabIndex = 1;
this.salesProducedLabel.Text = "Sales Produced By Ad Items (A):"; this.salesProducedLabel.Text = "Sales Produced By Ad Items (A):";
// //
// departmentSalesLabel // departmentSalesLabel
// //
this.departmentSalesLabel.AutoSize = true; this.departmentSalesLabel.AutoSize = true;
this.departmentSalesLabel.Location = new System.Drawing.Point(9, 62); this.departmentSalesLabel.Location = new System.Drawing.Point(0, 72);
this.departmentSalesLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.departmentSalesLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.departmentSalesLabel.Name = "departmentSalesLabel"; this.departmentSalesLabel.Name = "departmentSalesLabel";
this.departmentSalesLabel.Size = new System.Drawing.Size(146, 20); this.departmentSalesLabel.Size = new System.Drawing.Size(179, 25);
this.departmentSalesLabel.TabIndex = 0; this.departmentSalesLabel.TabIndex = 0;
this.departmentSalesLabel.Text = "Department Sales: "; this.departmentSalesLabel.Text = "Department Sales: ";
// //
@@ -390,11 +382,11 @@
this.grossProfitGroupBox.Controls.Add(this.grossProfitTotalSales); this.grossProfitGroupBox.Controls.Add(this.grossProfitTotalSales);
this.grossProfitGroupBox.Controls.Add(this.grossProfitLessCostOfSales); this.grossProfitGroupBox.Controls.Add(this.grossProfitLessCostOfSales);
this.grossProfitGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; this.grossProfitGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.grossProfitGroupBox.Location = new System.Drawing.Point(712, 5); this.grossProfitGroupBox.Location = new System.Drawing.Point(831, 6);
this.grossProfitGroupBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.grossProfitGroupBox.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.grossProfitGroupBox.Name = "grossProfitGroupBox"; this.grossProfitGroupBox.Name = "grossProfitGroupBox";
this.grossProfitGroupBox.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.grossProfitGroupBox.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.grossProfitGroupBox.Size = new System.Drawing.Size(376, 186); this.grossProfitGroupBox.Size = new System.Drawing.Size(438, 216);
this.grossProfitGroupBox.TabIndex = 2; this.grossProfitGroupBox.TabIndex = 2;
this.grossProfitGroupBox.TabStop = false; this.grossProfitGroupBox.TabStop = false;
this.grossProfitGroupBox.Text = "Gross Profit"; this.grossProfitGroupBox.Text = "Gross Profit";
@@ -402,45 +394,45 @@
// grossProfitEstimatedWeeklyDeptmartmentExpenseLabel // grossProfitEstimatedWeeklyDeptmartmentExpenseLabel
// //
this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.AutoSize = true; this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.AutoSize = true;
this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Location = new System.Drawing.Point(7, 152); this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Location = new System.Drawing.Point(8, 177);
this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Name = "grossProfitEstimatedWeeklyDeptmartmentExpenseLabel"; this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Name = "grossProfitEstimatedWeeklyDeptmartmentExpenseLabel";
this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Size = new System.Drawing.Size(299, 20); this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Size = new System.Drawing.Size(368, 25);
this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.TabIndex = 4; this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.TabIndex = 4;
this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Text = "Estimated Weekly Department Expense: "; this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Text = "Estimated Weekly Department Expense: ";
// //
// grossProfitDollarGrossProfitLabel // grossProfitDollarGrossProfitLabel
// //
this.grossProfitDollarGrossProfitLabel.AutoSize = true; this.grossProfitDollarGrossProfitLabel.AutoSize = true;
this.grossProfitDollarGrossProfitLabel.Location = new System.Drawing.Point(7, 92); this.grossProfitDollarGrossProfitLabel.Location = new System.Drawing.Point(8, 107);
this.grossProfitDollarGrossProfitLabel.Name = "grossProfitDollarGrossProfitLabel"; this.grossProfitDollarGrossProfitLabel.Name = "grossProfitDollarGrossProfitLabel";
this.grossProfitDollarGrossProfitLabel.Size = new System.Drawing.Size(146, 20); this.grossProfitDollarGrossProfitLabel.Size = new System.Drawing.Size(179, 25);
this.grossProfitDollarGrossProfitLabel.TabIndex = 2; this.grossProfitDollarGrossProfitLabel.TabIndex = 2;
this.grossProfitDollarGrossProfitLabel.Text = "Dollar Gross Profit: "; this.grossProfitDollarGrossProfitLabel.Text = "Dollar Gross Profit: ";
// //
// perfectGrossProfitLabel // perfectGrossProfitLabel
// //
this.perfectGrossProfitLabel.AutoSize = true; this.perfectGrossProfitLabel.AutoSize = true;
this.perfectGrossProfitLabel.Location = new System.Drawing.Point(7, 122); this.perfectGrossProfitLabel.Location = new System.Drawing.Point(8, 142);
this.perfectGrossProfitLabel.Name = "perfectGrossProfitLabel"; this.perfectGrossProfitLabel.Name = "perfectGrossProfitLabel";
this.perfectGrossProfitLabel.Size = new System.Drawing.Size(160, 20); this.perfectGrossProfitLabel.Size = new System.Drawing.Size(196, 25);
this.perfectGrossProfitLabel.TabIndex = 3; this.perfectGrossProfitLabel.TabIndex = 3;
this.perfectGrossProfitLabel.Text = "Percent Gross Profit: "; this.perfectGrossProfitLabel.Text = "Percent Gross Profit: ";
// //
// grossProfitTotalSales // grossProfitTotalSales
// //
this.grossProfitTotalSales.AutoSize = true; this.grossProfitTotalSales.AutoSize = true;
this.grossProfitTotalSales.Location = new System.Drawing.Point(7, 32); this.grossProfitTotalSales.Location = new System.Drawing.Point(8, 37);
this.grossProfitTotalSales.Name = "grossProfitTotalSales"; this.grossProfitTotalSales.Name = "grossProfitTotalSales";
this.grossProfitTotalSales.Size = new System.Drawing.Size(96, 20); this.grossProfitTotalSales.Size = new System.Drawing.Size(122, 25);
this.grossProfitTotalSales.TabIndex = 0; this.grossProfitTotalSales.TabIndex = 0;
this.grossProfitTotalSales.Text = "Total Sales: "; this.grossProfitTotalSales.Text = "Total Sales: ";
// //
// grossProfitLessCostOfSales // grossProfitLessCostOfSales
// //
this.grossProfitLessCostOfSales.AutoSize = true; this.grossProfitLessCostOfSales.AutoSize = true;
this.grossProfitLessCostOfSales.Location = new System.Drawing.Point(7, 62); this.grossProfitLessCostOfSales.Location = new System.Drawing.Point(8, 72);
this.grossProfitLessCostOfSales.Name = "grossProfitLessCostOfSales"; this.grossProfitLessCostOfSales.Name = "grossProfitLessCostOfSales";
this.grossProfitLessCostOfSales.Size = new System.Drawing.Size(150, 20); this.grossProfitLessCostOfSales.Size = new System.Drawing.Size(187, 25);
this.grossProfitLessCostOfSales.TabIndex = 1; this.grossProfitLessCostOfSales.TabIndex = 1;
this.grossProfitLessCostOfSales.Text = "Less Cost of Sales: "; this.grossProfitLessCostOfSales.Text = "Less Cost of Sales: ";
// //
@@ -448,9 +440,9 @@
// //
this.taxableGroupBox.Controls.Add(this.usePreRenderedFilesCheckbox); this.taxableGroupBox.Controls.Add(this.usePreRenderedFilesCheckbox);
this.taxableGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; this.taxableGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.taxableGroupBox.Location = new System.Drawing.Point(1095, 3); this.taxableGroupBox.Location = new System.Drawing.Point(1277, 3);
this.taxableGroupBox.Name = "taxableGroupBox"; this.taxableGroupBox.Name = "taxableGroupBox";
this.taxableGroupBox.Size = new System.Drawing.Size(380, 190); this.taxableGroupBox.Size = new System.Drawing.Size(444, 222);
this.taxableGroupBox.TabIndex = 3; this.taxableGroupBox.TabIndex = 3;
this.taxableGroupBox.TabStop = false; this.taxableGroupBox.TabStop = false;
this.taxableGroupBox.Text = "Taxable"; this.taxableGroupBox.Text = "Taxable";
@@ -458,9 +450,9 @@
// usePreRenderedFilesCheckbox // usePreRenderedFilesCheckbox
// //
this.usePreRenderedFilesCheckbox.AutoSize = true; this.usePreRenderedFilesCheckbox.AutoSize = true;
this.usePreRenderedFilesCheckbox.Location = new System.Drawing.Point(177, 164); this.usePreRenderedFilesCheckbox.Location = new System.Drawing.Point(206, 191);
this.usePreRenderedFilesCheckbox.Name = "usePreRenderedFilesCheckbox"; this.usePreRenderedFilesCheckbox.Name = "usePreRenderedFilesCheckbox";
this.usePreRenderedFilesCheckbox.Size = new System.Drawing.Size(198, 24); this.usePreRenderedFilesCheckbox.Size = new System.Drawing.Size(239, 29);
this.usePreRenderedFilesCheckbox.TabIndex = 5; this.usePreRenderedFilesCheckbox.TabIndex = 5;
this.usePreRenderedFilesCheckbox.Text = "Use Pre-rendered Files"; this.usePreRenderedFilesCheckbox.Text = "Use Pre-rendered Files";
this.usePreRenderedFilesCheckbox.UseVisualStyleBackColor = true; this.usePreRenderedFilesCheckbox.UseVisualStyleBackColor = true;
@@ -474,16 +466,16 @@
this.dateSelectorPanel.Controls.Add(this.monthComboBox); this.dateSelectorPanel.Controls.Add(this.monthComboBox);
this.dateSelectorPanel.Controls.Add(this.dateSelectLabel); this.dateSelectorPanel.Controls.Add(this.dateSelectLabel);
this.dateSelectorPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.dateSelectorPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.dateSelectorPanel.Location = new System.Drawing.Point(711, 199); this.dateSelectorPanel.Location = new System.Drawing.Point(829, 231);
this.dateSelectorPanel.Name = "dateSelectorPanel"; this.dateSelectorPanel.Name = "dateSelectorPanel";
this.dateSelectorPanel.Size = new System.Drawing.Size(764, 44); this.dateSelectorPanel.Size = new System.Drawing.Size(892, 52);
this.dateSelectorPanel.TabIndex = 4; this.dateSelectorPanel.TabIndex = 4;
// //
// printPreviewButton // printPreviewButton
// //
this.printPreviewButton.Location = new System.Drawing.Point(638, 0); this.printPreviewButton.Location = new System.Drawing.Point(744, 0);
this.printPreviewButton.Name = "printPreviewButton"; this.printPreviewButton.Name = "printPreviewButton";
this.printPreviewButton.Size = new System.Drawing.Size(118, 42); this.printPreviewButton.Size = new System.Drawing.Size(138, 49);
this.printPreviewButton.TabIndex = 4; this.printPreviewButton.TabIndex = 4;
this.printPreviewButton.Text = "Print Preview"; this.printPreviewButton.Text = "Print Preview";
this.printPreviewButton.UseVisualStyleBackColor = true; this.printPreviewButton.UseVisualStyleBackColor = true;
@@ -492,36 +484,36 @@
// yearComboBox // yearComboBox
// //
this.yearComboBox.FormattingEnabled = true; this.yearComboBox.FormattingEnabled = true;
this.yearComboBox.Location = new System.Drawing.Point(382, 11); this.yearComboBox.Location = new System.Drawing.Point(446, 13);
this.yearComboBox.Name = "yearComboBox"; this.yearComboBox.Name = "yearComboBox";
this.yearComboBox.Size = new System.Drawing.Size(96, 28); this.yearComboBox.Size = new System.Drawing.Size(111, 32);
this.yearComboBox.Sorted = true; this.yearComboBox.Sorted = true;
this.yearComboBox.TabIndex = 3; this.yearComboBox.TabIndex = 3;
// //
// dayComboBox // dayComboBox
// //
this.dayComboBox.FormattingEnabled = true; this.dayComboBox.FormattingEnabled = true;
this.dayComboBox.Location = new System.Drawing.Point(280, 11); this.dayComboBox.Location = new System.Drawing.Point(327, 13);
this.dayComboBox.Name = "dayComboBox"; this.dayComboBox.Name = "dayComboBox";
this.dayComboBox.Size = new System.Drawing.Size(96, 28); this.dayComboBox.Size = new System.Drawing.Size(111, 32);
this.dayComboBox.Sorted = true; this.dayComboBox.Sorted = true;
this.dayComboBox.TabIndex = 2; this.dayComboBox.TabIndex = 2;
// //
// monthComboBox // monthComboBox
// //
this.monthComboBox.FormattingEnabled = true; this.monthComboBox.FormattingEnabled = true;
this.monthComboBox.Location = new System.Drawing.Point(178, 11); this.monthComboBox.Location = new System.Drawing.Point(208, 13);
this.monthComboBox.Name = "monthComboBox"; this.monthComboBox.Name = "monthComboBox";
this.monthComboBox.Size = new System.Drawing.Size(96, 28); this.monthComboBox.Size = new System.Drawing.Size(111, 32);
this.monthComboBox.Sorted = true; this.monthComboBox.Sorted = true;
this.monthComboBox.TabIndex = 1; this.monthComboBox.TabIndex = 1;
// //
// dateSelectLabel // dateSelectLabel
// //
this.dateSelectLabel.AutoSize = true; this.dateSelectLabel.AutoSize = true;
this.dateSelectLabel.Location = new System.Drawing.Point(6, 12); this.dateSelectLabel.Location = new System.Drawing.Point(7, 14);
this.dateSelectLabel.Name = "dateSelectLabel"; this.dateSelectLabel.Name = "dateSelectLabel";
this.dateSelectLabel.Size = new System.Drawing.Size(166, 20); this.dateSelectLabel.Size = new System.Drawing.Size(204, 25);
this.dateSelectLabel.TabIndex = 0; this.dateSelectLabel.TabIndex = 0;
this.dateSelectLabel.Text = "Select a Date to View:"; this.dateSelectLabel.Text = "Select a Date to View:";
// //
@@ -533,21 +525,21 @@
this.mainViewTabControl.Controls.Add(this.suppliersTabPage); this.mainViewTabControl.Controls.Add(this.suppliersTabPage);
this.mainViewTabControl.Controls.Add(this.WeeklySalesTabPage); this.mainViewTabControl.Controls.Add(this.WeeklySalesTabPage);
this.mainViewTabControl.Dock = System.Windows.Forms.DockStyle.Fill; this.mainViewTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.mainViewTabControl.Location = new System.Drawing.Point(4, 40); this.mainViewTabControl.Location = new System.Drawing.Point(5, 47);
this.mainViewTabControl.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.mainViewTabControl.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.mainViewTabControl.Name = "mainViewTabControl"; this.mainViewTabControl.Name = "mainViewTabControl";
this.mainViewTabControl.SelectedIndex = 0; this.mainViewTabControl.SelectedIndex = 0;
this.mainViewTabControl.Size = new System.Drawing.Size(1478, 464); this.mainViewTabControl.Size = new System.Drawing.Size(1724, 541);
this.mainViewTabControl.TabIndex = 3; this.mainViewTabControl.TabIndex = 3;
// //
// projectionTab // projectionTab
// //
this.projectionTab.Controls.Add(this.projectedSalesMainDataGrid); this.projectionTab.Controls.Add(this.projectedSalesMainDataGrid);
this.projectionTab.Location = new System.Drawing.Point(4, 29); this.projectionTab.Location = new System.Drawing.Point(4, 33);
this.projectionTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.projectionTab.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.projectionTab.Name = "projectionTab"; this.projectionTab.Name = "projectionTab";
this.projectionTab.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.projectionTab.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.projectionTab.Size = new System.Drawing.Size(1470, 431); this.projectionTab.Size = new System.Drawing.Size(1716, 504);
this.projectionTab.TabIndex = 0; this.projectionTab.TabIndex = 0;
this.projectionTab.Text = "Projections"; this.projectionTab.Text = "Projections";
this.projectionTab.UseVisualStyleBackColor = true; this.projectionTab.UseVisualStyleBackColor = true;
@@ -562,23 +554,23 @@
this.projectedSalesMainDataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.projectedSalesMainDataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.projectedSalesMainDataGrid.Dock = System.Windows.Forms.DockStyle.Fill; this.projectedSalesMainDataGrid.Dock = System.Windows.Forms.DockStyle.Fill;
this.projectedSalesMainDataGrid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke; this.projectedSalesMainDataGrid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke;
this.projectedSalesMainDataGrid.Location = new System.Drawing.Point(4, 5); this.projectedSalesMainDataGrid.Location = new System.Drawing.Point(5, 6);
this.projectedSalesMainDataGrid.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.projectedSalesMainDataGrid.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.projectedSalesMainDataGrid.Name = "projectedSalesMainDataGrid"; this.projectedSalesMainDataGrid.Name = "projectedSalesMainDataGrid";
this.projectedSalesMainDataGrid.ReadOnly = true; this.projectedSalesMainDataGrid.ReadOnly = true;
this.projectedSalesMainDataGrid.RowHeadersVisible = false; this.projectedSalesMainDataGrid.RowHeadersVisible = false;
this.projectedSalesMainDataGrid.ShowCellErrors = false; this.projectedSalesMainDataGrid.ShowCellErrors = false;
this.projectedSalesMainDataGrid.ShowRowErrors = false; this.projectedSalesMainDataGrid.ShowRowErrors = false;
this.projectedSalesMainDataGrid.Size = new System.Drawing.Size(1462, 421); this.projectedSalesMainDataGrid.Size = new System.Drawing.Size(1706, 492);
this.projectedSalesMainDataGrid.TabIndex = 0; this.projectedSalesMainDataGrid.TabIndex = 0;
// //
// inventoryTabPage // inventoryTabPage
// //
this.inventoryTabPage.Controls.Add(this.inventoryDataGridView); this.inventoryTabPage.Controls.Add(this.inventoryDataGridView);
this.inventoryTabPage.Location = new System.Drawing.Point(4, 29); this.inventoryTabPage.Location = new System.Drawing.Point(4, 33);
this.inventoryTabPage.Name = "inventoryTabPage"; this.inventoryTabPage.Name = "inventoryTabPage";
this.inventoryTabPage.Padding = new System.Windows.Forms.Padding(3); this.inventoryTabPage.Padding = new System.Windows.Forms.Padding(3);
this.inventoryTabPage.Size = new System.Drawing.Size(1470, 431); this.inventoryTabPage.Size = new System.Drawing.Size(1716, 504);
this.inventoryTabPage.TabIndex = 4; this.inventoryTabPage.TabIndex = 4;
this.inventoryTabPage.Text = "Inventory"; this.inventoryTabPage.Text = "Inventory";
this.inventoryTabPage.UseVisualStyleBackColor = true; this.inventoryTabPage.UseVisualStyleBackColor = true;
@@ -597,16 +589,16 @@
this.inventoryDataGridView.RowHeadersVisible = false; this.inventoryDataGridView.RowHeadersVisible = false;
this.inventoryDataGridView.RowTemplate.Height = 28; this.inventoryDataGridView.RowTemplate.Height = 28;
this.inventoryDataGridView.ShowRowErrors = false; this.inventoryDataGridView.ShowRowErrors = false;
this.inventoryDataGridView.Size = new System.Drawing.Size(1464, 425); this.inventoryDataGridView.Size = new System.Drawing.Size(1710, 498);
this.inventoryDataGridView.TabIndex = 0; this.inventoryDataGridView.TabIndex = 0;
// //
// actualSalesTab // actualSalesTab
// //
this.actualSalesTab.Controls.Add(this.actualSalesMainLayoutPanel); this.actualSalesTab.Controls.Add(this.actualSalesMainLayoutPanel);
this.actualSalesTab.Location = new System.Drawing.Point(4, 29); this.actualSalesTab.Location = new System.Drawing.Point(4, 33);
this.actualSalesTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.actualSalesTab.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.actualSalesTab.Name = "actualSalesTab"; this.actualSalesTab.Name = "actualSalesTab";
this.actualSalesTab.Size = new System.Drawing.Size(1470, 431); this.actualSalesTab.Size = new System.Drawing.Size(1716, 504);
this.actualSalesTab.TabIndex = 2; this.actualSalesTab.TabIndex = 2;
this.actualSalesTab.Text = "Actual Sales"; this.actualSalesTab.Text = "Actual Sales";
this.actualSalesTab.UseVisualStyleBackColor = true; this.actualSalesTab.UseVisualStyleBackColor = true;
@@ -618,12 +610,12 @@
this.actualSalesMainLayoutPanel.Controls.Add(this.actualSalesMainDataGidView, 0, 0); this.actualSalesMainLayoutPanel.Controls.Add(this.actualSalesMainDataGidView, 0, 0);
this.actualSalesMainLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.actualSalesMainLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.actualSalesMainLayoutPanel.Location = new System.Drawing.Point(0, 0); this.actualSalesMainLayoutPanel.Location = new System.Drawing.Point(0, 0);
this.actualSalesMainLayoutPanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.actualSalesMainLayoutPanel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.actualSalesMainLayoutPanel.Name = "actualSalesMainLayoutPanel"; this.actualSalesMainLayoutPanel.Name = "actualSalesMainLayoutPanel";
this.actualSalesMainLayoutPanel.RowCount = 1; this.actualSalesMainLayoutPanel.RowCount = 1;
this.actualSalesMainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.actualSalesMainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.actualSalesMainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 431F)); this.actualSalesMainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 504F));
this.actualSalesMainLayoutPanel.Size = new System.Drawing.Size(1470, 431); this.actualSalesMainLayoutPanel.Size = new System.Drawing.Size(1716, 504);
this.actualSalesMainLayoutPanel.TabIndex = 0; this.actualSalesMainLayoutPanel.TabIndex = 0;
// //
// actualSalesMainDataGidView // actualSalesMainDataGidView
@@ -636,24 +628,24 @@
this.actualSalesMainDataGidView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.actualSalesMainDataGidView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.actualSalesMainDataGidView.Dock = System.Windows.Forms.DockStyle.Fill; this.actualSalesMainDataGidView.Dock = System.Windows.Forms.DockStyle.Fill;
this.actualSalesMainDataGidView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke; this.actualSalesMainDataGidView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke;
this.actualSalesMainDataGidView.Location = new System.Drawing.Point(4, 5); this.actualSalesMainDataGidView.Location = new System.Drawing.Point(5, 6);
this.actualSalesMainDataGidView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.actualSalesMainDataGidView.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.actualSalesMainDataGidView.Name = "actualSalesMainDataGidView"; this.actualSalesMainDataGidView.Name = "actualSalesMainDataGidView";
this.actualSalesMainDataGidView.ReadOnly = true; this.actualSalesMainDataGidView.ReadOnly = true;
this.actualSalesMainDataGidView.RowHeadersVisible = false; this.actualSalesMainDataGidView.RowHeadersVisible = false;
this.actualSalesMainDataGidView.ShowCellErrors = false; this.actualSalesMainDataGidView.ShowCellErrors = false;
this.actualSalesMainDataGidView.ShowRowErrors = false; this.actualSalesMainDataGidView.ShowRowErrors = false;
this.actualSalesMainDataGidView.Size = new System.Drawing.Size(1462, 421); this.actualSalesMainDataGidView.Size = new System.Drawing.Size(1706, 492);
this.actualSalesMainDataGidView.TabIndex = 1; this.actualSalesMainDataGidView.TabIndex = 1;
// //
// suppliersTabPage // suppliersTabPage
// //
this.suppliersTabPage.Controls.Add(this.suppliersDataGridView); this.suppliersTabPage.Controls.Add(this.suppliersDataGridView);
this.suppliersTabPage.Location = new System.Drawing.Point(4, 29); this.suppliersTabPage.Location = new System.Drawing.Point(4, 33);
this.suppliersTabPage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.suppliersTabPage.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.suppliersTabPage.Name = "suppliersTabPage"; this.suppliersTabPage.Name = "suppliersTabPage";
this.suppliersTabPage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.suppliersTabPage.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.suppliersTabPage.Size = new System.Drawing.Size(1470, 431); this.suppliersTabPage.Size = new System.Drawing.Size(1716, 504);
this.suppliersTabPage.TabIndex = 1; this.suppliersTabPage.TabIndex = 1;
this.suppliersTabPage.Text = "Suppliers"; this.suppliersTabPage.Text = "Suppliers";
this.suppliersTabPage.UseVisualStyleBackColor = true; this.suppliersTabPage.UseVisualStyleBackColor = true;
@@ -668,22 +660,22 @@
this.suppliersDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.suppliersDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.suppliersDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.suppliersDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
this.suppliersDataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke; this.suppliersDataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke;
this.suppliersDataGridView.Location = new System.Drawing.Point(4, 5); this.suppliersDataGridView.Location = new System.Drawing.Point(5, 6);
this.suppliersDataGridView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.suppliersDataGridView.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.suppliersDataGridView.Name = "suppliersDataGridView"; this.suppliersDataGridView.Name = "suppliersDataGridView";
this.suppliersDataGridView.ReadOnly = true; this.suppliersDataGridView.ReadOnly = true;
this.suppliersDataGridView.RowHeadersVisible = false; this.suppliersDataGridView.RowHeadersVisible = false;
this.suppliersDataGridView.Size = new System.Drawing.Size(1462, 421); this.suppliersDataGridView.Size = new System.Drawing.Size(1706, 492);
this.suppliersDataGridView.TabIndex = 0; this.suppliersDataGridView.TabIndex = 0;
// //
// WeeklySalesTabPage // WeeklySalesTabPage
// //
this.WeeklySalesTabPage.Controls.Add(this.weeklySalesDataGridView); this.WeeklySalesTabPage.Controls.Add(this.weeklySalesDataGridView);
this.WeeklySalesTabPage.Location = new System.Drawing.Point(4, 29); this.WeeklySalesTabPage.Location = new System.Drawing.Point(4, 33);
this.WeeklySalesTabPage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.WeeklySalesTabPage.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.WeeklySalesTabPage.Name = "WeeklySalesTabPage"; this.WeeklySalesTabPage.Name = "WeeklySalesTabPage";
this.WeeklySalesTabPage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.WeeklySalesTabPage.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.WeeklySalesTabPage.Size = new System.Drawing.Size(1470, 431); this.WeeklySalesTabPage.Size = new System.Drawing.Size(1716, 504);
this.WeeklySalesTabPage.TabIndex = 3; this.WeeklySalesTabPage.TabIndex = 3;
this.WeeklySalesTabPage.Text = "Weekly Sales"; this.WeeklySalesTabPage.Text = "Weekly Sales";
this.WeeklySalesTabPage.UseVisualStyleBackColor = true; this.WeeklySalesTabPage.UseVisualStyleBackColor = true;
@@ -697,29 +689,21 @@
this.weeklySalesDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.weeklySalesDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.weeklySalesDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.weeklySalesDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
this.weeklySalesDataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke; this.weeklySalesDataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke;
this.weeklySalesDataGridView.Location = new System.Drawing.Point(4, 5); this.weeklySalesDataGridView.Location = new System.Drawing.Point(5, 6);
this.weeklySalesDataGridView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.weeklySalesDataGridView.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.weeklySalesDataGridView.Name = "weeklySalesDataGridView"; this.weeklySalesDataGridView.Name = "weeklySalesDataGridView";
this.weeklySalesDataGridView.ReadOnly = true; this.weeklySalesDataGridView.ReadOnly = true;
this.weeklySalesDataGridView.RowHeadersVisible = false; this.weeklySalesDataGridView.RowHeadersVisible = false;
this.weeklySalesDataGridView.Size = new System.Drawing.Size(1462, 421); this.weeklySalesDataGridView.Size = new System.Drawing.Size(1706, 492);
this.weeklySalesDataGridView.TabIndex = 0; this.weeklySalesDataGridView.TabIndex = 0;
// //
// newFormTestToolStripMenuItem
//
this.newFormTestToolStripMenuItem.Name = "newFormTestToolStripMenuItem";
this.newFormTestToolStripMenuItem.Size = new System.Drawing.Size(284, 30);
this.newFormTestToolStripMenuItem.Text = "&New Form Test";
this.newFormTestToolStripMenuItem.Click += new System.EventHandler(this.newFormTestToolStripMenuItem_Click);
//
// FrmMain // FrmMain
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(144F, 144F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(1734, 892);
this.ClientSize = new System.Drawing.Size(1486, 765);
this.Controls.Add(this.mainTableLayoutPanel); this.Controls.Add(this.mainTableLayoutPanel);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "FrmMain"; this.Name = "FrmMain";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
@@ -784,7 +768,6 @@
private System.Windows.Forms.Label departmentSalesLabel; private System.Windows.Forms.Label departmentSalesLabel;
private System.Windows.Forms.TabPage WeeklySalesTabPage; private System.Windows.Forms.TabPage WeeklySalesTabPage;
private System.Windows.Forms.DataGridView weeklySalesDataGridView; private System.Windows.Forms.DataGridView weeklySalesDataGridView;
private System.Windows.Forms.LinkLabel changeShrinkLinkLabel;
private System.Windows.Forms.Label shrinkLabel; private System.Windows.Forms.Label shrinkLabel;
private System.Windows.Forms.ToolStripMenuItem helpMainMenu; private System.Windows.Forms.ToolStripMenuItem helpMainMenu;
private System.Windows.Forms.ToolStripMenuItem showHideConsoleHelpMainMenu; private System.Windows.Forms.ToolStripMenuItem showHideConsoleHelpMainMenu;
+13 -31
View File
@@ -6,7 +6,6 @@ using System.Drawing.Printing;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Windows.Forms; using System.Windows.Forms;
@@ -27,8 +26,8 @@ namespace AdvertsingProfitControl
InitializeComponent(); InitializeComponent();
//Set the maximum and minimum sizes for the form. //Set the maximum and minimum sizes for the form.
MaximumSize = new Size(1200, 650); //MaximumSize = new Size(1200, 650);
MinimumSize = new Size(1000, 550); //MinimumSize = new Size(1000, 550);
} }
private void frmMain_Load(object sender, EventArgs e) private void frmMain_Load(object sender, EventArgs e)
@@ -51,10 +50,19 @@ namespace AdvertsingProfitControl
BuildAndFillDataGridTables(); BuildAndFillDataGridTables();
CalculateProfitAnalysis(); CalculateProfitAnalysis();
CalculateGrossProfit(); CalculateGrossProfit();
projectedSalesMainDataGrid.KeyDown += FrmMain_KeyDown;
//var margin = new Margins(50, 50, 0, 0); //var margin = new Margins(50, 50, 0, 0);
//_printDoc.DefaultPageSettings.Margins = margin; //_printDoc.DefaultPageSettings.Margins = margin;
} }
private void FrmMain_KeyDown(object sender, KeyEventArgs e)
{
if (e.Modifiers == Keys.Shift && e.KeyCode == Keys.Up)
{
MessageBox.Show("My message");
}
}
private void UpdateDataGridViewInformation(object sender, EventArgs e) private void UpdateDataGridViewInformation(object sender, EventArgs e)
{ {
var dateString = monthComboBox.Text + "/" + dayComboBox.Text + "/" + yearComboBox.Text; var dateString = monthComboBox.Text + "/" + dayComboBox.Text + "/" + yearComboBox.Text;
@@ -220,7 +228,7 @@ namespace AdvertsingProfitControl
{ {
dataGridViewColumn.Visible = false; dataGridViewColumn.Visible = false;
} }
dataGridViewColumn.HeaderText = AddSpacesToSentence(dataGridViewColumn.HeaderText, false); dataGridViewColumn.HeaderText = TextFormat.AddSpacesToSentence(dataGridViewColumn.HeaderText, false);
dataGridView.Columns.Add(dataGridViewColumn); dataGridView.Columns.Add(dataGridViewColumn);
} }
@@ -307,7 +315,7 @@ namespace AdvertsingProfitControl
CellTemplate = new DataGridViewTextBoxCell() CellTemplate = new DataGridViewTextBoxCell()
}; };
var columnHeaderText = table.Columns[columnIndex].ColumnName; var columnHeaderText = table.Columns[columnIndex].ColumnName;
columnHeaderText = AddSpacesToSentence(columnHeaderText, false); columnHeaderText = TextFormat.AddSpacesToSentence(columnHeaderText, false);
//Make the row attribute column invisible. //Make the row attribute column invisible.
if (table.Columns[columnIndex].ColumnName == "RowAttribute") if (table.Columns[columnIndex].ColumnName == "RowAttribute")
{ {
@@ -667,32 +675,6 @@ namespace AdvertsingProfitControl
adItemManager.ShowDialog(); adItemManager.ShowDialog();
} }
//http://stackoverflow.com/questions/272633/add-spaces-before-capital-letters
/// <summary>
/// Add spaces between all words that have capital letters
/// allowing for pretty looking column header text.
/// </summary>
/// <param name="text">The column header text to be made presentable.</param>
/// <param name="preserveAcronyms">Whether or not to do anything with text that's in all caps.</param>
/// <returns></returns>
private string AddSpacesToSentence(string text, bool preserveAcronyms)
{
if (string.IsNullOrWhiteSpace(text))
return string.Empty;
var newText = new StringBuilder(text.Length * 2);
newText.Append(text[0]);
for (var i = 1; i < text.Length; i++)
{
if (char.IsUpper(text[i]))
if ((text[i - 1] != ' ' && !char.IsUpper(text[i - 1])) ||
(preserveAcronyms && char.IsUpper(text[i - 1]) &&
i < text.Length - 1 && !char.IsUpper(text[i + 1])))
newText.Append(' ');
newText.Append(text[i]);
}
return newText.ToString();
}
private void dbVersionHelpMainMenu_Click(object sender, EventArgs e) private void dbVersionHelpMainMenu_Click(object sender, EventArgs e)
{ {
var databaseTracker = new DatabaseTracker(); var databaseTracker = new DatabaseTracker();
+5 -4
View File
@@ -972,7 +972,7 @@ namespace AdvertsingProfitControl
} }
//Create a temporary copy of the trimmed ad item auto complete list for use with the key press event. //Create a temporary copy of the trimmed ad item auto complete list for use with the key press event.
_tempAdItemCollection = customAutoComplete; _tempAdItemCollection = customAutoComplete;
autoText.KeyPress += UpdateAutoCompleteListOnKeyPress; autoText.KeyDown += UpdateAutoCompleteListOnKeyPress;
autoText.AutoCompleteMode = AutoCompleteMode.Suggest; autoText.AutoCompleteMode = AutoCompleteMode.Suggest;
autoText.AutoCompleteSource = AutoCompleteSource.CustomSource; autoText.AutoCompleteSource = AutoCompleteSource.CustomSource;
autoText.AutoCompleteCustomSource = customAutoComplete; autoText.AutoCompleteCustomSource = customAutoComplete;
@@ -983,11 +983,12 @@ namespace AdvertsingProfitControl
} }
}//End DisplayAutoCompleteOnEditingControlShowing }//End DisplayAutoCompleteOnEditingControlShowing
private void UpdateAutoCompleteListOnKeyPress(object sender, KeyPressEventArgs e) private void UpdateAutoCompleteListOnKeyPress(object sender, KeyEventArgs e)
{ {
var textBox = (TextBox) sender; var textBox = (TextBox) sender;
notificationLabel.Text = ""; notificationLabel.Text = "";
if (e.KeyChar == ':' && textBox.Text.Length == 0)
if (e.Modifiers == Keys.Shift && e.KeyCode == Keys.Up)
{ {
if (_adSpecialIndex == -1) if (_adSpecialIndex == -1)
{ {
@@ -999,7 +1000,7 @@ namespace AdvertsingProfitControl
notificationLabel.Text = "An Ad Special row already exists, auto complete mode\n can not be changed."; notificationLabel.Text = "An Ad Special row already exists, auto complete mode\n can not be changed.";
} }
} }
else if (e.KeyChar == ';' && textBox.Text.Length == 0) else if (e.Modifiers == Keys.Shift && e.KeyCode == Keys.Down)
{ {
textBox.AutoCompleteCustomSource = _tempAdItemCollection; textBox.AutoCompleteCustomSource = _tempAdItemCollection;
notificationLabel.Text = "Auto complete mode changed to Ad Items."; notificationLabel.Text = "Auto complete mode changed to Ad Items.";
File diff suppressed because it is too large Load Diff
+196
View File
@@ -3,18 +3,214 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows;
using System.Windows.Forms; using System.Windows.Forms;
namespace AdvertsingProfitControl namespace AdvertsingProfitControl
{ {
public partial class NewAddRecord : Form public partial class NewAddRecord : Form
{ {
private static readonly FrmLogConsole LogConsole = FrmLogConsole.GetStaticInstance;
public NewAddRecord() public NewAddRecord()
{ {
InitializeComponent(); InitializeComponent();
//Assign the events that all APC DataGridViews will use.
projectionsDataGridView.RowsAdded += DisplayRowNumbers;
inventoryDataGridView.RowsAdded += DisplayRowNumbers;
actualDataGridView.RowsAdded += DisplayRowNumbers;
//Assign the events for the comments text box and display the remaining character count for the user.
commentsTextBox.TextChanged += DisplayRemainingCommentCharacterCount;
//commentsTextBox.KeyUp += DisplayRemainingCommentCharacterCount;
commentsGroupBox.Text = @"Comments (Characters Remaining: " + commentsTextBox.MaxLength + @")";
/*
*
OnCellLeave(C1)
OnRowLeave(R1)
OnCellValidating(C1)
OnCellValidated(C1)
OnRowValidating(R1)
OnRowValidated(R1)
OnRowEnter(R2)
OnCellEnter(C2)
*
*/
//Setup the events for that the Projected and Actual Sales DataGridViews will share.
//Events are assigned with regard to which event gets triggered first and so on..
projectionsDataGridView.CellValidating += ValidateSalesDataGridViewCellContents;
actualDataGridView.CellValidating += ValidateSalesDataGridViewCellContents;
} }
#region APC DataGridView Events
/// <summary>
/// Event Used: RowsAdded
/// Draws the row number in the row's cell header whenever a row is added.
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private static void DisplayRowNumbers(object sender, DataGridViewRowsAddedEventArgs e)
{
var table = ((DataGridView)sender);
table.Rows[e.RowIndex].HeaderCell.Value = (e.RowIndex + 1).ToString();
}
#endregion
#region Sales DataGridView Events
/// <summary>
/// Event Used: CellValidating
/// Validates the contents of a cell, before leaving it. If the contents
/// are valid then the appropriate formatting is applied if needed.
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ValidateSalesDataGridViewCellContents(object sender, DataGridViewCellValidatingEventArgs e)
{
//Grab the DataGirdView that fired the event and make it into a local variable.
var dataGridView = ((DataGridView)sender);
//
var textInfo = new CultureInfo("en-US", false).TextInfo;
//Check for isNewRow if it is, return no need to check it for anything.
if (dataGridView.Rows[e.RowIndex].IsNewRow)
{
return;
}
//Check to see if the current column is the ad item column.
if (e.ColumnIndex == 0)
{
var adItemText = dataGridView.Rows[e.RowIndex].Cells[0].EditedFormattedValue.ToString();
//If there is text after all the whitespace has been cleared, clear the error text property regardless of whether or not it is set.
if (!string.IsNullOrEmpty(Regex.Replace(adItemText, @"\s+", "")))
{
//Clear the error text since there is in fact an item entered.
dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].ErrorText = "";
//Send the ad item text through the formatting engine and assign the new value to the cell.
dataGridView.Rows[e.RowIndex].Cells[0].Value = TextFormat.FormatAdItemText(adItemText);
//Force a refresh so the cell's text updates and displays for the user.
dataGridView.RefreshEdit();
return;
}
//If column one (1) is blank then cancel cell validating.
if (e.ColumnIndex == 0 && Regex.Replace(adItemText, @"\s+", "") == "") dataGridView.Rows[e.RowIndex].Cells[0].ErrorText = "Ad Item needed"; return;
}
//Check to see if the cell is in the "Sold" column.
if (e.ColumnIndex == 1)
{
//This Reg-ex pattern will match any number followed by the word bin(s), to allow specifying the number of bins of product were ordered.
var inventoryStringCheck = new Regex(@"^[0-9]{1,2} \bbin(s){0,1}\b", RegexOptions.IgnoreCase);
if (
inventoryStringCheck.IsMatch(
dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].EditedFormattedValue.ToString()))
{
//IF a match has been found, then make sure the word 'bin(s)' is capitalized to keep things looking pretty.
var input = textInfo.ToTitleCase(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].EditedFormattedValue.ToString());
dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = input;
dataGridView.RefreshEdit();
return;
}
}
//If the column is the "Sale Price" column try to parse the contents to a Double and apply number formatting to the contents.
//Check for the cost column to see if there are any strings formatted like such:
var regExpression = new Regex(@"^\d+( *)?/( *)?\${0,1}?\d+(\.\d+)?", RegexOptions.IgnoreCase); // [0-9]/($)?[0-9]
//IF the current cell is in the sale price column, check for the string format above, else move to the default method.
if ((e.ColumnIndex == 2) && regExpression.IsMatch(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].EditedFormattedValue.ToString()))
{
//Grab the input and split it at the forward slash (/) for formatting.
var input = dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].EditedFormattedValue.ToString();
input = input.Replace(" ", "");
//Remove any dollar signs as these cause errors.
input = input.Replace("$", "");
var stringArray = input.Split('/');
//Format the last number as Currency, and round it up if necessary.
dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value =
$@"{stringArray[0]}/{Math.Round(decimal.Parse(stringArray[1]), 2):C}";
//Always refresh edit so the new value shows up to the user.
dataGridView.RefreshEdit();
return; //And return, there is no need to go further.
}
//If the column is any other then check to see if the entered value can be parsed to a double (is a number), if not then throw an error to the user.
double parsedUserInput;
if (
!double.TryParse(
dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].EditedFormattedValue.ToString(),
out parsedUserInput))
{
MessageBox.Show(@"Non numeric characters in column " + (e.ColumnIndex + 1) + @" are not allowed.", @"Invalid Characters Detected");
e.Cancel = true;
dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = "";
dataGridView.RefreshEdit();
return;
}
//IF the index is greater then two (2), then that means we are not in a column that requires special formatting out side of currency.
if (e.ColumnIndex <= 2) return;
//IF not, then apply currency formatting to the cell.
var value = double.Parse(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].EditedFormattedValue.ToString(), NumberStyles.Currency);
//If all goes well, format the string in question by adding commas and decimal points if applicable.
dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = Math.Round(value, 2).ToString("N", new CultureInfo("en-US"));
//Always refresh edit so the new value shows up to the user.
dataGridView.RefreshEdit();
}
#endregion
#region Comments TextBox Events
/// <summary>
/// Event Used: KeyUp
/// Calculates and displays the remaining number of characters left available for the user to enter,
/// and changes the color of the label displaying the character count to red when 20% or less characters remain.
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void DisplayRemainingCommentCharacterCount(object sender, EventArgs e)
{
//If the amount of characters left is less then 20% (Or more 80% or more characters have been used) then color the label red, otherwise color it its default color.
commentsGroupBox.ForeColor = (double)commentsTextBox.TextLength / commentsTextBox.MaxLength < .8 ? default(Color) : Color.DarkRed;
commentsGroupBox.Text = @"Comments (Characters Remaining: " + (commentsTextBox.MaxLength - commentsTextBox.TextLength) + @")";
}
#endregion
#region MonthCalendar Events
/// <summary>
/// Updates the week ending masked text box with the selected date
/// using the format (MM/DD/YYYY).
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void UpdateWeekEndingMaskedTextBox(object sender, DateRangeEventArgs e)
{
var selectedDate = weekEndingMonthCalendar.SelectionStart;
if (!selectedDate.ToString("D").StartsWith("Saturday"))
{
weekEndingMaskedTextBox.ForeColor = Color.Maroon;
weekEndingMaskedTextBoxInstructionLabel.Text = @"... or manually enter it here: *";
errorLabel.Text = @"The date you selected does not appear to be a week ending date.";
}
else
{
weekEndingMaskedTextBox.ForeColor = Color.Black;
weekEndingMaskedTextBoxInstructionLabel.Text = @"... or manually enter it here:";
errorLabel.Text = "";
}
weekEndingMaskedTextBox.Text = selectedDate.ToString("MM-dd-yyyy");
}
#endregion
#region Data Grid View Construction Functions
#endregion
} }
} }
File diff suppressed because it is too large Load Diff
-2
View File
@@ -1,5 +1,4 @@
using System; using System;
using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
namespace AdvertsingProfitControl namespace AdvertsingProfitControl
@@ -12,7 +11,6 @@ namespace AdvertsingProfitControl
[STAThread] [STAThread]
private static void Main() private static void Main()
{ {
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
Application.ThreadException += GlobalClasses.LogError; Application.ThreadException += GlobalClasses.LogError;
@@ -26,6 +26,7 @@
</trustInfo> </trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application> <application>
<dpiAware>true/PM</dpiAware>
<!-- A list of all Windows versions that this application is designed to work with. <!-- A list of all Windows versions that this application is designed to work with.
Windows will automatically select the most compatible environment.--> Windows will automatically select the most compatible environment.-->
<!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node--> <!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node-->
@@ -34,6 +35,7 @@
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>--> <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
<!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node--> <!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node-->
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>--> <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>-->
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>-->
</application> </application>
</compatibility> </compatibility>
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) --> <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+9 -16
View File
@@ -28,6 +28,7 @@ namespace AdvertsingProfitControl
var isPreviousCharWhiteSpace = false; var isPreviousCharWhiteSpace = false;
var cleanedInputString = ""; var cleanedInputString = "";
var lastnumberStartingIndex = -1; var lastnumberStartingIndex = -1;
var removedCharacterOffset = 0;
//Create an array of brackets to test for, and either balance out or simply ignore the extras. //Create an array of brackets to test for, and either balance out or simply ignore the extras.
char[] openBrackets = { '(', '<', '{', '[' }; char[] openBrackets = { '(', '<', '{', '[' };
char[] closedBrackets = { ')', '>', '}', ']' }; char[] closedBrackets = { ')', '>', '}', ']' };
@@ -46,6 +47,7 @@ namespace AdvertsingProfitControl
if (isPreviousCharWhiteSpace) if (isPreviousCharWhiteSpace)
{ {
//If more then one space is found to be in a row, then ignore it and move onto the next character. //If more then one space is found to be in a row, then ignore it and move onto the next character.
removedCharacterOffset++;
continue; continue;
} }
//IF the current character is whitespace, then mark it and move onto the next loop. //IF the current character is whitespace, then mark it and move onto the next loop.
@@ -60,6 +62,7 @@ namespace AdvertsingProfitControl
if (isInsideBrackets) if (isInsideBrackets)
{ {
//If we are already inside of brackets then don't add anymore to the string just continue. //If we are already inside of brackets then don't add anymore to the string just continue.
removedCharacterOffset++;
continue; continue;
} }
isInsideBrackets = true; isInsideBrackets = true;
@@ -73,6 +76,7 @@ namespace AdvertsingProfitControl
//IF we're not inside brackets then there is an imbalance so discard this parenthesis. //IF we're not inside brackets then there is an imbalance so discard this parenthesis.
if (!isInsideBrackets) if (!isInsideBrackets)
{ {
removedCharacterOffset++;
continue; continue;
} }
//Just gonna force parenthesis for now. //Just gonna force parenthesis for now.
@@ -87,13 +91,13 @@ namespace AdvertsingProfitControl
if (!char.IsNumber(adItemText[currentCharacter]) && isPreviousCharWhiteSpace) if (!char.IsNumber(adItemText[currentCharacter]) && isPreviousCharWhiteSpace)
{ {
//Check to see the length of the string and determine if the word with the number needs to be capitalized. //Check to see the length of the string and determine if the word with the number needs to be capitalized.
if (char.IsNumber(cleanedInputString[cleanedInputString.Length - 2])) if (char.IsNumber(cleanedInputString[currentCharacter - (2 + removedCharacterOffset)]))
{ {
BuildAbbreviationsAndWordsLists(adItemText, currentCharacter, out abbreviations, out words); BuildAbbreviationsAndWordsLists(adItemText, currentCharacter, out abbreviations, out words);
//Remove the last space if there are any abbreviations or words found. //Remove the last space if there are any abbreviations or words found.
if (abbreviations.Count > 0 || words.Count > 0) if (abbreviations.Count > 0 || words.Count > 0)
{ {
cleanedInputString = cleanedInputString.Remove(cleanedInputString.Length - 1, 1); cleanedInputString = cleanedInputString.Remove(currentCharacter - (1 + removedCharacterOffset), 1);
} }
//Begin checking to see how to place these items back into the final string. //Begin checking to see how to place these items back into the final string.
if (abbreviations.Count >= 1 && words.Count == 0) if (abbreviations.Count >= 1 && words.Count == 0)
@@ -139,7 +143,7 @@ namespace AdvertsingProfitControl
else if (!char.IsNumber(adItemText[currentCharacter]) && char.IsLetter(adItemText[currentCharacter])) else if (!char.IsNumber(adItemText[currentCharacter]) && char.IsLetter(adItemText[currentCharacter]))
{ {
//IF the previous character is a number... //IF the previous character is a number...
if (char.IsNumber(cleanedInputString[cleanedInputString.Length - 1])) if (char.IsNumber(cleanedInputString[currentCharacter - (1 + removedCharacterOffset)]))
{ {
//Check to see the length of the string and determine if the word with the number needs to be capitalized. //Check to see the length of the string and determine if the word with the number needs to be capitalized.
BuildAbbreviationsAndWordsLists(adItemText, currentCharacter, out abbreviations, out words); BuildAbbreviationsAndWordsLists(adItemText, currentCharacter, out abbreviations, out words);
@@ -179,7 +183,7 @@ namespace AdvertsingProfitControl
break; break;
} }
} }
else if (char.IsLetter(adItemText[currentCharacter - 1]) || adItemText[currentCharacter - 1] == '\'') else if (char.IsLetter(adItemText[currentCharacter - 1]))
{ {
cleanedInputString += char.ToLowerInvariant(adItemText[currentCharacter]); cleanedInputString += char.ToLowerInvariant(adItemText[currentCharacter]);
} }
@@ -187,20 +191,10 @@ namespace AdvertsingProfitControl
//IF a number is found, and we're not inside brackets, check to see if there is an opening parenthesis and if there aren't create one. //IF a number is found, and we're not inside brackets, check to see if there is an opening parenthesis and if there aren't create one.
if (char.IsNumber(adItemText[currentCharacter])) if (char.IsNumber(adItemText[currentCharacter]))
{ {
cleanedInputString += adItemText[currentCharacter];
if (lastnumberStartingIndex == -1) if (lastnumberStartingIndex == -1)
{ {
lastnumberStartingIndex = cleanedInputString.Length - 1; //Non-index based system, minus one for the index lastnumberStartingIndex = currentCharacter - removedCharacterOffset;
} }
}
//Check for any allowed punctuation.
if (adItemText[currentCharacter] == '\'')
{
cleanedInputString += adItemText[currentCharacter];
}
//Check if the previous character is an "'".
else if (cleanedInputString[cleanedInputString.Length - 1] == '\'')
{
cleanedInputString += adItemText[currentCharacter]; cleanedInputString += adItemText[currentCharacter];
} }
//Since whitespace booleans are handled above, set the boolean for white spaces false. //Since whitespace booleans are handled above, set the boolean for white spaces false.
@@ -211,7 +205,6 @@ namespace AdvertsingProfitControl
{ {
cleanedInputString += ')'; cleanedInputString += ')';
} }
//removedCharacterOffset++;
} }
#if DEBUG #if DEBUG
+1 -1
View File
@@ -40,7 +40,7 @@
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />--> <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
<!-- Windows 10 --> <!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /> <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
</application> </application>
</compatibility> </compatibility>
+14 -42
View File
@@ -27,13 +27,13 @@ namespace StringInputParseTester
private void ExecuteParserCode(object sender, EventArgs e) private void ExecuteParserCode(object sender, EventArgs e)
{ {
var adItemText = inputTextBox.Text.Trim(); var adItemText = inputTextBox.Text.Trim();
//var splitInput = inputTextBox.Text.Split((char[])null, StringSplitOptions.RemoveEmptyEntries);
var isInsideBrackets = false; var isInsideBrackets = false;
var isPreviousCharWhiteSpace = false; var isPreviousCharWhiteSpace = false;
//preserveAcronyms //preserveAcronyms
var preserveAcronyms = true; var preserveAcronyms = true;
var cleanedInputString = ""; var cleanedInputString = "";
var lastnumberStartingIndex = -1; var lastnumberStartingIndex = -1;
var removedCharacterOffset = 0;
//Create an array of brackets to test for, and either balance out or simply ignore. //Create an array of brackets to test for, and either balance out or simply ignore.
char[] openBrackets = {'(', '<', '{', '['}; char[] openBrackets = {'(', '<', '{', '['};
char[] closedBrackets = {')', '>', '}', ']'}; char[] closedBrackets = {')', '>', '}', ']'};
@@ -52,6 +52,7 @@ namespace StringInputParseTester
if (isPreviousCharWhiteSpace) if (isPreviousCharWhiteSpace)
{ {
//If more then one space is found to be in a row, then ignore it and move onto the next character. //If more then one space is found to be in a row, then ignore it and move onto the next character.
removedCharacterOffset++;
continue; continue;
} }
//IF the current character is whitespace, then mark it and move onto the next loop. //IF the current character is whitespace, then mark it and move onto the next loop.
@@ -65,6 +66,7 @@ namespace StringInputParseTester
if (isInsideBrackets) if (isInsideBrackets)
{ {
//If we are already inside of brackets then don't add anymore to the string just continue. //If we are already inside of brackets then don't add anymore to the string just continue.
removedCharacterOffset++;
continue; continue;
} }
isInsideBrackets = true; isInsideBrackets = true;
@@ -78,6 +80,7 @@ namespace StringInputParseTester
//IF we're not inside brackets then there is an imbalance so discard this parenthesis. //IF we're not inside brackets then there is an imbalance so discard this parenthesis.
if (!isInsideBrackets) if (!isInsideBrackets)
{ {
removedCharacterOffset++;
continue; continue;
} }
//Just gonna force parenthesis for now. //Just gonna force parenthesis for now.
@@ -92,7 +95,7 @@ namespace StringInputParseTester
if (!char.IsNumber(adItemText[currentCharacter]) && isPreviousCharWhiteSpace) if (!char.IsNumber(adItemText[currentCharacter]) && isPreviousCharWhiteSpace)
{ {
//Check to see if the character before the whitespace is a number. //Check to see if the character before the whitespace is a number.
if (char.IsNumber(cleanedInputString[cleanedInputString.Length - 2])) if (char.IsNumber(cleanedInputString[currentCharacter - (2 + removedCharacterOffset)]))
{ {
var abbreviations = new List<string>(); var abbreviations = new List<string>();
var words = new List<string>(); var words = new List<string>();
@@ -100,7 +103,7 @@ namespace StringInputParseTester
//Remove the last space if there are any abbreviations or words found. //Remove the last space if there are any abbreviations or words found.
if (abbreviations.Count > 0 || words.Count > 0) if (abbreviations.Count > 0 || words.Count > 0)
{ {
cleanedInputString = cleanedInputString.Remove(cleanedInputString.Length - 1, 1); cleanedInputString = cleanedInputString.Remove(currentCharacter - (1 + removedCharacterOffset), 1);
} }
//Begin checking to see how to place these items back into the final string. //Begin checking to see how to place these items back into the final string.
if (abbreviations.Count >= 1 && words.Count == 0) if (abbreviations.Count >= 1 && words.Count == 0)
@@ -146,7 +149,7 @@ namespace StringInputParseTester
else if (!char.IsNumber(adItemText[currentCharacter]) && char.IsLetter(adItemText[currentCharacter])) else if (!char.IsNumber(adItemText[currentCharacter]) && char.IsLetter(adItemText[currentCharacter]))
{ {
//IF the previous character is a number... //IF the previous character is a number...
if (char.IsNumber(cleanedInputString[cleanedInputString.Length - 1])) if (char.IsNumber(cleanedInputString[currentCharacter - (1 + removedCharacterOffset)]))
{ {
//Check to see the length of the string and determine if the word with the number needs to be capitalized. //Check to see the length of the string and determine if the word with the number needs to be capitalized.
var abbreviations = new List<string>(); var abbreviations = new List<string>();
@@ -196,21 +199,10 @@ namespace StringInputParseTester
//IF a number is found, and we're not inside brackets, check to see if there is an opening parenthesis and if there aren't create one. //IF a number is found, and we're not inside brackets, check to see if there is an opening parenthesis and if there aren't create one.
if (char.IsNumber(adItemText[currentCharacter])) if (char.IsNumber(adItemText[currentCharacter]))
{ {
cleanedInputString += adItemText[currentCharacter];
if (lastnumberStartingIndex == -1) if (lastnumberStartingIndex == -1)
{ {
lastnumberStartingIndex = cleanedInputString.Length - 1; //This is index based. lastnumberStartingIndex = currentCharacter - removedCharacterOffset;
} }
}
//Check for any allowed punctuation.
if (adItemText[currentCharacter] == '\'')
{
cleanedInputString += adItemText[currentCharacter];
}
//Check if the previous character is an "'".
else if (cleanedInputString[cleanedInputString.Length - 1] == '\'')
{
cleanedInputString += adItemText[currentCharacter]; cleanedInputString += adItemText[currentCharacter];
} }
//Since whitespace booleans are handled above, set the boolean for white spaces false. //Since whitespace booleans are handled above, set the boolean for white spaces false.
@@ -232,23 +224,23 @@ namespace StringInputParseTester
/// three (3) characters long or being exactly three characters long but having /// three (3) characters long or being exactly three characters long but having
/// zero (0) vowels. /// zero (0) vowels.
/// </summary> /// </summary>
/// <param name="text">The string to determine whether or not its a word.</param> /// <param name="stringToCheck">The string to determine whether or not its a word.</param>
/// <returns></returns> /// <returns></returns>
private bool IsWord(string text) private bool IsWord(string stringToCheck)
{ {
if (string.IsNullOrEmpty(text)) return false; if (string.IsNullOrEmpty(stringToCheck)) return false;
var isWord = true; var isWord = true;
//Most abbreviations do not have vowels in them so check to see if the "abbreviation" //Most abbreviations do not have vowels in them so check to see if the "abbreviation"
//isn't just a short word like "Box", as opposed to "lbs". //isn't just a short word like "Box", as opposed to "lbs".
char[] vowels = {'a', 'e', 'i', 'o', 'u', 'y'}; char[] vowels = {'a', 'e', 'i', 'o', 'u', 'y'};
//Count the number of vowels the word has. //Count the number of vowels the word has.
var vowelCount = text.Count(x => vowels.Contains(x)); var vowelCount = stringToCheck.Count(x => vowels.Contains(x));
//IF the string is exactly three (3) characters long and has more then zero (0) vowels then it is considered a word. //IF the string is exactly three (3) characters long and has more then zero (0) vowels then it is considered a word.
if (text.Length == 3 && vowelCount == 0) if (stringToCheck.Length == 3 && vowelCount == 0)
{ {
isWord = false; isWord = false;
} }
else if (text.Length < 3) else if (stringToCheck.Length < 3)
{ {
isWord = false; isWord = false;
} }
@@ -315,25 +307,5 @@ namespace StringInputParseTester
words[i] = CapitalizeFirstLetter(words[i]); words[i] = CapitalizeFirstLetter(words[i]);
} }
} }
public string FormatShit(string inputString)
{
var finalString = "";
var workingText = "";
//The (char[])null avoids creating a new object in memory.
var splitInput = inputString.Split((char[])null, StringSplitOptions.RemoveEmptyEntries);
foreach (var text in splitInput)
{
//Clear the working text to start building the next one to test.
workingText = "";
foreach (var character in text)
{
}
}
return finalString;
}
} }
} }