Loading module/Oscar/src/Oscar/Service/TimesheetService.php +2 −2 Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -2150,7 +2150,7 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa 'description' => $t->getComment(), 'duration' => $t->getDuration(), 'foo' => 'bar', 'status_id' => $t->getValidationPeriod() ? $t->getValidationPeriod()->getStatus() : null, 'status_id' => $t->getValidationPeriod() ? $t->getValidationPeriod()->getStatus() : 'draft', 'status' => 'locked', 'validations' => $t->getValidationPeriod() ? $t->getValidationPeriod()->json() : null ]; Loading Loading @@ -2198,7 +2198,7 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa 'activity_code' => $activityCode, 'acronym' => $projectAcronym, 'project' => (string)$project, 'status_id' => $t->getValidationPeriod() ? $t->getValidationPeriod()->getStatus() : null, 'status_id' => $t->getValidationPeriod() ? $t->getValidationPeriod()->getStatus() : 'draft', 'status' => 'locked', 'wpCode' => $wpCode, 'duration' => (float)$t->getDuration(), Loading public/js/oscar/src/TimesheetMonthDay.vue +0 −49 Changes for public/js/oscar/src/TimesheetMonthDay.vue: 0 added lines, 49 removed lines. Original line number Diff line number Diff line Loading @@ -86,55 +86,6 @@ }, computed: { totalEnseignement(){ let t = 0.0; this.day.teaching.forEach(d => { t += d.duration; }); return t; }, totalInfo(){ let t = 0.0; this.day.infos.forEach(d => { t += d.duration; }); return t; }, totalFormation(){ let t = 0.0; this.day.training.forEach(d => { t += d.duration; }); return t; }, totalConges(){ let t = 0.0; this.day.conges.forEach(d => { t += d.duration; }); return t; }, totalSickleave(){ let t = 0.0; this.day.sickleave.forEach(d => { t += d.duration; }); return t; }, totalAbsent(){ let t = 0.0; this.day.absent.forEach(d => { t += d.duration; }); return t; }, totalResearch(){ let t = 0.0; this.day.research.forEach(d => { t += d.duration; }); return t; }, groupProject(){ let groups = {}; if( this.day.declarations ) { Loading Loading
module/Oscar/src/Oscar/Service/TimesheetService.php +2 −2 Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -2150,7 +2150,7 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa 'description' => $t->getComment(), 'duration' => $t->getDuration(), 'foo' => 'bar', 'status_id' => $t->getValidationPeriod() ? $t->getValidationPeriod()->getStatus() : null, 'status_id' => $t->getValidationPeriod() ? $t->getValidationPeriod()->getStatus() : 'draft', 'status' => 'locked', 'validations' => $t->getValidationPeriod() ? $t->getValidationPeriod()->json() : null ]; Loading Loading @@ -2198,7 +2198,7 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa 'activity_code' => $activityCode, 'acronym' => $projectAcronym, 'project' => (string)$project, 'status_id' => $t->getValidationPeriod() ? $t->getValidationPeriod()->getStatus() : null, 'status_id' => $t->getValidationPeriod() ? $t->getValidationPeriod()->getStatus() : 'draft', 'status' => 'locked', 'wpCode' => $wpCode, 'duration' => (float)$t->getDuration(), Loading
public/js/oscar/src/TimesheetMonthDay.vue +0 −49 Changes for public/js/oscar/src/TimesheetMonthDay.vue: 0 added lines, 49 removed lines. Original line number Diff line number Diff line Loading @@ -86,55 +86,6 @@ }, computed: { totalEnseignement(){ let t = 0.0; this.day.teaching.forEach(d => { t += d.duration; }); return t; }, totalInfo(){ let t = 0.0; this.day.infos.forEach(d => { t += d.duration; }); return t; }, totalFormation(){ let t = 0.0; this.day.training.forEach(d => { t += d.duration; }); return t; }, totalConges(){ let t = 0.0; this.day.conges.forEach(d => { t += d.duration; }); return t; }, totalSickleave(){ let t = 0.0; this.day.sickleave.forEach(d => { t += d.duration; }); return t; }, totalAbsent(){ let t = 0.0; this.day.absent.forEach(d => { t += d.duration; }); return t; }, totalResearch(){ let t = 0.0; this.day.research.forEach(d => { t += d.duration; }); return t; }, groupProject(){ let groups = {}; if( this.day.declarations ) { Loading