From 164c7de4c13050218ad4bf8ff9d55b48668e7ff8 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Fri, 7 Feb 2020 15:12:35 +0100 Subject: [PATCH] Patch level : 12.0 938 Files correlati : cg5.exe cg5500b.msk cg5500c.msk Commento : Attivati acconto e interessi con ricalcolo nei trimestrali. Aggiunta 13 nei trimestrali e sistemata la visualizzazione dei trimestrali. --- src/include/msksheet.cpp | 11 +++++++++++ src/include/msksheet.h | 3 +++ 2 files changed, 14 insertions(+) diff --git a/src/include/msksheet.cpp b/src/include/msksheet.cpp index c8a133b7a..e51a13eca 100755 --- a/src/include/msksheet.cpp +++ b/src/include/msksheet.cpp @@ -3135,6 +3135,17 @@ int TSheet_field::set_row_cell(short id, const TDate& value, int nrow) return nrow; } +int TSheet_field::set_row_cell(short id, const bool value, int nrow) +{ + if (nrow < 0) + nrow = first_empty(); + set_row_cell(row(nrow), id, value); +#ifdef DBG + const TToken_string & r = row(nrow); +#endif + return nrow; +} + // Certified 100% // Ritorna l'indice della prima riga vuota dello sheet int TSheet_field::first_empty() const diff --git a/src/include/msksheet.h b/src/include/msksheet.h index d817e027f..cc15d9a65 100755 --- a/src/include/msksheet.h +++ b/src/include/msksheet.h @@ -157,6 +157,7 @@ public: virtual void set_row_cell(TToken_string & row, short id, int value) { row.add(value, cid2index(id)); } virtual void set_row_cell(TToken_string & row, short id, const real& value) { row.add(value, cid2index(id)); } virtual void set_row_cell(TToken_string & row, short id, const TDate& value) { row.add(value, cid2index(id)); } + virtual void set_row_cell(TToken_string & row, short id, const bool value) { row.add(value ? "X" : "", cid2index(id)); } virtual int set_row_cell(short id, const char * value, int nrow = -1); virtual int set_row_cell(short id, char value, int nrow = -1); @@ -164,6 +165,7 @@ public: virtual int set_row_cell(short id, int value, int nrow = -1); virtual int set_row_cell(short id, const real& value, int nrow = -1); virtual int set_row_cell(short id, const TDate& value, int nrow = -1); + virtual int set_row_cell(short id, const bool value, int nrow = -1); virtual const char * get_str_row_cell(int nrow, short id) { return row(nrow).get(cid2index(id)); } virtual char get_char_row_cell(int nrow, short id) { return row(nrow).get_char(cid2index(id)); } @@ -171,6 +173,7 @@ public: virtual int get_int_row_cell(int nrow, short id) { return row(nrow).get_int(cid2index(id)); } virtual real get_real_row_cell(int nrow, short id) { return real(row(nrow).get(cid2index(id))); } virtual TDate get_date_row_cell(int nrow, short id) { return TDate(row(nrow).get(cid2index(id))); } + virtual bool get_bool_row_cell(int nrow, short id) { const TString s = get_str_row_cell(nrow, id); return s == "X"; } char separator() const { return _separator; }