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

Ajout du lien vers le fichier Excel de la déclaration + Fix bug des...

Ajout du lien vers le fichier Excel de la déclaration + Fix bug des déclarations à activités multiples
parent f33903fb
Loading
Loading
Loading
Loading
+8 −8
Changes for module/Oscar/src/Oscar/Controller/TimesheetController.php: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -583,8 +583,8 @@ class TimesheetController extends AbstractOscarController
                \IntlDateFormatter::GREGORIAN,
                'd MMMM Y');

            /** @var Activity $activity */
            $activity = $this->getEntityManager()->getRepository(Activity::class)->find($activityId);
//            /** @var Activity $activity */
//            $activity = $this->getEntityManager()->getRepository(Activity::class)->find($activityId);

            $cellDays = ['C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U', 'V', 'W','X','Y','Z','AA', 'AB', 'AC', 'AD', 'AE','AF','AG'];
            $lineWpFormula = '=SUM(C%s:AG%s)';
@@ -599,15 +599,15 @@ class TimesheetController extends AbstractOscarController
            $dateStart  = new \DateTime($period.'-01');
            $dateEnd    = new \DateTime($period.'-01');

            $spreadsheet->getActiveSheet()->setCellValue('A1', $activity->getLabel());
            $spreadsheet->getActiveSheet()->setCellValue('A1', "Déclaration");
            $spreadsheet->getActiveSheet()->setCellValue('C3', (string)$person);
            $spreadsheet->getActiveSheet()->setCellValue('C4', 'Université de Caen');
            $spreadsheet->getActiveSheet()->setCellValue('C5', $activity->getAcronym());
            $spreadsheet->getActiveSheet()->setCellValue('C5', "ACRO");

            $spreadsheet->getActiveSheet()->setCellValue('U3', $fmt->format($activity->getDateStart()));
            $spreadsheet->getActiveSheet()->setCellValue('U4', $fmt->format($activity->getDateEnd()));
            $spreadsheet->getActiveSheet()->setCellValue('U5', $activity->getOscarNum());
            $spreadsheet->getActiveSheet()->setCellValue('U6', $activity->getCodeEOTP());
            $spreadsheet->getActiveSheet()->setCellValue('U3', "U3"); //$fmt->format($activity->getDateStart()));
            $spreadsheet->getActiveSheet()->setCellValue('U4', 'U4'); // $fmt->format($activity->getDateEnd()));
            $spreadsheet->getActiveSheet()->setCellValue('U5', 'U5'); //$activity->getOscarNum());
            $spreadsheet->getActiveSheet()->setCellValue('U6', 'EOTP'); //$activity->getCodeEOTP());

            $spreadsheet->getActiveSheet()->setCellValue('C6', $period);
            $spreadsheet->getActiveSheet()->setCellValue('B8', $period);
+2 −0
Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1019,6 +1019,8 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa
                        $month = $split[1];
                        $periodsDetails[$period] = [
                            'period'            => $period,
                            'person_id'         => $person->getId(),
                            'person'            => (string)$person,
                            'month'             => $month,
                            'year'              => $year,
                            'periodDuration'    => $this->getPeriodDuration($person, $year, $month),
+12 −2
Changes for public/js/oscar/src/TimesheetPersonResume.vue: 12 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -34,18 +34,28 @@
                'error-105': p.total > p.periodDuration*1.05,
                'error-95': p.total < p.periodDuration*.95,
                }">
                    <th class="period"><strong @click="debug = p">{{ p.period | period}}</strong></th>
                    <th class="period"><strong @click="debug = p">
                        <i class="icon-ellipsis" v-if="p.activities_id.length == 0" title="Aucune déclaration requise pour cette période"></i>
                        <i class="icon-attention-1" v-if="p.activities_id.length && !p.validations_id.length && p.past" title="Il faut déclarer pour cette période"></i>
                        <i class="icon-calendar" v-if="p.activities_id.length && p.validations_id.length" title="Procédure de déclaration en cours"></i>

                        {{ p.period | period}}</strong>
                    </th>
                    <td class="required">
                        <em v-if="p.activities_id.length">
                            <span v-if="p.validations_id.length">
                                <i :class="'icon-' +p.validation_state"></i>
                                <small>
                                <small v-if="p.validators.length">
                                    Validateur(s) :
                                    <strong class="cartouche" v-for="v in p.validators">
                                        <i class="icon-user"></i>
                                        {{ v }}</strong>
                                </small>
                            </span>
                            <a :href="'/feuille-de-temps/excel?action=export&period=' +p.period +'&personid=' + p.person_id" v-if="p.validation_state == 'valid'">
                                <i class="icon-download-outline"></i>
                                Télécharger la feuille de temps (Excel)
                            </a>
                            <span v-else="p.validations_id.length">Non</span>
                        </em>
                        <em v-else>