Skip to content
Snippets Groups Projects

Resolve "Fusionner les "select" avec "source" et les "select_custom""

Merged Resolve "Fusionner les "select" avec "source" et les "select_custom""
483-fusionner-les-select-avec-source-et-les-select_custom into devel
Merged David Dorchies requested to merge 483-fusionner-les-select-avec-source-et-les-select_custom into devel

Closes #483 (closed)

Edited by David Dorchies

Merge request reports

Checking pipeline status.

Merged by David DorchiesDavid Dorchies 2 years ago (Nov 10, 2022 9:51am UTC)

Merge details

Pipeline #139985 passed

Stage: install
    Stage: test
      Stage: build
        Stage: deploy-dev
          Stage: releases-nightly

            Pipeline passed for 04a0c0d8 on devel

            Activity

            Filter activity
            • Approvals
            • Assignees & reviewers
            • Comments (from bots)
            • Comments (from users)
            • Commits & branches
            • Edits
            • Labels
            • Lock status
            • Mentions
            • Merge request status
            • Tracking
            • David Dorchies changed milestone to %Version 4.17.0

              changed milestone to %Version 4.17.0

            • David Dorchies added enhancement label

              added enhancement label

            • David Dorchies assigned to @francois.grand

              assigned to @francois.grand

              By Grand Francois on 2022-10-13T10:47:22 (imported from GitLab)

            • David Dorchies added 10 commits

              added 10 commits

              • 655def7e - refactor: FieldSet class: rename getPropValue to getNubPropValue, setPropValue to setNubPropValue
              • 557c3978 - refactor: SelectField: rename getSelectedEntryFromValue to getEntryFromValue
              • 4db193e8 - update jalhyd_branch to 328-fusionner-les-select-avec-source-et-les-select_custom
              • 566b9c54 - refactor: merge SelectField and SelectFieldCustom classes, split select code into specific classes
              • faa6e21c - refactor: select component: remove unused disabled flag
              • 9a6ca6cf - test(e2e): check that select default value from configuration is honored
              • bfdae695 - fix: select default from configuration value not honored
              • f5eba4f5 - refactor: SelectFieldNubProperty: move configuration parsing out of constructor
              • 1930e4d6 - refactor: calculator JSON configuration: remove selectIds, customSelectIds
              • 2ef065a4 - refactor: use SelectField derived model for chart type component

              Compare with previous version

              By Grand Francois on 2022-10-20T09:29:00 (imported from GitLab)

              Toggle commit list
            • David Dorchies added 2 commits

              added 2 commits

              • cd000992 - refactor: calculator configuration: remove defaultNodeType property
              • d816e82b - doc: update developer documentation

              Compare with previous version

              By Grand Francois on 2022-10-27T14:16:46 (imported from GitLab)

            • David Dorchies marked this merge request as ready

              marked this merge request as ready

              By Grand Francois on 2022-10-27T15:27:09 (imported from GitLab)

            • David Dorchies added 3 commits

              added 3 commits

              • e0403b11 - fix: standard select defaut value from calculator configuration not honored
              • 285aad67 - test(e2e): increase timeout for failing tests
              • 13153718 - test(e2e): check section select default value from calculator configuration is honored

              Compare with previous version

              By Grand Francois on 2022-10-28T09:22:01 (imported from GitLab)

            • David Dorchies
              David Dorchies @david.dorchies ·
              Author Owner

              Bug sur les lois d'ouvrages:

              • Ouvrir un nouveau module "Lois d'ouvrages"
              • Le type d'ouvrage sélectionné est "orifice" et la loi sélectionnée est "Seuil épais/orifice"

              image

              La loi "Seuil épais/orifice" ne fait pas partie du type "orifice" et je ne suis pas sûr que ce soit la loi par défaut (à vérifier).

              By Dorchies David on 2022-11-07T13:24:11 (imported from GitLab)

            • David Dorchies marked this merge request as draft

              marked this merge request as draft

              By Dorchies David on 2022-11-07T13:37:20 (imported from GitLab)

            • David Dorchies added 4 commits

              added 4 commits

              • 4d93072a - fix: select field: check default value
              • f443a1d6 - fix: calculator JSON configuration: remove unused defaultMaterial in Lechapt-Calmon
              • 47c2d30b - refactor: JSON calculator config: replace defaultLoiDebit/defaultStructType by...
              • 90ea29b9 - fix: wrong default value for discharge law select

              Compare with previous version

              By Grand Francois on 2022-11-08T13:33:27 (imported from GitLab)

              Toggle commit list
            • David Dorchies marked this merge request as ready

              marked this merge request as ready

              By Grand Francois on 2022-11-08T15:00:45 (imported from GitLab)

            • David Dorchies merged

              merged

            Please register or sign in to reply