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

Mise en page de l'écran des validateurs. L'accès à l'UI de validation est...

Mise en page de l'écran des validateurs. L'accès à l'UI de validation est toujours affiché par défaut sur l'accueil, mais est en couleur si des validations sont en attente. L'UI de validation est déplillable, par défaut, les périodes à valider sont ouvertes, les autres sont fermées
parent 58d5a363
Loading
Loading
Loading
Loading
+4 −36
Changes for module/Oscar/src/Oscar/Controller/PublicController.php: 4 added lines, 36 removed lines.
Original line number Diff line number Diff line
@@ -141,42 +141,9 @@ class PublicController extends AbstractOscarController
        /** @var TimesheetService  $timeSheetService */
        $timeSheetService = $this->getServiceLocator()->get('TimesheetService');

//        // est déclarant
//
//        // est validateur (Application)
//        $isValidateurScientifique = $this->getOscarUserContext()->hasPrivileges(Privileges::ACTIVITY_TIMESHEET_VALIDATE_SCI);
//        $isValidateurAdministratif = $this->getOscarUserContext()->hasPrivileges(Privileges::ACTIVITY_TIMESHEET_VALIDATE_ADM);
//
//        $activitiesValidation = [];
//        $periodsRejected = [];
//        $periodHorsLotsUnvalid = [];
//
//        $validationsHorsLot = [];
//        if( $this->getCurrentPerson() ) {
//            $validationsHorsLot = $timeSheetService->getValidationHorsLotByReferent($this->getCurrentPerson(), true);
//        }


//        $activityWithValidationUp = $timeSheetService->getActivitiesWithTimesheetSend();
//
//        ///
//        /** @var Activity $activity */
//        foreach ($activityWithValidationUp as $activity ){
//            if( $this->getOscarUserContext()->hasPrivileges(Privileges::ACTIVITY_TIMESHEET_VALIDATE_SCI, $activity)){
//                $activitiesValidation[] = $activity;
//                continue;
//            }
//            if( $this->getOscarUserContext()->hasPrivileges(Privileges::ACTIVITY_TIMESHEET_VALIDATE_ACTIVITY, $activity)){
//                $activitiesValidation[] = $activity;
//                continue;
//            }
//            if( $this->getOscarUserContext()->hasPrivileges(Privileges::ACTIVITY_TIMESHEET_VALIDATE_ADM, $activity)){
//                $activitiesValidation[] = $activity;
//                continue;
//            }
//        }

        $validations = [];
        $isValidator = false;

        try {
            $person = $this->getOscarUserContext()->getCurrentPerson();
@@ -184,6 +151,8 @@ class PublicController extends AbstractOscarController
            if( $person ){
                // Déclaration en conflit
                $periodsRejected = $timeSheetService->getValidationPeriodPersonConflict($person);

                $isValidator = $timeSheetService->isValidator($person);
                $validations = $timeSheetService->getValidationToDoPerson($person);
            }

@@ -191,9 +160,8 @@ class PublicController extends AbstractOscarController
            $this->getLogger()->error("Impossible de charger les déclarations en conflit pour $person : " . $e->getMessage());
        }
        return [
//            'validationsHorsLot' => $validationsHorsLot,
//            'activitiesValidation' => $activitiesValidation,
            'validations' => $validations,
            'isValidator' => $isValidator,
            'periodsRejected' => $periodsRejected,
            'user' => $person
        ];
+13 −0
Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -690,6 +690,7 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa
                    'person_id' => $period->getDeclarer()->getId(),
                    'declarations_activities' => [],
                    'declarations_others' => [],
                    'validableStep' => $validateCurrentState,
                    'declarations_off' => [
                        'timesheets' => [],
                        'total' => 0.0,
@@ -2915,6 +2916,18 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa
    }


    public function isValidator( Person $person ){
        $query = $this->getEntityManager()->getRepository(ValidationPeriod::class)
            ->createQueryBuilder('vp')
            ->leftJoin('vp.validatorsPrj', 'vprj')
            ->leftJoin('vp.validatorsSci', 'vsci')
            ->leftJoin('vp.validatorsAdm', 'vadm')
            ->where('vprj = :person OR vsci = :person OR vadm = :person')
            ->setParameter('person', $person);

        return count($query->getQuery()->getResult()) > 0;
    }

    /**
     * Retourne toutes les validations où la personne est identifiée comme validateur.
     *
+6 −6
Changes for module/Oscar/view/oscar/public/index.phtml: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -128,14 +128,14 @@
                                </div>
                            <?php endif; ?>

                            <?php if( count($validations) ): ?>
                                <h1>Validation (<?= count($validations) ?>)</h1>
                                <section>
                                    <a href="<?= $this->url('timesheet/validations') ?>" class="btn btn-primary">
                            <?php if( $isValidator ): ?>


                                    <a href="<?= $this->url('timesheet/validations') ?>" class="btn <?= count($validations) > 0 ? 'btn-primary' : 'btn-default' ?>">
                                        <i class="icon-pencil"></i>
                                        Valider les déclarations
                                        Validation des feuilles de temps
                                    </a>
                                </section>

                            <?php endif; ?>

                            <?php /* if( count($activitiesValidation) ): ?>
+1 −1
Changes for public/js/oscar/dist/ValidationPeriod.css: 1 added line, 1 removed line.
Original line number Diff line number Diff line
.validation{background:transparent;font-size:14px}.validation .heading{font-size:1.2em}.validation th small{display:block}.validation tbody tr.datas:hover{background:rgba(92,156,204,.25)}.validation .heading-days th{text-align:center}.validation .heading-days th.locked{background:#ccc}.validation td,.validation th{border-right:thin solid #ddd}.validation th small{font-weight:100;font-size:.8em}.validation td:nth-child(odd){background:hsla(0,0%,80%,.3)}.validation .datas th{padding-left:1em}.validation .datas td{text-align:right}.validation .total{text-align:right;font-size:1.4em}
.validation{background:transparent;font-size:14px}.validation .has-validation{cursor:pointer;border-left:4px solid #0b93d5}.validation .heading{font-size:1.2em}.validation th small{display:block}.validation tbody tr.datas:hover{background:rgba(92,156,204,.25)}.validation .heading-days th{text-align:center}.validation .heading-days th.locked{background:#ccc}.validation td,.validation th{border-right:thin solid #ddd}.validation th small{font-weight:100;font-size:.8em}.validation td:nth-child(odd){background:hsla(0,0%,80%,.3)}.validation .datas th{padding-left:1em}.validation .datas td{text-align:right}.validation .total{text-align:right;font-size:1.2em}
/*# sourceMappingURL=ValidationPeriod.css.map*/
 No newline at end of file
