Commit 5e19bb10 authored by Stéphane Bouvry's avatar Stéphane Bouvry
Browse files

FIX : Bug sur les options de remplissage de temps automatique (les durées...

FIX : Bug sur les options de remplissage de temps automatique (les durées n'étaient pas calculées en fonction de la journée)
parent 387419e4
Loading
Loading
Loading
Loading
+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1
Changes for public/js/oscar/dist/timesheetmonth.css: 1 added line, 1 removed line.
Original line number Diff line number Diff line
.repport-item .icon-attention-circled{display:none}.repport-item.excess{color:#900;border-left:4px solid red}.repport-item.excess .icon-attention-circled{display:inline-block}.loading-message{background:#fff;font-size:1em;position:fixed;z-index:10000;bottom:0;right:0;padding:.3em 1em;border-radius:8px 0 0 0}.interaction-off{cursor:default;pointer-events:none}.interactive-icon-big{font-size:32px;cursor:pointer}.card.closed,.card.locked{opacity:.7}.card.closed .week-header,.card.locked .week-header{cursor:default}.card.closed{opacity:.4}.card.closed .week-header{cursor:default}article.wp,article.wp h3{font-size:1.2em}article.wp h3{margin:0;padding:0}.has-titled-error{color:darkred;cursor:help}.menu-wps{padding:2px 4px;-webkit-box-shadow:0 0 1em rgba(0,0,0,.3);box-shadow:0 0 1em rgba(0,0,0,.3);font-size:12px;margin:0;padding:0}.menu-wps>li{cursor:pointer;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-transition:background-color .5s ease-out;transition:background-color .5s ease-out;border-bottom:thin solid rgba(0,0,0,.4);padding:2px 4px;text-shadow:-1px 1px 0 rgba(0,0,0,.1)}.menu-wps>li .icon-angle-right{color:#fff;position:relative;left:-25px;opacity:0;-webkit-transition:left .3s ease-out,opacity .5s ease-out;transition:left .3s ease-out,opacity .5s ease-out;margin-left:auto}.menu-wps>li .acronym{font-weight:700}.menu-wps>li .acronym:after{content:":"}.menu-wps>li.selected,.menu-wps>li:hover{background:#0b58a2;color:#fff}.menu-wps>li.selected .icon-angle-right,.menu-wps>li:hover .icon-angle-right{left:0;opacity:1}.daymenu{position:fixed;background:#fff;z-index:100}.daymenu .selector,.month-header{display:-webkit-box;display:-ms-flexbox;display:flex}.month-header{line-height:30px;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;justify-items:center}.month-header strong{font-weight:100;display:block;text-align:center;-webkit-box-flex:0;-ms-flex:0 0 14.285714286%;flex:0 0 14.285714286%;background:#efefef;color:#5c9ccc;border-left:thin solid #fff}.periode{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.periode strong{display:inline-block;width:10em;text-align:center}.week{border:2px solid #fff;margin:2px 0}.week .days{background-image:url("/images/bg-lock.gif")}.week .days .day{background:#efefef}.week.selected{background:rgba(128,183,236,.25);border-color:#80b7ec;-webkit-box-shadow:0 -4px 4px rgba(0,0,0,.2);box-shadow:0 -4px 4px rgba(0,0,0,.2)}.week.selected .week-header{background-color:#80b7ec;color:#fff}.week.selected .week-header span{text-shadow:-1px 1px 0 rgba(0,0,0,.2)}.week.selected .day{border-color:#80b7ec}.week .day.error{background:#d14!important}.heure-total{display:inline-block;width:5em}.month-header .week-header,.week-header{background-color:hsla(0,0%,100%,.5);-webkit-box-align:center;-ms-flex-align:center;align-items:center;cursor:pointer;display:-webkit-box;display:-ms-flexbox;display:flex;text-align:left;font-size:1em;padding:0 .8em;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.month-header .week-header span,.week-header span{font-weight:700;-webkit-box-flex:1;-ms-flex:1;flex:1}.month-header .week-header small.subtotal,.week-header small.subtotal{-webkit-box-flex:0;-ms-flex:0;flex:0}.month-header .week-header small,.week-header small{justify-self:flex-end;-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;margin-left:auto}.month-header .week-header small em,.week-header small em{color:#5c646c}.days{display:-webkit-box;display:-ms-flexbox;display:flex}.days .day{position:relative;background:hsla(0,0%,100%,.25);-webkit-transition:background-color .3s linear;transition:background-color .3s linear;border:thin solid #fff;-webkit-box-flex:0;-ms-flex:0 0 14.285714286%;flex:0 0 14.285714286%;overflow:hidden;cursor:pointer;min-height:50px}.days .day .label{position:absolute;bottom:0;right:0;display:block;font-size:12px;text-align:right;text-shadow:-1px 1px 1px hsla(0,0%,100%,.3);color:#787171}.days .day .cartouche em{max-width:3em;overflow:hidden;display:inline-block;white-space:nowrap}.days .day:hover{background:#fff}.days .day.selected{background:#5c9ccc}.days .day.locked{cursor:not-allowed;background:hsla(0,0%,80%,.8)}.week:first-child .days{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.week:last-child .days{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.cartouche[data-v-9739d852]{white-space:nowrap;margin:0;border-radius:2px;-webkit-box-shadow:none;box-shadow:none;font-size:.75em}.cartouche.training[data-v-9739d852]{background-color:#0b58a2}.cartouche.sickleave[data-v-9739d852]{background-color:olive}.cartouche.wp[data-v-9739d852]{background-color:#6a5999}.cartouche.conflict[data-v-9739d852]{background:#a00}.wp-duration{display:-webkit-box;display:-ms-flexbox;display:flex;border-bottom:thin solid #fff;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.wp-duration strong small{font-weight:100}.wp-duration[class*=status-]{border-left:4px solid #ddd}.wp-duration.status-5{border-left-color:#0b58a2}.wp-duration .icon-comment{color:#ccc}.wp-duration .icon-comment.with-comment{color:#000}.left{-webkit-box-flex:0;-ms-flex:0 0 35px;flex:0 0 35px;overflow:hidden;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-left:8px;border-left:thin solid #fff}.total{margin-left:auto;font-size:1.4em;font-weight:700;padding-right:.5em}.total em{font-size:.5em;font-weight:100;line-height:2em}.icon-trash,[class*=icon-]{text-align:center}.icon-trash{cursor:pointer}.icon-trash:hover{background:#0b58a2;color:#fff}.dropdown[data-v-bfe1aaac]{color:#000;font-size:1em}.dropdown .selected a[data-v-bfe1aaac]{background-color:#5c9ccc;text-shadow:-1px 1px 0 hsla(0,0%,100%,.25)}.dropdown li a[data-v-bfe1aaac]{padding:2px 4px;background-color:#fff;-webkit-transition:background-color .3s ease-out;transition:background-color .3s ease-out}.dropdown li:hover a[data-v-bfe1aaac]{background-color:#aacbe4}button[data-v-bfe1aaac]{display:-webkit-box;display:-ms-flexbox;display:flex;text-align:left;padding:2px 4px;line-height:1em;-webkit-box-align:center;-ms-flex-align:center;align-items:center}button .info[data-v-bfe1aaac]{padding-right:4px}button small[data-v-bfe1aaac]{font-size:.8em}.ui-timechooser[data-v-044d2ea8]{background:#fff;max-width:450px;margin:0 auto}.ui-timechooser .percents[data-v-044d2ea8]{display:-webkit-box;display:-ms-flexbox;display:flex}.ui-timechooser .percents span[data-v-044d2ea8]{-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;padding:2px 4px;text-align:center;font-size:2em;cursor:pointer}.ui-timechooser .percents span.selected[data-v-044d2ea8],.ui-timechooser .percents span[data-v-044d2ea8]:hover{background-color:#0b58a2;color:#fff}.ui-timechooser .hours[data-v-044d2ea8]{font-size:48px;text-align:center;font-weight:700;display:-webkit-box;display:-ms-flexbox;display:flex;justify-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;font-size:2em}.ui-timechooser .hours .sel[data-v-044d2ea8]{border:thin solid #ddd;padding:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.ui-timechooser .hours .sel i[data-v-044d2ea8]{font-size:1em;cursor:pointer;text-shadow:0 0 4px rgba(0,0,0,.1)}.ui-timechooser .hours .sel i[data-v-044d2ea8]:hover{background:#5c9ccc;color:#fff}.ui-timechooser .hours .separator[data-v-044d2ea8]{color:red}
.repport-item .icon-attention-circled{display:none}.repport-item.excess{color:#900;border-left:4px solid red}.repport-item.excess .icon-attention-circled{display:inline-block}.loading-message{background:#fff;font-size:1em;position:fixed;z-index:10000;bottom:0;right:0;padding:.3em 1em;border-radius:8px 0 0 0}.interaction-off{cursor:default;pointer-events:none}.interactive-icon-big{font-size:32px;cursor:pointer}.card.closed,.card.locked{opacity:.7}.card.closed .week-header,.card.locked .week-header{cursor:default}.card.closed{opacity:.4}.card.closed .week-header{cursor:default}article.wp,article.wp h3{font-size:1.2em}article.wp h3{margin:0;padding:0}.has-titled-error{color:darkred;cursor:help}.menu-wps{padding:2px 4px;-webkit-box-shadow:0 0 1em rgba(0,0,0,.3);box-shadow:0 0 1em rgba(0,0,0,.3);font-size:12px;margin:0;padding:0}.menu-wps>li{cursor:pointer;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-transition:background-color .5s ease-out;transition:background-color .5s ease-out;border-bottom:thin solid rgba(0,0,0,.4);padding:2px 4px;text-shadow:-1px 1px 0 rgba(0,0,0,.1)}.menu-wps>li .icon-angle-right{color:#fff;position:relative;left:-25px;opacity:0;-webkit-transition:left .3s ease-out,opacity .5s ease-out;transition:left .3s ease-out,opacity .5s ease-out;margin-left:auto}.menu-wps>li .acronym{font-weight:700}.menu-wps>li .acronym:after{content:":"}.menu-wps>li.selected,.menu-wps>li:hover{background:#0b58a2;color:#fff}.menu-wps>li.selected .icon-angle-right,.menu-wps>li:hover .icon-angle-right{left:0;opacity:1}.daymenu{position:fixed;background:#fff;z-index:100}.daymenu .selector,.month-header{display:-webkit-box;display:-ms-flexbox;display:flex}.month-header{line-height:30px;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;justify-items:center}.month-header strong{font-weight:100;display:block;text-align:center;-webkit-box-flex:0;-ms-flex:0 0 14.285714286%;flex:0 0 14.285714286%;background:#efefef;color:#5c9ccc;border-left:thin solid #fff}.periode{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.periode strong{display:inline-block;width:10em;text-align:center}.week{border:2px solid #fff;margin:2px 0}.week .days{background-image:url("/images/bg-lock.gif")}.week .days .day{background:#efefef}.week.selected{background:rgba(128,183,236,.25);border-color:#80b7ec;-webkit-box-shadow:0 -4px 4px rgba(0,0,0,.2);box-shadow:0 -4px 4px rgba(0,0,0,.2)}.week.selected .week-header{background-color:#80b7ec;color:#fff}.week.selected .week-header span{text-shadow:-1px 1px 0 rgba(0,0,0,.2)}.week.selected .day{border-color:#80b7ec}.week .day.error{background:#d14!important}.heure-total{display:inline-block;width:5em}.month-header .week-header,.week-header{background-color:hsla(0,0%,100%,.5);-webkit-box-align:center;-ms-flex-align:center;align-items:center;cursor:pointer;display:-webkit-box;display:-ms-flexbox;display:flex;text-align:left;font-size:1em;padding:0 .8em;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.month-header .week-header span,.week-header span{font-weight:700;-webkit-box-flex:1;-ms-flex:1;flex:1}.month-header .week-header small.subtotal,.week-header small.subtotal{-webkit-box-flex:0;-ms-flex:0;flex:0}.month-header .week-header small,.week-header small{justify-self:flex-end;-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:right;margin-left:auto}.month-header .week-header small em,.week-header small em{color:#5c646c}.days{display:-webkit-box;display:-ms-flexbox;display:flex}.days .day{position:relative;background:hsla(0,0%,100%,.25);-webkit-transition:background-color .3s linear;transition:background-color .3s linear;border:thin solid #fff;-webkit-box-flex:0;-ms-flex:0 0 14.285714286%;flex:0 0 14.285714286%;overflow:hidden;cursor:pointer;min-height:50px}.days .day .label{position:absolute;bottom:0;right:0;display:block;font-size:12px;text-align:right;text-shadow:-1px 1px 1px hsla(0,0%,100%,.3);color:#787171}.days .day .cartouche em{max-width:3em;overflow:hidden;display:inline-block;white-space:nowrap}.days .day:hover{background:#fff}.days .day.selected{background:#5c9ccc}.days .day.locked{cursor:not-allowed;background:hsla(0,0%,80%,.8)}.week:first-child .days{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.week:last-child .days{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.cartouche[data-v-9739d852]{white-space:nowrap;margin:0;border-radius:2px;-webkit-box-shadow:none;box-shadow:none;font-size:.75em}.cartouche.training[data-v-9739d852]{background-color:#0b58a2}.cartouche.sickleave[data-v-9739d852]{background-color:olive}.cartouche.wp[data-v-9739d852]{background-color:#6a5999}.cartouche.conflict[data-v-9739d852]{background:#a00}.wp-duration{display:-webkit-box;display:-ms-flexbox;display:flex;border-bottom:thin solid #fff;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.wp-duration strong small{font-weight:100}.wp-duration[class*=status-]{border-left:4px solid #ddd}.wp-duration.status-5{border-left-color:#0b58a2}.wp-duration .icon-comment{color:#ccc}.wp-duration .icon-comment.with-comment{color:#000}.left{-webkit-box-flex:0;-ms-flex:0 0 35px;flex:0 0 35px;overflow:hidden;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-left:8px;border-left:thin solid #fff}.total{margin-left:auto;font-size:1.4em;font-weight:700;padding-right:.5em}.total em{font-size:.5em;font-weight:100;line-height:2em}.icon-trash,[class*=icon-]{text-align:center}.icon-trash{cursor:pointer}.icon-trash:hover{background:#0b58a2;color:#fff}.dropdown[data-v-38efb716]{color:#000;font-size:1em}.dropdown .selected a[data-v-38efb716]{background-color:#5c9ccc;text-shadow:-1px 1px 0 hsla(0,0%,100%,.25)}.dropdown li a[data-v-38efb716]{padding:2px 4px;background-color:#fff;-webkit-transition:background-color .3s ease-out;transition:background-color .3s ease-out}.dropdown li:hover a[data-v-38efb716]{background-color:#aacbe4}button[data-v-38efb716]{display:-webkit-box;display:-ms-flexbox;display:flex;text-align:left;padding:2px 4px;line-height:1em;-webkit-box-align:center;-ms-flex-align:center;align-items:center}button .info[data-v-38efb716]{padding-right:4px}button small[data-v-38efb716]{font-size:.8em}.ui-timechooser[data-v-044d2ea8]{background:#fff;max-width:450px;margin:0 auto}.ui-timechooser .percents[data-v-044d2ea8]{display:-webkit-box;display:-ms-flexbox;display:flex}.ui-timechooser .percents span[data-v-044d2ea8]{-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;padding:2px 4px;text-align:center;font-size:2em;cursor:pointer}.ui-timechooser .percents span.selected[data-v-044d2ea8],.ui-timechooser .percents span[data-v-044d2ea8]:hover{background-color:#0b58a2;color:#fff}.ui-timechooser .hours[data-v-044d2ea8]{font-size:48px;text-align:center;font-weight:700;display:-webkit-box;display:-ms-flexbox;display:flex;justify-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;font-size:2em}.ui-timechooser .hours .sel[data-v-044d2ea8]{border:thin solid #ddd;padding:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.ui-timechooser .hours .sel i[data-v-044d2ea8]{font-size:1em;cursor:pointer;text-shadow:0 0 4px rgba(0,0,0,.1)}.ui-timechooser .hours .sel i[data-v-044d2ea8]:hover{background:#5c9ccc;color:#fff}.ui-timechooser .hours .separator[data-v-044d2ea8]{color:red}
/*# sourceMappingURL=timesheetmonth.css.map*/
 No newline at end of file
+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

+2 −1
Changes for public/js/oscar/src/TimesheetMonth.vue: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -135,9 +135,10 @@

                        <div class="col-md-6">
                            <h4>Temps</h4>
                            <pre>{{ selection }}</pre>
                            <timechooser @timeupdate="handlerDayUpdated"
                                         :declarationInHours="declarationInHours"
                                         :baseTime="ts.daylength"
                                         :baseTime="selectedDay.dayLength"
                                         :fill="fillDayValue"
                                         :duration="editedTimesheet ? editedTimesheet.duration : 0"></timechooser>
                        </div>
Loading