Commit 63ce901c authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Merge branch 'master' into starling-activity-cached

parents 19ee8dfc 6f156f9e

module/Oscar/src/Oscar/Formatter/TimesheetActivityPeriodFormatter.php

+7 −7
Original line number Diff line number Diff line
@@ -262,10 +262,10 @@ class TimesheetActivityPeriodFormatter 


        $wpWidth = count($datas['wps']);

        $ceWidth = count($datas['ces']);

        $educationWidth = count($datas['othersGroups']['education']);

        $absWidth = count($datas['othersGroups']['abs']);

        $otherWidth = count($datas['othersGroups']['other']);

        $researchWidth = count($datas['othersGroups']['research']);

        $educationWidth = $datas['othersGroups']['education'] ? count($datas['othersGroups']['education']) : 0;

        $absWidth = $datas['othersGroups']['abs'] ? count($datas['othersGroups']['abs']) : 0;

        $otherWidth = $datas['othersGroups']['other'] ? count($datas['othersGroups']['other']) : 0;

        $researchWidth = $datas['othersGroups']['research'] ? count($datas['othersGroups']['research']) : 0;



        $fullWidth = $wpWidth + $ceWidth + $educationWidth + $absWidth + $otherWidth + $researchWidth + 5;
@@ -610,21 +610,21 @@ class TimesheetActivityPeriodFormatter 
            foreach ($datas['othersGroups']['education'] as $r) {

                $this->drawCell($r['label'], 0, true, 'headEducation');

            }

            if( count($datas['othersGroups']['education']) > 1 ){

            if( $datas['othersGroups']['education'] && count($datas['othersGroups']['education']) > 1 ){

                $this->drawCell("Total Enseignement", 0, true, 'headEducation');

            }



            foreach ($datas['othersGroups']['abs'] as $r) {

                $this->drawCell($r['label'], 0, true, 'headAbs');

            }

            if( count($datas['othersGroups']['abs']) > 1 ){

            if( $datas['othersGroups']['abs'] && count($datas['othersGroups']['abs']) > 1 ){

                $this->drawCell("Total absent", 0, true, 'headAbs');

            }



            foreach ($datas['othersGroups']['other'] as $r) {

                $this->drawCell($r['label'], 0, true, 'headOther');

            }

            if( count($datas['othersGroups']['other']) > 1 ){

            if( $datas['othersGroups']['other'] && count($datas['othersGroups']['other']) > 1 ){

                $this->drawCell("Total autre", 0, true, 'headOther');

            }

public/js/oscar/vite/dist/assets/Activity-78516507.css

0 → 100644
+1 −0
Original line number Diff line number Diff line 
.time-value[data-v-91b82f9c]{font-weight:600}.time-value .ago[data-v-91b82f9c]{font-weight:100}.person-text[data-v-dfc2c1c6]{display:inline-block;position:relative;.info-bulle[data-v-dfc2c1c6] {display: none;} &[data-v-dfc2c1c6]:hover {.info-bulle[data-v-dfc2c1c6] {display: block;}}}.info-bulle[data-v-dfc2c1c6]{position:absolute;text-shadow:none;background-color:#000000b3;box-shadow:-4px 4px 8px #0000004d;header[data-v-dfc2c1c6] {background: #222; display: flex; .infos[data-v-dfc2c1c6] {font-size: 1.25em; padding: 4px .5em 4px .5em; font-weight: 700; .firstname[data-v-dfc2c1c6] {line-height: 16px; font-size: 16px; color: rgba(255,255,255,.8); font-style: italic;} .lastname[data-v-dfc2c1c6] {color: #fff; line-height: 36px; font-size: 30px;}}} .content[data-v-dfc2c1c6] {i[data-v-dfc2c1c6] {color: #999;} font-size: .9em; background: #fff; color: #111; padding: .3em 1em; > div[data-v-dfc2c1c6] {border-bottom: dotted 1px #777; &[data-v-dfc2c1c6]:last-child {border-bottom: none;}}} footer[data-v-dfc2c1c6] {font-size: .7em; padding: 0 .25em; border-top: 1px solid #DDD; background-color: #EEE; color: #555; text-align: right;}}.workpackage[data-v-8250b1b6]{max-width:31%;margin:1%}.vjs-tree-brackets{cursor:pointer}.vjs-tree-brackets:hover{color:#1890ff}.vjs-check-controller{position:absolute;left:0}.vjs-check-controller.is-checked .vjs-check-controller-inner{background-color:#1890ff;border-color:#0076e4}.vjs-check-controller.is-checked .vjs-check-controller-inner.is-checkbox:after{transform:rotate(45deg) scaleY(1)}.vjs-check-controller.is-checked .vjs-check-controller-inner.is-radio:after{transform:translate(-50%,-50%) scale(1)}.vjs-check-controller .vjs-check-controller-inner{display:inline-block;position:relative;border:1px solid #bfcbd9;border-radius:2px;vertical-align:middle;box-sizing:border-box;width:16px;height:16px;background-color:#fff;z-index:1;cursor:pointer;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.vjs-check-controller .vjs-check-controller-inner:after{box-sizing:content-box;content:"";border:2px solid #fff;border-left:0;border-top:0;height:8px;left:4px;position:absolute;top:1px;transform:rotate(45deg) scaleY(0);width:4px;transition:transform .15s cubic-bezier(.71,-.46,.88,.6) .05s;transform-origin:center}.vjs-check-controller .vjs-check-controller-inner.is-radio{border-radius:100%}.vjs-check-controller .vjs-check-controller-inner.is-radio:after{border-radius:100%;height:4px;background-color:#fff;left:50%;top:50%}.vjs-check-controller .vjs-check-controller-original{opacity:0;outline:none;position:absolute;z-index:-1;top:0;left:0;right:0;bottom:0;margin:0}.vjs-carets{position:absolute;right:0;cursor:pointer}.vjs-carets svg{transition:transform .3s}.vjs-carets:hover{color:#1890ff}.vjs-carets-close{transform:rotate(-90deg)}.vjs-tree-node{display:flex;position:relative;line-height:20px}.vjs-tree-node.has-carets{padding-left:15px}.vjs-tree-node.has-carets.has-selector,.vjs-tree-node.has-selector{padding-left:30px}.vjs-tree-node.is-highlight,.vjs-tree-node:hover{background-color:#e6f7ff}.vjs-tree-node .vjs-indent{display:flex;position:relative}.vjs-tree-node .vjs-indent-unit{width:1em}.vjs-tree-node .vjs-indent-unit.has-line{border-left:1px dashed #bfcbd9}.vjs-tree-node.dark.is-highlight,.vjs-tree-node.dark:hover{background-color:#2e4558}.vjs-node-index{position:absolute;right:100%;margin-right:4px;user-select:none}.vjs-colon{white-space:pre}.vjs-comment{color:#bfcbd9}.vjs-value{word-break:break-word}.vjs-value-null,.vjs-value-undefined{color:#d55fde}.vjs-value-boolean,.vjs-value-number{color:#1d8ce0}.vjs-value-string{color:#13ce66}.vjs-tree{font-family:Monaco,Menlo,Consolas,Bitstream Vera Sans Mono,monospace;font-size:14px;text-align:left}.vjs-tree.is-virtual{overflow:auto}.vjs-tree.is-virtual .vjs-tree-node{white-space:nowrap}.activity-fiche[data-v-4b2a6d69]{position:relative;padding-bottom:4em}.section-infos[data-v-4b2a6d69]{margin-top:1em;scroll-margin-top:120px}.section-infos:target h2[data-v-4b2a6d69]{-webkit-animation-name:animation-4b2a6d69;-webkit-animation-duration:2s;-webkit-animation-timing-function:ease-in-out;-webkit-animation-iteration-count:1;-webkit-animation-play-state:running;animation-name:animation-4b2a6d69;animation-duration:2s;animation-timing-function:ease-in-out;animation-iteration-count:1;animation-play-state:running}.section-infos>h2[data-v-4b2a6d69]{border-bottom:1px solid #a2a7af;margin:0;padding:.2em 0}@-webkit-keyframes animation-4b2a6d69{0%{color:#333}15.0%{color:#0a53be}30.0%{color:#333}50.0%{color:#0a53be}100.0%{color:#333}}@keyframes animation-4b2a6d69{0%{color:#333}15.0%{color:#0a53be}30.0%{color:#333}50.0%{color:#0a53be}100.0%{color:#333}}.activity-project[data-v-4b2a6d69]{padding:.25em 1em .25em .25em;border-bottom:#eee solid thin}.activity-type[data-v-4b2a6d69]{background:#EEE;padding:.25em 1em .25em .25em}.activity-type .icon-tag[data-v-4b2a6d69]{color:#999}.type-chain span[data-v-4b2a6d69]{font-weight:400}.type-chain span[data-v-4b2a6d69]:last-child{font-weight:700}.type-chain span[data-v-4b2a6d69]:last-child:after{content:""}.type-chain span[data-v-4b2a6d69]{margin:auto}.type-chain span[data-v-4b2a6d69]:after{content:" > ";color:#ccc}.buttons[data-v-4b2a6d69]{padding:1em;text-align:right}header .line-bottom[data-v-4b2a6d69]{border-bottom:#dee2ea thin solid;padding-bottom:1em}header h3[data-v-4b2a6d69]{font-size:1em}header h4[data-v-4b2a6d69]{color:#95afe3}header .texthighlight[data-v-4b2a6d69]{color:#111}header .texthighlight strong[data-v-4b2a6d69],header .texthighlight time[data-v-4b2a6d69]{color:#000}.descriptionPacked[data-v-4b2a6d69]{cursor:pointer;max-height:4em;overflow:hidden}.budget[data-v-4b2a6d69]{border-left:#dee2ea thin solid}.budget .amount[data-v-4b2a6d69]{font-size:1.4em;border-top:solid thin #EEE;border-bottom:solid thin #EEE}.budget .details[data-v-4b2a6d69]{font-size:.8em}.budget .details small[data-v-4b2a6d69]{display:block}

public/js/oscar/vite/dist/assets/Activity-c35f7800.css

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
.time-value[data-v-0e3f066a]{font-weight:600}.time-value .ago[data-v-0e3f066a]{font-weight:100}.person-text[data-v-dfc2c1c6]{display:inline-block;position:relative;.info-bulle[data-v-dfc2c1c6] {display: none;} &[data-v-dfc2c1c6]:hover {.info-bulle[data-v-dfc2c1c6] {display: block;}}}.info-bulle[data-v-dfc2c1c6]{position:absolute;text-shadow:none;background-color:#000000b3;box-shadow:-4px 4px 8px #0000004d;header[data-v-dfc2c1c6] {background: #222; display: flex; .infos[data-v-dfc2c1c6] {font-size: 1.25em; padding: 4px .5em 4px .5em; font-weight: 700; .firstname[data-v-dfc2c1c6] {line-height: 16px; font-size: 16px; color: rgba(255,255,255,.8); font-style: italic;} .lastname[data-v-dfc2c1c6] {color: #fff; line-height: 36px; font-size: 30px;}}} .content[data-v-dfc2c1c6] {i[data-v-dfc2c1c6] {color: #999;} font-size: .9em; background: #fff; color: #111; padding: .3em 1em; > div[data-v-dfc2c1c6] {border-bottom: dotted 1px #777; &[data-v-dfc2c1c6]:last-child {border-bottom: none;}}} footer[data-v-dfc2c1c6] {font-size: .7em; padding: 0 .25em; border-top: 1px solid #DDD; background-color: #EEE; color: #555; text-align: right;}}.workpackage[data-v-8450c663]{max-width:31%;margin:1%}.activity-fiche[data-v-fff52211]{position:relative;padding-bottom:4em}.section-infos[data-v-fff52211]{margin-top:1em;scroll-margin-top:120px}.section-infos:target h2[data-v-fff52211]{-webkit-animation-name:animation-fff52211;-webkit-animation-duration:2s;-webkit-animation-timing-function:ease-in-out;-webkit-animation-iteration-count:1;-webkit-animation-play-state:running;animation-name:animation-fff52211;animation-duration:2s;animation-timing-function:ease-in-out;animation-iteration-count:1;animation-play-state:running}.section-infos>h2[data-v-fff52211]{border-bottom:1px solid #a2a7af;margin:0;padding:.2em 0}@-webkit-keyframes animation-fff52211{0%{color:#333}15.0%{color:#0a53be}30.0%{color:#333}50.0%{color:#0a53be}100.0%{color:#333}}@keyframes animation-fff52211{0%{color:#333}15.0%{color:#0a53be}30.0%{color:#333}50.0%{color:#0a53be}100.0%{color:#333}}.type-chain span[data-v-fff52211]:last-child{font-weight:700}.type-chain span[data-v-fff52211]:last-child:after{content:""}.type-chain span[data-v-fff52211]{margin:auto}.type-chain span[data-v-fff52211]:after{content:" > "}.buttons[data-v-fff52211]{padding:1em;text-align:right}header .line-bottom[data-v-fff52211]{border-bottom:#dee2ea thin solid;padding-bottom:1em}header h3[data-v-fff52211]{font-size:1em}header h4[data-v-fff52211]{color:#95afe3}header .texthighlight[data-v-fff52211]{color:#111}header .texthighlight strong[data-v-fff52211],header .texthighlight time[data-v-fff52211]{color:#000}.descriptionPacked[data-v-fff52211]{cursor:pointer;max-height:4em;overflow:hidden}.budget[data-v-fff52211]{border-left:#dee2ea thin solid}.budget .details[data-v-fff52211]{font-size:.8em}.budget .details small[data-v-fff52211]{display:block}

public/js/oscar/vite/dist/assets/ActivityDocument-4bf3910d.css

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
.step-content[data-v-bceebff5]{border:thin solid #aaa;border-top:none;padding:1em}.card .alert[data-v-bceebff5]{padding:0 .5em;margin:.1em}.step[data-v-bceebff5]{flex:1;padding:.25em 1em 1em;text-align:left;border:1px solid #aaa;border-left:4px solid #aaa;margin:.5em}.step.error[data-v-bceebff5]{border-color:#900}.step .alert[data-v-bceebff5]{margin:0;padding:.25em 1em}.current[data-v-bceebff5]{color:#333;background:white;border-bottom-color:#fff}.private[data-v-bceebff5]{color:#777;text-shadow:1px -1px 1px rgba(255,255,255,.3);font-weight:100}.stepHandler[data-v-bceebff5]{border-radius:18px;outline:0;padding:8px 12px;text-align:center;transition:all .3s ease-out;display:inline-block;margin-left:100px}.stepHandler[data-v-bceebff5]:before{font-family:fontello;content:"\e8a4"}.stepHandler[data-v-bceebff5]:hover,.stepHandler[data-v-bceebff5]:focus{color:#333;background:#8E969F}

public/js/oscar/vite/dist/assets/ActivityDocument-6fac22ac.css

0 → 100644
+1 −0
Original line number Diff line number Diff line 
.step-content[data-v-0afe21a6]{border:thin solid #aaa;border-top:none;padding:1em}.card .alert[data-v-0afe21a6]{padding:0 .5em;margin:.1em}.step[data-v-0afe21a6]{flex:1;padding:.25em 1em 1em;text-align:left;border:1px solid #aaa;border-left:4px solid #aaa;margin:.5em}.step.error[data-v-0afe21a6]{border-color:#900}.step .alert[data-v-0afe21a6]{margin:0;padding:.25em 1em}.current[data-v-0afe21a6]{color:#333;background:white;border-bottom-color:#fff}.private[data-v-0afe21a6]{color:#777;text-shadow:1px -1px 1px rgba(255,255,255,.3);font-weight:100}.stepHandler[data-v-0afe21a6]{border-radius:18px;outline:0;padding:8px 12px;text-align:center;transition:all .3s ease-out;display:inline-block;margin-left:100px}.stepHandler[data-v-0afe21a6]:before{font-family:fontello;content:"\e8a4"}.stepHandler[data-v-0afe21a6]:hover,.stepHandler[data-v-0afe21a6]:focus{color:#333;background:#8E969F}