Commit 3c748542 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Merge branch 'starling' into kusanagi

parents e7e82d3a 780ce036

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

+4 −0
Original line number Diff line number Diff line
@@ -257,6 +257,9 @@ class ProjectGrantApiService implements 
                            Privileges::ACTIVITY_EDIT,

                            $activity

                        ),

                        'duplicate' => $oscarUserContext->hasPrivileges(

                                Privileges::ACTIVITY_CREATE

                            ),

                        'change_project' => !$locked && $oscarUserContext->hasPrivileges(

                            Privileges::ACTIVITY_CHANGE_PROJECT,

                            $activity
@@ -564,6 +567,7 @@ class ProjectGrantApiService implements 
            'dateUpdated' => $this->formatDateTime($activity->getDateUpdated()),

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

            'urls' => [

                'duplicate' => $urlPlugin->fromRoute('contract/duplicate', ['id' => $activity->getId()]),

                'edit' => $urlPlugin->fromRoute('contract/edit', ['id' => $activity->getId()]),

                'change_project' => $urlPlugin->fromRoute('contract/moveToProject', ['id' => $activity->getId()]),

                'new_project'    => $urlPlugin->fromRoute('project/new') . '?ids=' . $activity->getId(),

public/js/oscar/vite/dist/assets/Activity-88a82384.css→public/js/oscar/vite/dist/assets/Activity-1615f765.css

+1 −1
Original line number Diff line number Diff line 
.disabled[data-v-833d8759]{cursor:not-allowed;color:#aaa;text-decoration:line-through}.change{&[data-v-833d8759]{border:1px solid #CCC;padding:.3em;margin:.5em 0;border-left:solid #CCC 4px;display:flex}> div {&[data-v-833d8759] {flex: 1; display: flex;} span.text[data-v-833d8759] {flex: 0; font-weight: bold; white-space: nowrap;} select[data-v-833d8759],div[data-v-833d8759]{flex: 1;}} > i[data-v-833d8759] {flex: 0;} > nav[data-v-833d8759] {flex: 0; border-top: solid #CCC 4px; text-align: center;} > div[data-v-833d8759] {flex: 1; display: flex;}}.avenant{&[data-v-833d8759]{border-left:#CCC 4px solid}&.status-100[data-v-833d8759]{border-color:#ccc}&.status-200[data-v-833d8759]{border-color:#2d7800}p[data-v-833d8759] {border-top: solid #CCC 1px; padding: .5em 2em;} nav[data-v-833d8759] {padding: .3em 0; border-top: solid #CCC 1px; text-align: center;} .modification[data-v-833d8759] {padding: 0 1em;}}.jalon[data-v-42de1793]{background:white;padding:.25em 1em;margin-bottom:.2em}.jalon .main[data-v-42de1793]{display:inline-block;font-size:1.2em;text-align:left;border-bottom:solid thin #ddd;padding:.1em .5em}.jalon.payment[data-v-42de1793]{background:rgba(255,255,255,.7)}.time-value[data-v-42de1793]{font-weight:600}.time-value .ago[data-v-42de1793]{font-weight:100}.list{margin:1em 0}.person-text{&[data-v-dfc2c1c6]{display:inline-block;position:relative}.info-bulle[data-v-dfc2c1c6] {display: none;} &: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] {font-size: .9em; background: #fff; color: #111; padding: .3em 1em;} i[data-v-dfc2c1c6] {color: #999;} > 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-301c8003]{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-8bb8ef1f]{position:relative;padding-bottom:4em}.section-infos[data-v-8bb8ef1f]{margin-top:1em;scroll-margin-top:120px}.section-infos:target h2[data-v-8bb8ef1f]{-webkit-animation-name:animation-8bb8ef1f;-webkit-animation-duration:2s;-webkit-animation-timing-function:ease-in-out;-webkit-animation-iteration-count:1;-webkit-animation-play-state:running;animation-name:animation-8bb8ef1f;animation-duration:2s;animation-timing-function:ease-in-out;animation-iteration-count:1;animation-play-state:running}.section-infos>h2[data-v-8bb8ef1f]{border-bottom:1px solid #a2a7af;margin:0;padding:.2em 0;display:flex;justify-content:left;justify-content:space-between}@-webkit-keyframes animation-8bb8ef1f{0%{color:#333}15.0%{color:#0a53be}30.0%{color:#333}50.0%{color:#0a53be}100.0%{color:#333}}@keyframes animation-8bb8ef1f{0%{color:#333}15.0%{color:#0a53be}30.0%{color:#333}50.0%{color:#0a53be}100.0%{color:#333}}.activity-project[data-v-8bb8ef1f]{padding:.25em 1em .25em .25em;border-bottom:#eee solid thin}.activity-type[data-v-8bb8ef1f]{background:#EEE;padding:.25em 1em .25em .25em}.activity-type .icon-tag[data-v-8bb8ef1f]{color:#999}.type-chain span[data-v-8bb8ef1f]{font-weight:400}.type-chain span[data-v-8bb8ef1f]:last-child{font-weight:700}.type-chain span[data-v-8bb8ef1f]:last-child:after{content:""}.type-chain span[data-v-8bb8ef1f]{margin:auto}.type-chain span[data-v-8bb8ef1f]:after{content:" > ";color:#ccc}.buttons[data-v-8bb8ef1f]{padding:1em;text-align:right}header .line-bottom[data-v-8bb8ef1f]{border-bottom:#dee2ea thin solid;padding-bottom:1em}header h3[data-v-8bb8ef1f]{font-size:1em}header h4[data-v-8bb8ef1f]{color:#95afe3}header .texthighlight[data-v-8bb8ef1f]{color:#111}header .texthighlight strong[data-v-8bb8ef1f],header .texthighlight time[data-v-8bb8ef1f]{color:#000}.budget[data-v-8bb8ef1f]{border-left:#dee2ea thin solid}.budget .amount[data-v-8bb8ef1f]{font-size:1.4em;border-top:solid thin #EEE;border-bottom:solid thin #EEE}.budget .details[data-v-8bb8ef1f]{font-size:.8em}.budget .details small[data-v-8bb8ef1f]{display:block}
 
.disabled[data-v-833d8759]{cursor:not-allowed;color:#aaa;text-decoration:line-through}.change[data-v-833d8759]{border:1px solid #CCC;padding:.3em;margin:.5em 0;border-left:solid #CCC 4px;display:flex}.change>div{span.text[data-v-833d8759] {flex: 0; font-weight: bold; white-space: nowrap;} select[data-v-833d8759],div[data-v-833d8759]{flex: 1;}}.change>i[data-v-833d8759]{flex:0}.change>nav[data-v-833d8759]{flex:0;border-top:solid #CCC 4px;text-align:center}.change>div[data-v-833d8759]{flex:1;display:flex}.avenant{p[data-v-833d8759] {border-top: solid #CCC 1px; padding: .5em 2em;} nav[data-v-833d8759] {padding: .3em 0; border-top: solid #CCC 1px; text-align: center;} .modification[data-v-833d8759] {padding: 0 1em;}}.avenant[data-v-833d8759]{border-left:#CCC 4px solid}.avenant.status-100[data-v-833d8759]{border-color:#ccc}.avenant.status-200[data-v-833d8759]{border-color:#2d7800}.jalon[data-v-42de1793]{background:white;padding:.25em 1em;margin-bottom:.2em}.jalon .main[data-v-42de1793]{display:inline-block;font-size:1.2em;text-align:left;border-bottom:solid thin #ddd;padding:.1em .5em}.jalon.payment[data-v-42de1793]{background:rgba(255,255,255,.7)}.time-value[data-v-42de1793]{font-weight:600}.time-value .ago[data-v-42de1793]{font-weight:100}.list{margin:1em 0}.person-text[data-v-dfc2c1c6]{display:inline-block;position:relative}.person-text .info-bulle[data-v-dfc2c1c6]{display:none}.person-text:hover .info-bulle[data-v-dfc2c1c6]{display:block}.info-bulle{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] {font-size: .9em; background: #fff; color: #111; padding: .3em 1em;} i[data-v-dfc2c1c6] {color: #999;} > 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;}}.info-bulle[data-v-dfc2c1c6]{position:absolute;text-shadow:none;background-color:#000000b3;box-shadow:-4px 4px 8px #0000004d}.workpackage[data-v-301c8003]{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;-webkit-user-select:none;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-3910ad18]{position:relative;padding-bottom:4em}.section-infos[data-v-3910ad18]{margin-top:1em;scroll-margin-top:120px}.section-infos:target h2[data-v-3910ad18]{-webkit-animation-name:animation-3910ad18;-webkit-animation-duration:2s;-webkit-animation-timing-function:ease-in-out;-webkit-animation-iteration-count:1;-webkit-animation-play-state:running;animation-name:animation-3910ad18;animation-duration:2s;animation-timing-function:ease-in-out;animation-iteration-count:1;animation-play-state:running}.section-infos>h2[data-v-3910ad18]{border-bottom:1px solid #a2a7af;margin:0;padding:.2em 0;display:flex;justify-content:left;justify-content:space-between}@-webkit-keyframes animation-3910ad18{0%{color:#333}15.0%{color:#0a53be}30.0%{color:#333}50.0%{color:#0a53be}100.0%{color:#333}}@keyframes animation-3910ad18{0%{color:#333}15.0%{color:#0a53be}30.0%{color:#333}50.0%{color:#0a53be}100.0%{color:#333}}.activity-project[data-v-3910ad18]{padding:.25em 1em .25em .25em;border-bottom:#eee solid thin}.activity-type[data-v-3910ad18]{background:#EEE;padding:.25em 1em .25em .25em}.activity-type .icon-tag[data-v-3910ad18]{color:#999}.type-chain span[data-v-3910ad18]{font-weight:400}.type-chain span[data-v-3910ad18]:last-child{font-weight:700}.type-chain span[data-v-3910ad18]:last-child:after{content:""}.type-chain span[data-v-3910ad18]{margin:auto}.type-chain span[data-v-3910ad18]:after{content:" > ";color:#ccc}.buttons[data-v-3910ad18]{padding:1em;text-align:right}header .line-bottom[data-v-3910ad18]{border-bottom:#dee2ea thin solid;padding-bottom:1em}header h3[data-v-3910ad18]{font-size:1em}header h4[data-v-3910ad18]{color:#95afe3}header .texthighlight[data-v-3910ad18]{color:#111}header .texthighlight strong[data-v-3910ad18],header .texthighlight time[data-v-3910ad18]{color:#000}.budget[data-v-3910ad18]{border-left:#dee2ea thin solid}.budget .amount[data-v-3910ad18]{font-size:1.4em;border-top:solid thin #EEE;border-bottom:solid thin #EEE}.budget .details[data-v-3910ad18]{font-size:.8em}.budget .details small[data-v-3910ad18]{display:block}

public/js/oscar/vite/dist/assets/ActivityDocument-2deed9d1.css

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
.step-content[data-v-fc17618a]{border:thin solid #aaa;border-top:none;padding:1em}.card .alert[data-v-fc17618a]{padding:0 .5em;margin:.1em}.step[data-v-fc17618a]{flex:1;padding:.25em 1em 1em;text-align:left;border:1px solid #aaa;border-left:4px solid #aaa;margin:.5em}.step.error[data-v-fc17618a]{border-color:#900}.step .alert[data-v-fc17618a]{margin:0;padding:.25em 1em}.current[data-v-fc17618a]{color:#333;background:white;border-bottom-color:#fff}.private[data-v-fc17618a]{color:#777;text-shadow:1px -1px 1px rgba(255,255,255,.3);font-weight:100}.stepHandler[data-v-fc17618a]{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-fc17618a]:before{font-family:fontello;content:"\e8a4"}.stepHandler[data-v-fc17618a]:hover,.stepHandler[data-v-fc17618a]:focus{color:#333;background:#8E969F}

public/js/oscar/vite/dist/assets/ActivityDocument-96379771.css

0 → 100644
+1 −0
Original line number Diff line number Diff line 
.step-content[data-v-b7924d78]{border:thin solid #aaa;border-top:none;padding:1em}.card .alert[data-v-b7924d78]{padding:0 .5em;margin:.1em}.step[data-v-b7924d78]{flex:1;padding:.25em 1em 1em;text-align:left;border:1px solid #aaa;border-left:4px solid #aaa;margin:.5em}.step.error[data-v-b7924d78]{border-color:#900}.step .alert[data-v-b7924d78]{margin:0;padding:.25em 1em}.current[data-v-b7924d78]{color:#333;background:white;border-bottom-color:#fff}.private[data-v-b7924d78]{color:#777;text-shadow:1px -1px 1px rgba(255,255,255,.3);font-weight:100}.stepHandler[data-v-b7924d78]{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-b7924d78]:before{font-family:fontello;content:""}.stepHandler[data-v-b7924d78]:hover,.stepHandler[data-v-b7924d78]:focus{color:#333;background:#8E969F}

public/js/oscar/vite/dist/assets/ActivityNotes-4bdabff2.css

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
.note{&[data-v-7ac26f3c]{background-color:#fff;margin:0 0 .5em;padding:0}.note-header[data-v-7ac26f3c] {padding: .2em 1em; border-bottom: solid thin #DDD; display: flex; justify-content: space-between;} .note-content[data-v-7ac26f3c] {padding: .2em 1em; white-space: pre-wrap; font-family: monospace;}}