Commit ff168614 authored by Stéphane Bouvry's avatar Stéphane Bouvry
Browse files

Lors de l'envoi d'un période, les paramètres horaires sont joins à la procédure de validation

parent d5ba92b0
Loading
Loading
Loading
Loading
+3
Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2539,8 +2539,11 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa
            $declaration->setStatus(ValidationPeriod::STATUS_STEP1);
        }

        $settings = json_encode($this->getDayLengthPerson($sender));

        $now = new \DateTime();
        $declaration
            ->setSchedule($settings)
            ->setDateSend($now)
            ->setDeclarer($sender)
            ->setLog($now->format('Y-m-d H:i:s') . " : $sender vient d'envoyer sa déclaration\n")
+1 −1
Changes for module/Oscar/view/oscar/timesheet/declarant.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@
        <?php else: ?>
        Vue.filter('duration2', function(duree, total){
            if( duree == 0 ) return 0.0;
            return Math.round( 100 / total * duree) + "%";
            return duree + '(' + Math.round( 100 / total * duree) + "%)";
        });
        <?php endif; ?>
        <?php /*