1. 12 Mar, 2019 4 commits
  2. 11 Mar, 2019 4 commits
  3. 07 Mar, 2019 1 commit
  4. 06 Mar, 2019 1 commit
  5. 04 Mar, 2019 6 commits
  6. 27 Feb, 2019 6 commits
  7. 26 Feb, 2019 7 commits
  8. 22 Feb, 2019 7 commits
  9. 21 Feb, 2019 1 commit
  10. 20 Feb, 2019 3 commits
    • PiTrem's avatar
    • pierre.tremouilhac's avatar
      Merge branch '636-user-can-input-reaction-duration' into 'development' · c57d0cad
      pierre.tremouilhac authored
      Resolve "user can input reaction duration"
      
      Closes #636
      
      See merge request ComPlat/chemotion_ELN!895
      c57d0cad
    • chia-lin.lin's avatar
      User can input reaction duration · 46e709ee
      chia-lin.lin authored
      Add one column named 'Duration (type-in)' in Reaction Properties for
      user to type in his/her reaction duration data.
      
      Summary:
      1. For original duraction function, rename 'duraction' to 'duractionCalc' and leave the logic as is
      2. One migration file for adding column duration(type:string) to table:reaction
      3. Seven kinds of time unit provided, ['Year(s)', 'Month(s)', 'Week(s)', 'Day(s)', 'Hour(s)', 'Minute(s)', 'Second(s)']
      4. Use moment.js to do the duration convert(unit): moment.duration(stop - start).as(time_unit) and take round(1)
      5. The data in DB is human readable, e.g. 62.2 Day(s)
      6. Variable duration_display is used for UI display/operation
      
      Additional:
      1. Use 'disabled' instead of 'disabled=true' to fix js warniing below:
      components.self-5354874f5e704060f12fc6203a6141126a613d1ab0626d137f33ba1e693586a6.js:273694
      Warning: Received the string  for the boolean attribute .
      Although this works, it will not work as expected if you pass the string false.
      Did you mean disabled={true}?
          in input (created by FormControl)
          in FormControl (created by ReactionDetailsProperties)
      46e709ee