Corretto errore MI1037

git-svn-id: svn://10.65.10.50/trunk@421 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1994-10-19 13:56:40 +00:00
parent e01d7d1ed7
commit 2c955a6c90

View File

@ -1,4 +1,4 @@
// $Id: maskfld.cpp,v 1.31 1994-10-19 11:46:18 alex Exp $ // $Id: maskfld.cpp,v 1.32 1994-10-19 13:56:40 alex Exp $
#include <xvt.h> #include <xvt.h>
#include <applicat.h> #include <applicat.h>
@ -2289,7 +2289,7 @@ bool TDate_field::on_key(KEY key)
{ {
TFixed_string data(get_window_data(), 15); TFixed_string data(get_window_data(), 15);
data.trim(); data.trim();
if (data.not_empty() || required()) if (data.not_empty())
{ {
bool changed = FALSE; bool changed = FALSE;
if (isdigit(data[0])) if (isdigit(data[0]))
@ -2315,13 +2315,32 @@ bool TDate_field::on_key(KEY key)
{ {
TDate g(TODAY); TDate g(TODAY);
data.upper(); data.upper();
if (data == "IERI") --g; else if (data == "IERI")
if (data == "DOMANI") ++g; {
--g;
changed = TRUE;
}
else
if (data == "DOMANI")
{
++g;
changed = TRUE;
}
TString16 gstring(g.string()); TString16 gstring(g.string());
if (data == "PRIMO") { gstring.overwrite("01-01", 0); } else if (data == "PRIMO")
if (data == "ULTIMO") { gstring.overwrite("31-12", 0); } {
data = gstring; gstring.overwrite("01-01", 0);
changed = TRUE; changed = TRUE;
}
else
if (data == "ULTIMO")
{
gstring.overwrite("31-12", 0);
changed = TRUE;
}
else
if (data == "OGGI") changed = TRUE;
if (changed) data = gstring;
} }
TDate d(data); TDate d(data);