Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
65aa0c1
Committing random file
Davin-Deol Apr 6, 2018
e5e42c6
Merge branch 'develop' of https://github.com/Davin-Deol/PayRollSystem…
Davin-Deol Apr 6, 2018
4408264
Added Change Password Controller and Layout
Davin-Deol Apr 6, 2018
8211620
Finished Update Password Feature
Davin-Deol Apr 6, 2018
4f264ed
Merge branch 'develop' into develop
Davin-Deol Apr 6, 2018
0592665
Merge pull request #15 from Davin-Deol/develop
Davin-Deol Apr 6, 2018
0b64456
Removed Unneeded Pages
Davin-Deol Apr 6, 2018
3b7c772
Finished basic functionality of admin side of employee requests.
naawdawg Apr 6, 2018
c818a64
Merge pull request #16 from naawdawg/feature/adminFeature
Davin-Deol Apr 6, 2018
39c2bb5
Merge pull request #11 from Comp-4941-Project-Payroll/develop
Davin-Deol Apr 6, 2018
42448a7
Merge pull request #12 from Davin-Deol/polishing
Davin-Deol Apr 6, 2018
3150f08
Merge pull request #17 from Davin-Deol/develop
Davin-Deol Apr 6, 2018
30d7c79
Time Off Requests Don't Get Deleted
Davin-Deol Apr 7, 2018
f033097
more payroll backend
aavram Apr 7, 2018
33f5d17
Merge pull request #19 from aavram/payrollBackend
Davin-Deol Apr 7, 2018
a333b9f
Authentication Login for General Employees
MrOStanMan Apr 7, 2018
87fa996
Merge pull request #21 from MrOStanMan/login
Davin-Deol Apr 7, 2018
4c76dee
Merge pull request #13 from Comp-4941-Project-Payroll/develop
Davin-Deol Apr 10, 2018
0d187ee
Replaced References to Employee.Phone
Davin-Deol Apr 10, 2018
addea1d
Resolved Deleting Bug
Davin-Deol Apr 10, 2018
58561f6
Replaced References to Model.EmailNumber
Davin-Deol Apr 10, 2018
a45a366
Merge pull request #22 from Davin-Deol/develop
Davin-Deol Apr 10, 2018
1c34a6c
Replaced References to Phone in Edit Functions
Davin-Deol Apr 10, 2018
5ba9caf
Merge pull request #23 from Davin-Deol/develop
Davin-Deol Apr 10, 2018
5c2e19d
Temporarily Resolved Bugs in Manage Controller
Davin-Deol Apr 10, 2018
cabc752
Merge pull request #24 from Davin-Deol/develop
Davin-Deol Apr 10, 2018
8301069
Removed storage.ide
naawdawg Apr 11, 2018
0604ddc
session
aavram Apr 11, 2018
3241b91
Merge pull request #25 from aavram/session
Davin-Deol Apr 11, 2018
d4222c6
Update 2
naawdawg Apr 11, 2018
979ad10
update 2
naawdawg Apr 11, 2018
fccc779
update 3
naawdawg Apr 11, 2018
cd0a5e7
This is just an Update so that Davin Has What Vinz Has
Davin-Deol Apr 11, 2018
e4a6f66
Updating Develop
Davin-Deol Apr 11, 2018
65bb0c8
Polished Time Off Requests Table + Started Implementing Credentials
Davin-Deol Apr 11, 2018
9c0da28
Adjusted Seeded Data to Test Credentials Better
Davin-Deol Apr 11, 2018
b7b8b72
Just Changed Some Wording on the Front End
Davin-Deol Apr 11, 2018
6c3820f
Adjusted .gitignore to see if it will ignore storage file
Davin-Deol Apr 11, 2018
f93952f
Merge pull request #28 from Davin-Deol/develop
Davin-Deol Apr 11, 2018
49024e5
Added Master Position
Davin-Deol Apr 11, 2018
472437d
Updated "Change Password" so that it Doesn't Show the Password
Davin-Deol Apr 11, 2018
2ffd570
Removed Authorization Attribute Attempt and Managers Controller
Davin-Deol Apr 12, 2018
e46b528
Implemented Position Ranks
Davin-Deol Apr 12, 2018
061d02e
Changed Default Login to Employees Version
Davin-Deol Apr 12, 2018
ef5a7cf
Put Button in Login in Normal Position
Davin-Deol Apr 12, 2018
1b7cbbf
Removed Unneeded Header
Davin-Deol Apr 12, 2018
670026c
Better Implemented Departments
Davin-Deol Apr 12, 2018
a087a25
Only Your Superior Can Approve Your Time Off
Davin-Deol Apr 12, 2018
1d4e999
Removed TypesOfTimeOffRequests Model
Davin-Deol Apr 12, 2018
ca69f7c
Implemented Email
Davin-Deol Apr 12, 2018
56f3233
Fixed Details To Showcase More Info
Davin-Deol Apr 12, 2018
6198628
Prepped Some Code for Showcase Tomorrow
Davin-Deol Apr 12, 2018
bd35e93
Merge pull request #15 from Comp-4941-Project-Payroll/develop
Davin-Deol Apr 12, 2018
a6088f2
Fixed It
Davin-Deol Apr 12, 2018
7a50802
Merge pull request #30 from Davin-Deol/redo-yans-branch-cause-storage…
Davin-Deol Apr 12, 2018
c0773fa
Merge pull request #16 from Comp-4941-Project-Payroll/develop
Davin-Deol Apr 12, 2018
29acb67
Added SSL for application
NixonWu Apr 12, 2018
fe8ef06
Merge pull request #31 from NixonWu/loginfeature
Davin-Deol Apr 12, 2018
af4384a
Implemented Datepicker
Davin-Deol Apr 12, 2018
408066b
Updated Storage.ide
Davin-Deol Apr 12, 2018
d46d570
Merge pull request #32 from Davin-Deol/time-off-request-date-input
Davin-Deol Apr 12, 2018
0e69e99
manager functionality payroll
aavram Apr 12, 2018
51276b9
Merge pull request #33 from aavram/payrollManager
Davin-Deol Apr 12, 2018
4edd268
resolve conflicts
aavram Apr 12, 2018
98f4f8b
clear conflicts
aavram Apr 12, 2018
2fcdec6
Merge pull request #17 from Comp-4941-Project-Payroll/develop
Davin-Deol Apr 12, 2018
a315da5
Ignore this
Davin-Deol Apr 12, 2018
408c83f
Merge branch 'develop' of https://github.com/Davin-Deol/PayRollSystem…
Davin-Deol Apr 12, 2018
3ad10fe
Login Error Validations Created
NixonWu Apr 12, 2018
4a98d9a
Merge pull request #34 from NixonWu/loginfeature
Davin-Deol Apr 12, 2018
c9dad04
Implemented Login Verification
Davin-Deol Apr 13, 2018
ed9e8f1
Merge branch 'develop' into develop
Davin-Deol Apr 13, 2018
4a915e2
Merge pull request #35 from Davin-Deol/develop
Davin-Deol Apr 13, 2018
c7c85c2
Merge pull request #18 from Comp-4941-Project-Payroll/develop
Davin-Deol Apr 13, 2018
b6de1f9
css payroll
aavram Apr 13, 2018
8fe2265
clear conflicts
aavram Apr 13, 2018
09908da
Merge pull request #36 from aavram/css
Davin-Deol Apr 13, 2018
9dbe1a2
Merge pull request #19 from Comp-4941-Project-Payroll/develop
Davin-Deol Apr 13, 2018
a2d19c3
Fixed Chrome Datepicker Bug
Davin-Deol Apr 13, 2018
d1c07b5
Merge pull request #37 from Davin-Deol/develop
Davin-Deol Apr 13, 2018
65f64df
"Change Password" Now uses Session
Davin-Deol Apr 13, 2018
e0149e4
Merge pull request #38 from Davin-Deol/develop
Davin-Deol Apr 13, 2018
221a02d
Masters Don't Need Approval For Time Off
Davin-Deol Apr 13, 2018
d74e9a0
Removed Tab For Payroll
Davin-Deol Apr 13, 2018
d4ab7b0
Human Resources Doesn't Need To Request Time Off
Davin-Deol Apr 13, 2018
2a0a157
Shift feature
naawdawg Apr 13, 2018
2065721
Merge pull request #39 from naawdawg/feature/shifts
Davin-Deol Apr 13, 2018
5e773e6
Moved Constant Header Tabs to the Right
Davin-Deol Apr 13, 2018
bc16ae7
Merge pull request #40 from Davin-Deol/polish
Davin-Deol Apr 13, 2018
4c43496
applied my old code
ybui210 Apr 13, 2018
ef9f6fa
Merge pull request #43 from phybui/develop
ybui210 Apr 13, 2018
dcc39fc
printing to pdf
aavram Apr 13, 2018
7d70241
Merge pull request #44 from aavram/print
ybui210 Apr 13, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.vs/
.mdf
.mdf
.mdl
.vs/PayRoll/v15/sqlite3/storage.ide
###################
Expand Down Expand Up @@ -29,6 +28,7 @@ _UpgradeReport_Files/
bin/
obj/
TestResults/
.vs/
###################
# Web publish log #
###################
Expand Down
Binary file modified .vs/PayRoll/v15/sqlite3/storage.ide
Binary file not shown.
47 changes: 47 additions & 0 deletions PayRoll/App_Browsers/qt.browser
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<!--
You can find existing browser definitions at
<windir>\Microsoft.NET\Framework\<ver>\CONFIG\Browsers

