From 2fe83f120271ab4b9d02201fc864160e3a435b32 Mon Sep 17 00:00:00 2001 From: "Valeriano A.R" Date: Wed, 8 Jul 2020 00:55:00 +0200 Subject: [PATCH] FrmWorkLogStats: Misc changes. Adjust dates to start and end of day. Show hours as decimal numbers. Fix alignment of total label. --- VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.Designer.cs | 1 + VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.cs | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.Designer.cs b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.Designer.cs index ad216bd..3211e90 100644 --- a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.Designer.cs +++ b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.Designer.cs @@ -102,6 +102,7 @@ // // lblTotalTime // + this.lblTotalTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblTotalTime.AutoSize = true; this.lblTotalTime.Location = new System.Drawing.Point(12, 406); this.lblTotalTime.Name = "lblTotalTime"; diff --git a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.cs b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.cs index 471c69b..9677f9e 100644 --- a/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.cs +++ b/VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.cs @@ -27,8 +27,8 @@ namespace VAR.Toolbox.UI.Tools.WorkLog private void FrmWorkLogStats_Load(object sender, EventArgs e) { - dtpStart.Value = DateTime.Now.AddDays(-1); - dtpEnd.Value = DateTime.Now; + dtpStart.Value = DateTime.Now.Date; + dtpEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1); WorkLog_ProcessStats(); } @@ -93,7 +93,7 @@ namespace VAR.Toolbox.UI.Tools.WorkLog if (dictDaysHours.ContainsKey(dateDayCurrent)) { TimeSpan tsDay = dictDaysHours[dateDayCurrent]; - strDays.Add(string.Format("{0} -- {1} h", dateDayCurrent.ToString("yyyy-MM-dd"), tsDay.ToString())); + strDays.Add(string.Format("{0} -- {1} h", dateDayCurrent.ToString("yyyy-MM-dd"), tsDay.TotalHours)); tsTotal += tsDay; } @@ -101,7 +101,7 @@ namespace VAR.Toolbox.UI.Tools.WorkLog } while (dateDayCurrent <= dateDayEnd); lsbDays.Items.Clear(); lsbDays.Items.AddRange(strDays.ToArray()); - lblTotalTime.Text = tsTotal.ToString(); + lblTotalTime.Text = string.Format("{0} - {1}", tsTotal.ToString(), tsTotal.TotalHours); } } }