From a2eabd022e006301bd627ac362f2d4f820cad2ec Mon Sep 17 00:00:00 2001
From: cris <cris@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 14 Jul 2004 13:11:31 +0000
Subject: [PATCH] Patch level : 2.1 88 Files correlati : in0.exe
in0100a.msk Ricompilazione Demo : [ ] Commento : bug 0000037 Su
stampa riepiloghi aggiunta possibilita' di stampare solo il frontespizio
git-svn-id: svn://10.65.10.50/trunk@12245 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
in/in0100.cpp | 17 +++++++++++------
in/in0100a.h | 1 +
in/in0100a.uml | 7 ++++++-
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/in/in0100.cpp b/in/in0100.cpp
index c462edb8c..e14747678 100755
--- a/in/in0100.cpp
+++ b/in/in0100.cpp
@@ -29,6 +29,7 @@ class TStampaIntra_form : public TForm
real _totaleprog1, _totaleprog2; // Totale progressivo per pagina, sezioni 1 e 2
int _decimals;
+ bool _solofronte;
protected:
void print_page(const pagetype p);
@@ -39,7 +40,7 @@ protected:
public:
void print();
- TStampaIntra_form (const char* name, char t, char f, int p, int a);
+ TStampaIntra_form (const char* name, char t, char f, int p, int a, bool sf);
virtual ~TStampaIntra_form ();
};
@@ -67,12 +68,13 @@ bool TStampaIntra_form::validate(TForm_item& fld, TToken_string& val)
return TForm::validate(fld, val);
}
-TStampaIntra_form::TStampaIntra_form(const char* name, char t, char f, int p, int a) : TForm(name)
+TStampaIntra_form::TStampaIntra_form(const char* name, char t, char f, int p, int a, bool sf) : TForm(name)
{
_tipo << t;
_frequenza << f;
_periodo << p;
_anno << a;
+ _solofronte = sf;
TRectype dep(cursor()->file(LF_RIEPRETT).curr());
dep.zero();
@@ -312,7 +314,8 @@ void TStampaIntra_form::print()
arrange_form();
// Ed ecco qui... il Lievito Svi$$ero (sempre per rimanere in tema di Ali' Baba' ed i 40 Kazzoni)
- while (good())
+ bool verygood = good();
+ while (verygood)
{
for (int pagina = 1; pagina <= 4; pagina++)
{
@@ -331,8 +334,9 @@ void TStampaIntra_form::print()
default:
break;
}
- bool verygood = good();
- if (!verygood)
+ verygood = good();
+ if (_solofronte) verygood = FALSE;
+ if (!verygood || _solofronte)
break;
}
}
@@ -354,6 +358,7 @@ protected:
virtual short type_field() const { return R_TIPO; }
virtual short period_field() const { return R_PERIODO_M; }
virtual int anno() const { return get_int(R_ANNO); }
+ virtual bool solofronte() const { return get_bool(R_SOLOFRONTE); }
public:
void print();
@@ -368,7 +373,7 @@ TStampaIntra_mask::TStampaIntra_mask()
void TStampaIntra_mask::print()
{
const int anno_s = anno();
- TStampaIntra_form form(tipo() == 'A' ? "in0100a" : "in0100b", tipo(), frequenza(anno_s), periodo(), anno_s);
+ TStampaIntra_form form(tipo() == 'A' ? "in0100a" : "in0100b", tipo(), frequenza(anno_s), periodo(), anno_s, solofronte());
form.print();
}
diff --git a/in/in0100a.h b/in/in0100a.h
index 551d07394..7a373562b 100755
--- a/in/in0100a.h
+++ b/in/in0100a.h
@@ -4,3 +4,4 @@
#define R_PERIODO_M 103
#define R_PERIODO_T 104
#define R_PERIODO_A 105
+#define R_SOLOFRONTE 106
diff --git a/in/in0100a.uml b/in/in0100a.uml
index 19f5eb3b2..f4c673cdc 100755
--- a/in/in0100a.uml
+++ b/in/in0100a.uml
@@ -1,6 +1,6 @@
#include "in0100a.h"
-PAGE "Stampa Riepiloghi" -1 -1 32 6
+PAGE "Stampa Riepiloghi" -1 -1 32 8
LIST R_TIPO 1 10
BEGIN
@@ -42,6 +42,11 @@ BEGIN
MESSAGE COPY,R_PERIODO_M
END
+BOOLEAN R_SOLOFRONTE
+BEGIN
+ PROMPT 1 5 "Stampa solo il frontespizio"
+END
+
BUTTON DLG_PRINT 10 2
BEGIN
PROMPT -12 -1 ""