+1 −1
Changes for public/js/oscar/dist/ValidationPeriod.css.map: 1 added line, 1 removed line.
Original line number Diff line number Diff line
{"version":3,"sources":["webpack:///./public/js/oscar/src/ValidationPeriod.vue"],"names":[],"mappings":"AACA,YACE,uBACA,cAAgB,CAElB,qBACI,eAAiB,CAErB,qBACI,aAAe,CAEnB,iCACI,+BAAqC,CAEzC,6BACI,iBAAmB,CAEvB,oCACM,eAAiB,CAEvB,8BACI,4BAA8B,CAElC,qBACI,gBACA,cAAgB,CAEpB,8BACI,4BAAqC,CAEzC,sBACI,gBAAkB,CAEtB,sBACI,gBAAkB,CAEtB,mBACI,iBACA,eAAiB","file":"ValidationPeriod.css","sourcesContent":["\n.validation {\n  background: transparent;\n  font-size: 14px;\n}\n.validation .heading {\n    font-size: 1.2em;\n}\n.validation th small {\n    display: block;\n}\n.validation tbody tr.datas:hover {\n    background: rgba(92, 156, 204, 0.25);\n}\n.validation .heading-days th {\n    text-align: center;\n}\n.validation .heading-days th.locked {\n      background: #CCC;\n}\n.validation td, .validation th {\n    border-right: thin #ddd solid;\n}\n.validation th small {\n    font-weight: 100;\n    font-size: .8em;\n}\n.validation td:nth-child(odd) {\n    background: rgba(204, 204, 204, 0.3);\n}\n.validation .datas th {\n    padding-left: 1em;\n}\n.validation .datas td {\n    text-align: right;\n}\n.validation .total {\n    text-align: right;\n    font-size: 1.4em;\n}\n\n\n\n// WEBPACK FOOTER //\n// ./public/js/oscar/src/ValidationPeriod.vue"],"sourceRoot":""}
 No newline at end of file
{"version":3,"sources":["webpack:///./public/js/oscar/src/ValidationPeriod.vue"],"names":[],"mappings":"AACA,YACE,uBACA,cAAgB,CAElB,4BACI,eACA,6BAA+B,CAEnC,qBACI,eAAiB,CAErB,qBACI,aAAe,CAEnB,iCACI,+BAAqC,CAEzC,6BACI,iBAAmB,CAEvB,oCACM,eAAiB,CAEvB,8BACI,4BAA8B,CAElC,qBACI,gBACA,cAAgB,CAEpB,8BACI,4BAAqC,CAEzC,sBACI,gBAAkB,CAEtB,sBACI,gBAAkB,CAEtB,mBACI,iBACA,eAAiB","file":"ValidationPeriod.css","sourcesContent":["\n.validation {\n  background: transparent;\n  font-size: 14px;\n}\n.validation .has-validation {\n    cursor: pointer;\n    border-left: 4px #0b93d5 solid;\n}\n.validation .heading {\n    font-size: 1.2em;\n}\n.validation th small {\n    display: block;\n}\n.validation tbody tr.datas:hover {\n    background: rgba(92, 156, 204, 0.25);\n}\n.validation .heading-days th {\n    text-align: center;\n}\n.validation .heading-days th.locked {\n      background: #CCC;\n}\n.validation td, .validation th {\n    border-right: thin #ddd solid;\n}\n.validation th small {\n    font-weight: 100;\n    font-size: .8em;\n}\n.validation td:nth-child(odd) {\n    background: rgba(204, 204, 204, 0.3);\n}\n.validation .datas th {\n    padding-left: 1em;\n}\n.validation .datas td {\n    text-align: right;\n}\n.validation .total {\n    text-align: right;\n    font-size: 1.2em;\n}\n\n\n\n// WEBPACK FOOTER //\n// ./public/js/oscar/src/ValidationPeriod.vue"],"sourceRoot":""}
 No newline at end of file
Loading