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

Commits:

2 changed files:

Changes:

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUI.jaxx
    ... ... @@ -115,4 +115,5 @@
    115 115
         <SetBranchlinesCompositionUIModelStates id='branchlinesCompositionStates' initializer="branchlinesCompositionUI.getModel().getStates()"/>
    
    116 116
         <SetHooksCompositionUIModelStates id='hooksCompositionStates' initializer="hooksCompositionUI.getModel().getStates()"/>
    
    117 117
         <SetBaitsCompositionUIModelStates id='baitsCompositionStates' initializer="baitsCompositionUI.getModel().getStates()"/>
    
    118
    +    <JButton id="save"/>
    
    118 119
     </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/logbook/SetGlobalCompositionUI.jcss
    ... ... @@ -21,17 +21,14 @@
    21 21
      */
    
    22 22
     
    
    23 23
     #states {
    
    24
    +  modified:{validator.isChanged() || floatlinesCompositionStates.isModified() || branchlinesCompositionStates.isModified() || hooksCompositionStates.isModified() || baitsCompositionStates.isModified()};
    
    25
    +  valid:{validator.isValid() && floatlinesCompositionStates.isValid() && branchlinesCompositionStates.isValid() && hooksCompositionStates.isValid() && baitsCompositionStates.isValid()};
    
    24 26
       baitsCompositionModel:{baitsCompositionUI.getModel()};
    
    25 27
       branchlinesCompositionModel:{branchlinesCompositionUI.getModel()};
    
    26 28
       floatlinesCompositionModel:{floatlinesCompositionUI.getModel()};
    
    27 29
       hooksCompositionModel:{hooksCompositionUI.getModel()};
    
    28 30
     }
    
    29 31
     
    
    30
    -#states {
    
    31
    -  modified:{validator.isChanged() || floatlinesCompositionStates.isModified() || branchlinesCompositionStates.isModified() || hooksCompositionStates.isModified() || baitsCompositionStates.isModified()};
    
    32
    -  valid:{validator.isValid() && floatlinesCompositionStates.isValid() && branchlinesCompositionStates.isValid() && hooksCompositionStates.isValid() && baitsCompositionStates.isValid()};
    
    33
    -}
    
    34
    -
    
    35 32
     #mainTabbedPane {
    
    36 33
       _focusComponent:{newComponentArray(floatlinesCompositionUI,branchlinesCompositionUI,hooksCompositionUI,baitsCompositionUI,mitigationType)};
    
    37 34
     }
    
    ... ... @@ -51,3 +48,7 @@
    51 48
     #baitsCompositionUI {
    
    52 49
      _tab:{"baitsCompositionTab"};
    
    53 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