Commit 83a55888 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Merge branch 'kusanagi-activity-form' into kusanagi

parents 8ea9c9a4 eb6ebe3f

module/Oscar/config/module.config.php

+2 −0
Changes for module/Oscar/config/module.config.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ return array( 
                        "accessAPI",

                        'accounts',

                        'accueil', // OK

                        'activityForm', // OK

                        'activityIndexBuild', // OK

                        'activityStatus', // OK

                        'connectorsConfig',
@@ -704,6 +705,7 @@ return array( 
            'hasAccess' => \Oscar\View\Helpers\Access::class,

            'keyvalue' => \Oscar\View\Helpers\KeyValueHelper::class,

            'moment' => \Oscar\View\Helpers\Moment::class,

            'oscarFormRow' => \Oscar\View\Helpers\OscarFormRow::class,

            'pager' => UnicaenDoctrinePaginatorHelper::class,

            'pagerSimple' => \Oscar\View\Helpers\UnicaenPaginatorHelper::class,

            'slugify' => \Oscar\View\Helpers\Slugify::class,

module/Oscar/config/routes.yml

+9 −0
Changes for module/Oscar/config/routes.yml: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1867,6 +1867,15 @@ administration: 




  child_routes:

    # Gestion et chargement du référenciel des pays

    activity-form:

      type: segment

      may_terminate: true

      options:

        route: /activity-form

        defaults:

          action: activityForm



    # Gestion et chargement du référenciel des pays

    logs:

      type: segment

module/Oscar/src/Oscar/Controller/AdministrationController.php

+26 −1
Changes for module/Oscar/src/Oscar/Controller/AdministrationController.php: 26 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -743,7 +743,6 @@ class AdministrationController extends AbstractOscarController implements 
                $this->getPCRUService()->updateTypeContrat();

                $this->getPCRUService()->updatePoleCompetitivite();

                $this->getPCRUService()->updateSourcesFinancement();

                $this->getPCRUService()->updatePcruTypesEtablissement();

                $this->flashMessenger()->addSuccessMessage('Les référentiels PCRU ont été mis à jour');

                $this->redirect()->toRoute('administration/accueil');

                return [];
@@ -2063,4 +2062,30 @@ class AdministrationController extends AbstractOscarController implements 
            'datas' => $this->getProjectGrantService()->getPcruTypesEtablissement()

        ];

    }



    public function disciplineAction()

    {

        $this->getOscarUserContextService()->check(Privileges::MAINTENANCE_DISCIPLINE_MANAGE);

        $disciplineConfigApi = new AdminDisciplineAPIService();

        $disciplineConfigApi->setServiceContainer($this->getServiceLocator());

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

            return $disciplineConfigApi->entrypoint($this->getRequest());

        }

        return [];

    }



    public function activityFormAction()

    {

        $this->getOscarUserContextService()->check(Privileges::MAINTENANCE_PARAMETERS_MANAGE);



        $adminApi = new AdminActivityFormAPIService();

        $adminApi->setServiceContainer($this->getServiceLocator());

        $adminApi->setOscarConfigurationService($this->getOscarConfigurationService());

        if( $this->isAjax() ){

            return $adminApi->entrypoint($this->getRequest());

        }

        return [



        ];

    }

}
 
 No newline at end of file

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

+6 −3
Changes for module/Oscar/src/Oscar/Controller/ProjectGrantController.php: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -32,16 +32,13 @@ use Oscar\Entity\Person; 
use Oscar\Entity\Project;

use Oscar\Entity\ProjectMember;

use Oscar\Entity\ProjectPartner;

use Oscar\Entity\Role;

use Oscar\Entity\SpentTypeGroup;

use Oscar\Entity\TabDocument;

use Oscar\Entity\TabsDocumentsRoles;

use Oscar\Entity\ValidationPeriod;

use Oscar\Entity\ValidationPeriodRepository;

use Oscar\Exception\OscarException;

use Oscar\Factory\ActivityGantJson;

use Oscar\Form\ProjectGrantForm;

use Oscar\Form\SignedDocumentForm;

use Oscar\Formatter\ActivityPaymentFormatter;

use Oscar\Formatter\ActivityToJsonFormatter;

use Oscar\Formatter\CSVDownloader;
@@ -878,11 +875,17 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
                    'contract/show',

                    ['id' => $projectGrant->getId()]

                );

            } else {

//                var_dump($form->getMessages());

//                var_dump($form);

//                die();



            }

        }



        $view = new ViewModel(

            [

                'config'             => $this->getOscarConfigurationService()->getActivityFormConfigKeying(),

                'numerotationKeys'   => $numerotationKeys,

                'hidden'             => $hidden,

                'form'               => $form,

module/Oscar/src/Oscar/Form/ProjectGrantForm.php

+123 −381

File changed.

Preview size limit exceeded, changes collapsed.