From f887c7e7c13cb6ab68e79fe60b3759863927975f Mon Sep 17 00:00:00 2001 From: Simoe Date: Thu, 7 Apr 2022 17:30:22 +0200 Subject: [PATCH] Patch level : 12.0 1134 Files correlati : fp Commento: - Corretto bug nell'invio regolarizzazioni che salvava un valore errato nel campo tipo documento sdi - Corretti alcuni bug in fplib02 --- build/fp0.vcxproj | 12 ++++++++++++ build/fp1.vcxproj | 9 +++++++++ build/fplib.vcxproj | 14 -------------- src/fp/fp0700.cpp | 23 ++++++----------------- src/fp/fp0700a.h | 2 +- src/fp/fp0700a.uml | 14 -------------- src/fp/fplib.h | 2 +- src/fp/fplib02.cpp | 16 +++++++++------- 8 files changed, 38 insertions(+), 54 deletions(-) diff --git a/build/fp0.vcxproj b/build/fp0.vcxproj index 3fb8b211a..a1da5beb7 100644 --- a/build/fp0.vcxproj +++ b/build/fp0.vcxproj @@ -180,9 +180,21 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + {41f4c25f-6bd2-4fc9-a0d3-a68cd1c9e4fc} + + {c575788b-0be4-4f68-b9c9-3c204ec04e07} + + + {b61f0ad4-0cce-4371-8e92-85a26caf1a7c} + + + {7bf6939e-dfcd-49ed-b0a8-edb68ddce6d5} + {a1ce9743-a597-4f92-b55a-345a366c9e55} diff --git a/build/fp1.vcxproj b/build/fp1.vcxproj index 474c948c3..9e31744db 100644 --- a/build/fp1.vcxproj +++ b/build/fp1.vcxproj @@ -179,9 +179,18 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + {c575788b-0be4-4f68-b9c9-3c204ec04e07} + + {b61f0ad4-0cce-4371-8e92-85a26caf1a7c} + + + {7bf6939e-dfcd-49ed-b0a8-edb68ddce6d5} + {a1ce9743-a597-4f92-b55a-345a366c9e55} diff --git a/build/fplib.vcxproj b/build/fplib.vcxproj index b3f946532..f1f3623de 100644 --- a/build/fplib.vcxproj +++ b/build/fplib.vcxproj @@ -157,20 +157,6 @@ true - - - {2d38a763-3d74-4338-9362-b891784ec90e} - - - {7b80f974-ce2e-4bd9-855a-44ff139ff288} - - - {a1ce9743-a597-4f92-b55a-345a366c9e55} - - - {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} - - diff --git a/src/fp/fp0700.cpp b/src/fp/fp0700.cpp index 2be652638..3d40f389d 100644 --- a/src/fp/fp0700.cpp +++ b/src/fp/fp0700.cpp @@ -147,8 +147,6 @@ void TPAR_mask::fill() enable(DLG_OK, filter_selected.empty() || filter_selected == "E" || filter_selected == "X" || filter_selected == "D"); enable(DLG_PRINT, true); enable(DLG_SAVEREC, (is_f8() && (filter_selected == "X") || filter_selected == "D")); - enable(DLG_FINDREC, filter_selected == "D"); - enable(DLG_KEY, _enable_chiave_fixer && filter_selected.empty()); /* VECCHIA QUERY @@ -421,9 +419,9 @@ void TPAR_mask::export_paf() { int ndocs = 0; TSheet_field& sht = sfield(F_REGS); - const TString &tipo_doc_sdi = get(F_TIPO_SDI); + const bool diagn = get_bool(F_DIAGN); - TReg_fp elab(tipo_doc_sdi, !diagn); + TReg_fp elab(EMPTY_STRING, !diagn); TReport_book book; //elab.set_cache_insert(true); @@ -432,13 +430,17 @@ void TPAR_mask::export_paf() { TProgress_monitor pi(sht.items(), "Esportazione Regolarizzazioni"); + FOR_EACH_SHEET_ROW_LOOP(sht, r) { + if (!pi.add_status()) break; if (sht.get_bool_row_cell(r, S_SELECTED)) { + const TString& tipo_doc_sdi = sht.get_str_row_cell(r, S_TIPODOC); + elab.set_tipodocsdi(tipo_doc_sdi); const long nreg = sht.get_long_row_cell(r, S_NUMREG); // Verifico che il codice sdi nello sheet sia lo stesso sulla testata del documento in caso contrario lo aggiorno @@ -582,18 +584,6 @@ bool TPAR_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) delete_paf(); } break; - case DLG_FINDREC: - { - if (e == fe_button) - set_pronto(); - } - break; - case DLG_KEY: - { - if (e == fe_button) - connect_keys(); - } - break; default: break; } if ((e == fe_modify || e >= se_enter) && jolly == 0) @@ -763,7 +753,6 @@ TPAR_mask::TPAR_mask() : TAutomask("fp0700a"), _filter_changed(true), _enable_ch disable(DLG_OK); disable(DLG_PRINT); disable(DLG_SAVEREC); - disable(DLG_FINDREC); load_all_fields(); const TDate data_inizio = get_date_start_new_fatt(); __mask = this; diff --git a/src/fp/fp0700a.h b/src/fp/fp0700a.h index 7fa9e375c..d60b10382 100644 --- a/src/fp/fp0700a.h +++ b/src/fp/fp0700a.h @@ -8,7 +8,7 @@ #define START_MASK F_DATAINI #define END_MASK F_DIAGN -#define DLG_KEY 501 +//#define DLG_KEY 501 #define S_TIPO_SDI 101 #define S_COD_CAUS 102 diff --git a/src/fp/fp0700a.uml b/src/fp/fp0700a.uml index 4d540af02..7829aefd3 100644 --- a/src/fp/fp0700a.uml +++ b/src/fp/fp0700a.uml @@ -35,20 +35,6 @@ BEGIN FLAGS "D" END -BUTTON DLG_FINDREC 2 2 -BEGIN - PROMPT 1 1 "Segna pronto" - PICTURE TOOL_PERMISSIONS - FLAGS "D" -END - -BUTTON DLG_KEY 2 2 -BEGIN - PROMPT 1 1 "Correggi chiavi" - PICTURE TOOL_SMILE - FLAGS "D" -END - #include ENDPAGE diff --git a/src/fp/fplib.h b/src/fp/fplib.h index 8be06630e..181cb295e 100644 --- a/src/fp/fplib.h +++ b/src/fp/fplib.h @@ -712,7 +712,7 @@ public: int commit(); int force_commit(); void set_cache_insert(const bool v) { _cache_insert = v; } - + void set_tipodocsdi(const char* t) { _tipo_doc_sdi = t; } TReg_fp(const char* tipo_doc_sdi, bool definitivo); ~TReg_fp(); diff --git a/src/fp/fplib02.cpp b/src/fp/fplib02.cpp index a0b88cd27..3ca80a114 100644 --- a/src/fp/fplib02.cpp +++ b/src/fp/fplib02.cpp @@ -1,4 +1,5 @@ #include "fplib.h" +#include "fp0300a.h" #define FILE_CONFIG CONFIG_DITTA #define FILE_SECTION "fp" @@ -314,13 +315,14 @@ void TFP_selected_docs::fill_sheet(TSheet_field& sheet) const { for(*_cur = 0; _cur->pos() < _cur->items(); ++*_cur) { - TRectype rec = _cur->curr(); - TToken_string& row = sheet.row(-1); - row.add(rec.get(FP_SLD_CODNUM)); - row.add(rec.get(FP_SLD_TIPODOC)); - row.add(rec.get(FP_SLD_DASTATO)); - row.add(rec.get(FP_SLD_ASTATO)); - row.add(TTipo_documento(rec.get(FP_SLD_TIPODOC)).tipo_doc_sdi()); + TRectype & rec = _cur->curr(); + + const int nrow = sheet.set_row_cell(S_SELCODNUM, rec.get(FP_SLD_CODNUM)); + sheet.set_row_cell(S_TIPODOCSEL, rec.get(FP_SLD_TIPODOC), nrow); + sheet.set_row_cell(S_DASTATO, rec.get(FP_SLD_DASTATO), nrow); + sheet.set_row_cell(S_ASTATO, rec.get(FP_SLD_ASTATO), nrow); + sheet.set_row_cell(S_TIPODOCSDI, TTipo_documento(rec.get(FP_SLD_TIPODOC)).tipo_doc_sdi(), nrow); + } }