diff --git a/src/li/li0400a.uml b/src/li/li0400a.uml index ecd2cab0c..ee055318c 100755 --- a/src/li/li0400a.uml +++ b/src/li/li0400a.uml @@ -202,14 +202,14 @@ STRING F_PROTINTF 17 BEGIN PROMPT 1 12 "Numero di protocollo di invio:" FIELD PROTINTF - CHECKTYPE REQUIRED + //CHECKTYPE REQUIRED END STRING F_PROTINTS 6 BEGIN PROMPT 50 12 " - " FIELD PROTINTS - CHECKTYPE REQUIRED + //CHECKTYPE REQUIRED END GROUPBOX DLG_NULL 75 6 diff --git a/src/li/li0500.cpp b/src/li/li0500.cpp index c9fce066b..e0005823e 100755 --- a/src/li/li0500.cpp +++ b/src/li/li0500.cpp @@ -22,7 +22,7 @@ class TPrint_letint_mask : public TAutomask TDate _last_data; protected: bool on_field_event(TOperable_field& o, TField_event e, long jolly); - bool ask_service_pwd(); + //bool ask_service_pwd(); public: TPrint_letint_mask(); @@ -54,27 +54,19 @@ bool TPrint_letint_mask::on_field_event(TOperable_field& o, TField_event e, long TString s(o.get()); s.lpad(4, '0'); _last_data = botime; - o.mask().set(F_PAGINI, ""); + //o.mask().set(F_PAGINI, ""); reg.put("CODTAB", s); for (int err = reg.read(_isgteq); s == reg.get("CODTAB").left(4) && err == NOERR; err = reg.next()) if (reg.get_int("I0") == 10) { - o.mask().set(F_PAGINI, reg.get("I1")); + //o.mask().set(F_PAGINI, reg.get("I1")); _last_data = reg.get_date("D3"); } } break; - case F_MESE: - if (e == fe_close) - { - const int mese = atoi(o.get()); - - if (mese <= _last_data.month()) - return error_box("Attenzione Stampa definitiva già effettuata. Ripristinare il mese se si desidera procedere"); - } - break; + /* case F_RIPRISTINA: if (e == fe_button) { @@ -149,12 +141,14 @@ bool TPrint_letint_mask::on_field_event(TOperable_field& o, TField_event e, long } //end ask_service_pwd() } //end if(e==fe_button) break; + */ default: break; } return true; } +/* bool TPrint_letint_mask::ask_service_pwd() { bool ok = false; @@ -174,6 +168,7 @@ bool TPrint_letint_mask::ask_service_pwd() return ok; } +*/ //--------------------------------------------------------------- // REPORT @@ -270,25 +265,13 @@ void TPrint_letint::main_loop() TReport_book book; word last_page = 0; const int anno = m.get_int(F_ANNO); - const bool definitiva = m.get_bool(F_DEFINITIVA); - if (definitiva) - { - last_page = m.get_int(F_PAGINI); - const int mese = m.get_int(F_MESE); - - _da_data = TDate(1, mese, anno); - _a_data = _da_data; - _a_data.set_end_month(); - } - else - { - _da_data = m.get_date(F_DAL); - if (!_da_data.ok()) - _da_data = TDate(1, 1, anno); - _a_data = m.get_date(F_AL); - if (!_a_data.ok()) - _a_data = TDate(31, 12, anno); - } + + _da_data = m.get_date(F_DAL); + if (!_da_data.ok()) + _da_data = TDate(1, 1, anno); + _a_data = m.get_date(F_AL); + if (!_a_data.ok()) + _a_data = TDate(31, 12, anno); TLetint_report rep(last_page); @@ -304,10 +287,6 @@ void TPrint_letint::main_loop() book.add(rep); book.print_or_preview(); - - //in caso di stampa definitiva... - if (definitiva && yesno_box(TR("La stampa e' corretta?"))) - setta_stampato(m, (long)rep.page()); } } diff --git a/src/li/li0500a.h b/src/li/li0500a.h index ffe5a370d..7e0b8ea8f 100755 --- a/src/li/li0500a.h +++ b/src/li/li0500a.h @@ -2,10 +2,10 @@ // definizione campi per maschera li0500a #define F_ANNO 101 -#define F_MESE 102 -#define F_DEFINITIVA 103 +//#define F_MESE 102 +//#define F_DEFINITIVA 103 #define F_DAL 105 #define F_AL 106 -#define F_RIPRISTINA 107 +//#define F_RIPRISTINA 107 #define F_REPORT 108 -#define F_PAGINI 109 +//#define F_PAGINI 109 diff --git a/src/li/li0500a.rep b/src/li/li0500a.rep index df1287f8d..e8b0b4f02 100755 --- a/src/li/li0500a.rep +++ b/src/li/li0500a.rep @@ -1,104 +1,125 @@ - - - registro dichiarazioni d'intento - -
- - - "!RAGSOC" -GET_FIRM_DATA - - - - #PAGE - #REPORT.PAGE - - - - - - - #ANNO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - VSDATA - - - VSPROT - - - DATAREG - - - NUMPROT - - - CODCLI - - - CLIFO.RAGSOC - - - CLIFO.PAIV - - - 154.UFFIVA - - - 154.NOTE - -
-
-
- USE 154 -SELECT (NUM(ANSI(DATAREG))E;=ANSI(#DADATA))(NUM(ANSI(DATAREG))C;=ANSI(#ADATA)) -JOIN CLIFO INTO TIPOCF=='C' CODCF==CODCLI -FROM ANNO=#ANNO -TO ANNO=#ANNO + + + registro dichiarazioni d'intento + +
+ + + "!RAGSOC" +GET_FIRM_DATA + + + + #PAGE + #REPORT.PAGE + + + + "Registro Dichiarazioni d'intento " +#ANNO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + DATAREG + + + NUMPROT + + + VSDATA + + + VSPROT + + + CODCLI + + + CLIFO.RAGSOC + + + CLIFO.PAIV + + + 154.TIPOOP + +
  • MESSAGE SHOW,10@|HIDE,20@
    • +
  • MESSAGE SHOW,10@|HIDE,20@
    • +
  • MESSAGE SHOW,20@|HIDE,10@
    • +     +     + + 20 + 154.DAL + + + 10 + 154.IMPORTO + + + 20 + 154.AL + + + 154.PROTINTF+" - "+154.PROTINTS + + + 154.CHIUSA + +
    +
    +
    + USE 154 SELEC (BETWEEN(154.DATAREG,#DADATA,#ADATA)) +JOIN CLIFO INTO TIPOCF=='C' CODCF==CODCLI +FROM ANNO=#ANNO +TO ANNO=#ANNO \ No newline at end of file diff --git a/src/li/li0500a.uml b/src/li/li0500a.uml index e59d8fe2d..e45f96b73 100755 --- a/src/li/li0500a.uml +++ b/src/li/li0500a.uml @@ -2,30 +2,12 @@ TOOLBAR "topbar" 0 0 0 2 -BUTTON F_RIPRISTINA 10 2 -BEGIN - PROMPT -1 -1 "~Ripristina" -END - #include ENDPAGE PAGE "Stampa dichiarazioni d'intento" 0 2 0 0 -BOOLEAN F_DEFINITIVA -BEGIN - PROMPT 1 1 "Definitiva" - MESSAGE FALSE HIDE,2@|SHOW,1@ - MESSAGE TRUE SHOW,2@|HIDE,1@ -END - -NUMBER F_PAGINI 6 -BEGIN - PROMPT 20 1 "Ultima pagina " - GROUP 2 -END - NUMBER F_ANNO 4 BEGIN PROMPT 1 3 "Anno " @@ -34,13 +16,6 @@ BEGIN FIELD ANNO END -LIST F_MESE 2 16 -BEGIN - PROMPT 15 3 "Mese " - FLAGS "AM" - GROUP 2 -END - DATE F_DAL BEGIN PROMPT 15 3 "Dal "