Commit 0b0b7e38 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Nouvelle fiche activité (fonctionnelle)

parent 3caa16ae

module/Oscar/config/routes.yml

+8 −8
Original line number Diff line number Diff line
@@ -991,12 +991,12 @@ contract: 
        route: /modifier-projet/:id

        defaults:

          action: changeProject

    show:

      type: segment

      options:

        route: /fiche-detaillee/:id

        defaults:

          action: show

#    show:

#      type: segment

#      options:

#        route: /fiche-detaillee/:id

#        defaults:

#          action: show2



    pcru-infos:

      type: segment
@@ -1068,10 +1068,10 @@ contract: 
        defaults:

          action: generatedDocument



    show2:

    show:

      type: segment

      options:

        route: /fiche/:id[/:do]

        route: /fiche-detaillee/:id[/:do]

        defaults:

          action: show2

module/Oscar/src/Oscar/Controller/ProjectGrantController.php

+0 −2
Original line number Diff line number Diff line
@@ -1748,7 +1748,6 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
        $isAjax = $this->isAjax();



        $id = $this->params()->fromRoute('id');

        $this->getLoggerService()->debug(__METHOD__ . " id:$id, ajax:" . ($isAjax?'true':'false'));

        $entity = $this->getActivityService()->getActivityById($id);



        // Check access
@@ -1756,7 +1755,6 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 


        switch ($method) {

            case 'GET' :

                $this->getLoggerService()->debug("GET");

                if ($this->isAjax() || $this->getRequest()->getQuery('f') === 'json') {

                    $datas = [

                        'activity' => $this->getActivityService()->getActivityJson(

module/Oscar/view/oscar/project-grant/show2.phtml

+1 −1
Original line number Diff line number Diff line 
<div class="container">

    <div class="activity" id="activity"

         data-url="<?php echo $this->url('contract/show2', ['id' => $activity->getId()]) ?>"

         data-url="<?php echo $this->url('contract/show', ['id' => $activity->getId()]) ?>"

         data-manage="<?php $this->grant()->privilege(\Oscar\Provider\Privileges::ACTIVITY_EDIT, $activity) ? "true" : "false" ?>"

    ></div>

    <?= $this->Vite()->addJs('src/Activity.js'); ?>

public/css/_common.scss

+1 −0
Original line number Diff line number Diff line
@@ -853,6 +853,7 @@ $colorDefault: $colorMedium; 
  left: 0;

  right: 0;

  bottom: 0;

  z-index:3;

  img {

    max-width: 75%;

    display: block;

public/css/adaj.css

+1 −0
Original line number Diff line number Diff line
@@ -8365,6 +8365,7 @@ mark { 
  left: 0;

  right: 0;

  bottom: 0;

  z-index: 3;

}

.site-footer img {

  max-width: 75%;