Commit 4a436e36 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Fix : Dépassement du selecteur de date, mise en page et traitement des dates

parent f19b49bd

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

+3 −2
Changes for module/Oscar/src/Oscar/Controller/ProjectGrantController.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1451,6 +1451,7 @@ class ProjectGrantController extends AbstractOscarController 
                'id' => $activityPerson->getId(),

                'role' => $activityPerson->getRole(),

                'roleLabel' => $activityPerson->getRole(),

                'roleId' => $activityPerson->getRoleObj()->getId(),

                'rolePrincipal' => $activityPerson->isPrincipal(),

                'urlDelete' => $urlDelete,

                'context' => $context,
@@ -1533,8 +1534,8 @@ class ProjectGrantController extends AbstractOscarController 
//                'hash' => (string)$activityOrganization,

                'enrolled' => $activityOrganization->getOrganization()->getId(),

                'enrolledLabel' => $activityOrganization->getOrganization()->getFullName(),

                'start' => $activityOrganization->getDateStart(),

                'end' => $activityOrganization->getDateEnd()

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

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

            ];

        }

        return $this->jsonOutput($out);

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

+6 −4
Changes for module/Oscar/view/oscar/project-grant/show.phtml: 6 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ 
                    <?php endif; ?>

                </section>

                <script>

                    require(['vue', 'vue-resource', 'EntityWithRole'], function(Vue, VueResource, EntityWithRole){

                    require(['vue', 'vue-resource', 'EntityWithRole', 'moment'], function(Vue, VueResource, EntityWithRole, moment){

                        Vue.use(VueResource);

                        Vue.http.options.emulateJSON = true;

                        Vue.http.options.emulateHTTP = true;
@@ -224,7 +224,8 @@ 
                                        urlNew: "<?= $this->url('personactivity/new', ['idenroller' => $entity->getId()]) ?>",

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

                                        title: "Personne",

                                        roles: <?= json_encode($rolesPersons) ?>

                                        roles: <?= json_encode($rolesPersons) ?>,

                                        moment: moment

                                    }});

                            }
@@ -243,7 +244,7 @@ 
                <section id="organizations" class="has-btn"></section>

            </section>

            <script>

                require(['vue', 'vue-resource', 'EntityWithRole'], function(Vue, VueResource, EntityWithRole){

                require(['vue', 'vue-resource', 'EntityWithRole', 'moment'], function(Vue, VueResource, EntityWithRole, moment){

                    Vue.use(VueResource);

                    Vue.http.options.emulateJSON = true;

                    Vue.http.options.emulateHTTP = true;
@@ -255,7 +256,8 @@ 
                                    urlNew: "<?= $this->url('organizationactivity/new', ['idenroller' => $entity->getId()]) ?>",

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

                                    title: "Organisation",

                                    roles: <?= json_encode($rolesOrganizations) ?>

                                    roles: <?= json_encode($rolesOrganizations) ?>,

                                    moment: moment

                                }});

                        }

public/js/oscar/dist/EntityWithRole.js

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

public/js/oscar/dist/EntityWithRole.js.map

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

public/js/oscar/dist/client.css

