atlanticbiomedical/biomedjs
1
0
Fork 0
mirror of https://github.com/atlanticbiomedical/biomedjs.git synced 2025-07-02 00:47:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed a bug

Browse Source
This commit is contained in:
Dobie Wollert
2015-12-21 00:47:26 -08:00
parent 2f00d0e03e
commit a83a046933
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/timesheet.js
View File

@ -159,8 +159,6 @@ function buildReport(spans, week) {
function generateSummary(spans, workordersById, usersById, timesheetsByUser) {
var results = {};
console.log(spans);
function fetchOrCreateUserRecord(userId) {
var record = results[userId];
if (!record) {
@ -216,6 +214,11 @@ function generateSummary(spans, workordersById, usersById, timesheetsByUser) {
delete user.spans[span._id].__v;
delete user.spans[span._id].user;
if (span.type === 'workorder') {
var workorder = workordersById[span.workorder];
addWorkorder(user, workorder);
}
if (span.status !== 'closed') {
user.hasOpenSpans = true;
return;
@ -235,8 +238,6 @@ function generateSummary(spans, workordersById, usersById, timesheetsByUser) {
if (NON_BILLABLE_WORKORDER_TYPES.indexOf(workorderType) > -1) {
logTime(user.accountingByNonBillable, workorderType, span.duration);
} else {
addWorkorder(user, workorder);
logTime(user.accountingByWorkorderType, workorderType, span.duration);
logTime(user.accountingByPayroll, PAYROLL_WORKORDER_TYPE_MAP[workorderType], span.duration);
logTime(user.accountingByWorkorder, span.workorder, span.duration);