Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

4 changed files:

Changes:

  • .gitignore
    ... ... @@ -29,7 +29,7 @@ server/runner/src/main/assembly/dist/config/observe-server*
    29 29
     /*/*/*/.mvn/i18n-configuration.properties
    
    30 30
     /*/*/*/*/.mvn/i18n-configuration.properties
    
    31 31
     /*/*/*/*/*/.mvn/i18n-configuration.properties
    
    32
    -doc/specs/*/*
    
    32
    +doc/specs/*/*.pdf
    
    33 33
     /*/src/site/markdown/index.md
    
    34 34
     /*/*/src/site/markdown/index.md
    
    35 35
     /*/*/*/src/site/markdown/index.md
    

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUI.jaxx
    ... ... @@ -106,4 +106,5 @@
    106 106
         <SetBranchlinesCompositionUIModelStates id='branchlinesCompositionStates' initializer="branchlinesCompositionUI.getModel().getStates()"/>
    
    107 107
         <SetHooksCompositionUIModelStates id='hooksCompositionStates' initializer="hooksCompositionUI.getModel().getStates()"/>
    
    108 108
         <SetBaitsCompositionUIModelStates id='baitsCompositionStates' initializer="baitsCompositionUI.getModel().getStates()"/>
    
    109
    +    <JButton id="save"/>
    
    109 110
     </fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUI>

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUI.jcss
    ... ... @@ -48,3 +48,7 @@
    48 48
     #baitsCompositionUI {
    
    49 49
      _tab:{"baitsCompositionTab"};
    
    50 50
     }
    
    51
    +
    
    52
    +#save {
    
    53
    +  enabled:{states.isModified() && states.isValid() && !(floatlinesCompositionStates.isCanSaveRow() || branchlinesCompositionStates.isCanSaveRow() || hooksCompositionStates.isCanSaveRow() || baitsCompositionStates.isCanSaveRow())};
    
    54
    +}
    \ No newline at end of file

  • pom.xml
    ... ... @@ -23,7 +23,7 @@
    23 23
       <parent>
    
    24 24
         <groupId>io.ultreia.maven</groupId>
    
    25 25
         <artifactId>pom</artifactId>
    
    26
    -  <version>2023.44</version>
    
    26
    +  <version>2023.45</version>
    
    27 27
       </parent>
    
    28 28
       <groupId>fr.ird.observe</groupId>
    
    29 29
       <artifactId>ird-observe</artifactId>