diff --git a/src/ca/ca3A00.cpp b/src/ca/ca3A00.cpp index e0a191398..b5532d12e 100644 --- a/src/ca/ca3A00.cpp +++ b/src/ca/ca3A00.cpp @@ -100,8 +100,8 @@ const TString& TPrint_prosp_ricerca_ca_mask::get_report_class() const switch (tipostampa) { case 2: classe = "ca3A00c"; break; - case 1: classe = "ca3A00a"; break; - case 0: + case 0: classe = "ca3A00a"; break; + case 1: default: classe = "ca3A00b"; break; } return classe; @@ -381,7 +381,9 @@ protected: public: virtual bool set_recordset(const TString& sql = "USE PROSP.DBF") override; - virtual const char * get_excel_disabled_field() override { return "H0.201|H0.202|H0.203|H0.204|H0.205|H0.206|H0.207"; } + virtual int max_excel_height() { return 1; } + virtual const char * get_excel_header_section() { return "H0"; } + virtual const char * get_excel_disabled_field() override { return "H0.201|H0.202|H0.203|H0.204|H0.205"; } TLog_report& log() { return *_log; } TPrint_prosp_ricerca_ca_rep(TPrint_prosp_ricerca_ca_mask * _mask); ~TPrint_prosp_ricerca_ca_rep(); @@ -392,17 +394,13 @@ bool TPrint_prosp_ricerca_ca_rep::get_usr_val(const TString& name, TVariant& var return TAnal_report::get_usr_val(name, var); } + void TPrint_prosp_ricerca_ca_rep::set_dbase_fixed_fields(bool on) { -/* field("B1.201")->show(on); - field("B1.202")->show(on); - field("B1.203")->show(on); - field("B1.204")->show(on); - field("B1.100")->show(!on); - field("B1.102")->show(!on); // perchč non va ' - field("B1.104")->show(!on);*/ + field("B1.201")->show(on); } + bool TPrint_prosp_ricerca_ca_rep::set_recordset(const TString& sql) { TPrint_prosp_ricerca_ca_recordset* rs = new TPrint_prosp_ricerca_ca_recordset(_mask, _log, sql); @@ -436,7 +434,7 @@ protected: virtual TTrec * get_dbase_recdesc(TReport & rep, const TAutomask & mask); virtual TAutomask & get_mask(); virtual void execute_print(TReport_book & book, TAutomask & mask, TReport & rep, export_type & type); - virtual const char * output_name(const TAutomask & mask, const TReport & rep) const { return "rend"; } + virtual const char * output_name(const TAutomask & mask, const TReport & rep) const { return "prosp"; } // @cmember Distruzione dei dati dell'utente virtual bool user_destroy(); @@ -464,27 +462,34 @@ TAutomask & TPrint_prosp_ricerca_ca::get_mask() TTrec * TPrint_prosp_ricerca_ca::get_dbase_recdesc(TReport & rep, const TAutomask & mask) { TTrec * desc = new TTrec; - TToken_string def; + const int tipostampa = mask.get_int(F_TIPOSTAMPA); desc->add_fielddef(PROSP_LETTERA, _alfafld, 1); desc->add_fielddef(PROSP_NUM, _intfld, 2); - desc->add_fielddef(PROSP_SUB, _intfld, 6); desc->add_fielddef(PROSP_DESCR, _alfafld, 70); - desc->add_fielddef(PROSP_NONECON, _realfld, 18, 2); - desc->add_fielddef(PROSP_ATTREZZ, _realfld, 18, 2); - desc->add_fielddef(PROSP_SERVIZI, _realfld, 18, 2); - desc->add_fielddef(PROSP_CONTR, _realfld, 18, 2); - desc->add_fielddef(PROSP_TRACON, _realfld, 18, 2); - desc->add_fielddef(PROSP_ALTRE, _realfld, 18, 2); - desc->add_fielddef(PROSP_SERVCOM, _realfld, 18, 2); - desc->add_fielddef(PROSP_NONATTR, _realfld, 18, 2); - desc->add_fielddef(PROSP_TOTALE, _realfld, 18, 2); - desc->add_fielddef(PROSP_MOVIM, _boolfld, 1); - + if (tipostampa == 2) + { + desc->add_fielddef(PROSP_TOTALE, _realfld, 18, 2); + desc->add_fielddef(PROSP_NONECON, _realfld, 18, 2); + desc->add_fielddef("ECONOMICHE", _realfld, 18, 2); + desc->add_fielddef(PROSP_NONATTR, _realfld, 18, 2); + } + else + { + desc->add_fielddef(PROSP_TOTALE, _realfld, 18, 2); + desc->add_fielddef(PROSP_NONECON, _realfld, 18, 2); + desc->add_fielddef(PROSP_ATTREZZ, _realfld, 18, 2); + desc->add_fielddef(PROSP_SERVIZI, _realfld, 18, 2); + desc->add_fielddef(PROSP_CONTR, _realfld, 18, 2); + desc->add_fielddef(PROSP_TRACON, _realfld, 18, 2); + desc->add_fielddef(PROSP_ALTRE, _realfld, 18, 2); + if (tipostampa == 0) + desc->add_fielddef(PROSP_SERVCOM, _realfld, 18, 2); + desc->add_fielddef(PROSP_NONATTR, _realfld, 18, 2); + } TToken_string keydef(PROSP_LETTERA, '+'); keydef.add(PROSP_NUM); - keydef.add(PROSP_SUB); desc->add_keydef(keydef, true); return desc; } @@ -501,7 +506,7 @@ void TPrint_prosp_ricerca_ca::execute_print(TReport_book & book, TAutomask & mas const int anno = mask.get_int(F_ANNO); rep.set_export_sections(type); - book.add(rep); //aggiunge il report relativo alla cdc/cms corrente al book + book.add(rep, type); //aggiunge il report relativo alla cdc/cms corrente al book rep.reset_export_sections(); //anteprima report degli errori rilevati if (ca_rep.log().recordset()->items() > 0) diff --git a/src/ca/ca3A00.uml b/src/ca/ca3A00.uml index db8f8b3b9..e6fc6e8c3 100644 --- a/src/ca/ca3A00.uml +++ b/src/ca/ca3A00.uml @@ -71,7 +71,7 @@ BEGIN PROMPT 1 9 "Tipo di stampa " ITEM " |Stampa per attivitą senza allocazione" ITEM "1|Stampa per attivitą con allocazione" - ITEM "2|Stampa riepologativa" + ITEM "2|Stampa riepilogativa" END BOOLEAN F_SKIPNULL diff --git a/src/ca/ca3A00a.rep b/src/ca/ca3A00a.rep index b6ea2bb38..3d7918808 100644 --- a/src/ca/ca3A00a.rep +++ b/src/ca/ca3A00a.rep @@ -1,61 +1,61 @@ - - Prospetto enti di ricerca con allocazione + + Prospetto enti di ricerca senza allocazione -