File per permettere a wkhtmltopdf di inviare richiete con cookie
-->
<browsers>
<browser id="Qt" parentID="Safari">
<identification>
<userAgent match="Qt/(?'version'(?'major'\d+)(\.(?'minor'\d+)?)\w*)" />
</identification>

<!--<capture>
<userAgent match="NewBrowser (?'version'\d+\.\d+)" />
</capture>-->

<capabilities>
<capability name="browser" value="Qt" />
<capability name="version" value="${version}" />
<capability name="majorversion" value="${major}" />
<capability name="minorversion" value="${minor}" />
<capability name="type" value="Qt${major}" />
<capability name="ecmascriptversion" value="3.0" />
<capability name="javascript" value="true" />
<capability name="javascriptversion" value="1.7" />
<capability name="w3cdomversion" value="1.0" />
<capability name="tagwriter" value="System.Web.UI.HtmlTextWriter" />
<capability name="cookies" value="true" />
<capability name="frames" value="true" />
<capability name="javaapplets" value="true" />
<capability name="supportsAccesskeyAttribute" value="true" />
<capability name="supportsCallback" value="true" />
<capability name="supportsDivNoWrap" value="false" />
<capability name="supportsFileUpload" value="true" />
<capability name="supportsMaintainScrollPositionOnPostback" value="true" />
<capability name="supportsMultilineTextBoxDisplay" value="true" />
<capability name="supportsXmlHttp" value="true" />
<capability name="tables" value="true" />
</capabilities>
</browser>