+1 −1
Changes for public/js/oscar/dist/client.css: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
.icon-clickable[data-v-fbbef28c]{cursor:pointer}.icon-clickable[data-v-fbbef28c]:hover{color:#fff;text-shadow:0 0 3px rgba(0,0,0,.5)}.text-clickable[data-v-fbbef28c]{cursor:pointer}.text-clickable[data-v-fbbef28c]:hover{text-decoration:underline}

.datepicker-selector[data-v-5bc1d1c4]{position:absolute;width:16em;z-index:1000;background:#fff;font-size:.9em;-webkit-box-shadow:0 0 1em rgba(0,0,0,.25);box-shadow:0 0 1em rgba(0,0,0,.25);border:thin solid rgba(0,0,0,.5)}.datepicker-selector .datepicker-wrapper[data-v-5bc1d1c4]{position:relative;z-index:900;background:#fff;padding:4px}.datepicker-selector[data-v-5bc1d1c4]:before{content:"";position:absolute;background:#fff;border:thin solid rgba(0,0,0,.5);width:16px;left:16px;height:16px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg);top:-8px;z-index:800}.datepicker-selector header nav[data-v-5bc1d1c4]{display:-webkit-box;display:-ms-flexbox;display:flex}.datepicker-selector header nav .heading[data-v-5bc1d1c4]{white-space:nowrap;text-align:center}.datepicker-selector header nav .currentMonth[data-v-5bc1d1c4],.datepicker-selector header nav .currentYear[data-v-5bc1d1c4]{cursor:pointer}.datepicker-selector header nav .currentMonth[data-v-5bc1d1c4]:hover,.datepicker-selector header nav .currentYear[data-v-5bc1d1c4]:hover{background:rgba(255,0,0,.5)}.datepicker-selector header nav>[data-v-5bc1d1c4]{-webkit-box-flex:1;-ms-flex:1;flex:1}.datepicker-selector header nav>span[data-v-5bc1d1c4]{-webkit-box-flex:0;-ms-flex:0;flex:0;cursor:pointer}.datepicker-selector header nav>span[data-v-5bc1d1c4]:hover{background:rgba(255,0,0,.5)}.datepicker-selector .day-labels[data-v-5bc1d1c4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch}.datepicker-selector .day-labels .day-label[data-v-5bc1d1c4]{color:rgba(0,0,0,.5);-webkit-box-flex:1;-ms-flex:1;flex:1}.datepicker-selector .months[data-v-5bc1d1c4],.datepicker-selector .week[data-v-5bc1d1c4],.datepicker-selector .years[data-v-5bc1d1c4]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;cursor:pointer}.datepicker-selector .months .month[data-v-5bc1d1c4]{-webkit-box-flex:1;-ms-flex:1;flex:1;width:33.333333333333336%;padding:.3em 0}.datepicker-selector .months .month[data-v-5bc1d1c4],.datepicker-selector .months .week-day[data-v-5bc1d1c4],.datepicker-selector .months .year[data-v-5bc1d1c4],.datepicker-selector .week .month[data-v-5bc1d1c4],.datepicker-selector .week .week-day[data-v-5bc1d1c4],.datepicker-selector .week .year[data-v-5bc1d1c4],.datepicker-selector .years .month[data-v-5bc1d1c4],.datepicker-selector .years .week-day[data-v-5bc1d1c4],.datepicker-selector .years .year[data-v-5bc1d1c4]{padding:.3em;-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:center;border-radius:4px}.datepicker-selector .months .month[data-v-5bc1d1c4]:hover,.datepicker-selector .months .week-day[data-v-5bc1d1c4]:hover,.datepicker-selector .months .year[data-v-5bc1d1c4]:hover,.datepicker-selector .week .month[data-v-5bc1d1c4]:hover,.datepicker-selector .week .week-day[data-v-5bc1d1c4]:hover,.datepicker-selector .week .year[data-v-5bc1d1c4]:hover,.datepicker-selector .years .month[data-v-5bc1d1c4]:hover,.datepicker-selector .years .week-day[data-v-5bc1d1c4]:hover,.datepicker-selector .years .year[data-v-5bc1d1c4]:hover{background:rgba(255,0,0,.9);color:#fff}.datepicker-selector .months .month.active[data-v-5bc1d1c4],.datepicker-selector .months .week-day.active[data-v-5bc1d1c4],.datepicker-selector .months .year.active[data-v-5bc1d1c4],.datepicker-selector .week .month.active[data-v-5bc1d1c4],.datepicker-selector .week .week-day.active[data-v-5bc1d1c4],.datepicker-selector .week .year.active[data-v-5bc1d1c4],.datepicker-selector .years .month.active[data-v-5bc1d1c4],.datepicker-selector .years .week-day.active[data-v-5bc1d1c4],.datepicker-selector .years .year.active[data-v-5bc1d1c4]{background:rgba(255,0,0,.4)!important;text-shadow:-1px 1px 0 rgba(0,0,0,.3);color:#fff}.datepicker-selector .months .month.disabled[data-v-5bc1d1c4],.datepicker-selector .months .week-day.disabled[data-v-5bc1d1c4],.datepicker-selector .months .year.disabled[data-v-5bc1d1c4],.datepicker-selector .week .month.disabled[data-v-5bc1d1c4],.datepicker-selector .week .week-day.disabled[data-v-5bc1d1c4],.datepicker-selector .week .year.disabled[data-v-5bc1d1c4],.datepicker-selector .years .month.disabled[data-v-5bc1d1c4],.datepicker-selector .years .week-day.disabled[data-v-5bc1d1c4],.datepicker-selector .years .year.disabled[data-v-5bc1d1c4]{background:#fff!important;color:rgba(0,0,0,.2);pointer-events:none}.datepicker-selector .week[data-v-5bc1d1c4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch;line-height:1em}.datepicker-selector .week .week-label[data-v-5bc1d1c4]{font-size:.8em;-webkit-box-flex:1;-ms-flex:1;flex:1;color:rgba(0,0,0,.5)}.datepicker-selector .week .week-day[data-v-5bc1d1c4]{text-align:center;-webkit-box-flex:1;-ms-flex:1;flex:1;padding:4px;cursor:pointer}.datepicker-selector .week .week-day[data-v-5bc1d1c4]:hover{background-color:rgba(255,0,0,.75)!important;color:#fff}.datepicker-selector .week .week-day[data-v-5bc1d1c4]:nth-child(odd){background:rgba(0,0,0,.05)}

/*# sourceMappingURL=client.css.map*/
 
 No newline at end of file