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

Merge branch 'kusanagi' of https://git.unicaen.fr/open-source/oscar into kusanagi

parents 33bde50f 6fb4914b

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

+3 −1
Original line number Diff line number Diff line
@@ -2524,7 +2524,9 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
                'enrolledLabel' => $activityOrganization->getOrganization()->getFullName(),

                'past'          => !$activityOrganization->isActive(),

                'start'         => DateTimeUtils::toStr($activityOrganization->getDateStart(), 'Y-m-d'),

                'end'           => DateTimeUtils::toStr($activityOrganization->getDateEnd(), 'Y-m-d')

                'end'           => DateTimeUtils::toStr($activityOrganization->getDateEnd(), 'Y-m-d'),

                'active'        => $activityOrganization->getOrganization()->isActive(),

                'roleActive'    => $activityOrganization->isActive(),

            ];

        }

        /****/

module/Oscar/src/Oscar/Service/ProjectGrantApiService.php

+1 −0
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ class ProjectGrantApiService implements 
            'dateStart' => $this->formatDateTime($activity->getDateStart()),

            'dateEnd' => $this->formatDateTime($activity->getDateEnd()),

            'dateSigned' => $this->formatDateTime($activity->getDateSigned()),

            'dateCreated' => $this->formatDateTime($activity->getDateCreated()),

            'dateUpdated' => $this->formatDateTime($activity->getDateUpdated()),

            'dateOpened' => $this->formatDateTime($activity->getDateOpened()),

            'dateNegociation' => $this->formatDateTime($activity->getDateNegociation()),

ui/src/views/EntityWithRole.vue

+3 −3
Original line number Diff line number Diff line
@@ -100,13 +100,13 @@ 
              <div class="form-group">

                <label class="form-label control-label" for="dateStart">Date de début</label>

                <datepicker :moment="moment"

                            :value="entityEdited.start"

                            v-model="entityEdited.start"

                            @input="value => {entityEdited.start = value}"/>

              </div>

              <div class="form-group">

                <label class="form-label control-label" for="dateEnd">Date de fin</label>

                <datepicker :moment="moment"

                            :value="entityEdited.end"

                            v-model="entityEdited.end"

                            @input="value => {entityEdited.end = value}"/>

              </div>

            </div>