Skip to content

Commit

Permalink
Refactor and bug fixes across application modules
Browse files Browse the repository at this point in the history 
This commit encompasses a wide range of changes aimed at correcting critical typos, refactoring class dependencies, enhancing code documentation and organization, and improving the representation of asset details within the application. Key changes include:

- Corrected the misspelling of `SQLCHARVSMAL` to `SQLCHARVSMALL` in SQL data retrieval calls across multiple files, fixing a potential bug related to buffer size misidentification.
- Removed dependencies of certain classes on `CClosedWorkorderDetailsTabCtrl`, simplifying constructors and decoupling class relationships.
- Updated documentation comments and licensing information in several files to clarify file purposes, licensing, and authorship.
- Introduced and organized code with namespaces to improve readability and structure.
- Modified `OnInitDialog` and `DoDataExchange` methods to align with updated class definitions and buffer size corrections.
- Enhanced asset details representation by adding and updating class member variables with comprehensive asset information.
- Added copyright and GNU Affero General Public License notices in specific files, emphasizing the open-source nature of the software.
- Refactored constructors to use direct unsigned integer references for initialization and implemented database integration for fetching customer and invoice details.
- Updated UI elements and data binding to reflect new and fetched data, improving the user interface.
- Incremented application and database version information to reflect ongoing development and modifications.
- Restructured the "Maintenance" category within the application to focus on different aspects of maintenance management.

These changes collectively aim to improve the application's functionality, code quality, and user experience.
  • Loading branch information
@artvabas
artvabas committed Jun 30, 2024
1 parent c60f150 commit c5f66ff
Show file tree
Hide file tree
Showing 22 changed files with 885 additions and 225 deletions.
16 changes: 8 additions & 8 deletions RepairCafeCureApp/CAssetTab.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ BOOL CAssetTab::LoadAssetDetailsList() noexcept

if (sql.CreateSQLConnection()) {

SQLCHAR szName[SQLCHARVSMAL]{};
SQLCHAR szName[SQLCHARVSMALL]{};
SQLCHAR szNameLong[SQLCHARVMAX]{};
SQLLEN cbName{};
SQLRETURN retcode{};
Expand All @@ -443,25 +443,25 @@ BOOL CAssetTab::LoadAssetDetailsList() noexcept
return static_cast<CString>(szName);
};

