From e6b738de58b9cbdb9a5c3f28b61fc1f1906de379 Mon Sep 17 00:00:00 2001
From: Ahmed Zamil <ahmed@esiur.com>
Date: Fri, 28 Jun 2024 12:13:42 +0300
Subject: [PATCH] up

---
 AZ.Compute.Agent/Job.cs   |  4 ++--
 AZ.Compute.Agent/Node.cs  |  7 ++++---
 AZ.Compute/Web/index.html |  4 +++-
 AZ.Compute/Web/js/app.js  | 11 ++++++++++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/AZ.Compute.Agent/Job.cs b/AZ.Compute.Agent/Job.cs
index 859568b..75f1dbe 100644
--- a/AZ.Compute.Agent/Job.cs
+++ b/AZ.Compute.Agent/Job.cs
@@ -39,8 +39,8 @@ namespace AZ.Compute.Agent
 
         private void Process_Exited(object? sender, EventArgs e)
         {
-            finished = true;
-            finish = DateTime.Now;
+            Finished = true;
+            Finish = DateTime.Now;
         }
 
         [Export]
diff --git a/AZ.Compute.Agent/Node.cs b/AZ.Compute.Agent/Node.cs
index 3ad6f03..432ace1 100644
--- a/AZ.Compute.Agent/Node.cs
+++ b/AZ.Compute.Agent/Node.cs
@@ -40,7 +40,7 @@ namespace AZ.Compute.Agent
 
         [Export] float networkSpeed;
 
-        [Export] Job[] jobs=new Job[0];
+        [Export] Job[] jobs = new Job[0];
 
 
         [Export]
@@ -73,7 +73,7 @@ namespace AZ.Compute.Agent
 
             totalNetworkBytes = (ulong)nic.GetIPv4Statistics().BytesReceived + (ulong)nic.GetIPv4Statistics().BytesSent;
 
-            Ip = nic.GetIPProperties().UnicastAddresses.First(x=> x.Address.AddressFamily == AddressFamily.InterNetwork).Address.ToString();
+            Ip = nic.GetIPProperties().UnicastAddresses.First(x => x.Address.AddressFamily == AddressFamily.InterNetwork).Address.ToString();
 
 
             using (ManagementObject Mo = new ManagementObject("Win32_Processor.DeviceID='CPU0'"))
@@ -114,7 +114,8 @@ namespace AZ.Compute.Agent
 
                 foreach (Job job in jobs)
                 {
-                    job.Ram = (float)(job.Process.PeakWorkingSet64 / 1048576.0);
+                    if (!job.Finished)
+                        job.Ram = (float)(job.Process.PeakWorkingSet64 / 1048576.0);
                 }
             }
             catch (Exception ex)
diff --git a/AZ.Compute/Web/index.html b/AZ.Compute/Web/index.html
index c404400..f0dacf2 100644
--- a/AZ.Compute/Web/index.html
+++ b/AZ.Compute/Web/index.html
@@ -86,6 +86,7 @@
                                                 <th>Name</th>
                                                 <th>Start</th>
                                                 <th>Finished</th>
+                                                <th>Time</th>
                                                 <!-- <th>Command</th>
     <th>Start</th>
     <th>CPU</th>
@@ -96,7 +97,8 @@
                                             <tr repeat>
                                                 <td>${d.Name}</td>
                                                 <td>${d.Start.toLocaleTimeString()}</td>
-                                                <td>${d.Finished}</td>
+                                                <td>${d.Finishefd ? 'Yes' : 'No'}</td>
+                                                <td>${d.Finished ? FORMAT_TIME(d.Finish - d.Start) : FORMAT_TIME(new Date() - d.Start)}</td>
                                             </tr>
                                         </tbody>
                                     </table>   
diff --git a/AZ.Compute/Web/js/app.js b/AZ.Compute/Web/js/app.js
index 3b0d04b..0b3851e 100644
--- a/AZ.Compute/Web/js/app.js
+++ b/AZ.Compute/Web/js/app.js
@@ -50,4 +50,13 @@ async function addAgent() {
 
 const FORMAT_CONNECTION_STATUS = (x) => ["Offline", "Connecting...", "Online"][x];
 
- 
\ No newline at end of file
+const FORMAT_TIME = (x) => {
+    var hours = Math.floor(x / 3600);
+    var minutes = Math.floor((x - (hours * 3600)) / 60);
+    var seconds = x - (hours * 3600) - (minutes * 60);
+
+    if (hours < 10) { hours = "0" + hours; }
+    if (minutes < 10) { minutes = "0" + minutes; }
+    if (seconds < 10) { seconds = "0" + seconds; }
+    return hours + ':' + minutes + ':' + seconds;
+ }
\ No newline at end of file