Modifiche per memorizzare il formato data e numero: errori MI3382 e

MI4234.


git-svn-id: svn://10.65.10.50/trunk@3604 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
angelo 1996-09-17 11:09:57 +00:00
parent 7b1f903e5b
commit af13fe4e16
2 changed files with 42 additions and 18 deletions

View File

@ -363,12 +363,17 @@ bool TForm_editor::edit_formato_numero()
bool dirty = FALSE;
TMask m("ba21nm");
m.set(F_WIDTH,_frm_number.get(0));
m.set(F_DECIMALS,_frm_number.get(1));
m.set(F_PICTURE,_frm_number.get(2));
if (dirty = (m.run() == K_ENTER))
{
int w = m.get_int(F_WIDTH);
int d = m.get_int(F_DECIMALS);
TString p(m.get(F_PICTURE));
_frm_number = "";
_frm_number.add(w);_frm_number.add(d);_frm_number.add(p);
_form->change_number_format(w, d, p);
}
return dirty;
@ -378,20 +383,18 @@ bool TForm_editor::edit_formato_numero()
bool TForm_editor::edit_formato_data()
{
bool dirty = FALSE;
TString16 fmt("1"),sep("-");
char format[6] = { "1444-" };
TMask m("ba21dt");
TString16 fmt("1"),sep("-"),day("4"),month("4"),year("4");
m.set_handler(F_DFORMAT, date_example);
m.set_handler(F_DDAY, date_example);
m.set_handler(F_DMONTH, date_example);
m.set_handler(F_DYEAR, date_example);
m.set_handler(F_DSEP, date_example);
if (_frm_date.not_empty()) // Se e' settato il formato globale lo prende...
{
fmt.format("%c", _frm_date[0]);
sep.format("%c", _frm_date[4]);
day.format("%c", _frm_date[1]);
month.format("%c",_frm_date[2]);
year.format("%c", _frm_date[3]);
}
TDate dd(TODAY);
TFormatted_date d(dd);
d.set_format(format);
if (_form->code()[4] != '\0')
if (_frm_date.empty() && _form->code()[4] != '\0') // ...altrimenti cerca sulla tabella lingue...
{//Loads date format from %LNG
TTable l("%LNG");
l.put("CODTAB",_form->code()[4]);
@ -406,24 +409,38 @@ bool TForm_editor::edit_formato_data()
else fmt = "1";
}
}
TMask m("ba21dt");
m.set_handler(F_DFORMAT, date_example);
m.set_handler(F_DDAY, date_example);
m.set_handler(F_DMONTH, date_example);
m.set_handler(F_DYEAR, date_example);
m.set_handler(F_DSEP, date_example);
m.set(F_DFORMAT, fmt);
m.set(F_DDAY, "4");
m.set(F_DMONTH, "4");
m.set(F_DYEAR, "4");
m.set(F_DDAY, day);
m.set(F_DMONTH, month);
m.set(F_DYEAR, year);
m.set(F_DSEP, sep);
d.set_format(fmt<<"444"<< sep);
TDate dd(TODAY);
TFormatted_date d(dd);
d.set_format(fmt<< day << month << year<< sep);
m.set(F_DEXAMPLE, d.string());
if (dirty = (m.run() == K_ENTER))
{
char format[6];
format[0] = m.get(F_DFORMAT)[0];
format[1] = m.get(F_DDAY )[0];
format[2] = m.get(F_DMONTH )[0];
format[3] = m.get(F_DYEAR )[0];
format[4] = m.get(F_DSEP )[0];
format[5] = '\0';
_frm_date = format;
_form->change_date_format(format);
}
return dirty;

View File

@ -14,6 +14,9 @@ class TForm_editor : public TApplication
TForm* _form;
TMask* _m;
bool _extra;
TString16 _frm_date;
TToken_string _frm_number;
protected:
@ -36,6 +39,10 @@ protected:
bool edit_fincatura();
bool edit_formato_numero();
bool edit_formato_data();
const char* get_formato_numero() { return _frm_number; }
const char* get_formato_data() { return _frm_date; }
void set_formato_numero(const char* s) { _frm_number = s;}
void set_formato_data(const char* s) { _frm_date = s;}
virtual bool edit(char s, pagetype p);
bool form_config() const;
void check_form() { if (_form != NULL) delete _form; }