Commit 8e29b616 authored by Florian Joriot's avatar Florian Joriot
Browse files

Correction de l'interface de test de formule : trie des formules de calcul par ordre alphabetique

parent 460855f5
Loading
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@
                <tr>
                    <th>Formule</th>
                    <td class="saisie"><select v-model="intervenant.formule" class="dinput">
                        <option v-for="formule in formules" :value="formule.id">{{ formule.libelle }}</option>
                        <option v-for="formule in sortedFormules" :value="formule.id">{{ formule.libelle }}</option>
                    </select></td>
                </tr>
                <tr>
@@ -704,6 +704,10 @@ export default {
        },
    },
    computed: {
        sortedFormules()
        {
            return Object.values(this.formules).sort((a, b) => a.libelle.localeCompare(b.libelle, 'fr', {sensitivity: 'base'}));
        },
        filteredTypesIntervention()
        {
            let ti = Object.values(this.typesIntervention).filter(value => value);
+3 −2
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ class ContratService extends AbstractEntityService
                        $signatureFlowDatas['label'] .= " - " . $intervenant->__toString();


                        $recipients = [];
                        //On regarde si on a le paramétrage hook_recepient dans la config
                        //pour forcer l'envoie toujours à la même personne
                        $recipientsHook = [];
@@ -217,6 +216,8 @@ class ContratService extends AbstractEntityService
                        //On doit aller chercher les destinataires pour la signature électronique

                        foreach ($signatureFlowDatas['steps'] as $key => $step) {
                            $recipients = [];

                            //Si l'étape de process concerne un rôle de l'application on va chercher les utilisateurs de ce role.
                            if (in_array($step['recipient_method'], ['by_etablissement', 'by_etablissement_and_intervenant']) && empty($step['recipients'])) {
                                $role = '';
+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
    "name": "vendor"
  },
  "main.js": {
    "file": "assets/main-Cx2QDd7_.js",
    "file": "assets/main-Tv_MXiMM.js",
    "name": "main",
    "src": "main.js",
    "isEntry": true,
@@ -12,7 +12,7 @@
      "_vendor-KzP7jRq0.js"
    ],
    "css": [
      "assets/main-BkKDMaid.css"
      "assets/main-jFf4OOQq.css"
    ]
  }
}
 No newline at end of file
+0 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

+1 −1
Original line number Diff line number Diff line
.user-profile-select-form[data-v-cbfe77c3]{padding-left:25px}input.is-invalid[data-v-29c90e6d]{background-color:#dc4c64}.cartridge[data-v-ba77464f]{white-space:nowrap}.icon-attention[data-v-ba77464f]{font-size:50pt;float:left;margin-right:20pt;margin-top:0;line-height:42pt}.desactivee[data-v-ba77464f]{background-color:#fdfdfd;font-style:italic;color:#bbb}.code[data-v-f6c21cf6]{font-weight:400;font-size:7pt}.arrondi[data-v-717df7b7]{text-decoration:underline dotted}.arrondi-defaut[data-v-717df7b7]{color:#00f;background-color:#e6e6ff;text-decoration:underline dotted}.arrondi-exces[data-v-717df7b7]{color:red;background-color:#ffe6e6;text-decoration:underline dotted}table tr.details th[data-v-07a28351]{font-weight:700;background-color:#f8f8f8}.table-details tr.details th[data-v-07a28351]{font-size:8pt}.btn-choixtevh[data-v-07a28351]{width:100%;margin-bottom:6px}.total[data-v-07a28351]{text-align:right;font-weight:700}table.table-details[data-v-07a28351]{border-top:0px white solid}th.service[data-v-07a28351]{border-left:0px white solid;border-right:0px white solid;padding-top:1em;padding-bottom:2px}.types-interventions[data-v-ae3b6607]{overflow:scroll}.types-interventions table[data-v-ae3b6607] *{border-width:1px 1px}.types-interventions table th[data-v-ae3b6607],.types-interventions table td[data-v-ae3b6607]{min-width:5em;white-space:nowrap}.saisie[data-v-ae3b6607]{background-color:#fff8dc}.fvh th[data-v-ae3b6607]{font-size:8pt}.fvh td[data-v-ae3b6607]{white-space:nowrap;min-width:4em;padding:0}.fvh td .pourc[data-v-ae3b6607]{font-size:8pt}.spacer[data-v-ae3b6607]{max-width:5px!important;min-width:5px!important}.dinput[data-v-ae3b6607]{border:none;height:2em;width:100%;background-color:#fff8dc}.doutput[data-v-ae3b6607]{border:none;height:2em;width:100%;background-color:transparent}.res-mode[data-v-ae3b6607]{width:100%;min-width:300px}.resultats td[data-v-ae3b6607]{text-align:right}.debug-td[data-v-ae3b6607]{min-width:42em!important}.debug-cell[data-v-ae3b6607]{background-color:#ccc;color:#000;margin:2px;padding:3px;border-radius:5px;font-size:8pt;white-space:nowrap;float:left}.debug-val[data-v-ae3b6607]{background-color:#fff;padding:0 3px;border-top-right-radius:5px;border-bottom-right-radius:5px;color:#000;font-size:8pt}.importer[data-v-ae3b6607]{display:none}.actions .btn[data-v-ae3b6607]{width:100%}.actions label[data-v-ae3b6607]{display:block}table[data-v-ca424aa5]{margin-bottom:0}td.nombre[data-v-ca424aa5]{text-align:right}table.table-bordered[data-v-ca424aa5] *{border-width:1px}.sous-structures[data-v-046af32d]{padding-left:4em}.card-header h5[data-v-6ff4d26e]{font-weight:500}.btn[data-v-6ff4d26e]{margin-left:2px;margin-right:2px}.table tr[data-v-b803dde7]{background-color:#f4f4f4;border-left:1px #ddd solid;border-right:1px #ddd solid}.table-hover tr[data-v-b803dde7]:hover{background-color:#f7f7f7}.recherche[data-v-b803dde7]{text-align:center}.recherche .btn-group[data-v-b803dde7]{box-shadow:none;margin:auto}.recherche select.btn[data-v-b803dde7]{padding-right:3em}.recherche #otherMois[data-v-b803dde7]{width:12em}.recherche #otherAnnee[data-v-b803dde7]{width:8em}th.nom-jour[data-v-b803dde7]{width:1%;padding-left:3px}th.numero-jour[data-v-b803dde7]{width:1%;padding-right:.5em}.recherche[data-v-b803dde7]{justify-content:center;padding-bottom:5px}.event[data-v-b803dde7]{display:flex;justify-content:space-between;align-items:center;margin-bottom:3px;border-left:10px #bbb solid;border-right:10px #bbb solid}.event[data-v-b803dde7]:hover{background-color:#fff}.event-content[data-v-e888b6fc]{flex-grow:1}.event-content.valide[data-v-e888b6fc]{background-color:#ff0}.event-content p[data-v-e888b6fc]{margin-bottom:.2rem}.event-content p.mission[data-v-e888b6fc]{font-weight:700}.event-content p.horaires[data-v-e888b6fc]{font-style:italic;font-weight:lighter}.event-actions[data-v-e888b6fc]{align-self:flex-start}.table[data-v-6001d54b]{margin-bottom:1px}.lap[data-v-6001d54b]{padding-top:.5em;padding-bottom:.5em}.lap[data-v-6001d54b]:hover{background-color:#fff9de}
.user-profile-select-form[data-v-cbfe77c3]{padding-left:25px}input.is-invalid[data-v-29c90e6d]{background-color:#dc4c64}.cartridge[data-v-ba77464f]{white-space:nowrap}.icon-attention[data-v-ba77464f]{font-size:50pt;float:left;margin-right:20pt;margin-top:0;line-height:42pt}.desactivee[data-v-ba77464f]{background-color:#fdfdfd;font-style:italic;color:#bbb}.code[data-v-f6c21cf6]{font-weight:400;font-size:7pt}.arrondi[data-v-717df7b7]{text-decoration:underline dotted}.arrondi-defaut[data-v-717df7b7]{color:#00f;background-color:#e6e6ff;text-decoration:underline dotted}.arrondi-exces[data-v-717df7b7]{color:red;background-color:#ffe6e6;text-decoration:underline dotted}table tr.details th[data-v-07a28351]{font-weight:700;background-color:#f8f8f8}.table-details tr.details th[data-v-07a28351]{font-size:8pt}.btn-choixtevh[data-v-07a28351]{width:100%;margin-bottom:6px}.total[data-v-07a28351]{text-align:right;font-weight:700}table.table-details[data-v-07a28351]{border-top:0px white solid}th.service[data-v-07a28351]{border-left:0px white solid;border-right:0px white solid;padding-top:1em;padding-bottom:2px}.types-interventions[data-v-c9d17243]{overflow:scroll}.types-interventions table[data-v-c9d17243] *{border-width:1px 1px}.types-interventions table th[data-v-c9d17243],.types-interventions table td[data-v-c9d17243]{min-width:5em;white-space:nowrap}.saisie[data-v-c9d17243]{background-color:#fff8dc}.fvh th[data-v-c9d17243]{font-size:8pt}.fvh td[data-v-c9d17243]{white-space:nowrap;min-width:4em;padding:0}.fvh td .pourc[data-v-c9d17243]{font-size:8pt}.spacer[data-v-c9d17243]{max-width:5px!important;min-width:5px!important}.dinput[data-v-c9d17243]{border:none;height:2em;width:100%;background-color:#fff8dc}.doutput[data-v-c9d17243]{border:none;height:2em;width:100%;background-color:transparent}.res-mode[data-v-c9d17243]{width:100%;min-width:300px}.resultats td[data-v-c9d17243]{text-align:right}.debug-td[data-v-c9d17243]{min-width:42em!important}.debug-cell[data-v-c9d17243]{background-color:#ccc;color:#000;margin:2px;padding:3px;border-radius:5px;font-size:8pt;white-space:nowrap;float:left}.debug-val[data-v-c9d17243]{background-color:#fff;padding:0 3px;border-top-right-radius:5px;border-bottom-right-radius:5px;color:#000;font-size:8pt}.importer[data-v-c9d17243]{display:none}.actions .btn[data-v-c9d17243]{width:100%}.actions label[data-v-c9d17243]{display:block}table[data-v-ca424aa5]{margin-bottom:0}td.nombre[data-v-ca424aa5]{text-align:right}table.table-bordered[data-v-ca424aa5] *{border-width:1px}.sous-structures[data-v-046af32d]{padding-left:4em}.card-header h5[data-v-6ff4d26e]{font-weight:500}.btn[data-v-6ff4d26e]{margin-left:2px;margin-right:2px}.table tr[data-v-b803dde7]{background-color:#f4f4f4;border-left:1px #ddd solid;border-right:1px #ddd solid}.table-hover tr[data-v-b803dde7]:hover{background-color:#f7f7f7}.recherche[data-v-b803dde7]{text-align:center}.recherche .btn-group[data-v-b803dde7]{box-shadow:none;margin:auto}.recherche select.btn[data-v-b803dde7]{padding-right:3em}.recherche #otherMois[data-v-b803dde7]{width:12em}.recherche #otherAnnee[data-v-b803dde7]{width:8em}th.nom-jour[data-v-b803dde7]{width:1%;padding-left:3px}th.numero-jour[data-v-b803dde7]{width:1%;padding-right:.5em}.recherche[data-v-b803dde7]{justify-content:center;padding-bottom:5px}.event[data-v-b803dde7]{display:flex;justify-content:space-between;align-items:center;margin-bottom:3px;border-left:10px #bbb solid;border-right:10px #bbb solid}.event[data-v-b803dde7]:hover{background-color:#fff}.event-content[data-v-e888b6fc]{flex-grow:1}.event-content.valide[data-v-e888b6fc]{background-color:#ff0}.event-content p[data-v-e888b6fc]{margin-bottom:.2rem}.event-content p.mission[data-v-e888b6fc]{font-weight:700}.event-content p.horaires[data-v-e888b6fc]{font-style:italic;font-weight:lighter}.event-actions[data-v-e888b6fc]{align-self:flex-start}.table[data-v-6001d54b]{margin-bottom:1px}.lap[data-v-6001d54b]{padding-top:.5em;padding-bottom:.5em}.lap[data-v-6001d54b]:hover{background-color:#fff9de}
Loading