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

UI validateur up

parent b6e1bf99
Loading
Loading
Loading
Loading
+4 −1
Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa
            $validators = [];
            foreach ( $period->getCurrentValidators() as $v ){
                if( $v->getId() == $validator->getId() ){
                    $hasValidableStep = $validateCurrentState = true;
                    $validateCurrentState = true;
                }
                $validators[] = (string)$v;
            }
@@ -696,6 +696,7 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa
                    'declarations_off' => [
                        'timesheets' => [],
                        'total' => 0.0,
                        'validators' => []
                    ],
                    'details' => $this->getDaysPeriodInfosPerson($period->getDeclarer(), $period->getYear(), $period->getMonth()),
                ];
@@ -775,6 +776,7 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa
                        $periodPersonDatas['declarations_activities'][$main]['workpackages'][$sub]['total'] += $timesheet->getDuration();
                        $periodPersonDatas['declarations_activities'][$main]['total'] += $timesheet->getDuration();
                    } else {
                        $periodPersonDatas['declarations_off']['validators'] = $validators;
                        $periodPersonDatas['declarations_off']['total'] += $timesheet->getDuration();
                        $periodPersonDatas['declarations_off']['timesheets'][$dayStr] += $timesheet->getDuration();
                    }
@@ -789,6 +791,7 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa
                    } else {
                        $periodPersonDatas['declarations_off']['total'] += $timesheet->getDuration();
                        $periodPersonDatas['declarations_off']['timesheets'][$dayStr] += $timesheet->getDuration();
                        $periodPersonDatas['declarations_off']['validators'] = $validators;
                    }
                }
                $periodPersonDatas['total'] += $timesheet->getDuration();
+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

+0 −1
Changes for public/js/oscar/src/ValidationPeriod.vue: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@
                            <template v-if="period.declarations_off && period.declarations_off.total > 0">
                                <tr class="heading-activity heading">
                                    <th :colspan="period.totalDays+2"><i class="icon-lock"></i>Autres déclarations
                                    <pre>{{ period.declarations_off }}</pre>
                                    </th>
                                </tr>
                                <tr class="datas">