 Adam
|
aefcd150f4
Merge pull request #13 from advation/overlapFix
|
před 9 roky |
 Adam Day
|
2d51044d38
Made progress on overlap issue. The only overlap that isn't being detected is when a time entry is submitting that overlaps an already existing PM and AM entry for a specific day. Also resolved a small issue with the time totals not being calculated correctly for entries going from PM to AM.
|
před 9 roky |
|
Adam Day
|
a0dbd3c956
Have a basic check working for overlap however a user can still edit a time entry can cause overlap. Resolved an issue with the 25th day of the payperiod not showing up in the timesheet.
|
před 9 roky |
|
Adam Day
|
7c08bdd49d
Cleaned up extra spaces.
|
před 9 roky |
|
Adam Day
|
d65b92717f
Created a sql statement that will prevent a user from submitting a new time entry that falls within an already existing time entry.
|
před 9 roky |
|
Adam
|
d25b986213
Merge pull request #6 from advation/deleteEntry
|
před 9 roky |
|
Adam Day
|
7e8e6608c0
Changed the timesheetmodel to appropriately handle the different time codes and to correctly tally up the total time worked for a specified time period.
|
před 9 roky |
|
Adam Day
|
ee6672ff52
Changed the timesheetmodel to appropriately handle the different time codes and to correctly tally up the total time worked for a specified time period.
|
před 9 roky |
|
Adam
|
64afe4a559
Merge pull request #4 from advation/editEntries
|
před 9 roky |
|
Adam Day
|
58b60a8e7d
Adjusted how the time fields were being scrubbed. This now happens with regex at the form validation for each time field.
|
před 9 roky |
|
Adam Day
|
4e0744edb6
Adjusted how the time fields were being scrubbed. This now happens with regex at the form validation for each time field.
|
před 9 roky |
|
Adam
|
37a05b188b
Update README.md
|
před 9 roky |
|
Adam
|
b247fb67fb
Merge pull request #2 from advation/timesheetValidation
|
před 9 roky |
|
Adam Day
|
7821e780d9
Adjusted how the time fields were being scrubbed. This now happens with regex at the form validation for each time field.
|
před 9 roky |
|
Adam Day
|
3fd3c84f22
Added current pay period validation to new timesheet entries.
|
před 9 roky |
|
Adam Day
|
ebb572a4b4
Added entry overlap validation and updated the timesheet view to reflect entrys under each day.
|
před 9 roky |
|
Adam Day
|
0928266da7
Have a basic validation process working.
|
před 9 roky |
|
Adam Day
|
5a9154720a
Working on getting timesheet validation working. Added a new MySQL template.
|
před 9 roky |
|
Adam Day
|
adfc18c256
Added a total drop down menu for the timesheet.
|
před 9 roky |
 Adam Day
|
32d8636040
Changed some visual layout elements on the timesheet page.
|
před 9 roky |
|
Adam Day
|
29513cee8c
timesheet view now reports vacation, sick, and normal time used for a specified date range.
|
před 9 roky |
|
Adam Day
|
d347a02cec
Time entry model now calculates out a users worked time and other various meta data about the entry. The timesheet model now passes back all information pertaining to the timesheet for a authenticated user.
|
před 9 roky |
|
Adam Day
|
5bda4ddfc0
Added generic MySQL dump for dev purposes.
|
před 9 roky |
|
Adam Day
|
9d3e6b533f
Spilt timesheet model into a time entry model and a timesheet model. Started working on getting the timesheet querys. Have the entryModel submitting data to the table.
|
před 9 roky |
|
Adam Day
|
9241d8b2cf
Added jQuery UI. Have the edit time entry form working.
|
před 9 roky |
|
Adam Day
|
0273d6f888
Moved the timesheet into it's own controller. The time submission process is working and saving new time entries to the DB table.
|
před 9 roky |
|
Adam Day
|
885aa8bdbd
Added application.ini to the gitignore list.
|
před 9 roky |
|
Adam Day
|
e702618709
Added application.ini to the gitignore list.
|
před 9 roky |
|
Adam Day
|
c210d57990
Added application.ini to the gitignore list.
|
před 9 roky |
|
Adam Day
|
df7e41d378
Removing application.ini and .gitignore
|
před 9 roky |
