bnewman
/
trakker
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor code refactoring (renaming functions, variables, etc

This commit is contained in:
c0d3.m0nk3y 2026-05-15 13:55:25 -04:00
parent 29497cc003
commit e9ec7ca392
11 changed files with 203 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Forms/MainForm.Designer.cs generated
View File

@ -261,21 +261,21 @@
addTaskSubtaskToolStripMenuItem.Name = "addTaskSubtaskToolStripMenuItem";
addTaskSubtaskToolStripMenuItem.Size = new Size(370, 38);
addTaskSubtaskToolStripMenuItem.Text = "Add Task / Sub-task";
addTaskSubtaskToolStripMenuItem.Click += addTaskSubtaskToolStripMenuItem_Click;
addTaskSubtaskToolStripMenuItem.Click += PTask_AddTaskSubtaskToolStripMenuItem_Click;
//
// editThisTaskSubtaskToolStripMenuItem
//
editThisTaskSubtaskToolStripMenuItem.Name = "editThisTaskSubtaskToolStripMenuItem";
editThisTaskSubtaskToolStripMenuItem.Size = new Size(370, 38);
editThisTaskSubtaskToolStripMenuItem.Text = "Edit this Task / Sub-task";
editThisTaskSubtaskToolStripMenuItem.Click += editThisTaskSubtaskToolStripMenuItem_Click;
editThisTaskSubtaskToolStripMenuItem.Click += PTask_EditThisTaskSubtaskToolStripMenuItem_Click;
//
// deleteThisTaskSubtaskToolStripMenuItem
//
deleteThisTaskSubtaskToolStripMenuItem.Name = "deleteThisTaskSubtaskToolStripMenuItem";
deleteThisTaskSubtaskToolStripMenuItem.Size = new Size(370, 38);
deleteThisTaskSubtaskToolStripMenuItem.Text = "Delete this Task / Sub-task";
deleteThisTaskSubtaskToolStripMenuItem.Click += deleteThisTaskSubtaskToolStripMenuItem_Click;
deleteThisTaskSubtaskToolStripMenuItem.Click += PTask_DeleteThisTaskSubtaskToolStripMenuItem_Click;
//
// toolStripSeparator1
//
@ -287,7 +287,7 @@
addACommentToolStripMenuItem.Name = "addACommentToolStripMenuItem";
addACommentToolStripMenuItem.Size = new Size(370, 38);
addACommentToolStripMenuItem.Text = "Add a comment";
addACommentToolStripMenuItem.Click += addACommentToolStripMenuItem_Click;
addACommentToolStripMenuItem.Click += PTask_AddACommentToolStripMenuItem_Click;
//
// splitContainerTasks2
//
@ -356,7 +356,7 @@
richTextBoxTaskComments.Size = new Size(1218, 259);
richTextBoxTaskComments.TabIndex = 1;
richTextBoxTaskComments.Text = "";
richTextBoxTaskComments.LinkClicked += richTextBoxTaskComments_LinkClicked;
richTextBoxTaskComments.LinkClicked += PTask_RichTextBoxTaskComments_LinkClicked;
//
// MainForm
//

161
Forms/MainForm.cs
View File

@ -1,22 +1,22 @@
using Microsoft.Data.Sqlite;
using newcle.us.Forms;
using newcle.us.Utilities;
using System.ComponentModel;
using trakker.Data;
using trakker.Forms;
using trakker.Interfaces;
using trakker.Models;
using trakker.Services;
using trakker.Utilities;
namespace trakker
{
public partial class MainForm : Form, IMainForm
{
//private readonly string _dbversion = "[N.N.N]";
private string connectionString = string.Empty;
private const string _AppVersion = "[n.n.n]";
private static readonly string _empty = string.Empty;
private string _ConnectionString = _empty;
readonly MainCtrl _ctrl;
/// <summary>
/// Initializes a new instance of the <see cref="MainForm"/> class.
/// Sets up the form's controls and event handlers by calling
@ -29,19 +29,19 @@ namespace trakker
// build connection string that will be used for database connections
// ------------------------------------------------------------------------
var dbPath = Path.Combine(AppContext.BaseDirectory, "trakker.db");
connectionString = new SqliteConnectionStringBuilder
_ConnectionString = new SqliteConnectionStringBuilder
{
DataSource = dbPath,
Mode = SqliteOpenMode.ReadWriteCreate,
Cache = SqliteCacheMode.Shared
}.ToString();
Text = "Project Trakker - v[n.n.n] / pragmattica.com";
Text = $"Project Trakker - v{_AppVersion} / pragmattica.com";
tabControlMainForm.TabPages[0].Text = " Home ";
tabControlMainForm.TabPages[1].Text = " Clients ";
tabControlMainForm.TabPages[2].Text = " Projects ";
_ctrl = new Services.MainCtrl(this, connectionString);
_ctrl = new Services.MainCtrl(this, _ConnectionString);
}
/// <summary>
@ -55,7 +55,7 @@ namespace trakker
Application.Exit();
}
public void InitDataGridViewClients(BindingList<Client> clients)
public void Client_DataGridViewClients_Init(BindingList<Client> clients)
{
dataGridViewClients.AllowUserToAddRows = true;
dataGridViewClients.AllowUserToDeleteRows = true;
@ -111,6 +111,18 @@ namespace trakker
}
dataGridViewClients.DoubleClick += (s, e) =>
{
Client_DataGridViewClients_DoubleClick(s!, e);
};
dataGridViewClients.SelectionChanged += (s, e) =>
{
Client_DataGridViewClients_SelectionChanged(s!, e);
};
}
public void Client_DataGridViewClients_DoubleClick(object sender, EventArgs e)
{
if (dataGridViewClients.SelectedRows.Count > 0)
{
@ -121,7 +133,7 @@ namespace trakker
if (dialog.ShowDialog(this) == DialogResult.OK)
{
Client client = dialog.Client;
ClientData clientData = new ClientData(connectionString);
ClientData clientData = new ClientData(_ConnectionString);
try
{
clientData.Upsert(client);
@ -134,9 +146,9 @@ namespace trakker
}
}
}
};
}
dataGridViewClients.SelectionChanged += (s, e) =>
public void Client_DataGridViewClients_SelectionChanged(object sender, EventArgs e)
{
if (dataGridViewClients.SelectedRows.Count > 0)
{
@ -147,21 +159,20 @@ namespace trakker
// MessageBox.Show($"Selected Client: {selectedClient.AddressStreet}", "Client Selected", MessageBoxButtons.OK, MessageBoxIcon.Information );
}
}
};
}
public void FillDataGridViewProjects(BindingSource projects)
public void Project_DataGridViewProjects_Fill(BindingSource projects)
{
int idx = 0;
if (dataGridViewProjects.CurrentRow != null)
{
idx = dataGridViewProjects.CurrentRow.Index;
}
//MessageBox.Show($"Project idx: {idx}", "Debug Info", MessageBoxButtons.OK, MessageBoxIcon.Information);
dataGridViewProjects.DataSource = projects;
dataGridViewProjects.Rows[idx].Selected = true;
}
public void InitDataGridViewProjects()
public void Project_DataGridViewProjects_Init()
{
dataGridViewProjects.AllowUserToAddRows = true;
dataGridViewProjects.AllowUserToDeleteRows = true;
@ -267,6 +278,18 @@ namespace trakker
}
dataGridViewProjects.DoubleClick += (s, e) =>
{
Project_DataGridViewProjects_DoubleClick(s!, e);
};
dataGridViewProjects.SelectionChanged += (s, e) =>
{
Project_DataGridViewProjects_SelectionChanged(s!, e);
};
}
public void Project_DataGridViewProjects_DoubleClick(object sender, EventArgs e)
{
if (dataGridViewProjects.SelectedRows.Count > 0)
{
@ -278,7 +301,7 @@ namespace trakker
if (dialog.ShowDialog(this) == DialogResult.OK)
{
Project project = dialog.Project;
ProjectData projectData = new ProjectData(connectionString);
ProjectData projectData = new ProjectData(_ConnectionString);
try
{
projectData.Upsert(project);
@ -297,9 +320,9 @@ namespace trakker
return;
}
}
};
}
dataGridViewProjects.SelectionChanged += (s, e) =>
public void Project_DataGridViewProjects_SelectionChanged(object sender, EventArgs e)
{
if (_ctrl == null) return; // Safety check to prevent null reference exceptions during initialization)
if (dataGridViewProjects.SelectedRows.Count > 0)
@ -313,8 +336,6 @@ namespace trakker
InitProjectTasks();
}
}
};
}
public void InitProjectTasks()
@ -325,7 +346,7 @@ namespace trakker
richTextBoxTaskComments.ReadOnly = true;
}
public void InitTreeViewTasks()
public void PTask_TreeViewTasks1_Init()
{
// Basic TreeView configuration
treeViewTasks1.BeginUpdate();
@ -339,11 +360,11 @@ namespace trakker
// When a tree node is clicked, fetch and show notebooks for that folder
treeViewTasks1.NodeMouseClick += (sender, e) =>
{
TreeViewTasks1_NodeMouseClick(e.Node, e.Button);
PTask_TreeViewTasks1_NodeMouseClick(e.Node, e.Button);
};
}
public void TreeViewTasks1_NodeMouseClick(TreeNode node, MouseButtons button = MouseButtons.Left)
public void PTask_TreeViewTasks1_NodeMouseClick(TreeNode node, MouseButtons button = MouseButtons.Left)
{
if (node == null) return;
@ -360,7 +381,7 @@ namespace trakker
}
_ctrl.LoadTasksRecursive(selectedNode?.GUID ?? "/", PTask.RecursiveRoot.TASK_ID); // Load all tasks for the project when root node is clicked
}
public void FillTreeViewTasks(List<PTaskFS> items)
public void PTask_TreeViewTasks1_Fill(List<PTaskFS> items)
{
if (items == null) return;
@ -371,7 +392,7 @@ namespace trakker
PTaskFS root = new();
root.GUID = "/";
root.Node = "/Project";
root.Parent = string.Empty;
root.Parent = _empty;
TreeNode rootNode = new TreeNode(root.Node) { Tag = root };
treeViewTasks1.Nodes.Add(rootNode);
@ -417,12 +438,12 @@ namespace trakker
treeViewTasks1.EndUpdate(); // End the update
TreeNode node = rootNode.FirstNode;
TreeViewTasks1_NodeMouseClick(node, MouseButtons.Left);
PTask_TreeViewTasks1_NodeMouseClick(node, MouseButtons.Left);
//treeViewTasks1.SelectedNode = node;
//treeViewTasks1.Focus();
}
private void addTaskSubtaskToolStripMenuItem_Click(object sender, EventArgs e)
private void PTask_AddTaskSubtaskToolStripMenuItem_Click(object sender, EventArgs e)
{
if (treeViewTasks1.SelectedNode == null) return;
PTaskFS? selectedNode = (PTaskFS?)treeViewTasks1.SelectedNode.Tag ?? new PTaskFS();
@ -436,7 +457,7 @@ namespace trakker
{
TaskId = taskId,
Title = "New Task",
Description = string.Empty,
Description = _empty,
ParentTaskId = selectedNode?.GUID == "/" ? null : selectedNode?.GUID,
HourlyRate = selectedNode?.HourlyRate,
ProjectId = selectedNode?.ProjectId, // Root node has no project
@ -446,7 +467,7 @@ namespace trakker
if (result == DialogResult.OK)
{
task = dialog.Task;
TaskData taskData = new TaskData(connectionString);
TaskData taskData = new TaskData(_ConnectionString);
try
{
taskData.Upsert(task);
@ -460,7 +481,7 @@ namespace trakker
}
}
private void editThisTaskSubtaskToolStripMenuItem_Click(object sender, EventArgs e)
private void PTask_EditThisTaskSubtaskToolStripMenuItem_Click(object sender, EventArgs e)
{
if (treeViewTasks1.SelectedNode == null) return;
PTaskFS? selectedTask = treeViewTasks1.SelectedNode.Tag as PTaskFS;
@ -469,7 +490,7 @@ namespace trakker
MessageBox.Show("Cannot edit root node", "Edit Task", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
TaskData taskData = new TaskData(connectionString);
TaskData taskData = new TaskData(_ConnectionString);
PTask task = taskData.Get(selectedTask?.GUID);
TaskForm dialog = new TaskForm(task, _ctrl.GetLOV("task.status"), _ctrl.GetLOV("task.priority"));
DialogResult result = dialog.ShowDialog(this);
@ -490,7 +511,7 @@ namespace trakker
}
}
private void deleteThisTaskSubtaskToolStripMenuItem_Click(object sender, EventArgs e)
private void PTask_DeleteThisTaskSubtaskToolStripMenuItem_Click(object sender, EventArgs e)
{
if (treeViewTasks1.SelectedNode == null) return;
PTaskFS? selectedTask = treeViewTasks1.SelectedNode.Tag as PTaskFS;
@ -505,14 +526,14 @@ namespace trakker
MessageBox.Show("Cannot delete a task with subtasks", "Delete Task", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
TaskData taskData = new TaskData(connectionString);
TaskData taskData = new TaskData(_ConnectionString);
DialogResult result = MessageBox.Show("Are you sure you want to delete this task?", "Delete Task", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
if (result == DialogResult.Yes)
{
//MessageBox.Show(task.ToString(), "Task Details", MessageBoxButtons.OK, MessageBoxIcon.Information);
try
{
taskData.Delete(selectedTask?.GUID ?? string.Empty);
taskData.Delete(selectedTask?.GUID ?? _empty);
treeViewTasks1.SelectedNode.Remove();
//_ctrl.LoadTasks(); // Reload tasks to update the DataGridView with any changes
}
@ -523,7 +544,7 @@ namespace trakker
}
}
private void addACommentToolStripMenuItem_Click(object sender, EventArgs e)
private void PTask_AddACommentToolStripMenuItem_Click(object sender, EventArgs e)
{
if (treeViewTasks1.SelectedNode == null) return;
PTaskFS? selectedTask = treeViewTasks1.SelectedNode.Tag as PTaskFS;
@ -538,17 +559,17 @@ namespace trakker
if (result == DialogResult.OK)
{
if (string.IsNullOrEmpty(textAreaForm.BasicText)) return;
TaskData taskData = new TaskData(connectionString);
TaskData taskData = new TaskData(_ConnectionString);
try
{
PTaskComment comment = new()
{
TaskId = selectedTask?.GUID ?? string.Empty,
Comment = textAreaForm.BasicText ?? string.Empty,
TaskId = selectedTask?.GUID ?? _empty,
Comment = textAreaForm.BasicText ?? _empty,
};
taskData.SaveComment(comment);
DialogExtensions.GenericSuccess($"Comment saved successfully for task '{selectedTask!.Node}'.");
dataGridViewProjectTasks_SelectionChanged(null, null);
PTask_DataGridViewProjectTasks_SelectionChanged(null, null);
}
catch (Exception ex)
{
@ -556,7 +577,7 @@ namespace trakker
}
}
}
public void InitDataGridViewProjectTasks()
public void PTask_DataGridViewProjectTasks_Init()
{
dataGridViewProjectTasks.AllowUserToAddRows = false;
dataGridViewProjectTasks.AllowUserToDeleteRows = false;
@ -681,11 +702,35 @@ namespace trakker
dataGridViewProjectTasks.SelectionChanged += (s, e) =>
{
dataGridViewProjectTasks_SelectionChanged(s, e);
PTask_DataGridViewProjectTasks_SelectionChanged(s, e);
};
dataGridViewProjectTasks.DoubleClick += (s, e) =>
{ // BCN
{
PTask_DataGridViewProjectTasks_DoubleClick(s, e);
};
}
public void PTask_DataGridViewProjectTasks_SelectionChanged(object? sender, EventArgs? e)
{
if (dataGridViewProjectTasks.SelectedRows.Count > 0)
{
var selectedIdx = dataGridViewProjectTasks.SelectedRows[0].Index;
var selectedTask = dataGridViewProjectTasks.SelectedRows[0].DataBoundItem as PTask;
if (selectedTask != null)
{
TaskData taskData = new TaskData(_ConnectionString);
List<PTaskComment> comments = taskData.GetComments(selectedTask.TaskId ?? _empty);
richTextBoxTaskComments.Clear();
foreach (var comment in comments)
{
richTextBoxTaskComments.AppendText($"{comment.CreatedAt}\n---\n{comment.Comment}\n\n");
}
}
}
}
public void PTask_DataGridViewProjectTasks_DoubleClick(object? sender, EventArgs? e)
{
var projectIdx = dataGridViewProjects.SelectedRows[0].Index;
var taskIdx = dataGridViewProjectTasks.SelectedRows[0].Index;
@ -700,11 +745,11 @@ namespace trakker
task = dialog.Task;
try
{
TaskData taskData = new TaskData(connectionString);
TaskData taskData = new TaskData(_ConnectionString);
taskData.Upsert(task);
//_ctrl.LoadTasks(task.ProjectId ?? string.Empty); // Reload tasks to update the DataGridView with any changes
_ctrl.LoadProjects(); // Reload projects to update the DataGridView with any changes
_ctrl.LoadTasksRecursive(task.TaskId ?? string.Empty, PTask.RecursiveRoot.TASK_ID); // Reload tasks to update the tree view with any changes
_ctrl.LoadTasksRecursive(task.TaskId ?? _empty, PTask.RecursiveRoot.TASK_ID); // Reload tasks to update the tree view with any changes
dataGridViewProjects.ClearSelection();
if (projectIdx >= 0 && projectIdx < dataGridViewProjects.Rows.Count)
@ -724,34 +769,16 @@ namespace trakker
}
}
};
}
public void dataGridViewProjectTasks_SelectionChanged(object? sender, EventArgs? e)
{
if (dataGridViewProjectTasks.SelectedRows.Count > 0)
{
var selectedIdx = dataGridViewProjectTasks.SelectedRows[0].Index;
var selectedTask = dataGridViewProjectTasks.SelectedRows[0].DataBoundItem as PTask;
if (selectedTask != null)
{
TaskData taskData = new TaskData(connectionString);
List<PTaskComment> comments = taskData.GetComments(selectedTask.TaskId ?? string.Empty);
richTextBoxTaskComments.Clear();
foreach (var comment in comments)
{
richTextBoxTaskComments.AppendText($"{comment.CreatedAt}\n---\n{comment.Comment}\n\n");
}
}
}
}
public void FillDataGridViewProjectTasks(BindingSource tasks)
public void PTask_DataGridViewProjectTasks_Fill(BindingSource tasks)
{
//dataGridViewProjectTasks.Rows.Clear();
dataGridViewProjectTasks.DataSource = tasks;
//dataGridViewProjectTasks.Refresh();
}
private void richTextBoxTaskComments_LinkClicked(object sender, LinkClickedEventArgs e)
private void PTask_RichTextBoxTaskComments_LinkClicked(object sender, LinkClickedEventArgs e)
{
try
{

2
Forms/TextAreaForm.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace newcle.us.Forms
namespace trakker.Forms
{
partial class TextAreaForm
{

5
Forms/TextAreaForm.cs
View File

@ -1,7 +1,6 @@
using newcle.us.Utilities;
using System.ComponentModel;
using System.ComponentModel;
namespace newcle.us.Forms
namespace trakker.Forms
{
public partial class TextAreaForm : Form
{

14
Interfaces/IMainForm.cs
View File

@ -10,13 +10,13 @@ namespace trakker.Interfaces
{
internal interface IMainForm
{
void InitDataGridViewClients(BindingList<Client> clients);
void InitDataGridViewProjects();
void FillDataGridViewProjects(BindingSource projects);
void FillTreeViewTasks(List<PTaskFS> items);
void InitTreeViewTasks();
void InitDataGridViewProjectTasks();
void Client_DataGridViewClients_Init(BindingList<Client> clients);
void Project_DataGridViewProjects_Init();
void Project_DataGridViewProjects_Fill(BindingSource projects);
void PTask_TreeViewTasks1_Fill(List<PTaskFS> items);
void PTask_TreeViewTasks1_Init();
void PTask_DataGridViewProjectTasks_Init();
void InitProjectTasks();
void FillDataGridViewProjectTasks(BindingSource tasks);
void PTask_DataGridViewProjectTasks_Fill(BindingSource tasks);
}
}

14
Services/MainCtrl.cs
View File

@ -22,9 +22,9 @@ namespace trakker.Services
LoadClients();
_view.InitDataGridViewProjectTasks();
_view.InitDataGridViewProjects();
_view.InitTreeViewTasks();
_view.PTask_DataGridViewProjectTasks_Init();
_view.Project_DataGridViewProjects_Init();
_view.PTask_TreeViewTasks1_Init();
LoadProjects();
}
@ -42,7 +42,7 @@ namespace trakker.Services
internal void LoadClients()
{
var clients = GetClients();
_view.InitDataGridViewClients(clients);
_view.Client_DataGridViewClients_Init(clients);
}
public BindingList<Project> GetProjects()
@ -58,13 +58,13 @@ namespace trakker.Services
{
var x = project.Status;
}
_view.FillDataGridViewProjects(new BindingSource { DataSource = projects });
_view.Project_DataGridViewProjects_Fill(new BindingSource { DataSource = projects });
//LoadTasks();
}
internal void LoadTasks(string projectId)
{
var dbo = new TaskData(_connectionString);
_view.FillTreeViewTasks(dbo.GetFS(projectId));
_view.PTask_TreeViewTasks1_Fill(dbo.GetFS(projectId));
_view.InitProjectTasks();
//_view.InitDataGridViewProjectTasks();
}
@ -72,7 +72,7 @@ namespace trakker.Services
{
var dbo = new TaskData(_connectionString);
BindingList<PTask> tasks = dbo.GetRecursive(id, root);
_view.FillDataGridViewProjectTasks(new BindingSource { DataSource = tasks });
_view.PTask_DataGridViewProjectTasks_Fill(new BindingSource { DataSource = tasks });
}

2
Utilities/CurrencyExtensions.cs
View File

@ -1,6 +1,6 @@
using System.Globalization;
namespace newcle.us.Utilities
namespace trakker.Utilities
{
public static class CurrencyExtensions
{

2
Utilities/DateTimeExtensions.cs
View File

@ -1,4 +1,4 @@
namespace newcle.us.Utilities
namespace trakker.Utilities
{
internal class DateTimeExtensions
{

2
Utilities/DialogExtensions.cs
View File

@ -1,4 +1,4 @@
namespace newcle.us.Utilities
namespace trakker.Utilities
{
internal class DialogExtensions
{

2
Utilities/FileExtensions.cs
View File

@ -1,6 +1,6 @@
using System.Diagnostics;
namespace newcle.us.Utilities
namespace trakker.Utilities
{
public class FileExtensions
{

2
Utilities/StringExtensions.cs
View File

@ -1,4 +1,4 @@
namespace newcle.us.Utilities
namespace trakker.Utilities
{
public class StringExtensions
{