From 568a79875bc7a9b8c7d1d7a5256d6d2cc35124a7 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Mon, 21 Sep 2020 16:33:57 +0200 Subject: [PATCH] Patch level : 12.0 996 Files correlati : limenu.men li0.exe li0700a.msk Commento : Aggiunto programma per la ricostruzione del plafond. --- build/li.sln | 6 ++++++ src/li/li0.cpp | 3 ++- src/li/li0.h | 1 + src/li/li0100.cpp | 40 ++-------------------------------- src/li/li0100a.h | 6 ------ src/li/li0400a.uml | 1 - src/li/li0700.cpp | 47 ++++++++++++++++++++++++++++++++++++++++ src/li/li0700a.h | 6 ++++++ src/li/li0700a.uml | 54 ++++++++++++++++++++++++++++++++++++++++++++++ src/li/limenu.men | 3 ++- 10 files changed, 120 insertions(+), 47 deletions(-) create mode 100644 src/li/li0700.cpp create mode 100644 src/li/li0700a.h create mode 100644 src/li/li0700a.uml diff --git a/build/li.sln b/build/li.sln index 1c3f0f283..0e40b49ad 100644 --- a/build/li.sln +++ b/build/li.sln @@ -18,6 +18,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -44,6 +46,10 @@ Global {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32 {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32 {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32 + {7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32 + {7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32 + {7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32 + {7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/li/li0.cpp b/src/li/li0.cpp index d435706e5..d9300f737 100755 --- a/src/li/li0.cpp +++ b/src/li/li0.cpp @@ -13,7 +13,8 @@ int main(int argc,char** argv) case 3: li0400(argc,argv) ; break; // Gestione archivio case 4: li0500(argc,argv) ; break; // Stampa archivio case 5: li0600(argc,argv) ; break; // Invio dati - default: li0100(argc,argv) ; break; // Generatore riferimenti plafond su documenti + case 6: li0700(argc, argv); break; // Ricostruzione Plafond + default: li0100(argc,argv) ; break; // Generatore riferimenti plafond su documenti } return 0; } diff --git a/src/li/li0.h b/src/li/li0.h index e0a189e5d..7f29fa2ca 100755 --- a/src/li/li0.h +++ b/src/li/li0.h @@ -7,6 +7,7 @@ int li0300(int argc, char* argv[]); int li0400(int argc, char* argv[]); int li0500(int argc, char* argv[]); int li0600(int argc, char* argv[]); +int li0700(int argc, char* argv[]); #endif // __LI0_H diff --git a/src/li/li0100.cpp b/src/li/li0100.cpp index 6969ccd2c..978fd677a 100644 --- a/src/li/li0100.cpp +++ b/src/li/li0100.cpp @@ -12,6 +12,7 @@ #include "li0.h" #include "li0100a.h" +#include "li0700a.h" #define PLA_COLS 10 // n° colonne di lettere di intento #define PLNPR(x) (START_PLA + x * 2) @@ -179,46 +180,9 @@ bool TVisLI_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) case DLG_OK: { // Creo una maschera che richiede la data - TMask sto("Creazione storico LI", 1, 50, 14); + TMask sto("li0700a"); - sto.add_button_tool(DLG_OK, "~Conferma", TOOL_OK); - sto.add_button_tool(DLG_CANCEL, "Annulla", TOOL_CANCEL); - TList_field & tipo = sto.add_list(F_TIPO, 0, "", 0, 0, 7, "H", "C", "Cliente"); - TReal_field & anno = sto.add_number(F_ANNO_STO, 0, "Esercizio ", 1, 1, 4, "B"); - TBrowse * b = new TBrowse(&anno, new TRelation("ESC")); - - b->add_input_field(F_ANNO_STO, "CODTAB"); - b->add_display_field("Codice esercizio", "CODTAB"); - b->add_display_field("Data inizio esercizio", "D0"); - b->add_display_field("Data fine esercizio", "D1"); - b->add_output_field(F_ANNO_STO, "CODTAB"); - anno.set_query_button(b); - anno.enable_check(); - anno.check_type(CHECK_SEARCH); - - TReal_field & from_cli = sto.add_number(F_FROM_CLI, 0, "Da cliente ", 1, 3, 6, "B"); - TBrowse * bfc = new TBrowse(&from_cli, new TRelation(LF_CLIFO)); - - bfc->add_input_field(F_TIPO, CLI_TIPOCF, -1, true); - bfc->add_input_field(F_FROM_CLI, CLI_CODCF); - bfc->add_display_field("Codice cliente/fornitore", CLI_CODCF); - bfc->add_display_field("Ragione sociale@50", CLI_RAGSOC); - bfc->add_output_field(F_FROM_CLI, CLI_CODCF); - from_cli.set_query_button(bfc); - from_cli.enable_check(); - from_cli.check_type(CHECK_SEARCH); - - TReal_field & to_cli = sto.add_number(F_TO_CLI, 0, "A cliente ", 2, 5, 6, "B"); - TBrowse * btc = new TBrowse(&to_cli, new TRelation(LF_CLIFO)); - - btc->add_input_field(F_TIPO, CLI_TIPOCF, -1, true); - btc->add_input_field(F_TO_CLI, CLI_CODCF); - btc->copy_display(bfc); - btc->add_output_field(F_TO_CLI, CLI_CODCF); - to_cli.set_query_button(btc); - to_cli.enable_check(); - from_cli.check_type(CHECK_SEARCH); // Lancio la maschera sto.disable(F_ANNO_STO); sto.disable(F_FROM_CLI); diff --git a/src/li/li0100a.h b/src/li/li0100a.h index 702e1beab..1681fe0cd 100644 --- a/src/li/li0100a.h +++ b/src/li/li0100a.h @@ -8,12 +8,6 @@ #define F_ACODCF 408 #define F_ARAGSOC 409 -// maschera ricostruzione storico -#define F_ANNO_STO 101 -#define F_FROM_CLI 102 -#define F_TO_CLI 103 -#define F_TIPO 104 - #define DOCUMENTI_STATO 201 #define F_RIGHE 301 diff --git a/src/li/li0400a.uml b/src/li/li0400a.uml index cef8545f5..ea1e23275 100755 --- a/src/li/li0400a.uml +++ b/src/li/li0400a.uml @@ -190,7 +190,6 @@ STRING F_VSPROT 7 BEGIN PROMPT 1 11 "Numero di protocollo" FIELD VSPROT - CHECKTYPE REQUIRED END DATE F_VSDATA diff --git a/src/li/li0700.cpp b/src/li/li0700.cpp new file mode 100644 index 000000000..4a2c91b73 --- /dev/null +++ b/src/li/li0700.cpp @@ -0,0 +1,47 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "li0.h" +#include "li0700a.h" +#include "lilib01.h" + +//--------------------------------------------------------------- +// APPLICAZIONE +//--------------------------------------------------------------- +class TRebuild_letint : public TSkeleton_application +{ +public: + virtual void main_loop(); +}; + + +void TRebuild_letint::main_loop() +{ + TMask mask("li0700a"); + + mask.set(F_ANNO_STO, today.year()); + + while (mask.run() == K_ENTER) + genera_li_storico(mask.get_int(F_ANNO_STO), mask.get_long(F_FROM_CLI), mask.get_long(F_TO_CLI)); +} + +int li0700(int argc, char* argv[]) +{ + TRebuild_letint a; + a.run(argc, argv, TR("Invio dichiarazioni d'intento")); + return 0; +} diff --git a/src/li/li0700a.h b/src/li/li0700a.h new file mode 100644 index 000000000..a12d5d1c2 --- /dev/null +++ b/src/li/li0700a.h @@ -0,0 +1,6 @@ +// Ricostruzione plafond lettere +// definizione campi per maschera li0700a + +#define F_ANNO_STO 101 +#define F_FROM_CLI 102 +#define F_TO_CLI 103 \ No newline at end of file diff --git a/src/li/li0700a.uml b/src/li/li0700a.uml new file mode 100644 index 000000000..0edb39e9b --- /dev/null +++ b/src/li/li0700a.uml @@ -0,0 +1,54 @@ +#include "li0700a.h" + +TOOLBAR "topbar" 0 0 0 2 + +#include + +ENDPAGE + +PAGE "Ricostruzione Plafond Lettere" 0 2 0 0 + +NUMBER F_ANNO_STO 4 +BEGIN + PROMPT 2 1 "Anno " + FLAGS "AU" + CHECKTYPE REQUIRED + FIELD ANNO +END + +NUMBER F_FROM_CLI 6 +BEGIN + PROMPT 2 3 "Codice " + FIELD CODCF + FLAGS "R" + USE LF_CLIFO + INPUT TIPOCF "C" + INPUT CODCF F_FROM_CLI + DISPLAY "Codice@6R" CODCF + DISPLAY "Sospeso@C" SOSPESO + DISPLAY "Ragione sociale@50" RAGSOC + DISPLAY "Codice fiscale@16" COFI + DISPLAY "Partita IVA@11" PAIV + OUTPUT F_FROM_CLI CODCF + CHECKTYPE SEARCH +END + +NUMBER F_TO_CLI 6 +BEGIN + PROMPT 2 5 "Codice " + FIELD CODCF + FLAGS "R" + USE LF_CLIFO + INPUT TIPOCF "C" + INPUT CODCF F_TO_CLI + DISPLAY "Codice@6R" CODCF + DISPLAY "Sospeso@C" SOSPESO + DISPLAY "Ragione sociale@50" RAGSOC + DISPLAY "Codice fiscale@16" COFI + DISPLAY "Partita IVA@11" PAIV + OUTPUT F_TO_CLI CODCF + CHECKTYPE SEARCH +END + +ENDPAGE +ENDMASK diff --git a/src/li/limenu.men b/src/li/limenu.men index d42385aa4..c1e1230f2 100755 --- a/src/li/limenu.men +++ b/src/li/limenu.men @@ -7,5 +7,6 @@ Item_01 = "Dichiarazioni d'intento", "li0 -3", "" Item_02 = "Stampa dichiarazioni", "li0 -4", "" Item_03 = "Riepilogo dichiarazioni", "li0 -1", "" Item_04 = "Riepilogo Documenti/Lettere", "li0 -0", "" -Item_03 = "Impostazioni", "li0 -2", "" +Item_05 = "Ricostruzione Plafond Lettere", "li0 -5", "" +Item_06 = "Impostazioni", "li0 -2", ""