[hop] branch master updated: HOP-4231 Add milliseconds (ms) to javascript function dateAdd and dateDiff

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/master by this push:
     new 47c0f7f5bb HOP-4231 Add milliseconds (ms) to javascript function 
dateAdd and dateDiff
     new 77fa4c6389 Merge pull request #1702 from nadment/HOP-4231
47c0f7f5bb is described below

commit 47c0f7f5bbcf3961b7f68b1ded21eddf60d73dc4
Author: Nicolas Adment <39568358+nadm...@users.noreply.github.com>
AuthorDate: Wed Sep 21 21:28:10 2022 +0200

    HOP-4231 Add milliseconds (ms) to javascript function dateAdd and
    dateDiff
---
 .../pipeline/transforms/javascript/ScriptValuesAddedFunctions.java    | 4 ++++
 .../org/apache/hop/pipeline/transforms/javascript/jsFunctionHelp.xml  | 2 ++
 2 files changed, 6 insertions(+)

diff --git 
a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesAddedFunctions.java
 
b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesAddedFunctions.java
index 560c7b4d1d..2dcd346677 100644
--- 
a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesAddedFunctions.java
+++ 
b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesAddedFunctions.java
@@ -649,6 +649,8 @@ public class ScriptValuesAddedFunctions extends 
ScriptableObject {
           } else if (strType.equals("w")) {
             int iDays = (int) ((endL - startL) / 86400000);
             return Double.valueOf(iDays / 7);
+          } else if (strType.equals("ms")) {            
+            return Double.valueOf(endL - startL);
           } else if (strType.equals("ss")) {
             return Double.valueOf(((endL - startL) / 1000));
           } else if (strType.equals("mi")) {
@@ -733,6 +735,8 @@ public class ScriptValuesAddedFunctions extends 
ScriptableObject {
           cal.add(Calendar.MINUTE, iValue);
         } else if (strType.equals("ss")) {
           cal.add(Calendar.SECOND, iValue);
+        } else if (strType.equals("ms")) {
+          cal.add(Calendar.MILLISECOND, iValue);
         }
         return cal.getTime();
       } catch (Exception e) {
diff --git 
a/plugins/transforms/javascript/src/main/resources/org/apache/hop/pipeline/transforms/javascript/jsFunctionHelp.xml
 
b/plugins/transforms/javascript/src/main/resources/org/apache/hop/pipeline/transforms/javascript/jsFunctionHelp.xml
index e96bedde22..91ea04ef89 100644
--- 
a/plugins/transforms/javascript/src/main/resources/org/apache/hop/pipeline/transforms/javascript/jsFunctionHelp.xml
+++ 
b/plugins/transforms/javascript/src/main/resources/org/apache/hop/pipeline/transforms/javascript/jsFunctionHelp.xml
@@ -826,6 +826,7 @@
             // hh - Hours
             // mi - Minutes
             // ss - Seconds
+            // ms - Milliseconds
             // 3: Numeric - The Value to add.
             //
             // 2006-11-15
@@ -861,6 +862,7 @@
             // hh - Hours
             // mi - Minutes
             // ss - Seconds
+            // ms - Milliseconds            
             //
             // 2006-11-15
             //