made the check if data is valid when clicking the add timesheet button less convoluded and inefficient
Merge branch 'john'