Fix timestamp rounding

Author: aorzelskiGH

src/AasxServerBlazor/Properties/launchSettings.json

@@ -10,13 +10,14 @@
     },
     "AasxServerBlazor": {
       "commandName": "Project",
-      "commandLineArgs": "--no-security --save-temp 30 --secret-string-api 1234 --aasx-in-memory 1000 --data-path \"/Development/ragu3\" --edit --external-blazor http://localhost:5001",
+      "commandLineArgs": "--no-security --save-temp 30 --secret-string-api 1234 --aasx-in-memory 1000 --data-path \"\\\\wsl.localhost\\Ubuntu\\home\\oze\\events\\Event1\" --edit --external-blazor http://localhost:5001",
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "AASREGISTRY": "",
         "IFRAMEPATH": "https://dpp40-2-v2.industrialdigitaltwin.org/dashboard/submodelViewV3.html",
-        "Kestrel__Endpoints__Http__Url": ""
+        "Kestrel__Endpoints__Http__Url": "",
+        "EVENT2": "http://localhost:5002/submodels/aHR0cHM6Ly9pNGQuZGUvVC8zMjA5NTEwL3N1Ym1vZGVsL05hbWVwbGF0ZS9yZWNlaXZlcg/events/EventElement1"
       },
       "applicationUrl": "http://localhost:5001",
       "jsWebView2Debugging": true

src/AasxServerDB/Events.cs

@@ -90,7 +90,8 @@ public static int collectSubmodelElements(List<ISubmodelElement> submodelElement
                 {
                     case "CREATE":
                         timeStamp = sme.TimeStampCreate;
-                        if (sme.TimeStampCreate >= sme.TimeStampTree && (sme.TimeStampCreate - diffTime).TotalMilliseconds > 1)
+                        if ((sme.TimeStampCreate - sme.TimeStampTree).TotalMilliseconds >= 0
+                            && (sme.TimeStampCreate - diffTime).TotalMilliseconds > 1)
                         {
                             copy = true;
                         }
@@ -103,8 +104,13 @@ public static int collectSubmodelElements(List<ISubmodelElement> submodelElement
                         }
                         break;
                     case "UPDATE":
-                        timeStamp = sme.TimeStampTree;
-                        if (diffTime > sme.TimeStampCreate && sme.TimeStampCreate < sme.TimeStampTree && (sme.TimeStampTree - diffTime).TotalMilliseconds > 1)
+                        timeStamp = sme.TimeStampTree;
+                        var a = (diffTime - sme.TimeStampCreate).TotalMilliseconds;
+                        var b = (sme.TimeStampTree - sme.TimeStampCreate).TotalMilliseconds;
+                        var c = (sme.TimeStampTree - diffTime).TotalMilliseconds;
+                        if ((diffTime - sme.TimeStampCreate).TotalMilliseconds >= -1
+                            && (sme.TimeStampTree - sme.TimeStampCreate).TotalMilliseconds > 1
+                            && (sme.TimeStampTree - diffTime).TotalMilliseconds > 1)
                         {
                             if (children != null && children.Count != 0)
                             {
@@ -125,7 +131,8 @@ public static int collectSubmodelElements(List<ISubmodelElement> submodelElement
                         break;
                     case "DELETE":
                         timeStamp = sme.TimeStampDelete;
-                        if (diffTime > sme.TimeStampCreate && (sme.TimeStampDelete - diffTime).TotalMilliseconds > 1)
+                        if ((diffTime - sme.TimeStampCreate).TotalMilliseconds >= 0
+                            && (sme.TimeStampDelete - diffTime).TotalMilliseconds > 1)
                         {
                             delete = true;
                         }

src/AasxServerStandardBib/SecurityClient.cs

@@ -1958,6 +1958,10 @@ static void operation_get_put_events(Operation op, int envIndex, DateTime timeSt
                         c = eventData.changes.Value;
                     }
                     var e = Events.EventPayload.CollectPayload(c, 0, eventData.statusData, source, d, diffEntry, np);
+                    foreach (var diff in diffEntry)
+                    {
+                        Console.WriteLine(diff);
+                    }
 
                     Console.WriteLine("PUT Events: " + requestPath + "/" + d);