<!--<browser refID="Mozilla">
<capabilities>
<capability name="xml" value="true" />
</capabilities>
</browser>-->
</browsers>
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion PayRoll/App_Start/FilterConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ public class FilterConfig
public static void RegisterGlobalFilters(GlobalFilterCollection filters)
{
filters.Add(new HandleErrorAttribute());
}
}
}
}
9 changes: 7 additions & 2 deletions PayRoll/App_Start/IdentityConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ public static ApplicationUserManager Create(IdentityFactoryOptions<ApplicationUs
manager.DefaultAccountLockoutTimeSpan = TimeSpan.FromMinutes(5);
manager.MaxFailedAccessAttemptsBeforeLockout = 5;

// Register two factor authentication providers. This application uses Phone and Emails as a step of receiving a code for verifying the user
// Register two factor authentication providers. This application uses Email and Emails as a step of receiving a code for verifying the user
// You can write your own provider and plug it in here.
manager.RegisterTwoFactorProvider("Phone Code", new PhoneNumberTokenProvider<ApplicationUser>
manager.RegisterTwoFactorProvider("Email Code", new PhoneNumberTokenProvider<ApplicationUser>
{
MessageFormat = "Your security code is {0}"
});
Expand Down Expand Up @@ -105,5 +105,10 @@ public static ApplicationSignInManager Create(IdentityFactoryOptions<Application
{
return new ApplicationSignInManager(context.GetUserManager<ApplicationUserManager>(), context.Authentication);
}

internal Task PasswordSignInAsync(string employeeId, string password, bool shouldLockout)
{
throw new NotImplementedException();
}
}
}
2 changes: 1 addition & 1 deletion PayRoll/App_Start/RouteConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static void RegisterRoutes(RouteCollection routes)
routes.MapRoute(
name: "Default",
url: "{controller}/{action}/{id}",
defaults: new { controller = "Account", action = "Login", id = UrlParameter.Optional }
defaults: new { controller = "Employees", action = "Login", id = UrlParameter.Optional }
);
}
}
Expand Down
23 changes: 23 additions & 0 deletions PayRoll/Content/Site.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,23 @@
padding-right: 15px;
}

.spanningtable {
width: 100%;
}

.headingtable td {
padding-top: 0.5em;
padding-bottom: 0.5em;
}

.datatable td {
padding-right: 1em;
}

.floatup {
vertical-align: top;
}

/* Override the default bootstrap behavior where horizontal description lists
will truncate terms that are too long to fit in the left column
*/
Expand Down Expand Up @@ -42,3 +59,9 @@ textarea {
border-top: 1px solid #aaaaaa;
border-bottom: 1px solid #ffffff;
}

