Skip to content

GitLab

W
web-DPO
Commit 40eb4929 authored by THEO GUILLON's avatar THEO GUILLON
Browse files
Options

Merge branch... 

Merge branch '377-ajouter-des-infos-bulles-sur-les-champs-fixes-dans-la-declaration-d-un-traitement' into '2.0.0'

Resolve "Ajouter des infos bulles sur les champs fixes dans la déclaration d'un traitement"

See merge request libriciel/pole-citoyens/web-DPO/web-DPO!435
parents 0cc2ac1c beaf2dd2
Pipeline #10978 failed with stage
    in 32 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 101 additions and 15 deletions
    app/View/Elements/Fiches/tabs/informationComplementaire.ctp
    View file @ 40eb4929
    ......@@ -95,7 +95,10 @@ if (!isset($fieldsIsRequired)){
    'text' => $this->Html->tag(
    'abbr',
    __d('fiche', 'fiche.champBaselegale'),
    ['title' => __d('fiche', 'fiche.champBaselegaleDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champBaselegaleDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'multiple' => 'checkbox',
    ......
    app/View/Elements/Fiches/tabs/informationGenerale.ctp
    View file @ 40eb4929
    ......@@ -253,7 +253,6 @@ if (!isset($fieldsIsRequired)){
    <!-- Colonne de gauche -->
    <div class="col-md-6">
    <?php
    echo $this->WebcilForm->inputs([
    'WebdpoFiche.outilnom' => [
    'id' => 'outilnom',
    ......@@ -273,7 +272,10 @@ if (!isset($fieldsIsRequired)){
    'text' => $this->Html->tag(
    'abbr',
    __d('fiche', 'fiche.champTransfertHorsUe'),
    ['title' => __d('fiche', 'fiche.champTransfertHorsUeDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champTransfertHorsUeDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'class' => 'transformSelect form-control',
    ......@@ -292,7 +294,10 @@ if (!isset($fieldsIsRequired)){
    'text' => $this->Html->tag(
    'abbr',
    __d('fiche', 'fiche.champDonneesSensibles'),
    ['title' => __d('fiche', 'fiche.champDonneesSensiblesDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champDonneesSensiblesDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'class' => 'transformSelect form-control',
    ......@@ -314,7 +319,10 @@ if (!isset($fieldsIsRequired)){
    'text' => $this->Html->tag(
    'abbr',
    __d('fiche', 'fiche.champFinaliteprincipale'),
    ['title' => __d('fiche', 'fiche.champFinaliteprincipaleDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champFinaliteprincipaleDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'type' => 'textarea',
    ......@@ -384,7 +392,10 @@ if (!isset($fieldsIsRequired)){
    'text' => $this->Html->tag(
    'abbr',
    __d('fiche', 'fiche.champRealisationPia'),
    ['title' => __d('fiche', 'fiche.champRealisationPiaDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champRealisationPiaDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'class' => 'transformSelect form-control',
    ......@@ -441,7 +452,10 @@ if (!isset($fieldsIsRequired)){
    'text' => $this->Html->tag(
    'abbr',
    __d('fiche', 'fiche.champCoresponsable'),
    ['title' => __d('fiche', 'fiche.champCoresponsableDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champCoresponsableDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'class' => 'transformSelect form-control',
    ......@@ -480,7 +494,10 @@ if (!isset($fieldsIsRequired)){
    'text' => $this->Html->tag(
    'abbr',
    $libelleFieldSoustraitance,
    ['title' => __d('fiche', 'fiche.champSoustraitanceDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champSoustraitanceDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'options' => [
    ......
    app/View/Elements/Formulaires/tabs/informationComplementaire.ctp
    View file @ 40eb4929
    ......@@ -87,7 +87,10 @@ if ($this->request->params['action'] == 'add'){
    'text' => $this->Html->tag(
    'abbr',
    __d('fiche', 'fiche.champBaselegale'),
    ['title' => __d('fiche', 'fiche.champBaselegaleDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champBaselegaleDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'multiple' => 'checkbox',
    ......
    app/View/Elements/Formulaires/tabs/informationGenerale.ctp
    View file @ 40eb4929
    ......@@ -91,7 +91,10 @@
    'text' => $this->Html->tag(
    'abbr',
    __d('fiche', 'fiche.champTransfertHorsUe'),
    ['title' => __d('fiche', 'fiche.champTransfertHorsUeDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champTransfertHorsUeDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'class' => 'transformSelect form-control',
    ......@@ -111,7 +114,10 @@
    'text' => $this->Html->tag(
    'abbr',
    __d('fiche', 'fiche.champDonneesSensibles'),
    ['title' => __d('fiche', 'fiche.champDonneesSensiblesDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champDonneesSensiblesDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'class' => 'transformSelect form-control',
    ......@@ -134,7 +140,10 @@
    'text' => $this->Html->tag(
    'abbr',
    __d('fiche', 'fiche.champFinaliteprincipale'),
    ['title' => __d('fiche', 'fiche.champFinaliteprincipaleDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champFinaliteprincipaleDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'type' => 'textarea',
    ......@@ -192,7 +201,10 @@
    'text' => $this->Html->tag(
    'abbr',
    __d('fiche', 'fiche.champRealisationPia'),
    ['title' => __d('fiche', 'fiche.champRealisationPiaDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champRealisationPiaDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'class' => 'transformSelect form-control',
    ......@@ -248,7 +260,10 @@
    'text' => $this->Html->tag(
    'abbr',
    __d('fiche', 'fiche.champCoresponsable'),
    ['title' => __d('fiche', 'fiche.champCoresponsableDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champCoresponsableDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'default' => false,
    ......@@ -287,7 +302,10 @@
    'text' => $this->Html->tag(
    'abbr',
    $libelleFieldSoustraitance,
    ['title' => __d('fiche', 'fiche.champSoustraitanceDefinition')]
    [
    'data-content' => nl2br(__d('fiche', 'fiche.champSoustraitanceDefinition')),
    'class' => 'popoverText'
    ]
    )
    ],
    'options' => [
    ......
    app/View/Fiches/add.ctp
    View file @ 40eb4929
    ......@@ -414,6 +414,18 @@ echo $this->WebcilForm->end();
    displayTabSousTraitances(newValSousTraitance);
    });
    $('.popoverText').popover({
    delay: {
    show: 500,
    hide: 100
    },
    placement: 'right',
    trigger: 'hover',
    container: 'body',
    html: true,
    });
    });
    function displayTabCoresponsables(val){
    ......
    app/View/Fiches/show.ctp
    View file @ 40eb4929
    ......@@ -256,5 +256,16 @@ echo $this->WebcilForm->end();
    $('.btn').prop("disabled", false);
    $('.close').prop("disabled", false);
    $('.popoverText').popover({
    delay: {
    show: 500,
    hide: 100
    },
    placement: 'right',
    trigger: 'hover',
    container: 'body',
    html: true,
    });
    });
    </script>
    app/View/Formulaires/edit.ctp
    View file @ 40eb4929
    ......@@ -209,6 +209,17 @@ echo $this->WebcilForm->end();
    $( "a[href='#"+$(pane).attr('id')+"']" ).append("<span class='fa fa-exclamation-circle fa-danger' aria-hidden='true'/>");
    });
    $('.popoverText').popover({
    delay: {
    show: 500,
    hide: 100
    },
    placement: 'right',
    trigger: 'hover',
    container: 'body',
    html: true,
    });
    });
    </script>
    \ No newline at end of file
    app/View/Formulaires/show.ctp
    View file @ 40eb4929
    ......@@ -284,6 +284,17 @@ echo $this->WebcilForm->end();
    createForm('coresponsable');
    createForm('soustraitant');
    $('.popoverText').popover({
    delay: {
    show: 500,
    hide: 100
    },
    placement: 'right',
    trigger: 'hover',
    container: 'body',
    html: true,
    });
    });
    </script>
    \ No newline at end of file
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment