From 192cb5276c99bb30e1557ab91e9af77f3a009347 Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Tue, 3 Nov 2015 20:44:46 +0100
Subject: [PATCH] Better time display

---
 .../ErgometerApplication/PanelClientData.cs   | 11 +++++----
 .../Client/PanelClientData.cs                 | 11 +++++----
 ErgometerIPR/ErgometerLibrary/Helper.cs       | 23 +++++++++++++++++++
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/ErgometerIPR/ErgometerApplication/PanelClientData.cs b/ErgometerIPR/ErgometerApplication/PanelClientData.cs
index 0d4e07b..8cfc49f 100644
--- a/ErgometerIPR/ErgometerApplication/PanelClientData.cs
+++ b/ErgometerIPR/ErgometerApplication/PanelClientData.cs
@@ -1,4 +1,5 @@
-using System;
+using ErgometerLibrary;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -13,8 +14,8 @@ namespace ErgometerApplication
         public ProgressBar progressBarMeting;
         public Label metingName;
 
-        private int min;
-        private int max;
+        private int min { get; set; }
+        public int max { get; set; }
         private string name;
 
         public PanelClientData(string name, int min, int max) : base()
@@ -63,7 +64,7 @@ namespace ErgometerApplication
             this.labelMetingCurrentValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.labelMetingCurrentValue.AutoSize = true;
             this.labelMetingCurrentValue.Font = new System.Drawing.Font("Segoe UI", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelMetingCurrentValue.Location = new System.Drawing.Point(215, 32);
+            this.labelMetingCurrentValue.Location = new System.Drawing.Point(210, 32);
             this.labelMetingCurrentValue.Name = "labelMetingCurrentValue";
             this.labelMetingCurrentValue.Size = new System.Drawing.Size(57, 32);
             this.labelMetingCurrentValue.TabIndex = 2;
@@ -79,7 +80,7 @@ namespace ErgometerApplication
         {
             if (name == "Tijd")
             {
-                this.labelMetingCurrentValue.Text = (value / 60) + ":" + (value % 60);
+                this.labelMetingCurrentValue.Text = Helper.SecondsToTime(value);
             }
             else
             {
diff --git a/ErgometerIPR/ErgometerDoctorApplication/Client/PanelClientData.cs b/ErgometerIPR/ErgometerDoctorApplication/Client/PanelClientData.cs
index 076d6cb..81df79f 100644
--- a/ErgometerIPR/ErgometerDoctorApplication/Client/PanelClientData.cs
+++ b/ErgometerIPR/ErgometerDoctorApplication/Client/PanelClientData.cs
@@ -1,4 +1,5 @@
-using System;
+using ErgometerLibrary;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -13,8 +14,8 @@ namespace ErgometerDoctorApplication
         public ProgressBar progressBarMeting;
         public Label metingName;
 
-        private int min;
-        private int max;
+        private int min { get; set; }
+        public int max { get; set; }
         private string name;
 
         public PanelClientData(string name, int min, int max) : base()
@@ -63,7 +64,7 @@ namespace ErgometerDoctorApplication
             this.labelMetingCurrentValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.labelMetingCurrentValue.AutoSize = true;
             this.labelMetingCurrentValue.Font = new System.Drawing.Font("Segoe UI", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelMetingCurrentValue.Location = new System.Drawing.Point(215, 32);
+            this.labelMetingCurrentValue.Location = new System.Drawing.Point(210, 32);
             this.labelMetingCurrentValue.Name = "labelMetingCurrentValue";
             this.labelMetingCurrentValue.Size = new System.Drawing.Size(57, 32);
             this.labelMetingCurrentValue.TabIndex = 2;
@@ -79,7 +80,7 @@ namespace ErgometerDoctorApplication
         {
             if (name == "Tijd")
             {
-                this.labelMetingCurrentValue.Text = (value / 60) + ":" + (value % 60);
+                this.labelMetingCurrentValue.Text = Helper.SecondsToTime(value);
             }
             else
             {
diff --git a/ErgometerIPR/ErgometerLibrary/Helper.cs b/ErgometerIPR/ErgometerLibrary/Helper.cs
index 51c7a9e..fbc9865 100644
--- a/ErgometerIPR/ErgometerLibrary/Helper.cs
+++ b/ErgometerIPR/ErgometerLibrary/Helper.cs
@@ -28,5 +28,28 @@ namespace ErgometerLibrary
             var base64EncodedBytes = System.Convert.FromBase64String(base64EncodedData);
             return System.Text.Encoding.UTF8.GetString(base64EncodedBytes);
         }
+
+        public static string SecondsToTime(int input)
+        {
+            int hours = input / 3600;
+            input %= 3600;
+
+            int minutes = input / 60;
+            input %= 60;
+
+            int seconds = input;
+
+            string rtnstr = "";
+
+            if (hours != 0)
+            {
+                rtnstr += hours.ToString("D2") + ":";
+            }
+
+            rtnstr += minutes.ToString("D2") + ":";
+            rtnstr += seconds.ToString("D2");
+
+            return rtnstr;
+        }
     }
 }