@media print {
.printhide {
display: none;
}
}
36 changes: 36 additions & 0 deletions PayRoll/Content/themes/base/accordion.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*!
* jQuery UI Accordion 1.11.4
* http://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
* http://api.jqueryui.com/accordion/#theming
*/
.ui-accordion .ui-accordion-header {
display: block;
cursor: pointer;
position: relative;
margin: 2px 0 0 0;
padding: .5em .5em .5em .7em;
min-height: 0; /* support: IE7 */
font-size: 100%;
}
.ui-accordion .ui-accordion-icons {
padding-left: 2.2em;
}
.ui-accordion .ui-accordion-icons .ui-accordion-icons {
padding-left: 2.2em;
}
.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
position: absolute;
left: .5em;
top: 50%;
margin-top: -8px;
}
.ui-accordion .ui-accordion-content {
padding: 1em 2.2em;
border-top: 0;
overflow: auto;
}
12 changes: 12 additions & 0 deletions PayRoll/Content/themes/base/all.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*!
* jQuery UI CSS Framework 1.11.4
* http://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
* http://api.jqueryui.com/category/theming/
*/
@import "base.css";
@import "theme.css";
16 changes: 16 additions & 0 deletions PayRoll/Content/themes/base/autocomplete.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*!
* jQuery UI Autocomplete 1.11.4
* http://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
* http://api.jqueryui.com/autocomplete/#theming
*/
.ui-autocomplete {
position: absolute;
top: 0;
left: 0;
cursor: default;
}
28 changes: 28 additions & 0 deletions PayRoll/Content/themes/base/base.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*!
* jQuery UI CSS Framework 1.11.4
* http://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
* http://api.jqueryui.com/category/theming/
*/
@import url("core.css");

@import url("accordion.css");
@import url("autocomplete.css");
@import url("button.css");
@import url("datepicker.css");
@import url("dialog.css");
@import url("draggable.css");
@import url("menu.css");
@import url("progressbar.css");
@import url("resizable.css");
@import url("selectable.css");
@import url("selectmenu.css");
@import url("sortable.css");
@import url("slider.css");
@import url("spinner.css");
@import url("tabs.css");
@import url("tooltip.css");
114 changes: 114 additions & 0 deletions PayRoll/Content/themes/base/button.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
/*!
* jQuery UI Button 1.11.4
* http://jqueryui.com
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
* http://api.jqueryui.com/button/#theming
*/
.ui-button {
display: inline-block;
position: relative;
padding: 0;
line-height: normal;
margin-right: .1em;
cursor: pointer;
vertical-align: middle;
text-align: center;
overflow: visible; /* removes extra width in IE */
}
.ui-button,
.ui-button:link,
.ui-button:visited,
.ui-button:hover,
.ui-button:active {
text-decoration: none;
}
/* to make room for the icon, a width needs to be set here */
.ui-button-icon-only {
width: 2.2em;
}
/* button elements seem to need a little more width */
button.ui-button-icon-only {
width: 2.4em;
}
.ui-button-icons-only {
width: 3.4em;
}
button.ui-button-icons-only {
width: 3.7em;
}

/* button text element */
.ui-button .ui-button-text {
display: block;
line-height: normal;
}
.ui-button-text-only .ui-button-text {
padding: .4em 1em;
}
.ui-button-icon-only .ui-button-text,
.ui-button-icons-only .ui-button-text {
padding: .4em;
text-indent: -9999999px;
}
.ui-button-text-icon-primary .ui-button-text,
.ui-button-text-icons .ui-button-text {
padding: .4em 1em .4em 2.1em;
}
.ui-button-text-icon-secondary .ui-button-text,
.ui-button-text-icons .ui-button-text {
padding: .4em 2.1em .4em 1em;
}
.ui-button-text-icons .ui-button-text {
padding-left: 2.1em;
padding-right: 2.1em;
}
/* no icon support for input elements, provide padding by default */
input.ui-button {
padding: .4em 1em;
}

/* button icon element(s) */
.ui-button-icon-only .ui-icon,
.ui-button-text-icon-primary .ui-icon,
.ui-button-text-icon-secondary .ui-icon,
.ui-button-text-icons .ui-icon,
.ui-button-icons-only .ui-icon {
position: absolute;
top: 50%;
margin-top: -8px;
}
.ui-button-icon-only .ui-icon {
left: 50%;
margin-left: -8px;
}
.ui-button-text-icon-primary .ui-button-icon-primary,
.ui-button-text-icons .ui-button-icon-primary,
.ui-button-icons-only .ui-button-icon-primary {
left: .5em;
}
.ui-button-text-icon-secondary .ui-button-icon-secondary,
.ui-button-text-icons .ui-button-icon-secondary,
.ui-button-icons-only .ui-button-icon-secondary {
right: .5em;
}

/* button sets */
.ui-buttonset {
margin-right: 7px;
}
.ui-buttonset .ui-button {
margin-left: 0;
margin-right: -.3em;
}

/* workarounds */
/* reset extra padding in Firefox, see h5bp.com/l */
input.ui-button::-moz-focus-inner,
button.ui-button::-moz-focus-inner {
border: 0;
padding: 0;
}
Loading