From 36e835a42c759d137633a3659bda518ca1de0a68 Mon Sep 17 00:00:00 2001 From: luca Date: Wed, 4 Oct 2006 09:25:15 +0000 Subject: [PATCH] Patch level :4.0 504 Files correlati :ca4.exe ca4200a.msk Ricompilazione Demo : [ ] Commento :aggiunta opzione di eliminazione dei documenti generati al termine della stampa (eva braun request) git-svn-id: svn://10.65.10.50/trunk@14362 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ce/ce4200.cpp | 12 ++++++++---- ce/ce4200a.h | 1 + ce/ce4200a.uml | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ce/ce4200.cpp b/ce/ce4200.cpp index 2bc522ca0..ce2b6b703 100755 --- a/ce/ce4200.cpp +++ b/ce/ce4200.cpp @@ -92,7 +92,7 @@ public: void delete_cespi_docs(); TRiga_documento& cerca_riga(TDocumento& doc_cesp, const TString& idcesp, const TString& codcms) const; void elabora_docs(); - void stampa_docs(); + bool stampa_docs(); }; //Calcolo % utilizzo del cespite nella commessa @@ -368,7 +368,7 @@ void TCalc_cesp_cms::elabora_docs() } -void TCalc_cesp_cms::stampa_docs() +bool TCalc_cesp_cms::stampa_docs() { //setta la testata del form @@ -403,6 +403,8 @@ void TCalc_cesp_cms::stampa_docs() curform.setfilter(filtro); _form->print(); + + return true; } @@ -427,7 +429,7 @@ bool TCalc_cesp_cms::destroy() { delete _mask; delete _form; - return TRUE; + return true; } void TCalc_cesp_cms::main_loop() @@ -445,7 +447,9 @@ void TCalc_cesp_cms::main_loop() break; case K_ESC: - stampa_docs(); + if (stampa_docs() && !_mask->get_bool(F_DEFINITIVA)) + //eventuale eliminazione dei documenti appena creati (richiesta di Eva Braun) + delete_cespi_docs(); break; default: diff --git a/ce/ce4200a.h b/ce/ce4200a.h index 4b7cedd07..667252b33 100755 --- a/ce/ce4200a.h +++ b/ce/ce4200a.h @@ -25,3 +25,4 @@ #define F_DESCF 224 #define F_NUMDOCRIF 225 #define F_GENERA_DOC 226 +#define F_DEFINITIVA 227 diff --git a/ce/ce4200a.uml b/ce/ce4200a.uml index 7444f5c90..88566afb1 100755 --- a/ce/ce4200a.uml +++ b/ce/ce4200a.uml @@ -85,6 +85,11 @@ BEGIN CHECKTYPE REQUIRED END +BOOLEAN F_DEFINITIVA +BEGIN + PROMPT 1 5 "Stampa definitiva (i documenti generati non saranno eliminati dopo la stampa)" +END + STRING F_DA_IDCESPITE 10 BEGIN PROMPT 1 6 "Dal cespite "