Added classes to manage simple tabular data of known structure using a
popup containing a wxGrid object.
BasePicker : Abstract class adding a popup to wxPickerBase styled with
a wxTextCtrl.
BaseGridPicker : Abstract class adding a wxGrid in the popup.
JsonGridPickerCtrl : UI control storing the tabular data in a JSON
array.
LBoundJsonGridPicker : connect JsonGridPicker to database.
LGridJsonCellEditor : use LBoundJsonGridPicker in other wxGrid objects.
LGridJsonCellRenderer : render cell JSON data.
XmlGridPickerCtrl : UI control storing the tabular data in as XML
document.
LBoundXmlGridPicker : connect XmlGridPicker to database.
LGridXmlCellEditor : grid editor for LBoundXmlGridPicker.
LGridXmlCellRenderer : grid renderer for LBoundXmlGridPicker.
JsonHelper and XmlHelper : for applications to quickly get intent value
from database data..
The structure of managed tabular data :
Column 1 : Intent - this is what we want to store/edit. This can be
telephone numbers, email addresses, instant messaging addresses...
any single line piece of information that can exist many times for one
entity (person, company...).
Column 2 : Type - A short description of the intent : 'Home, Work,
Mobile, Fax, Other...'. It is displayed in a non editable wxComboBox.
Column 3 : Preferred - One line of data can be selected as the preferred
one. It is not mandatory, but it must be a single choice.
Column 4 : Notes - single line notes.
Adjust sql scripts and L7.dox.
Applied ANSI formatting style to all files.
Other changes :
Work around a nasty misbehavior.
Grid columns edited by a translated combobox expect full string
data as cell values. LResultSet::BEData() will report these mapped strings,
instead of database real data. LBoundComboBox::IsDirty() will always be
true even if the editor is unchanged once created.
Simplest workaround : disconnect m_BoundComboBox if unchanged.
LGridTextEditor::ProvideFormEditor() : set the form editor's value
explicitely.; wxTextCtrl does not interpret data it receives
LBoundControl::SetNull must be void.
LBoundGrid : Unbind:: instructions should limit to the widget's id, like Bind::
LConnection::GetReturnedKeys should return NULL.
LConnection::SetData should return void.
Notes : wxJSON must be configured with the same prefix as wxWidgets,
here /usr/local/{wxWidgets,wxWidgets-Release}.
This commit is contained in:
@@ -10,8 +10,8 @@
|
||||
#include "LBoundDatePickerCtrl.h"
|
||||
#include <wx/tokenzr.h>
|
||||
|
||||
LBoundDatePickerCtrl::LBoundDatePickerCtrl(wxWindow* parent, wxWindowID id)
|
||||
: wxDatePickerCtrl(parent, id, wxInvalidDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT|wxDP_ALLOWNONE|wxDP_SHOWCENTURY)
|
||||
LBoundDatePickerCtrl::LBoundDatePickerCtrl(wxWindow* parent, wxWindowID id)
|
||||
: wxDatePickerCtrl(parent, id, wxInvalidDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT | wxDP_ALLOWNONE | wxDP_SHOWCENTURY)
|
||||
{
|
||||
m_sqlQuote = _T("'");
|
||||
SetValue(wxInvalidDateTime);
|
||||
@@ -22,59 +22,70 @@ LBoundDatePickerCtrl::~LBoundDatePickerCtrl()
|
||||
if (m_rs) m_rs->UnRegisterControl(this);
|
||||
}
|
||||
|
||||
const wxAny LBoundDatePickerCtrl::GetData() {
|
||||
const wxAny LBoundDatePickerCtrl::GetData()
|
||||
{
|
||||
if (IsNull()) return L_SQLNULL;
|
||||
return GetValue().GetDateOnly().FormatISODate();
|
||||
}
|
||||
|
||||
bool LBoundDatePickerCtrl::SetData(const wxAny& newData) {
|
||||
if (newData.IsNull()) {
|
||||
void LBoundDatePickerCtrl::SetData(const wxAny& newData)
|
||||
{
|
||||
if (newData.IsNull())
|
||||
{
|
||||
SetValue(wxInvalidDateTime);
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
if (newData.As<wxString>() == L_SQLNULL || newData.As<wxString>().IsEmpty()) {
|
||||
if (newData.As<wxString>() == L_SQLNULL || newData.As<wxString>().IsEmpty())
|
||||
{
|
||||
SetValue(wxInvalidDateTime);
|
||||
return true;
|
||||
return;
|
||||
}
|
||||
wxString s; newData.GetAs(&s);
|
||||
wxString s;
|
||||
newData.GetAs(&s);
|
||||
const wxDateTime dt = BuildDate(s);
|
||||
if (!dt.IsValid()) {
|
||||
SetValue(wxInvalidDateTime);
|
||||
return false;
|
||||
}
|
||||
SetValue(dt);
|
||||
return true;
|
||||
}
|
||||
|
||||
void LBoundDatePickerCtrl::SetResultSet(LResultSet* newResultSet)
|
||||
{
|
||||
m_rs = newResultSet;
|
||||
if (m_rs == NULL) return;
|
||||
m_rs->RegisterControl(this);
|
||||
}
|
||||
bool LBoundDatePickerCtrl::IsNull() {
|
||||
|
||||
bool LBoundDatePickerCtrl::IsNull()
|
||||
{
|
||||
return !(GetValue().IsValid());
|
||||
}
|
||||
bool LBoundDatePickerCtrl::SetNull() {
|
||||
return SetData(L_SQLNULL);
|
||||
|
||||
void LBoundDatePickerCtrl::SetNull()
|
||||
{
|
||||
SetData(L_SQLNULL);
|
||||
}
|
||||
bool LBoundDatePickerCtrl::IsDirty() {
|
||||
|
||||
bool LBoundDatePickerCtrl::IsDirty()
|
||||
{
|
||||
wxASSERT_MSG(m_rs != NULL, "m_rs est NULL.");
|
||||
wxAny BEData = m_rs->GetData(m_columnName);
|
||||
if (BEData.As<wxString>().IsEmpty()) BEData = L_SQLNULL;
|
||||
return (GetData().As<wxString>() != BEData.As<wxString>());
|
||||
}
|
||||
const wxString LBoundDatePickerCtrl::GetDisplayedData() {
|
||||
|
||||
const wxString LBoundDatePickerCtrl::GetDisplayedData()
|
||||
{
|
||||
if (IsNull()) return wxEmptyString;
|
||||
return GetValue().GetDateOnly().FormatDate();
|
||||
}
|
||||
wxDateTime LBoundDatePickerCtrl::BuildDate(const wxString& ISODate) {
|
||||
|
||||
wxDateTime LBoundDatePickerCtrl::BuildDate(const wxString& ISODate)
|
||||
{
|
||||
wxDateTime dt = wxDateTime::Today();
|
||||
if (!dt.ParseISODate(ISODate)) return wxInvalidDateTime;
|
||||
unsigned int * res = new unsigned int[3];
|
||||
unsigned int i = 0;
|
||||
wxAny token;
|
||||
wxStringTokenizer tkz(ISODate, _T("-"));
|
||||
while ( tkz.HasMoreTokens() )
|
||||
while (tkz.HasMoreTokens())
|
||||
{
|
||||
token = tkz.GetNextToken();
|
||||
token.GetAs(&res[i]);
|
||||
|
||||
Reference in New Issue
Block a user