diff --git a/COM380/Project2/Employee-77260.txt b/COM380/Project2/Employee-77260.txt
index 2518ed2..ea6f229 100644
--- a/COM380/Project2/Employee-77260.txt
+++ b/COM380/Project2/Employee-77260.txt
@@ -1,14 +1,14 @@
EMPLOYEE TIMECARD
77260 Amrit S. Panesar
-Pay rate: $20.00/hr
+Pay rate: $13.50/hr
-----------------------------
04/01 04/02 04/03 04/04 04/05 04/06 04/07
-08.00 08.00 08.00 01.50 00.00 08.00 08.00
+08.00 10.00 08.00 00.00 00.00 08.00 08.00
04/08 04/09 04/10 04/11 04/12 04/13 04/14
-08.00 08.00 08.00 00.00 02.50 08.00 08.00
+10.88 08.00 08.88 00.00 00.00 08.88 08.88
-Regular hours: 80.00 Overtime hours: 04.00
-Regular pay: $1,600.00 Overtime pay: $120.00
+Regular hours: 80.00 Overtime hours: 07.52
+Regular pay: $1,080.00 Overtime pay: $152.28
-Total pay: $1,720.00
+Total pay: $1,232.28
diff --git a/COM380/Project2/Project2/Form1.h b/COM380/Project2/Project2/Form1.h
index f0895f1..a13902b 100644
--- a/COM380/Project2/Project2/Form1.h
+++ b/COM380/Project2/Project2/Form1.h
@@ -1317,7 +1317,7 @@ private: System::Void button1_Click(System::Object^ sender, System::EventArgs^
}
else
{
- MessageBox::Show("File save canceled", "Error", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
+ MessageBox::Show("File save cancelled", "Error", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
}
}
};
diff --git a/COM380/Project2/ScreenShots.docx b/COM380/Project2/ScreenShots.docx
new file mode 100644
index 0000000..1248d96
Binary files /dev/null and b/COM380/Project2/ScreenShots.docx differ
diff --git a/COM380/Project2/Thumbs.db b/COM380/Project2/Thumbs.db
new file mode 100644
index 0000000..76341d6
Binary files /dev/null and b/COM380/Project2/Thumbs.db differ
diff --git a/COM380/Project3/Project3.sln b/COM380/Project3/Project3.sln
new file mode 100644
index 0000000..08ea4df
--- /dev/null
+++ b/COM380/Project3/Project3.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project3", "Project3\Project3.vcxproj", "{2AC4C810-6AAC-4132-A0A2-BADC6312CAC8}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {2AC4C810-6AAC-4132-A0A2-BADC6312CAC8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2AC4C810-6AAC-4132-A0A2-BADC6312CAC8}.Debug|Win32.Build.0 = Debug|Win32
+ {2AC4C810-6AAC-4132-A0A2-BADC6312CAC8}.Release|Win32.ActiveCfg = Release|Win32
+ {2AC4C810-6AAC-4132-A0A2-BADC6312CAC8}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/COM380/Project3/Project3/AssemblyInfo.cpp b/COM380/Project3/Project3/AssemblyInfo.cpp
new file mode 100644
index 0000000..709bf91
--- /dev/null
+++ b/COM380/Project3/Project3/AssemblyInfo.cpp
@@ -0,0 +1,40 @@
+#include "stdafx.h"
+
+using namespace System;
+using namespace System::Reflection;
+using namespace System::Runtime::CompilerServices;
+using namespace System::Runtime::InteropServices;
+using namespace System::Security::Permissions;
+
+//
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly:AssemblyTitleAttribute("Project3")];
+[assembly:AssemblyDescriptionAttribute("")];
+[assembly:AssemblyConfigurationAttribute("")];
+[assembly:AssemblyCompanyAttribute("")];
+[assembly:AssemblyProductAttribute("Project3")];
+[assembly:AssemblyCopyrightAttribute("Copyright (c) 2015")];
+[assembly:AssemblyTrademarkAttribute("")];
+[assembly:AssemblyCultureAttribute("")];
+
+//
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the value or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+
+[assembly:AssemblyVersionAttribute("1.0.*")];
+
+[assembly:ComVisible(false)];
+
+[assembly:CLSCompliantAttribute(true)];
+
+[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];
diff --git a/COM380/Project3/Project3/Form1.h b/COM380/Project3/Project3/Form1.h
new file mode 100644
index 0000000..a381d3c
--- /dev/null
+++ b/COM380/Project3/Project3/Form1.h
@@ -0,0 +1,60 @@
+#pragma once
+
+namespace Project3 {
+
+ using namespace System;
+ using namespace System::ComponentModel;
+ using namespace System::Collections;
+ using namespace System::Windows::Forms;
+ using namespace System::Data;
+ using namespace System::Drawing;
+
+ ///
+ /// Summary for Form1
+ ///
+ public ref class Form1 : public System::Windows::Forms::Form
+ {
+ public:
+ Form1(void)
+ {
+ InitializeComponent();
+ //
+ //TODO: Add the constructor code here
+ //
+ }
+
+ protected:
+ ///
+ /// Clean up any resources being used.
+ ///
+ ~Form1()
+ {
+ if (components)
+ {
+ delete components;
+ }
+ }
+
+ private:
+ ///
+ /// Required designer variable.
+ ///
+ System::ComponentModel::Container ^components;
+
+#pragma region Windows Form Designer generated code
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ void InitializeComponent(void)
+ {
+ this->components = gcnew System::ComponentModel::Container();
+ this->Size = System::Drawing::Size(300,300);
+ this->Text = L"Form1";
+ this->Padding = System::Windows::Forms::Padding(0);
+ this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
+ }
+#pragma endregion
+ };
+}
+
diff --git a/COM380/Project3/Project3/Form1.resX b/COM380/Project3/Project3/Form1.resX
new file mode 100644
index 0000000..de824e1
--- /dev/null
+++ b/COM380/Project3/Project3/Form1.resX
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/COM380/Project3/Project3/Project3.cpp b/COM380/Project3/Project3/Project3.cpp
new file mode 100644
index 0000000..f0640e5
--- /dev/null
+++ b/COM380/Project3/Project3/Project3.cpp
@@ -0,0 +1,18 @@
+// Project3.cpp : main project file.
+
+#include "stdafx.h"
+#include "Form1.h"
+
+using namespace Project3;
+
+[STAThreadAttribute]
+int main(array ^args)
+{
+ // Enabling Windows XP visual effects before any controls are created
+ Application::EnableVisualStyles();
+ Application::SetCompatibleTextRenderingDefault(false);
+
+ // Create the main window and run it
+ Application::Run(gcnew Form1());
+ return 0;
+}
diff --git a/COM380/Project3/Project3/Project3.vcxproj b/COM380/Project3/Project3/Project3.vcxproj
new file mode 100644
index 0000000..9cdc9f7
--- /dev/null
+++ b/COM380/Project3/Project3/Project3.vcxproj
@@ -0,0 +1,117 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {2AC4C810-6AAC-4132-A0A2-BADC6312CAC8}
+ v4.0
+ ManagedCProj
+ Project3
+
+
+
+ Application
+ true
+ v110
+ Pure
+ Unicode
+
+
+ Application
+ false
+ v110
+ Pure
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ false
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;%(PreprocessorDefinitions)
+ Use
+
+
+ true
+
+ Windows
+ main
+
+
+
+
+ Level3
+ WIN32;NDEBUG;%(PreprocessorDefinitions)
+ Use
+
+
+ true
+
+ Windows
+ main
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Create
+ Create
+
+
+
+
+ CppForm
+
+
+
+
+
+
+
+
+
+
+
+
+ Form1.h
+ Designer
+
+
+
+
+
+
\ No newline at end of file
diff --git a/COM380/Project3/Project3/Project3.vcxproj.filters b/COM380/Project3/Project3/Project3.vcxproj.filters
new file mode 100644
index 0000000..e1eda67
--- /dev/null
+++ b/COM380/Project3/Project3/Project3.vcxproj.filters
@@ -0,0 +1,52 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Resource Files
+
+
+
+
+ Resource Files
+
+
+
\ No newline at end of file
diff --git a/COM380/Project3/Project3/ReadMe.txt b/COM380/Project3/Project3/ReadMe.txt
new file mode 100644
index 0000000..412f6eb
--- /dev/null
+++ b/COM380/Project3/Project3/ReadMe.txt
@@ -0,0 +1,40 @@
+========================================================================
+ APPLICATION : Project3 Project Overview
+========================================================================
+
+AppWizard has created this Project3 Application for you.
+
+This file contains a summary of what you will find in each of the files that
+make up your Project3 application.
+
+Project3.vcxproj
+ This is the main project file for VC++ projects generated using an Application Wizard.
+ It contains information about the version of Visual C++ that generated the file, and
+ information about the platforms, configurations, and project features selected with the
+ Application Wizard.
+
+Project3.vcxproj.filters
+ This is the filters file for VC++ projects generated using an Application Wizard.
+ It contains information about the association between the files in your project
+ and the filters. This association is used in the IDE to show grouping of files with
+ similar extensions under a specific node (for e.g. ".cpp" files are associated with the
+ "Source Files" filter).
+
+Project3.cpp
+ This is the main application source file.
+ Contains the code to display the form.
+
+Form1.h
+ Contains the implementation of your form class and InitializeComponent() function.
+
+AssemblyInfo.cpp
+ Contains custom attributes for modifying assembly metadata.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+ These files are used to build a precompiled header (PCH) file
+ named Project3.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
diff --git a/COM380/Project3/Project3/app.ico b/COM380/Project3/Project3/app.ico
new file mode 100644
index 0000000..301942f
Binary files /dev/null and b/COM380/Project3/Project3/app.ico differ
diff --git a/COM380/Project3/Project3/app.rc b/COM380/Project3/Project3/app.rc
new file mode 100644
index 0000000..eab4306
Binary files /dev/null and b/COM380/Project3/Project3/app.rc differ
diff --git a/COM380/Project3/Project3/resource.h b/COM380/Project3/Project3/resource.h
new file mode 100644
index 0000000..d5ac7c4
--- /dev/null
+++ b/COM380/Project3/Project3/resource.h
@@ -0,0 +1,3 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by app.rc
diff --git a/COM380/Project3/Project3/stdafx.cpp b/COM380/Project3/Project3/stdafx.cpp
new file mode 100644
index 0000000..d53cf00
--- /dev/null
+++ b/COM380/Project3/Project3/stdafx.cpp
@@ -0,0 +1,7 @@
+// stdafx.cpp : source file that includes just the standard includes
+// Project3.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+
diff --git a/COM380/Project3/Project3/stdafx.h b/COM380/Project3/Project3/stdafx.h
new file mode 100644
index 0000000..46bef73
--- /dev/null
+++ b/COM380/Project3/Project3/stdafx.h
@@ -0,0 +1,6 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+#pragma once
+
+// TODO: reference additional headers your program requires here
diff --git a/COM380/Template.docx b/COM380/Template.docx
new file mode 100644
index 0000000..48998f5
Binary files /dev/null and b/COM380/Template.docx differ
diff --git a/SDrive/Templates/CoverSheet.dotx b/SDrive/Templates/CoverSheet.dotx
index e78b22a..c83b79a 100644
Binary files a/SDrive/Templates/CoverSheet.dotx and b/SDrive/Templates/CoverSheet.dotx differ