VAR/VAR.Toolbox
1
0
Fork 0
Code Issues 11 Pull Requests Packages Projects Releases Wiki Activity

WorkLog: Usability fixes.

Browse Source
This commit is contained in:
Valeriano A.R.
2020-12-01 08:48:37 +01:00
parent ed27887c08
commit 98ced01b0f
4 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLog.cs
View File

@@ -35,11 +35,14 @@ namespace VAR.Toolbox.UI.Tools.WorkLog
private void FrmWorkLog_FormClosing(object sender, FormClosingEventArgs e)
{
DialogResult result = MessageBox.Show("There are unsaves changes. Close anyway?", "Close?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (result != DialogResult.Yes)
if (btnSave.Enabled)
{
e.Cancel = true;
return;
DialogResult result = MessageBox.Show("There are unsaves changes. Close anyway?", "Close?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (result != DialogResult.Yes)
{
e.Cancel = true;
return;
}
}
WorkLog_SaveConfig();
}

20
VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogStats.cs
View File

@@ -90,21 +90,39 @@ namespace VAR.Toolbox.UI.Tools.WorkLog
DateTime dateDayEnd = dateEnd.Date;
DateTime dateDayCurrent = dateDayStart;
TimeSpan tsTotal = new TimeSpan(0);
int? week = null;
TimeSpan tsWeek = new TimeSpan(0);
CultureInfo currentCulture = CultureInfo.CurrentCulture;
do
{
if (dictDaysHours.ContainsKey(dateDayCurrent))
{
int weekCurrent = currentCulture.Calendar.GetWeekOfYear(dateDayCurrent, currentCulture.DateTimeFormat.CalendarWeekRule, currentCulture.DateTimeFormat.FirstDayOfWeek);
if (week != null && week != weekCurrent)
{
strDays.Add(string.Format(" [{0:00}] -- {1} h",
week,
tsWeek.TotalHours));
tsWeek = new TimeSpan(0);
}
TimeSpan tsDay = dictDaysHours[dateDayCurrent];
strDays.Add(string.Format("[{0:00}] {1} -- {2} h",
currentCulture.Calendar.GetWeekOfYear(dateDayCurrent, currentCulture.DateTimeFormat.CalendarWeekRule, currentCulture.DateTimeFormat.FirstDayOfWeek),
weekCurrent,
dateDayCurrent.ToString("yyyy-MM-dd"),
tsDay.TotalHours));
tsTotal += tsDay;
tsWeek += tsDay;
week = weekCurrent;
}
dateDayCurrent = dateDayCurrent.AddDays(1);
} while (dateDayCurrent <= dateDayEnd);
if (tsWeek.TotalHours > 0)
{
strDays.Add(string.Format(" [{0:00}] -- {1} h",
week,
tsWeek.TotalHours));
}
lsbDays.Items.Clear();
lsbDays.Items.AddRange(strDays.ToArray());
lblTotalTime.Text = string.Format("{0} - {1}", tsTotal.ToString(), tsTotal.TotalHours);

27
VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogSumary.Designer.cs generated
View File

@@ -38,13 +38,15 @@
this.dtpEnd = new System.Windows.Forms.DateTimePicker();
this.chkOnlyGroups = new System.Windows.Forms.CheckBox();
this.txtActivity = new VAR.Toolbox.Controls.TextBoxNormal();
this.btnStats = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// lsbActivities
//
this.lsbActivities.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
this.lsbActivities.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lsbActivities.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
this.lsbActivities.FormattingEnabled = true;
this.lsbActivities.Location = new System.Drawing.Point(12, 113);
this.lsbActivities.Name = "lsbActivities";
@@ -136,16 +138,29 @@
//
// txtActivity
//
this.txtActivity.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
this.txtActivity.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtActivity.Location = new System.Drawing.Point(12, 422);
this.txtActivity.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
this.txtActivity.Location = new System.Drawing.Point(13, 415);
this.txtActivity.Name = "txtActivity";
this.txtActivity.Size = new System.Drawing.Size(312, 20);
this.txtActivity.Size = new System.Drawing.Size(251, 20);
this.txtActivity.TabIndex = 10;
//
// btnStats
//
this.btnStats.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnStats.Location = new System.Drawing.Point(270, 413);
this.btnStats.Name = "btnStats";
this.btnStats.Size = new System.Drawing.Size(54, 23);
this.btnStats.TabIndex = 11;
this.btnStats.Text = "Stats";
this.btnStats.UseVisualStyleBackColor = true;
this.btnStats.Click += new System.EventHandler(this.btnStats_Click);
//
// FrmWorkLogSumary
//
this.ClientSize = new System.Drawing.Size(417, 448);
this.Controls.Add(this.btnStats);
this.Controls.Add(this.txtActivity);
this.Controls.Add(this.chkOnlyGroups);
this.Controls.Add(this.dtpEnd);
@@ -156,6 +171,7 @@
this.Controls.Add(this.btnSearch);
this.Controls.Add(this.lblDateStart);
this.Controls.Add(this.lsbActivities);
this.Location = new System.Drawing.Point(0, 0);
this.Name = "FrmWorkLogSumary";
this.Text = "WorkLogSumary";
this.Load += new System.EventHandler(this.FrmWorkLogStats_Load);
@@ -176,5 +192,6 @@
private System.Windows.Forms.DateTimePicker dtpEnd;
private System.Windows.Forms.CheckBox chkOnlyGroups;
private VAR.Toolbox.Controls.TextBoxNormal txtActivity;
private System.Windows.Forms.Button btnStats;
}
}

6
VAR.Toolbox/UI/Tools/WorkLog/FrmWorkLogSumary.cs
View File

@@ -134,5 +134,11 @@ namespace VAR.Toolbox.UI.Tools.WorkLog
{
txtActivity.Text = (lsbActivities.SelectedItem as string) ?? string.Empty;
}
private void btnStats_Click(object sender, EventArgs e)
{
FrmWorkLogStats frmStats = new FrmWorkLogStats { Activity = txtActivity.Text, WorkLog = _workLog };
frmStats.Show(this);
}
}
}