root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corretti filtri per cantiere/fase in stampa riepiloghi

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@22950 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2014-05-16 13:01:25 +00:00
parent 982f90360e
commit e467cc572d
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ci/ci1200.cpp
View File

@ -20,14 +20,14 @@ class TRiepiloghi_mask : public TAutomask
protected: protected:
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly); virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
int create_sheet_fields(int lf, int& y, short& dlg, bool required = false); int create_sheet_fields(int lf, int& y, short& dlg/*, bool required = false*/);
void create_sheet(); void create_sheet();
public: public:
TRiepiloghi_mask(); TRiepiloghi_mask();
}; };
int TRiepiloghi_mask::create_sheet_fields(int lf, int& y, short& dlg, bool required) int TRiepiloghi_mask::create_sheet_fields(int lf, int& y, short& dlg/*, bool required*/)
{ {
TSheet_field& sf = sfield(F_COMMESSE); TSheet_field& sf = sfield(F_COMMESSE);
TMask& sm = sf.sheet_mask(); TMask& sm = sf.sheet_mask();
@ -44,7 +44,7 @@ int TRiepiloghi_mask::create_sheet_fields(int lf, int& y, short& dlg, bool requi
for (int i = 0; i < h; i++) for (int i = 0; i < h; i++)
{ {
TEdit_field& fld = sm.efield(dlg+i); TEdit_field& fld = sm.efield(dlg+i);
fld.check_type(required ? CHECK_REQUIRED : CHECK_NORMAL); fld.check_type(/*required ? CHECK_REQUIRED : */CHECK_NORMAL);
TEdit_field& dfld = sm.efield(dlg+50+i); TEdit_field& dfld = sm.efield(dlg+50+i);
dfld.set_field(EMPTY_STRING); // Toglie campi che fan saltare gli output! dfld.set_field(EMPTY_STRING); // Toglie campi che fan saltare gli output!
@ -77,18 +77,15 @@ void TRiepiloghi_mask::create_sheet()
if (fasinfo.parent() == LF_CDC) if (fasinfo.parent() == LF_CDC)
create_sheet_fields(LF_FASI, y, dlg); create_sheet_fields(LF_FASI, y, dlg);
else else
{ create_sheet_fields(LF_CDC, y, dlg);
const bool cdc_req = ini.get_bool("CdcRequired");
create_sheet_fields(LF_CDC, y, dlg, cdc_req);
}
} else } else
if (level == "CMS") // Crea commessa if (level == "CMS") // Crea commessa
{ {
const bool cms_req = ini.get_bool("CmsRequired"); const bool cms_req = false;
if (fasinfo.parent() == LF_COMMESSE) if (fasinfo.parent() == LF_COMMESSE)
create_sheet_fields(LF_FASI, y, dlg, cms_req); create_sheet_fields(LF_FASI, y, dlg);
else else
create_sheet_fields(LF_COMMESSE, y, dlg, cms_req); create_sheet_fields(LF_COMMESSE, y, dlg);
} }
} }
@ -298,8 +295,8 @@ void TRiepiloghi_recordset::set_filter(const TRiepiloghi_mask& msk, int cms_row)
_codfas = rel.curr().get(RMOVANA_CODFASE); _codfas = rel.curr().get(RMOVANA_CODFASE);
} }
set_var("#S_CDC", TVariant(_codcosto), true); set_var("#S_CDC", TVariant(_codcosto), true);
set_var("#S_CMS", TVariant(_codcms), true); set_var("#S_CMS", TVariant(_codcms), true);
set_var("#S_FAS", TVariant(_codfas), true); set_var("#S_FAS", TVariant(_codfas), true);
TToken_string td(80, ','); TToken_string td(80, ',');
_tipidoc.destroy(); _tipidoc.destroy();