Commit 1e27fe42 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

FIX : Page personnel corrigée (les filtres sont off pour le moment) 

FIX : Erreur de formatage de date des versements pour la génération des documents
parent 959d6408

front/src/ActivitySearchUi.vue

+133 −133
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
            <button type="submit" class="btn btn-primary">Rechercher</button>

        </span>

      </div>



      <section v-if="showCriteria">

        <h3>Critères de recherche</h3>

        <div class="row">

          <div class="col-md-4">
@@ -174,7 +174,7 @@ 
            Actualiser la recherche

          </button>

        </nav>



      </section>

    </form>



    <section v-if="search !== null">
@@ -230,13 +230,13 @@ export default { 
    status: {required: true},

    roles_person: {required: true},

    roles_organizations: {required: true},

    search: { require: false },

    search: { require: false, default: "" },

    selected_status: { default: [] },

    options_pays: { default: [] },

    options_organization_types: { default: [] },

    used_filters: { require: false, default: []},

    used_status: { require: false, default: []},



    showCriteria: { default: true },

    selectedOrganization: null

  },

module/Oscar/src/Oscar/Controller/ProjectController.php

+2 −1
Original line number Diff line number Diff line
@@ -440,7 +440,8 @@ class ProjectController extends AbstractOscarController 
    public function currentUserProjectsAction()

    {

        return [

            'person' => $this->getCurrentPerson()

            'person' => $this->getCurrentPerson(),

            'q' => $this->params()->fromQuery('q', '')

        ];

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -233,11 +233,11 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
    {

        // On test les droits de la personne / restrictions

        $person = $this->getCurrentPerson();

        $idsPerson = array_unique($this->getActivityService()->getActivitiesIdsPerson($person));

        if( $this->getOscarUserContextService()->hasPrivileges(Privileges::ACTIVITY_INDEX) ){

        $fullaccess = false; // $this->getOscarUserContextService()->hasPrivileges(Privileges::ACTIVITY_INDEX);

        if( $fullaccess ){

            $restricted_ids = false;

        } else {

            // TRAITEMENT des RESTRICTIONS

            $restricted_ids = array_unique($this->getActivityService()->getActivitiesIdsPerson($person));

        }



        ////////////////////////////////////////////////////////////////////////

module/Oscar/src/Oscar/Entity/Activity.php

+6 −5
Original line number Diff line number Diff line
@@ -2296,13 +2296,14 @@ class Activity implements ResourceInterface 
                $versementsEffectuesStr[] = $amount . ' le ' . $date;

                $versementsEffectuesDate[] = $date;

            } else {

                if( $payment->getDatePredicted() ){

                    $date = $payment->getDatePredicted()->format('d/m/Y');



                    $versementsPrevus[] = $amount;

                    $versementsPrevusStr[] = $amount . ' le ' . $date;

                    $versementsPrevusDate[] = $payment->getDatePredicted()->format('d/m/Y');

                }

            }

        }

        $datas['versements-prevus'] = implode(', ', $versementsPrevusStr);

        $datas['versements-effectues'] = implode(', ', $versementsEffectuesStr);

module/Oscar/view/oscar/project/current-user-projects.phtml

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
                        props: {

                            url: '<?= $this->url('contract/api') ?>',

                            first: true,

                            search: <?= json_encode($q) ?>,

                            showCriteria: false,

                            title: '<?= $this->translate("Mes activités de recherche") ?>'

                        }

                    })