Commit c4f94795 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Visa : Affichage des étapes pour un valideur

Fiche activité : en cours
parent 8698e250
Loading
Loading
Loading
Loading
Loading
+3 −0
Changes for module/Oscar/config/module.config.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -712,6 +712,9 @@ return array(
            'Timesheet' => \Oscar\Controller\TimesheetControllerFactory::class,
            'Person' => \Oscar\Controller\PersonControllerFactory::class,
            'WorkPackage' => \Oscar\Controller\WorkPackageControllerFactory::class,

            // Signature
            \UnicaenSignature\Controller\InternalLetterfileController::class => \Oscar\Controller\Signature\InternalLetterfileControllerFactory::class,
        ],
        "aliases" => [
            'Enroll' => \Oscar\Controller\EnrollController::class
+44 −0
Changes for module/Oscar/src/Oscar/Controller/Signature/InternalLetterfileController.php: 44 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Oscar\Controller\Signature;

use BjyAuthorize\Exception\UnAuthorizedException;
use Exception;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;
use Laminas\View\Model\ViewModel;
use UnicaenSignature\Entity\Db\Signature;
use UnicaenSignature\Exception\SignatureException;
use UnicaenSignature\Service\InternalLetterfileService;
use UnicaenSignature\Service\InternalLetterfileServiceAwareTrait;

class InternalLetterfileController extends \UnicaenSignature\Controller\InternalLetterfileController
{

    /**
     * Accès au "viseur" interne.
     *
     * @return array|void
     */
    public function visaAction()
    {
        try {
            $key = $this->params()->fromRoute('key');
            if (!$key) {
                throw new SignatureException("Paramètre manquant");
            }

            $signatureRecipient = $this->getInternalLetterfileService()->getSignatureRecipientByKey($key);

            $out = parent::visaAction();
            $out['activity'] = 'FOO';

            $view = new ViewModel($out);
            $view->setTemplate('unicaen-signature/internal-letterfile/visa.phtml');
            return $view;

        } catch (Exception $e) {
            $this->flash()->addErrorMessage($e->getMessage());
        }
    }
}
 No newline at end of file
+20 −0
Changes for module/Oscar/src/Oscar/Controller/Signature/InternalLetterfileControllerFactory.php: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Oscar\Controller\Signature;

use Laminas\ServiceManager\Factory\FactoryInterface;
use Oscar\Controller\Signature\InternalLetterfileController;
use Psr\Container\ContainerInterface;
use UnicaenSignature\Service\InternalLetterfileService;

class InternalLetterfileControllerFactory implements FactoryInterface
{

    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): InternalLetterfileController
    {
        $s = new InternalLetterfileController();
        $s->setInternalLetterfileService($container->get(InternalLetterfileService::class));
        return $s;
    }

}
 No newline at end of file
+10 −2
Changes for module/Oscar/view/unicaen-signature/internal-letterfile/visa.phtml: 10 added lines, 2 removed lines.
Original line number Diff line number Diff line
<div class="container">
    <h1>VISA de DOCUMENT</h1>
    <h1>
        VISA de DOCUMENT
        <strong><?= $activity ?></strong>
    </h1>
    <div class="row">
        <div class="col-md-8">
            <div id="document"
@@ -23,8 +26,13 @@
                            <em class="status-text">
                                <?= $recipient['status_text'] ?>
                            </em>
                            <code><?php var_dump($recipient) ?></code>
                            <?php if($recipient['informations']): ?>
                                <div>
                                    <i class="icon-help-circled"></i>
                                    <?= $recipient['informations'] ?></div>
                            <?php endif; ?>
                        </div>

                        <?php endforeach; ?>
                    </section>
                </div>
+3 −1
Changes for ui/src/components/OrganizationAutoComplete.vue: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@
      <div class="option" v-for="o, i in optionsFiltered"
           @mouseover="highlightedIndex = i"
           @click.prevent.stop="handlerSelectIndex(o.id)"
           @mousedown.prevent.stop="handlerSelectIndex(o.id)"
           :id="'item_'+i"
           :class="{
                 'active': i == highlightedIndex,
@@ -198,6 +199,7 @@ export default {
    },

    handlerSelectIndex(id){
      console.log(`handlerSelectIndex(${id})`);
      this.options.forEach(i => {
        if( i.id == id ){
          this.selectedValue = i.id;
@@ -341,7 +343,7 @@ export default {
      console.log("setSelected", selected);
      this.value = selected;
      this.$emit('change', this.value);
      this.$emit('input', this.value);
      //this.$emit('input', this.value);
    },

    /**
Loading