SQLGetData(hstmt, ASSET.ASSET_ID, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, ASSET.ASSET_ID, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
nIndex = m_ctrExistingAssetList.InsertItem(row++, CheckForNull(szName, cbName));

SQLGetData(hstmt, ASSET.ASSET_CUSTOMER_ID, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, ASSET.ASSET_CUSTOMER_ID, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_ctrExistingAssetList.SetItemText(nIndex, 1, CheckForNull(szName, cbName));

SQLGetData(hstmt, ASSET.ASSET_CREATE_DATE, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, ASSET.ASSET_CREATE_DATE, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_ctrExistingAssetList.SetItemText(nIndex, 2, CheckForNull(szName, cbName));

SQLGetData(hstmt, ASSET.ASSET_DESCRIPTION, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, ASSET.ASSET_DESCRIPTION, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_ctrExistingAssetList.SetItemText(nIndex, 3, CheckForNull(szName, cbName));

SQLGetData(hstmt, ASSET.ASSET_MODEL_NUMBER, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, ASSET.ASSET_MODEL_NUMBER, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_ctrExistingAssetList.SetItemText(nIndex, 4, CheckForNull(szName, cbName));

SQLGetData(hstmt, ASSET.ASSET_BRAND, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, ASSET.ASSET_BRAND, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_ctrExistingAssetList.SetItemText(nIndex, 5, CheckForNull(szName, cbName));

SQLGetData(hstmt, ASSET.ASSET_DISPOSED, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, ASSET.ASSET_DISPOSED, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_ctrExistingAssetList.SetItemText(nIndex, 6, CheckForNull(szName, cbName));

SQLGetData(hstmt, ASSET.ASSET_HISTORY_LOG, SQL_C_CHAR, szNameLong, SQLCHARVMAX, &cbName);
Expand Down
16 changes: 8 additions & 8 deletions RepairCafeCureApp/CAssetView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ void CAssetView::OnClickedHistorySearch()

if (sql.CreateSQLConnection()) {

SQLCHAR szName[SQLCHARVSMAL]{};
SQLCHAR szName[SQLCHARVSMALL]{};
SQLCHAR szNameLong[SQLCHARVMAX]{};
SQLLEN cbName{};
SQLRETURN retcode{};
Expand All @@ -253,25 +253,25 @@ void CAssetView::OnClickedHistorySearch()
return static_cast<CString>(szName);
};

SQLGetData(hstmt, HISTORY_SEARCH.ASSET_DESCRIPTION, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, HISTORY_SEARCH.ASSET_DESCRIPTION, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
nIndex = m_lstHistorySearchResults.InsertItem(row++, CheckForNull(szName, cbName));

SQLGetData(hstmt, HISTORY_SEARCH.ASSET_MODEL_NUMBER, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, HISTORY_SEARCH.ASSET_MODEL_NUMBER, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_lstHistorySearchResults.SetItemText(nIndex, 1, CheckForNull(szName, cbName));

SQLGetData(hstmt, HISTORY_SEARCH.ASSET_BRAND, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, HISTORY_SEARCH.ASSET_BRAND, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_lstHistorySearchResults.SetItemText(nIndex, 2, CheckForNull(szName, cbName));

SQLGetData(hstmt, HISTORY_SEARCH.ASSET_DISPOSED, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, HISTORY_SEARCH.ASSET_DISPOSED, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_lstHistorySearchResults.SetItemText(nIndex, 3, CheckForNull(szName, cbName));

SQLGetData(hstmt, HISTORY_SEARCH.WORKORDER_CREATE_DATE, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, HISTORY_SEARCH.WORKORDER_CREATE_DATE, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_lstHistorySearchResults.SetItemText(nIndex, 4, CheckForNull(szName, cbName));

SQLGetData(hstmt, HISTORY_SEARCH.WORKORDER_CREATE_BY, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, HISTORY_SEARCH.WORKORDER_CREATE_BY, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_lstHistorySearchResults.SetItemText(nIndex, 5, CheckForNull(szName, cbName));

SQLGetData(hstmt, HISTORY_SEARCH.WORKORDER_RESPONSIBLE, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, HISTORY_SEARCH.WORKORDER_RESPONSIBLE, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_lstHistorySearchResults.SetItemText(nIndex, 6, CheckForNull(szName, cbName));

SQLGetData(hstmt, HISTORY_SEARCH.WORKORDER_DESCRIPTION, SQL_C_CHAR, szNameLong, SQLCHARVMAX, &cbName);
Expand Down
28 changes: 13 additions & 15 deletions RepairCafeCureApp/CClosedWorkOrderDetailsTab.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

/*
* This file is part of RepairCafeCureApp.
* File: CClosedWorkOrderDetailsTab.h, implements class CClosedWorkOrderDetailsTab
* File: CClosedWorkOrderDetailsTab.cpp, implements class CClosedWorkOrderDetailsTab
*
* This class is the view of the Workorder-tab in the CClosedWorkorderDetailsTabCtrl class,
* which is the view of the CListCtrl created on the Closed Workorder Details dialog (CClosedWorkorderDetails)
Expand Down Expand Up @@ -58,9 +58,8 @@ using namespace artvabas::database::tables::workorder;

IMPLEMENT_DYNAMIC(CClosedWorkOrderDetailsTab, CDialogEx)

CClosedWorkOrderDetailsTab::CClosedWorkOrderDetailsTab(CClosedWorkorderDetailsTabCtrl* pTabControl, unsigned int unID, CWnd* pParent)
CClosedWorkOrderDetailsTab::CClosedWorkOrderDetailsTab(unsigned int unID, CWnd* pParent)
: CDialogEx(IDD_CLOSED_WORKORDER_DETAILS_TAB, pParent)
, m_pTabControl{ pTabControl }
, m_unWorkorderID{ unID }
, m_strWorkorderID{ _T("") }
, m_strWorkorderAssetID{ _T("") }
Expand All @@ -81,7 +80,7 @@ CClosedWorkOrderDetailsTab::~CClosedWorkOrderDetailsTab()
BEGIN_MESSAGE_MAP(CClosedWorkOrderDetailsTab, CDialogEx)
END_MESSAGE_MAP()

// OnintDialog is called when the dialog is created, it is used to load the data from the database
// OnIntDialog is called when the dialog is created, it is used to load the data from the database
// and display it in the dialog.
BOOL CClosedWorkOrderDetailsTab::OnInitDialog()
{
Expand All @@ -97,7 +96,7 @@ BOOL CClosedWorkOrderDetailsTab::OnInitDialog()

if (sql.CreateSQLConnection()) {

SQLCHAR szName[SQLCHARVSMAL]{};
SQLCHAR szName[SQLCHARVSMALL]{};
SQLCHAR szNameLong[SQLCHARVMAX]{};
SQLLEN cbName{};
SQLRETURN retcode{};
Expand All @@ -120,35 +119,34 @@ BOOL CClosedWorkOrderDetailsTab::OnInitDialog()
}
return static_cast<CString>(szName);
};
// Get data for columns 1, employee names
SQLGetData(hstmt, WORKORDER.WORKORDER_ID, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, WORKORDER.WORKORDER_ID, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_strWorkorderID = CheckForNull(szName, cbName);

SQLGetData(hstmt, WORKORDER.WORKORDER_ASSET_ID, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, WORKORDER.WORKORDER_ASSET_ID, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_strWorkorderAssetID = CheckForNull(szName, cbName);

SQLGetData(hstmt, WORKORDER.WORKORDER_CUSTOMER_ID, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, WORKORDER.WORKORDER_CUSTOMER_ID, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_strWorkorderCustomerID = CheckForNull(szName, cbName);

SQLGetData(hstmt, WORKORDER.WORKORDER_INVOICE_ID, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, WORKORDER.WORKORDER_INVOICE_ID, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_strWorkorderInvoiceID = CheckForNull(szName, cbName);

SQLGetData(hstmt, WORKORDER.WORKORDER_CREATE_DATE, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, WORKORDER.WORKORDER_CREATE_DATE, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_strWorkorderCreateDate = CheckForNull(szName, cbName);

SQLGetData(hstmt, WORKORDER.WORKORDER_CREATE_BY, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, WORKORDER.WORKORDER_CREATE_BY, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_strWorkorderCreatedBy = CheckForNull(szName, cbName);

SQLGetData(hstmt, WORKORDER.WORKORDER_DESCRIPTION, SQL_C_CHAR, szNameLong, SQLCHARVMAX, &cbName);
m_strWorkorderDescription = CheckForNull(szNameLong, cbName);

SQLGetData(hstmt, WORKORDER.WORKORDER_RESPONSIBLE, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, WORKORDER.WORKORDER_RESPONSIBLE, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_strWorkorderEmployeeResponsible = CheckForNull(szName, cbName);

SQLGetData(hstmt, WORKORDER.WORKORDER_STATUS, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, WORKORDER.WORKORDER_STATUS, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_strWorkorderStatus = CheckForNull(szName, cbName);

SQLGetData(hstmt, WORKORDER.WORKORDER_CLOSED_DATE, SQL_C_CHAR, szName, SQLCHARVSMAL, &cbName);
SQLGetData(hstmt, WORKORDER.WORKORDER_CLOSED_DATE, SQL_C_CHAR, szName, SQLCHARVSMALL, &cbName);
m_strWorkorderClosedDate = CheckForNull(szName, cbName);

SQLGetData(hstmt, WORKORDER.WORKORDER_HISTORY, SQL_C_CHAR, szNameLong, SQLCHARVMAX, &cbName);
Expand Down
14 changes: 4 additions & 10 deletions RepairCafeCureApp/CClosedWorkOrderDetailsTab.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,8 @@
* License: GPLv3
*/
#pragma once
#include "CClosedWorkorderDetailsTabCtrl.h"

namespace artvabas::rcc::ui::dialogs {

using namespace artvabas::rcc::ui::controls;

class CClosedWorkOrderDetailsTab : public CDialogEx
{
#ifdef AFX_DESIGN_TIME
Expand All @@ -60,7 +56,6 @@ namespace artvabas::rcc::ui::dialogs {
DECLARE_DYNAMIC(CClosedWorkOrderDetailsTab)

private:
CClosedWorkorderDetailsTabCtrl* m_pTabControl;
unsigned int m_unWorkorderID;

CString m_strWorkorderID;
Expand All @@ -76,14 +71,13 @@ namespace artvabas::rcc::ui::dialogs {
CString m_strWorkorderHistoryLog;

public:
CClosedWorkOrderDetailsTab(CClosedWorkorderDetailsTabCtrl* pTabControl, unsigned int unID, CWnd* pParent = nullptr); // standard constructor
CClosedWorkOrderDetailsTab(unsigned int unID, CWnd* pParent = nullptr);
virtual ~CClosedWorkOrderDetailsTab();

protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
private:
BOOL OnInitDialog() override;
void DoDataExchange(CDataExchange* pDX) override;

DECLARE_MESSAGE_MAP()
public:
virtual BOOL OnInitDialog();
};
}
Loading

0 comments on commit c5f66ff

Please sign in to comment.