From a1095f6e04e9840d315db188760a9095640045e4 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 12 Nov 1996 09:52:22 +0000 Subject: [PATCH] Cazzo, cazzeggio e controcazzeggio! Prime modifiche per utilizzare le nuove maschere (upgrade R9604/R9605) git-svn-id: svn://10.65.10.50/trunk@3889 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- m770/770100.cpp | 31 +-- m770/770100a.uml | 5 +- m770/770100b.uml | 12 +- m770/770100d.uml | 7 +- m770/770200.cpp | 6 +- m770/770200a.uml | 28 --- m770/771100.cpp | 6 +- m770/771100c.uml | 39 +++- m770/771200.cpp | 24 ++- m770/771200a.uml | 12 +- m770/771230.cpp | 20 +- m770/771233.cpp | 20 +- m770/771290.cpp | 8 +- m770/771300.cpp | 8 +- m770/771300a.uml | 4 +- m770/771310.cpp | 16 +- m770/771400a.uml | 2 +- m770/771400b.uml | 2 +- m770/775200.cpp | 10 +- m770/776100.cpp | 22 +- m770/776100b.h | 163 ++++++++------ m770/776100b.uml | 536 ++++++++++++++++++++++++++++++++++++++-------- m770/776300.cpp | 2 +- m770/776500.cpp | 8 +- m770/776600.cpp | 3 +- m770/77qn.uml | 1 - m770/77qq.uml | 2 - m770/77qr.uml | 1 - m770/77qt.uml | 2 - m770/batbca7.uml | 8 +- m770/generic.cpp | 4 +- m770/menustq.h | 97 +++++---- m770/menustq.uml | 8 - m770/quadb_b1.cpp | 14 +- m770/quadn_t.cpp | 13 +- 35 files changed, 785 insertions(+), 359 deletions(-) diff --git a/m770/770100.cpp b/m770/770100.cpp index deac1f69d..0630d9408 100755 --- a/m770/770100.cpp +++ b/m770/770100.cpp @@ -272,6 +272,12 @@ bool TSchedaPercipienti::nprog_handler(TMask_field& f, KEY key) if (!f.mask().is_running()) return TRUE; + if (key == K_CTRL+K_TAB) + { + f.set_dirty(); + return TRUE; + } + const int nprog = atoi(f.get()); if (key == K_ENTER) @@ -280,15 +286,14 @@ bool TSchedaPercipienti::nprog_handler(TMask_field& f, KEY key) app()._flag_cg = FALSE; // avoid recursion if (nprog==0 || !app().esiste_perc(f.mask())) return FALSE; - - f.mask().stop_run(K_AUTO_ENTER); +// f.mask().stop_run(K_AUTO_ENTER); } if (key == K_TAB) { if (nprog==0 || !app().esiste_perc(f.mask())) return FALSE; - f.mask().stop_run(K_AUTO_ENTER); // entra in modo modifica/inserimento +// f.mask().stop_run(K_AUTO_ENTER); // entra in modo modifica/inserimento } return TRUE; } @@ -300,7 +305,7 @@ bool TSchedaPercipienti::user_create() _rver = new TLocalisamfile(LF_RVER); _rpag = new TLocalisamfile(LF_RPAG); - _pags = new TNikArray_sheet(-1, -1, 0, 0, "Selezione Pagamenti", + _pags = new TNikArray_sheet(-1, -1, -4, -4, "Selezione Pagamenti", "@1|Data@11|Compenso@16|Spese@16|Ritenuta@16|", 0,NULL_WIN,5); @@ -435,14 +440,14 @@ void TSchedaPercipienti::init_query_mode(TMask& m) { case fattura: setta_nprog(m, variazione); - m.send_key(K_AUTO_ENTER,0); +// m.send_key(K_AUTO_ENTER,0); return; break; case pagamento: if (coll_datanum()) { setta_nprog(m, variazione); - m.send_key(K_AUTO_ENTER, 0); +// m.send_key(K_AUTO_ENTER, 0); } return; break; @@ -468,8 +473,8 @@ void TSchedaPercipienti::init_query_mode(TMask& m) } else { - m.send_key(K_SHIFT+K_CTRL+'h', -1); // group 1 Scelta ANAGR - m.send_key(K_SHIFT+K_CTRL+'s', -2); // group 3 Ricerca su DATI PER + m.hide(-1); // group 1 Scelta ANAGR + m.show(-2); // group 3 Ricerca su DATI PER } _from_modify = FALSE; @@ -496,8 +501,8 @@ void TSchedaPercipienti::init_query_insert_mode(TMask& m) } else { - m.send_key(K_SHIFT+K_CTRL+'h', -2); // group 3 Nasconde ricerca su PERC - m.send_key(K_SHIFT+K_CTRL+'s', -1); // group 1 Ricerca su ANAGR + m.hide(-2); // group 3 Nasconde ricerca su PERC + m.show(-1); // group 1 Ricerca su ANAGR } } @@ -567,7 +572,7 @@ void TSchedaPercipienti::rec2row(TToken_string& r, TRectype& rec, int row) int TSchedaPercipienti::read(TMask& m) { - m.autoload(_rel); + m.autoload(*_rel); TSheet_field& pags = (TSheet_field&)m.field(F_PAGAMENTI); pags.destroy(); @@ -771,7 +776,7 @@ bool TSchedaPercipienti::check_handler(TMask_field& f, KEY k) warning_box ("La differenza tra il totale dei versamenti " "e il totale delle ritenute non puo' superare " "le %s lire", THRESOLD.string()); - return forzatura; + return TRUE; } } return TRUE; @@ -781,7 +786,7 @@ bool TSchedaPercipienti::check_handler(TMask_field& f, KEY k) void TSchedaPercipienti::mask2rel(const TMask& m) { _rel->lfile().zero(); - m.autosave(_rel); + m.autosave(*_rel); const long codditta = m.get_long(F_CODDITTA); const char tipoa = m.get(F_TIPOA)[0]; diff --git a/m770/770100a.uml b/m770/770100a.uml index 0d7fef322..51bf36135 100755 --- a/m770/770100a.uml +++ b/m770/770100a.uml @@ -11,7 +11,7 @@ END ENDPAGE -PAGE "MODULO 770 - SCHEDA PERCIPIENTI" -1 -1 78 21 +PAGE "Scheda percipienti" -1 -1 78 21 GROUPBOX DLG_NULL 78 3 BEGIN @@ -49,12 +49,11 @@ BEGIN PROMPT 1 7 "@bDati percipiente" END -LIST F_TIPOA 1 12 +LIST F_TIPOA 1 9 BEGIN PROMPT 1 8 "" ITEM "F|Fisica" ITEM "G|Giuridica" - CHECKTYPE REQUIRED KEY 1 FIELD LF_SCPERC->TIPOA END diff --git a/m770/770100b.uml b/m770/770100b.uml index 8b3439af4..ebc51541e 100755 --- a/m770/770100b.uml +++ b/m770/770100b.uml @@ -12,7 +12,7 @@ BEGIN KEY 1 END -LIST F_TIPOA 1 12 +LIST F_TIPOA 1 9 BEGIN PROMPT 0 0 "" FIELD LF_SCPERC->TIPOA @@ -61,7 +61,7 @@ STRING F_CODCAUS 2 BEGIN FIELD LF_SCPERC->CODCAUS PROMPT 0 1 "" - USE %CA7 SELECT ((I0!="1015") && ((S1="C")||(S1="D")||(S1="D1")||(S1="E")||(S1="E1")||(S1="E2")) + USE %CA7 SELECT (I0!="1015")&&((S1="C")||(S1="D")||(S1="D1")||(S1="E")||(S1="E1")||(S1="E2")) CHECKTYPE REQUIRED INPUT CODTAB F_CODCAUS DISPLAY "Codice " CODTAB @@ -298,12 +298,12 @@ END TEXT DLG_NULL BEGIN - PROMPT 1 12 "@bVersamenti" + PROMPT 1 13 "@bVersamenti" END SPREADSHEET F_VERSAMENTI 79 5 BEGIN - PROMPT 0 13 "" + PROMPT 0 14 "" ITEM "1015" ITEM "Data@10" ITEM "Luogo" @@ -312,14 +312,12 @@ BEGIN ITEM "Numero-CAB@11" ITEM "Progressivo banca" ITEM "Ritenuta@15" -// ITEM "NUMVERS" - WARNING "Versamento inconsistente" END BOOLEAN F_FORCED BEGIN FIELD LF_SCPERC->FORZATURA - PROMPT 1 18 "Forzatura" + PROMPT 1 20 "Forzatura" HELP "Attivare questo flag per forzare la registrazione anche di dati incongruenti" END diff --git a/m770/770100d.uml b/m770/770100d.uml index d5808461b..3ae25744d 100755 --- a/m770/770100d.uml +++ b/m770/770100d.uml @@ -16,7 +16,7 @@ DATE 102 BEGIN PROMPT 2 3 "Data " FIELD LF_RVER->DATAVERS - VALIDATE REQIF_FUNC 4 103 104 105 106 107 + VALIDATE REQIF_FUNC 5 103 104 105 106 107 WARNING "Inserire la data del versamento" GROUP 1 END @@ -34,7 +34,6 @@ BEGIN OUTPUT 71 FLAGS "U" FIELD LF_RVER->LUOVERS - CHECKTYPE REQUIRED GROUP 1 END @@ -87,7 +86,6 @@ BEGIN OUTPUT 104 OUTPUT 70 GROUP 1 - CHECKTYPE REQUIRED FLAGS "U" END @@ -133,7 +131,6 @@ END NUMBER 107 6 BEGIN PROMPT 2 6 "Progressivo per versamento banca " -// FLAGS "DZ" FLAGS "Z" GROUP 2 6 END @@ -165,7 +162,7 @@ END BUTTON DLG_CANCEL 9 2 BEGIN PROMPT -24 -1 "" - MESSAGE CLEAR,103|CLEAR,104|CLEAR,105|CLEAR,106|CLEAR,107|CLEAR,108 +// MESSAGE CLEAR,103|CLEAR,104|CLEAR,105|CLEAR,106|CLEAR,107|CLEAR,108 END BUTTON DLG_AZZERA 9 2 diff --git a/m770/770200.cpp b/m770/770200.cpp index 0e889beeb..42c833c32 100755 --- a/m770/770200.cpp +++ b/m770/770200.cpp @@ -77,7 +77,6 @@ TCursor* TVersa_rit::meik_curs(TRelation* rel) TString16 filt; TCursor* cur; const long codditta = get_firm(); - filt.format("CODDITTA=%ld", codditta); cur = new TCursor(rel, filt); return cur; @@ -136,9 +135,10 @@ bool TVersa_rit::create() } TEdit_field& dummy = (TEdit_field&)_msk->field(F_CODANAGRPERC); - + + TToken_string siblings; // non ho ricerche alternative _sheet_perc = new TBrowse_sheet(_cur," |TIPOA|CODANAGR|6->RAGSOC", "Selezione percipienti", - "@1|Tipo|Codice|Ragione sociale@50", 8, &dummy); + "@1|Tipo|Codice|Ragione sociale@50", 8, &dummy,siblings); _sheet_perc->maximize(); _schede = new TArray_sheet(-1, -1, 0, 0, "Selezione Schede","@1|T|Codice|Ragione@50|N.|Data@10"); diff --git a/m770/770200a.uml b/m770/770200a.uml index 92fd738b8..8c64431f5 100755 --- a/m770/770200a.uml +++ b/m770/770200a.uml @@ -26,14 +26,6 @@ BEGIN FLAGS "D" END -/** -NUMBER F_ANNODIC 4 -BEGIN - PROMPT 52 4 "Anno dichiarazione " - FLAGS "DR" -END -**/ - LIST F_TIPOA 1 12 BEGIN PROMPT 1 8 "" @@ -86,7 +78,6 @@ BEGIN OUTPUT F_LUOGO OUTPUT 71 FLAGS "U" - CHECKTYPE REQUIRED WARNING "Manca il luogo del versamento" HELP "Inserire il luogo del versamento" VALIDATE NOT_EMPTY_FUNC @@ -141,7 +132,6 @@ BEGIN OUTPUT F_TIPO OUTPUT 70 GROUP 1 - CHECKTYPE REQUIRED HELP "Inserire il tipo di versamento" WARNING "Manca il tipo di versamento" FLAGS "U" @@ -154,22 +144,6 @@ BEGIN FLAGS "D" END -/* -LIST 104 16 -BEGIN - PROMPT 42 3 "Tipo " - ITEM " |Nessuno" - MESSAGE SHOW,210|SHOW,212|HIDE,209|HIDE,211|SHOW,105 - ITEM "C|C/C Postale" - MESSAGE HIDE,209|SHOW,211|HIDE,210|HIDE,212|HIDE,105 - ITEM "D|Distinta" - MESSAGE SHOW,209|SHOW,211|HIDE,210|HIDE,212|SHOW,105 - ITEM "B|Delega bancaria" - MESSAGE SHOW,210|SHOW,212|HIDE,209|HIDE,211|SHOW,105 - GROUP 1 -END -*/ - NUMBER F_ABI 5 BEGIN PROMPT 16 7 "" @@ -189,7 +163,6 @@ END STRING F_SERIE 5 BEGIN PROMPT 16 7 "" -// VALIDATE REQIF_FUNC 2 103 104 CHECKTYPE REQUIRED FLAGS "G" WARNING "Inserire il numero di serie" @@ -224,7 +197,6 @@ END BUTTON DLG_CANCEL 9 2 BEGIN PROMPT -22 -1 "" -// MESSAGE CLEAR,103|CLEAR,104|CLEAR,105|CLEAR,106|CLEAR,107 END ENDPAGE diff --git a/m770/771100.cpp b/m770/771100.cpp index 073770b2a..924a1dd33 100755 --- a/m770/771100.cpp +++ b/m770/771100.cpp @@ -123,8 +123,8 @@ bool TDati_anagrafici::attivita_handler(TMask_field& m, KEY k) body << "1" << "|"; body << m.mask().get(F_CODDITTA) << "|"; - body << m.mask().get(F_ATTIV) << "|"; - body << m.mask().get(F_ATTIV); +// body << m.mask().get(F_ATTIV) << "|"; +// body << m.mask().get(F_ATTIV); TMessage msg(cmd2name(appname), MSG_LN, (const char*) body); @@ -527,7 +527,7 @@ bool TDati_anagrafici::main_loop() { _rel->lfile().put("CODDITTA", _codditta); _rel->read(); - _msk->autoload(_rel); + _msk->autoload(*_rel); tasto = _msk->run(); switch (tasto) diff --git a/m770/771100c.uml b/m770/771100c.uml index f9ad21427..31ef3a72e 100755 --- a/m770/771100c.uml +++ b/m770/771100c.uml @@ -59,6 +59,43 @@ BEGIN FLAGS "D" END +NUMBER F_ANAGR 5 +BEGIN + PROMPT 1 4 "Codice rappresentante " + FLAGS "D" + USE LF_NDITTE + INPUT CODDITTA F_CODDITTA + FIELD LF_NDITTE->RAPPR + CHECKTYPE NORMAL + JOIN LF_ANAG INTO CODANAGR=RAPPR TIPOA="F" + JOIN LF_ANAGFIS TO LF_ANAG INTO CODANAGR=CODANAGR + JOIN LF_COMUNI TO LF_ANAGFIS INTO COM==COMNASC + JOIN LF_COMUNI TO LF_ANAG ALIAS 1 INTO COM==COMRES + JOIN LF_COMUNI TO LF_ANAG ALIAS 2 INTO COM==COMRF + OUTPUT F_COFI LF_ANAG->COFI + OUTPUT F_COGNOME LF_ANAG->RAGSOC[1,30] + OUTPUT F_NOME LF_ANAG->RAGSOC[31,50] + OUTPUT F_SESSO LF_ANAGFIS->SESSO + OUTPUT F_DATANASC LF_ANAGFIS->DATANASC + OUTPUT F_COMNASC LF_COMUNI->DENCOM + OUTPUT F_PROVNASC LF_COMUNI->PROVCOM + OUTPUT F_INDRES LF_ANAG->INDRES + OUTPUT F_CIVRES LF_ANAG->CIVRES + OUTPUT F_CAPRES LF_ANAG->CAPRES + OUTPUT F_INDRF LF_ANAG->INDRF + OUTPUT F_CIVRF LF_ANAG->CIVRF + OUTPUT F_CAPRF LF_ANAG->CAPRF + OUTPUT F_COMRES 1@->DENCOM + OUTPUT F_PROVRES 1@->PROVCOM + OUTPUT F_COMRF 2@->DENCOM + OUTPUT F_PROVRF 2@->PROVCOM + OUTPUT F_DOMFISC LF_ANAG->VARSLORES + OUTPUT F_ANAGR LF_ANAGFIS->CODANAGR + OUTPUT F_PTELRF LF_ANAG->PTELRF + OUTPUT F_TELRF LF_ANAG->TELRF +END + +/* NUMBER F_ANAGR 5 BEGIN PROMPT 1 4 "Codice rappresentante " @@ -95,7 +132,7 @@ BEGIN CHECKTYPE NORMAL FLAGS "R" END - +*/ STRING F_COFI 16 BEGIN PROMPT 1 5 "Codice fiscale " diff --git a/m770/771200.cpp b/m770/771200.cpp index 35ef6f1e7..4152b3ae2 100755 --- a/m770/771200.cpp +++ b/m770/771200.cpp @@ -434,6 +434,12 @@ bool TQuadroA::QAA2alleg_handler(TMask_field& f, KEY k) bool TQuadroA::nprog_handler(TMask_field& f, KEY key) { if (!f.mask().is_running()) return TRUE; + + if (key == K_CTRL+K_TAB) + { + f.set_dirty(); + return TRUE; + } if (key == K_TAB) { @@ -450,7 +456,7 @@ bool TQuadroA::nprog_handler(TMask_field& f, KEY key) { app()._codip = coddip; // app().AA3SettaCognomeNome(f.mask()); - f.mask().stop_run(K_AUTO_ENTER); // entra in modo modifica (se il record che ha chiave specificata esiste gia') oppure +// f.mask().stop_run(K_AUTO_ENTER); // entra in modo modifica (se il record che ha chiave specificata esiste gia') oppure // inserimento (se trova che non esiste) } } @@ -488,7 +494,7 @@ bool TQuadroA::QA3_codip_handler(TMask_field& f, KEY key) const long codditta = get_firm_770(); if (!esiste_dipendente(codditta, coddip)) return f.warning_box("Dipendente inesistente"); - f.mask().stop_run(K_AUTO_ENTER); // entra in modo modifica (se il record che ha chiave specificata esiste gia') oppure +// f.mask().stop_run(K_AUTO_ENTER); // entra in modo modifica (se il record che ha chiave specificata esiste gia') oppure // inserimento (se trova che non esiste) } return TRUE; @@ -602,7 +608,7 @@ bool TQuadroA::QA_comp_netti_hnd (TMask_field& f, KEY k) real compnetti = denaro + natura - cobbdip; if (compnetti < ZERO) compnetti = ZERO; f.mask().set(F_COMPNETTI, compnetti); - f.send_key(K_TAB,F_COMPNETTI); + f.mask().send_key(K_TAB,F_COMPNETTI); } return TRUE; } @@ -731,7 +737,7 @@ int TQuadroA::rewrite(const TMask& m) if (QuadroA3() && _soc_trasf) registra_record2_A3(m); - m.autosave(_rel); + m.autosave(*_rel); const int err = _rel->rewrite(); _registra = TRUE; @@ -743,7 +749,7 @@ int TQuadroA::write(const TMask& m) if (QuadroA3() && _soc_trasf) registra_record2_A3(m); - m.autosave(_rel); + m.autosave(*_rel); const int err = _rel->write(); _registra = TRUE; @@ -950,15 +956,15 @@ void TQuadroA::init_query_mode(TMask& m) if (dummy.not_empty()) setta_nprog(m.field(QAF_NPROG)); } - m.send_key(K_SHIFT+K_CTRL+'h', -1); // hide group 1 -nasconde DIPEND. - m.send_key(K_SHIFT+K_CTRL+'s', -2); // show group 2 -Ricerca su QUADRO A + m.hide(-1); // hide group 1 -nasconde DIPEND. + m.show(-2); // show group 2 -Ricerca su QUADRO A } void TQuadroA::init_query_insert_mode(TMask& m) { m.set(QAF_ANNODIC, _anno_dic); - m.send_key(K_SHIFT+K_CTRL+'h', -2); // group 2 Nasconde ricerca su QUADROA - m.send_key(K_SHIFT+K_CTRL+'s', -1); // group 1 Ricerca su ANAGR.DIPENDENTI + m.hide(-2); // group 2 Nasconde ricerca su QUADROA + m.show(-1); // group 1 Ricerca su ANAGR.DIPENDENTI } void TQuadroA::init_modify_mode(TMask& m) diff --git a/m770/771200a.uml b/m770/771200a.uml index c80221739..952b3f074 100755 --- a/m770/771200a.uml +++ b/m770/771200a.uml @@ -48,7 +48,7 @@ END NUMBER F_CODIP 6 BEGIN - PROMPT 80 80 "" + PROMPT 1 1 "" FLAGS "D" FIELD LF_QUAA->CODDIP CHECKTYPE REQUIRED @@ -58,7 +58,7 @@ END NUMBER F_CODANAGDIP 6 BEGIN PROMPT 1 8 "@bCodice " - USE LF_DIPEND KEY 1 SELECT ((CODDITTA=#QAF_CODDITTA)) + USE LF_DIPEND KEY 1 SELECT (CODDITTA==#QAF_CODDITTA) INPUT CODDITTA QAF_CODDITTA INPUT CODDIP F_CODANAGDIP DISPLAY "Codice " CODDIP @@ -69,15 +69,16 @@ BEGIN OUTPUT QAF_NOME NOME ADD RUN 773mod -1 771150a 45 "Anagrafica dipendenti" MESSAGE COPY, F_CODIP - FLAGS "H" + FLAGS "H" + KEY 1 GROUP G_DIPEND END NUMBER F_CODANAGDIPQA 6 BEGIN PROMPT 1 8 "@bCodice " - USE LF_QUAA KEY 1 SELECT ((CODDITTA=#QAF_CODDITTA)) - JOIN LF_DIPEND KEY 1 INTO CODDITTA=CODDITTA CODDIP=CODDIP + USE LF_QUAA KEY 1 SELECT (CODDITTA==#QAF_CODDITTA) + JOIN LF_DIPEND KEY 1 INTO CODDITTA==CODDITTA CODDIP==CODDIP INPUT CODDITTA QAF_CODDITTA INPUT CODDIP F_CODANAGDIPQA DISPLAY "Codice " CODDIP @@ -88,6 +89,7 @@ BEGIN OUTPUT QAF_COGNOME LF_DIPEND->COGNOME OUTPUT QAF_NOME LF_DIPEND->NOME MESSAGE COPY, F_CODIP + KEY 1 GROUP G_QUADROA END diff --git a/m770/771230.cpp b/m770/771230.cpp index d8343b56d..a93a00b47 100755 --- a/m770/771230.cpp +++ b/m770/771230.cpp @@ -718,12 +718,18 @@ bool TQuadroC_E2::codanagr_handler(TMask_field& f, KEY k) bool TQuadroC_E2::nprog_handler(TMask_field& f, KEY key) { if (!f.mask().is_running()) return TRUE; + + if (key == K_CTRL+K_TAB) + { + f.set_dirty(); + return TRUE; + } if (key == K_TAB) { const int nprog = atoi(f.get()); if (nprog==0) return TRUE; - f.mask().stop_run(K_AUTO_ENTER); // entra in modo modifica (se il record che ha chiave specificata esiste gia') oppure +// f.mask().stop_run(K_AUTO_ENTER); // entra in modo modifica (se il record che ha chiave specificata esiste gia') oppure // inserimento (se trova che non esiste) } return TRUE; @@ -758,7 +764,7 @@ bool TQuadroC_E2::scrivi_dati_per(TRectype& rec) int TQuadroC_E2::rewrite(const TMask& m) { - m.autosave(_rel); + m.autosave(*_rel); const int err = _rel->rewrite(); scrivi_dati_per(_rel->curr()); _registra = TRUE; @@ -767,7 +773,7 @@ int TQuadroC_E2::rewrite(const TMask& m) int TQuadroC_E2::write(const TMask& m) { - m.autosave(_rel); + m.autosave(*_rel); const int err = _rel->write(); scrivi_dati_per(_rel->curr()); @@ -887,16 +893,16 @@ void TQuadroC_E2::init_query_mode(TMask& m) if (dummy.not_empty()) setta_nprog(m.field(F_NPROG)); - m.send_key(K_SHIFT+K_CTRL+'h', -1); // nasconde (hide) group 1 - Scelta ANAGR - m.send_key(K_SHIFT+K_CTRL+'s', -2); // abilita (show) group 2 - Ricerca su DATI PERC + m.hide(-1); // nasconde (hide) group 1 - Scelta ANAGR + m.show(-2); // abilita (show) group 2 - Ricerca su DATI PERC } void TQuadroC_E2::init_query_insert_mode(TMask& m) { m.set(F_ANNODIC, _anno_dic); - m.send_key(K_SHIFT+K_CTRL+'h', -2); // group 3 Nasconde ricerca su PERC - m.send_key(K_SHIFT+K_CTRL+'s', -1); // group 1 Ricerca su ANAGR + m.hide(-2); // group 3 Nasconde ricerca su PERC + m.show(-1); // group 1 Ricerca su ANAGR } int quadriC_E2(int argc, char* argv[]) diff --git a/m770/771233.cpp b/m770/771233.cpp index e605e6551..5a1d61d3a 100755 --- a/m770/771233.cpp +++ b/m770/771233.cpp @@ -79,6 +79,12 @@ bool TDistintaQuadroG::codanagr_handler(TMask_field& f, KEY k) bool TDistintaQuadroG::nprog_handler(TMask_field& f, KEY key) { if (!f.mask().is_running()) return TRUE; + + if (key == K_CTRL+K_TAB) + { + f.set_dirty(); + return TRUE; + } if (key == K_TAB) { @@ -86,7 +92,7 @@ bool TDistintaQuadroG::nprog_handler(TMask_field& f, KEY key) if (nprog==0) return TRUE; // entra in modo modifica (se il record che ha chiave specificata esiste gia') oppure // inserimento (se trova che non esiste) - f.mask().stop_run(K_AUTO_ENTER); +// f.mask().stop_run(K_AUTO_ENTER); } return TRUE; } @@ -118,7 +124,7 @@ bool TDistintaQuadroG::scrivi_dati_per(TRectype& rec) int TDistintaQuadroG::rewrite(const TMask& m) { - m.autosave(_rel); + m.autosave(*_rel); const int err = _rel->rewrite(); scrivi_dati_per(_rel->curr()); _registra = TRUE; @@ -127,7 +133,7 @@ int TDistintaQuadroG::rewrite(const TMask& m) int TDistintaQuadroG::write(const TMask& m) { - m.autosave(_rel); + m.autosave(*_rel); const int err = _rel->write(); scrivi_dati_per(_rel->curr()); _registra = TRUE; @@ -181,14 +187,14 @@ void TDistintaQuadroG::init_query_mode(TMask& m) if (dummy.not_empty()) setta_nprog(m.field(F_NPROG)); - m.send_key(K_SHIFT+K_CTRL+'h', -1); // nasconde (hide) group 1 - Scelta ANAGR - m.send_key(K_SHIFT+K_CTRL+'s', -2); // abilita (show) group 2 - Ricerca su DATI PERC + m.hide(-1); // nasconde (hide) group 1 - Scelta ANAGR + m.show(-2); // abilita (show) group 2 - Ricerca su DATI PERC } void TDistintaQuadroG::init_query_insert_mode(TMask& m) { m.set(F_ANNODIC, _anno_dic); - m.send_key(K_SHIFT+K_CTRL+'h', -2); // group 2 Nasconde ricerca su PERC - m.send_key(K_SHIFT+K_CTRL+'s', -1); // group 1 Ricerca su ANAGR + m.hide(-2); // group 2 Nasconde ricerca su PERC + m.show(-1); // group 1 Ricerca su ANAGR } diff --git a/m770/771290.cpp b/m770/771290.cpp index 828ecf898..4371cc73b 100755 --- a/m770/771290.cpp +++ b/m770/771290.cpp @@ -83,8 +83,8 @@ void TQuadro_H_app::refresh(TMask& m) //datore.check(); //lavora.check(); - datore.autoload(_rel); - lavora.autoload(_rel); + datore.autoload(*_rel); + lavora.autoload(*_rel); if (almeno_un_dettaglio(m)) m.enable (F_BTG_GENERA); @@ -277,14 +277,14 @@ void TQuadro_H_app::init_modify_mode(TMask& m) int TQuadro_H_app::rewrite(const TMask& m) { - m.autosave(_rel); + m.autosave(*_rel); _registra = TRUE; return _rel->rewrite(); } int TQuadro_H_app::write(const TMask& m) { - m.autosave(_rel); + m.autosave(*_rel); _registra = TRUE; return _rel->write(); } diff --git a/m770/771300.cpp b/m770/771300.cpp index 5fcff4a7f..54455f23d 100755 --- a/m770/771300.cpp +++ b/m770/771300.cpp @@ -187,7 +187,7 @@ TMask* TQuadroI::get_mask(int mode) int TQuadroI::read(TMask& m) { - m.autoload(_rel); + m.autoload(*_rel); // Si posiziona sul record del dichiarante, e se non esiste lo crea if (_quadro == '1' || _quadro == '2') { @@ -200,7 +200,7 @@ int TQuadroI::read(TMask& m) if (err != NOERR) enter_dichiar_770(get_firm_770(), anno_770(), TRUE); - m.autoload(_rel); + m.autoload(*_rel); } // Setta i flag di quadro compilato nel prospetto dai generali @@ -268,7 +268,7 @@ bool TQuadroI::user_destroy() int TQuadroI::write(const TMask& m) { TRelation *r = get_relation(); - m.autosave(r); + m.autosave(*r); // Setta i flag di quadro compilato nel prospetto dai generali nella relazione if (_quadro == 'W' || _quadro == '2') set_rel_field_quadri(m); @@ -280,7 +280,7 @@ int TQuadroI::write(const TMask& m) int TQuadroI::rewrite(const TMask& m) { TRelation *r = get_relation(); - m.autosave(r); + m.autosave(*r); // Setta i flag di quadro compilato nel prospetto dai generali nella relazione if (_quadro == 'W' || _quadro == '2') set_rel_field_quadri(m); diff --git a/m770/771300a.uml b/m770/771300a.uml index 6c0ce59c0..587b05601 100755 --- a/m770/771300a.uml +++ b/m770/771300a.uml @@ -20,7 +20,7 @@ ENDPAGE PAGE "QUADRO I" -1 -1 78 18 -LISTBOX F_TIPOQUA1 2 +LISTBOX F_TIPOQUA1 12 BEGIN PROMPT 90 90 "" ITEM " |Normale" @@ -31,7 +31,7 @@ BEGIN // CHECKTYPE REQUIRED END -LISTBOX F_TIPOQUA2 2 +LISTBOX F_TIPOQUA2 12 BEGIN PROMPT 90 90 "" // PROMPT 10 3 "" diff --git a/m770/771310.cpp b/m770/771310.cpp index e3364118c..912876def 100755 --- a/m770/771310.cpp +++ b/m770/771310.cpp @@ -158,9 +158,15 @@ bool M71310_application::cod_tributo(TMask_field& f , KEY k) // "auto-premimento" // Sia da F_ABI che da F_NUMERO bool M71310_application::auto_premi(TMask_field& f, KEY k) -{ - if (k == K_TAB && f.mask().is_running()) - f.mask().stop_run(K_AUTO_ENTER); +{ + if (k == K_CTRL+K_TAB && f.mask().is_running()) + { + f.set_dirty(); + return TRUE; + } + +// if (k == K_TAB && f.mask().is_running()) +// f.mask().stop_run(K_AUTO_ENTER); return TRUE; } @@ -418,7 +424,7 @@ int M71310_application::rewrite(const TMask& m) { real rImpVersArr; build_note(m); - m.autosave(_rel); + m.autosave(*_rel); rImpVersArr = arrotonda(m); _rel->lfile().put(QUL_QLRITVER, rImpVersArr); return _rel->rewrite(); @@ -428,7 +434,7 @@ int M71310_application::write(const TMask& m) { real rImpVersArr; build_note(m); - m.autosave(_rel); + m.autosave(*_rel); rImpVersArr = arrotonda(m); _rel->lfile().put(QUL_QLRITVER, rImpVersArr); return _rel->write(); diff --git a/m770/771400a.uml b/m770/771400a.uml index b5ad626c3..ae6620f87 100755 --- a/m770/771400a.uml +++ b/m770/771400a.uml @@ -53,7 +53,7 @@ BEGIN MESSAGE COPY,2@ END -LISTBOX F_TIPOQUA 2 +LISTBOX F_TIPOQUA 12 BEGIN PROMPT 90 90 "" ITEM " |Normale" diff --git a/m770/771400b.uml b/m770/771400b.uml index e1ed9f94d..a4f022111 100755 --- a/m770/771400b.uml +++ b/m770/771400b.uml @@ -53,7 +53,7 @@ BEGIN MESSAGE COPY,2@ END -LISTBOX F_TIPOQUA1 2 +LISTBOX F_TIPOQUA1 12 BEGIN PROMPT 90 90 "" ITEM "D|Dichiarante" diff --git a/m770/775200.cpp b/m770/775200.cpp index aa7a53fab..f13c48847 100755 --- a/m770/775200.cpp +++ b/m770/775200.cpp @@ -11,13 +11,11 @@ #include #include #include - #include "774100.h" - -#include -#include -#include -#include +#include "rpag.h" +#include "rver.h" +#include "scperc.h" +#include "quadrol.h" class TGenera_dett : public TApplication { diff --git a/m770/776100.cpp b/m770/776100.cpp index 28af309d4..5266012e5 100755 --- a/m770/776100.cpp +++ b/m770/776100.cpp @@ -376,14 +376,30 @@ void TManutenzione_quadri::show_menu(TMask& m, const int group, bool mostra) bool TManutenzione_quadri::menu_dich(TMask_field& f, KEY k) { if (k == K_SPACE) - show_menu(f.mask(), -4, TRUE); + { + TMask& m = f.mask(); + m.hide(-1); + m.hide(DLG_NULL_SOCI); + m.hide(DLG_MANUTENZ_SOCI); + m.hide(-3); + m.show(-5); + } return TRUE; } bool TManutenzione_quadri::cancel_menu_dich(TMask_field& f, KEY k) { if (k == K_SPACE) - show_menu(f.mask(), -4, FALSE); + { + TMask& m = f.mask(); + m.hide(-5); + m.show(-3); + m.show(-1); + m.show(DLG_NULL_SOCI); + m.show(DLG_MANUTENZ_SOCI); + m.enable(DLG_NULL_SOCI, app()._soci); + m.enable(DLG_MANUTENZ_SOCI, app()._soci); + } return TRUE; } @@ -543,7 +559,7 @@ bool TManutenzione_quadri::main_loop() continue; load_mask(1); - _msk[1]->autoload(_rel); + _msk[1]->autoload(*_rel); init_menu(*_msk[1]); diff --git a/m770/776100b.h b/m770/776100b.h index f90e0412a..17d6b09d1 100755 --- a/m770/776100b.h +++ b/m770/776100b.h @@ -57,69 +57,104 @@ #define DLG_STOPREC_S 153 #define DLG_NULL_T 154 #define DLG_STOPREC_T 155 - -#define DLG_MANUTENZ 218 - -#define DLG_NULL_DICH 206 -#define DLG_STOPREC_DICH 207 -#define DLG_NULL_RAPP 208 -#define DLG_STOPREC_RAPP 209 -#define DLG_NULL_SCRIT 210 -#define DLG_STOPREC_SCRIT 211 -#define DLG_NULL_CAAF 212 -#define DLG_STOPREC_CAAF 213 -#define DLG_NULL_DIRET 214 -#define DLG_STOPREC_DIRET 215 -#define DLG_NULL_CONC 216 -#define DLG_STOPREC_CONC 217 -#define DLG_NULL_DIC0 200 -#define DLG_STOPREC_DIC0 201 -#define DLG_NULL_DIC1 202 -#define DLG_STOPREC_DIC1 203 -#define DLG_NULL_SOCTRA 204 -#define DLG_STOPREC_SOCTRA 205 - -#define DLG_CANCEL_MENU 163 - -#define DLG_NULL_DG 164 -#define DLG_STOPREC_DG 165 - -#define DLG_MANUTENZ_SOCI 166 -#define DLG_NULL_SOCI 167 - -#define DLG_NULL_ST 168 -#define DLG_STOPREC_ST 169 -#define DLG_STOPREC_AD 170 - -// Menu' stampe -#define DLG_NULL_ST0 219 -#define DLG_STOPREC_ST0 220 -#define DLG_NULL_ST1 221 -#define DLG_STOPREC_ST1 222 - -#define DLG_CANCEL_MENU_ST 170 -#define DLG_NULL_ST2 171 -#define DLG_STOPREC_ST2 172 -#define DLG_NULL_ST3 173 -#define DLG_STOPREC_ST3 174 -// Fine stampe - -// Menu' sogg. dichiarante -#define DLG_NULL_SD 198 -#define DLG_STOPREC_SD 199 -#define DLG_NULL_SD0 191 -#define DLG_STOPREC_SD0 192 -#define DLG_NULL_SD1 193 -#define DLG_STOPREC_SD1 194 -#define DLG_NULL_SD2 195 -#define DLG_STOPREC_SD2 196 -#define DLG_CANCEL_MENU_SD 197 - -#define DLG_STOPREC_IR 175 - -#define RILEGGI_QUADRI 190 - -#define DLG_NULL_STQD 198 -#define DLG_STOPREC_STQD 199 +#define DLG_MANUTENZ 156 +#define DLG_NULL_DICH 157 +#define DLG_STOPREC_DICH 158 +#define DLG_NULL_RAPP 159 +#define DLG_STOPREC_RAPP 160 +#define DLG_NULL_SCRIT 161 +#define DLG_STOPREC_SCRIT 162 +#define DLG_NULL_CAAF 163 +#define DLG_STOPREC_CAAF 164 +#define DLG_NULL_DIRET 165 +#define DLG_STOPREC_DIRET 166 +#define DLG_NULL_CONC 167 +#define DLG_STOPREC_CONC 168 +#define DLG_NULL_DIC0 169 +#define DLG_STOPREC_DIC0 170 +#define DLG_NULL_DIC1 171 +#define DLG_STOPREC_DIC1 172 +#define DLG_NULL_SOCTRA 173 +#define DLG_STOPREC_SOCTRA 174 +#define DLG_CANCEL_MENU 175 +#define DLG_NULL_DG 176 +#define DLG_STOPREC_DG 177 +#define DLG_MANUTENZ_SOCI 178 +#define DLG_NULL_SOCI 179 +#define DLG_NULL_ST 180 +#define DLG_STOPREC_ST 181 +#define DLG_STOPREC_AD 182 +#define DLG_NULL_ST0 183 +#define DLG_STOPREC_ST0 184 +#define DLG_NULL_ST1 185 +#define DLG_STOPREC_ST1 186 +#define DLG_CANCEL_MENU_ST 187 +#define DLG_NULL_ST2 188 +#define DLG_STOPREC_ST2 189 +#define DLG_NULL_ST3 190 +#define DLG_STOPREC_ST3 191 +#define DLG_NULL_SD 192 +#define DLG_STOPREC_SD 193 +#define DLG_NULL_SD0 194 +#define DLG_STOPREC_SD0 195 +#define DLG_NULL_SD1 196 +#define DLG_STOPREC_SD1 197 +#define DLG_NULL_SD2 198 +#define DLG_STOPREC_SD2 199 +#define DLG_CANCEL_MENU_SD 200 +#define DLG_STOPREC_IR 201 +#define RILEGGI_QUADRI 202 +#define DLG_NULL_STQD 203 +#define DLG_STOPREC_STQD 204 +#define T_BASE 205 +#define B_BASE 206 +#define T_LAGG 207 +#define B_LAGG 208 +#define T_NAGG 209 +#define B_NAGG 210 +#define T_ALLSOC 211 +#define B_ALLSOC 212 +#define T_ALLG 213 +#define B_ALLG 214 +#define T_BUST 215 +#define B_BUST 216 +#define T_A 217 +#define B_A 218 +#define T_A1 219 +#define B_A1 220 +#define T_A2 221 +#define B_A2 222 +#define T_A3 223 +#define B_A3 224 +#define T_B 225 +#define B_B 226 +#define T_B1 227 +#define B_B1 228 +#define T_C 229 +#define B_C 230 +#define T_D 231 +#define B_D 232 +#define T_D1 233 +#define B_D1 234 +#define T_E 235 +#define B_E 236 +#define T_E1 237 +#define B_E1 238 +#define T_E2 239 +#define B_E2 240 +#define T_F 241 +#define B_F 242 +#define T_F1 243 +#define B_F1 244 +#define T_F2 245 +#define B_F2 246 +#define T_G 247 +#define B_G 248 +#define T_G1 249 +#define B_G1 250 +#define T_H 251 +#define B_H 252 +#define DLG_STOPREC_SP 253 +#define DLG_STOPREC_DG 254 #endif diff --git a/m770/776100b.uml b/m770/776100b.uml index d3e3b743b..ac5b1b76d 100755 --- a/m770/776100b.uml +++ b/m770/776100b.uml @@ -1,6 +1,49 @@ // Menu' manutenzione quadri #include "776100b.h" -TOOLBAR "" 0 22 0 2 +TOOLBAR "" 0 19 0 0 + +BUTTON DLG_CANCEL 20 2 +BEGIN + PROMPT -22 -11 "Menu' precedente" + GROUP 1 +END + +BUTTON DLG_QUIT 20 2 +BEGIN + PROMPT -12 -11 "Fine" +END + +BUTTON DLG_CANCEL_MENU 20 2 +BEGIN + PROMPT -22 -11 "Menu' precedente" + GROUP 2 + FLAGS "H" +END + +BUTTON DLG_CANCEL_MENU_ST 20 2 +BEGIN + PROMPT -22 -11 "Menu' precedente" + GROUP 3 + FLAGS "H" +END + +BUTTON DLG_CANCEL_MENU_SD 20 2 +BEGIN + PROMPT -22 -11 "Menu' precedente" + GROUP 4 + FLAGS "H" +END + +#define DLG_CANCEL_MENUSTQ 303 + +BUTTON DLG_CANCEL_MENUSTQ 20 2 +BEGIN + PROMPT -22 -11 "Menu' precedente" + GROUP 5 + FLAGS "H" + MESSAGE HIDE,5@|SHOW,3@ +END + ENDPAGE PAGE "Manutenzione dichiarazione" -1 -1 78 21 @@ -86,7 +129,7 @@ BEGIN GROUP 1 END -BUTTON DLG_STOPREC 1 1 +BUTTON DLG_STOPREC_SP 1 1 BEGIN PROMPT 1 8 "" GROUP 1 @@ -102,7 +145,6 @@ END BUTTON DLG_MANUTENZ_SOCI 1 1 BEGIN PROMPT 39 5 "" -// MESSAGE RUN,ba4,-5 PICTURE 123 GROUP 1 END @@ -121,8 +163,7 @@ BEGIN GROUP 1 END -// Forza la rilettura del flag QCOMP -BUTTON DLG_STOPREC 1 1 +BUTTON DLG_STOPREC_DG 1 1 BEGIN PROMPT 39 7 "" MESSAGE RUN,771MOD,-2,W|K_TAB,RILEGGI_QUADRI @@ -661,68 +702,6 @@ BEGIN GROUP 2 END -/****************************************************** -NUMBER DLG_STOPREC_DIC0 5 -BEGIN - PROMPT 1 12 "Soggetto dichiarante " - USE LF_BASE KEY 1 SELECT (CODDIC="") - JOIN LF_NDITTE TO LF_BASE KEY 1 INTO CODDITTA=CODDITTA - INPUT CODDITTA F_CODDITTA - DISPLAY "Codice" CODDITTA - DISPLAY "Ragione sociale@50" LF_NDITTE->RAGSOC - OUTPUT DLG_STOPREC_DIC0 CODDITTA - FIELD LF_BASE->CODDIC - FLAGS "H" - GROUP 2 -END - -BUTTON DLG_STOPREC_DIC1 9 2 -BEGIN - PROMPT 1 13 "~Soggetti estinti" -// MESSAGE RUN,771MOD,-0,G - FLAGS "H" - GROUP 2 -END - -TEXT DLG_NULL_DIC0 -BEGIN - PROMPT 5 11 "Soggetto dichiarante" - FLAGS "H" - GROUP 2 -END - -BUTTON DLG_STOPREC_DIC0 1 1 -BEGIN - PROMPT 1 11 "" - PICTURE 123 -// MESSAGE RUN,771MOD,-0,G - FLAGS "H" - GROUP 2 -END - -TEXT DLG_NULL_DIC1 -BEGIN - PROMPT 5 12 "Soggetti estinti" - FLAGS "H" - GROUP 2 -END - -BUTTON DLG_STOPREC_DIC1 1 1 -BEGIN - PROMPT 1 12 "" - PICTURE 123 -// MESSAGE RUN,771MOD,-0,G - FLAGS "H" - GROUP 2 -END -**************************/ - -BUTTON DLG_CANCEL_MENU 20 2 -BEGIN - PROMPT -22 -1 "Menu' precedente" - GROUP 2 - FLAGS "H" -END /////////// Fine colonna MENU' ANAGRAFICI //////////////////////////// /////////// Inizio colonna MENU' STAMPE //////////////////////////// @@ -790,23 +769,13 @@ BEGIN GROUP 3 END -#include "menustq.uml" - TEXT DLG_NULL_STQD BEGIN PROMPT 5 9 "Menu' stampe dichiarazioni" - FLAGS "H" + FLAGS "H" GROUP 3 END -BUTTON DLG_CANCEL_MENU_ST 20 2 -BEGIN - PROMPT -22 -1 "Menu' precedente" - GROUP 3 - MESSAGE HIDE,3@|SHOW,1@ - FLAGS "H" -END - BUTTON DLG_STOPREC_STQD 1 1 BEGIN PROMPT 1 9 "" @@ -816,6 +785,400 @@ BEGIN GROUP 3 END +#define COL1 5 +#define COL2 24 +#define COL3 5 +#define COL4 5 + +#define ROW1 7 +#define ROW2 8 +#define ROW3 9 +#define ROW4 10 +#define ROW5 11 +#define ROW6 12 + +#define HIDDEN "H" +#define MYFLAGS "H" +#define GRUPPO 5 + +// Prima colonna +TEXT T_BASE +BEGIN + PROMPT COL1 ROW1 "Quadro Base" + GROUP GRUPPO + FLAGS MYFLAGS +END + +BUTTON B_BASE 1 1 +BEGIN + PROMPT 1 ROW1 "" + MESSAGE RUN,772MOD,-4,Base,D + PICTURE 123 + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_LAGG +BEGIN + PROMPT COL1 ROW2 "Quadro L agg." + GROUP GRUPPO + FLAGS MYFLAGS +END + +BUTTON B_LAGG 1 1 +BEGIN + PROMPT 1 ROW2 "" + MESSAGE RUN,772MOD,-4,L,D + PICTURE 123 + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_NAGG +BEGIN + PROMPT COL1 ROW3 "Quadro N agg." + GROUP GRUPPO + FLAGS MYFLAGS +END + +BUTTON B_NAGG 1 1 +BEGIN + PROMPT 1 ROW3 "" + MESSAGE RUN,772MOD,-4,N,D + PICTURE 123 + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_ALLSOC +BEGIN + PROMPT COL1 ROW4 "Allegato Soci " + GROUP GRUPPO + FLAGS MYFLAGS +END + +BUTTON B_ALLSOC 1 1 +BEGIN + PROMPT 1 ROW4 "" + MESSAGE RUN,772MOD,-4,S,D + PICTURE 123 + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_ALLG +BEGIN + PROMPT COL1 ROW5 "Allegato G " + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_ALLG 1 1 +BEGIN + PROMPT 1 ROW5 "" + PICTURE 123 + MESSAGE RUN,772MOD,-4,J,D + FLAGS MYFLAGS + GROUP GRUPPO +END +// Fine prima colonna + + +// Seconda colonna +TEXT T_A +BEGIN + PROMPT 24 ROW1 "Quadro A " + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_A 1 1 +BEGIN + PROMPT 20 ROW1 "" + PICTURE 123 + MESSAGE RUN,772MOD,-4,A,D|K_TAB,RILEGGI_QUADRI + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_A1 +BEGIN + PROMPT 24 ROW2 "Quadro A1 " + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_A1 1 1 +BEGIN + PROMPT 20 ROW2 "" + PICTURE 123 + FLAGS MYFLAGS + MESSAGE RUN,772MOD,-4,A1,D|K_TAB,RILEGGI_QUADRI + GROUP GRUPPO +END + +TEXT T_A2 +BEGIN + PROMPT 24 ROW3 "Quadro A2 " + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_A2 1 1 +BEGIN + PROMPT 20 ROW3 "" + PICTURE 123 + MESSAGE RUN,772MOD,-4,A2,D|K_TAB,RILEGGI_QUADRI + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_A3 +BEGIN + PROMPT 24 ROW4 "Quadro A3 " + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_A3 1 1 +BEGIN + PROMPT 20 ROW4 "" + PICTURE 123 + MESSAGE RUN,772MOD,-4,A3,D|K_TAB,RILEGGI_QUADRI + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_B +BEGIN + PROMPT 24 ROW5 "Quadro B" + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_B 1 1 +BEGIN + PROMPT 20 ROW5 "" + PICTURE 123 + MESSAGE RUN,772MOD,-4,B,D|K_TAB,RILEGGI_QUADRI + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_B1 +BEGIN + PROMPT 24 ROW6 "Quadro B1" + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_B1 1 1 +BEGIN + PROMPT 20 ROW6 "" + PICTURE 123 +// MESSAGE RUN,771MOD,-6,0|K_TAB,RILEGGI_QUADRI + FLAGS MYFLAGS + GROUP GRUPPO +END +// Fine seconda colonna + +// Terza colonna +TEXT T_C +BEGIN + PROMPT 43 ROW1 "Quadro C" + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_C 1 1 +BEGIN + PROMPT 39 ROW1 "" + PICTURE 123 + MESSAGE RUN,772MOD,-4,C,D|K_TAB,RILEGGI_QUADRI + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_D +BEGIN + PROMPT 43 ROW2 "Quadro D" + FLAGS HIDDEN + GROUP GRUPPO +END + +BUTTON B_D 1 1 +BEGIN + PROMPT 39 ROW2 "" + PICTURE 123 + MESSAGE RUN,772MOD,-4,D,D + FLAGS HIDDEN + GROUP GRUPPO +END + +TEXT T_D1 +BEGIN + PROMPT 43 ROW3 "Quadro D1" + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_D1 1 1 +BEGIN + PROMPT 39 ROW3 "" + PICTURE 123 + FLAGS MYFLAGS + MESSAGE RUN,772MOD,-4,D1,D|K_TAB,RILEGGI_QUADRI + GROUP GRUPPO +END + +TEXT T_E +BEGIN + PROMPT 43 ROW4 "Quadro E " + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_E 1 1 +BEGIN + PROMPT 39 ROW4 "" + PICTURE 123 + MESSAGE RUN,772MOD,-4,E,D|K_TAB,RILEGGI_QUADRI + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_E1 +BEGIN + PROMPT 43 ROW5 "Quadro E1 " + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_E1 1 1 +BEGIN + PROMPT 39 ROW5 "" + PICTURE 123 + MESSAGE RUN,772MOD,-4,E1,D|K_TAB,RILEGGI_QUADRI + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_E2 +BEGIN + PROMPT 43 ROW6 "Quadro E2 " + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_E2 1 1 +BEGIN + PROMPT 39 ROW6 "" + PICTURE 123 + MESSAGE RUN,772MOD,-4,E2,D|K_TAB,RILEGGI_QUADRI + FLAGS MYFLAGS + GROUP GRUPPO +END +// Fine terza colonna + +// QUARTA colonna +TEXT T_F +BEGIN + PROMPT 62 ROW1 "Quadro F" + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_F 1 1 +BEGIN + PROMPT 58 ROW1 "" + PICTURE 123 +// MESSAGE RUN,771MOD,-1 + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_F1 +BEGIN + PROMPT 62 ROW2 "Quadro F1" + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_F1 1 1 +BEGIN + PROMPT 58 ROW2 "" + PICTURE 123 +// MESSAGE RUN,771MOD,-1 + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_F2 +BEGIN + PROMPT 62 ROW3 "Quadro F2" + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_F2 1 1 +BEGIN + PROMPT 58 ROW3 "" + PICTURE 123 +// MESSAGE RUN,771MOD,-1 + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_G +BEGIN + PROMPT 62 ROW4 "Quadro G" + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_G 1 1 +BEGIN + PROMPT 58 ROW4 "" + PICTURE 123 + MESSAGE RUN,772MOD,-4,G,D + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_G1 +BEGIN + PROMPT 62 ROW5 "Quadro G1" + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_G1 1 1 +BEGIN + PROMPT 58 ROW5 "" + PICTURE 123 +// MESSAGE RUN,771MOD,-1 + FLAGS MYFLAGS + GROUP GRUPPO +END + +TEXT T_H +BEGIN + PROMPT 62 ROW6 "Quadro H" + FLAGS MYFLAGS + GROUP GRUPPO +END + +BUTTON B_H 1 1 +BEGIN + PROMPT 58 ROW6 "" + PICTURE 123 + MESSAGE RUN,772MOD,-4,H,D + FLAGS MYFLAGS + GROUP GRUPPO +END +// Fine QUARTA colonna + + /////////// Fine colonna MENU' STAMPE //////////////////////////// /////////// Inizio colonna MENU' SOGG. DICHIARANTE //////////////////////////// @@ -867,25 +1230,8 @@ BEGIN GROUP 4 END -BUTTON DLG_CANCEL_MENU_SD 20 2 -BEGIN - PROMPT -22 -1 "Menu' precedente" - GROUP 4 - FLAGS "H" -END /////////// Fine colonna MENU' SOGG. DICHIARANTE //////////////////////////// -BUTTON DLG_CANCEL 20 2 -BEGIN - PROMPT -22 -1 "Menu' precedente" - GROUP 1 -END - -BUTTON DLG_QUIT 20 2 -BEGIN - PROMTP -12 -1 "Fine" -END - ENDPAGE ENDMASK diff --git a/m770/776300.cpp b/m770/776300.cpp index 87a6ec6a0..2c38102e4 100755 --- a/m770/776300.cpp +++ b/m770/776300.cpp @@ -389,7 +389,7 @@ long TSelezioneDich::select_firm_range(long from, long to) if (to == 0l) to = 99999L; for (int i = 0; i < _ditte->items(); i++) { - if (_ditte->disabled(i)) + if (_ditte->row_disabled(i)) continue; TToken_string& d = _ditte->row(i); diff --git a/m770/776500.cpp b/m770/776500.cpp index 06e6d4a1b..1851951d0 100755 --- a/m770/776500.cpp +++ b/m770/776500.cpp @@ -58,14 +58,14 @@ bool TParametri_genera::main_loop() _rel->lfile().put("CODDITTA", codditta); _rel->read(); - msk.autoload(_rel); + msk.autoload(*_rel); tasto = msk.run(); if (tasto == K_ESC) continue; if (tasto == K_SAVE) { - msk.autosave(_rel); + msk.autosave(*_rel); _rel->rewrite(); } @@ -80,7 +80,7 @@ bool TParametri_genera::main_loop() _rel->lfile().put("CODDITTA", codditta); _rel->read(); - msk.autoload(_rel); + msk.autoload(*_rel); tasto = msk.run(); if (tasto == K_ESC) @@ -91,7 +91,7 @@ bool TParametri_genera::main_loop() if (tasto == K_SAVE) { - msk.autosave(_rel); + msk.autosave(*_rel); _rel->rewrite(); _risposta = 1; } diff --git a/m770/776600.cpp b/m770/776600.cpp index 18f2af8d0..5f5524899 100755 --- a/m770/776600.cpp +++ b/m770/776600.cpp @@ -68,8 +68,9 @@ bool TEstinti_app::create() filt.format("CODDIC=%ld", _codditta); _cur = new TCursor(_rel, filt); TEdit_field& dummy = (TEdit_field&)_msk->field(F_CODDIC_DUMMY); + TToken_string siblings; _estint_sheet = new TBrowse_sheet(_cur,"CODDITTA|9->RAGSOC", "Elenco estinti", - "Codice|Ragione sociale@50", 8, &dummy); + "Codice|Ragione sociale@50", 8, &dummy, siblings); _msk->set_handler(F_ESTINTI, show_estinti); dispatch_e_menu (BAR_ITEM(1)); return TRUE; diff --git a/m770/77qn.uml b/m770/77qn.uml index e3e1a7321..07f3bd6b4 100755 --- a/m770/77qn.uml +++ b/m770/77qn.uml @@ -78,7 +78,6 @@ BEGIN WARNING "Manca il mese" FLAGS "M" ITEM "|" - CHECKTYPE REQUIRED END TEXT DLG_NULL diff --git a/m770/77qq.uml b/m770/77qq.uml index d66c01247..f74c11ddb 100755 --- a/m770/77qq.uml +++ b/m770/77qq.uml @@ -78,7 +78,6 @@ BEGIN WARNING "Manca il mese" FLAGS "M" ITEM "|" - CHECKTYPE REQUIRED END TEXT DLG_NULL @@ -165,7 +164,6 @@ BEGIN ITEM "W|Valle d'Aosta" ITEM "Z|Veneto " FIELD LF_QUAQ->CODREG - CHECKTYPE REQUIRED END ENDPAGE diff --git a/m770/77qr.uml b/m770/77qr.uml index 38e7857fb..cb98c04e2 100755 --- a/m770/77qr.uml +++ b/m770/77qr.uml @@ -78,7 +78,6 @@ BEGIN WARNING "Manca il mese" FLAGS "M" ITEM "|" - CHECKTYPE REQUIRED END TEXT DLG_NULL diff --git a/m770/77qt.uml b/m770/77qt.uml index c6b05e9dc..c6d2d89fc 100755 --- a/m770/77qt.uml +++ b/m770/77qt.uml @@ -78,7 +78,6 @@ BEGIN WARNING "Manca il mese" FLAGS "M" ITEM "|" - CHECKTYPE REQUIRED END TEXT DLG_NULL @@ -166,7 +165,6 @@ BEGIN ITEM "W|Valle d'Aosta" ITEM "Z|Veneto " FIELD LF_QUAT->CODREG - CHECKTYPE REQUIRED END ENDPAGE diff --git a/m770/batbca7.uml b/m770/batbca7.uml index 820ef3153..9eaee4bbf 100755 --- a/m770/batbca7.uml +++ b/m770/batbca7.uml @@ -62,11 +62,10 @@ BEGIN MESSAGE CLEAR,G_INPS@|RESET,G_ICTS@|DISABLE,G_ICTS@|RESET,GR_CAUDD1@|DISABLE,GR_CAUDD1@|SHOW,F_DESCR1|HIDE,F_DESCR2 MESSAGE COPY,F_CODQUA WARNING "Manca il codice quadro" - CHECKTYPE REQUIRED FIELD LF_TABCOM->S1 END -LIST F_QUADRAT 2 +LIST F_QUADRAT 2 BEGIN PROMPT 1 3 "Codice quadro " HELP "Inserire il codice quadro" @@ -119,11 +118,10 @@ BEGIN MESSAGE COPY,F_QUADRCE2 MESSAGE COPY,F_CODQUA WARNING "Manca il codice quadro" - CHECKTYPE REQUIRED FIELD LF_TABCOM->S1 END -LIST F_CODQUA +LIST F_CODQUA 2 BEGIN PROMPT 1 3 "" ITEM "A|A" @@ -173,7 +171,7 @@ BEGIN MESSAGE COPY,F_DESCR1,1,22 END -LISTBOX TCF_CAUSD 1 60 +LISTBOX TCF_CAUSD 1 250 BEGIN PROMPT 1 5 "Causale D " ITEM "|" diff --git a/m770/generic.cpp b/m770/generic.cpp index f3e19c48a..73c2f7255 100755 --- a/m770/generic.cpp +++ b/m770/generic.cpp @@ -199,7 +199,7 @@ bool TGenericRel_application::user_destroy() int TGenericRel_application::rewrite(const TMask& m) { - m.autosave(_rel); + m.autosave(*_rel); const int err = _rel->rewrite(); _registra = TRUE; return err; @@ -207,7 +207,7 @@ int TGenericRel_application::rewrite(const TMask& m) int TGenericRel_application::write(const TMask& m) { - m.autosave(_rel); + m.autosave(*_rel); const int err = _rel->write(); _registra = TRUE; return err; diff --git a/m770/menustq.h b/m770/menustq.h index da1f1db1c..b0a3ad2ae 100755 --- a/m770/menustq.h +++ b/m770/menustq.h @@ -1,54 +1,53 @@ #ifndef __MENUST_H #define __MENUST_H -#define DLG_CANCEL_MENUSTQ 103 -#define T_BASE 104 -#define B_BASE 105 -#define T_LAGG 106 -#define B_LAGG 107 -#define T_NAGG 108 -#define B_NAGG 109 -#define T_ALLSOC 110 -#define B_ALLSOC 111 -#define T_ALLG 112 -#define B_ALLG 113 -#define T_BUST 114 -#define B_BUST 115 -#define T_A 116 -#define B_A 117 -#define T_A1 118 -#define B_A1 119 -#define T_A2 120 -#define B_A2 121 -#define T_A3 122 -#define B_A3 123 -#define T_B 124 -#define B_B 125 -#define T_B1 126 -#define B_B1 127 -#define T_C 128 -#define B_C 129 -#define T_D 130 -#define B_D 131 -#define T_D1 132 -#define B_D1 133 -#define T_E 134 -#define B_E 135 -#define T_E1 136 -#define B_E1 137 -#define T_E2 138 -#define B_E2 139 -#define T_F 140 -#define B_F 141 -#define T_F1 142 -#define B_F1 143 -#define T_F2 144 -#define B_F2 145 -#define T_G 146 -#define B_G 147 -#define T_G1 148 -#define B_G1 149 -#define T_H 150 -#define B_H 151 +#define T_BASE 504 +#define B_BASE 505 +#define T_LAGG 506 +#define B_LAGG 507 +#define T_NAGG 508 +#define B_NAGG 509 +#define T_ALLSOC 510 +#define B_ALLSOC 511 +#define T_ALLG 512 +#define B_ALLG 513 +#define T_BUST 514 +#define B_BUST 515 +#define T_A 516 +#define B_A 517 +#define T_A1 518 +#define B_A1 519 +#define T_A2 520 +#define B_A2 521 +#define T_A3 522 +#define B_A3 523 +#define T_B 524 +#define B_B 525 +#define T_B1 526 +#define B_B1 527 +#define T_C 528 +#define B_C 529 +#define T_D 530 +#define B_D 531 +#define T_D1 532 +#define B_D1 533 +#define T_E 534 +#define B_E 535 +#define T_E1 536 +#define B_E1 537 +#define T_E2 538 +#define B_E2 539 +#define T_F 540 +#define B_F 541 +#define T_F1 542 +#define B_F1 543 +#define T_F2 544 +#define B_F2 545 +#define T_G 546 +#define B_G 547 +#define T_G1 548 +#define B_G1 549 +#define T_H 550 +#define B_H 551 #endif diff --git a/m770/menustq.uml b/m770/menustq.uml index c43a6d1e8..12e85e032 100755 --- a/m770/menustq.uml +++ b/m770/menustq.uml @@ -394,11 +394,3 @@ BEGIN END // Fine QUARTA colonna -BUTTON DLG_CANCEL_MENUSTQ 20 2 -BEGIN - PROMPT -22 -1 "Menu' precedente" - GROUP GRUPPO - FLAGS "H" - MESSAGE HIDE,GRUPPO@|SHOW,3@ -END - diff --git a/m770/quadb_b1.cpp b/m770/quadb_b1.cpp index 77ccc9ae4..9e802288e 100755 --- a/m770/quadb_b1.cpp +++ b/m770/quadb_b1.cpp @@ -263,7 +263,7 @@ bool TQuadriBB1_application::EsisteGiaRecordDip(const TMask& m) int TQuadriBB1_application::rewrite(const TMask& m) { - m.autosave(_rel); + m.autosave(*_rel); const int err = _rel->rewrite(); _registra = err == NOERR; return err; @@ -283,7 +283,7 @@ int TQuadriBB1_application::read(TMask& m) int TQuadriBB1_application::write(const TMask& m) { - m.autosave(_rel); + m.autosave(*_rel); if (QuadroB1()) if (EsisteGiaRecordDip(m)) return warning_box("E' già presente un record per questo dipendente"); @@ -483,7 +483,13 @@ bool TQuadriBB1_application::NprogExitHandler(TMask_field& f, KEY k) { TMask& m = f.mask(); if (!m.is_running()) return TRUE; - + + if (k == K_CTRL+K_TAB) + { + f.set_dirty(); + return TRUE; + } + if (k == K_TAB) { TString nprog(f.get()); @@ -510,7 +516,7 @@ bool TQuadriBB1_application::NprogExitHandler(TMask_field& f, KEY k) // Compila cognome e nome se vuoti BB1SettaCognomeNome(m); - m.stop_run(K_AUTO_ENTER); +// m.stop_run(K_AUTO_ENTER); } } return TRUE; diff --git a/m770/quadn_t.cpp b/m770/quadn_t.cpp index 07f461a1f..577592cd0 100755 --- a/m770/quadn_t.cpp +++ b/m770/quadn_t.cpp @@ -173,7 +173,7 @@ bool TQuadriNT_application::CheckImporti(const TMask& m) int TQuadriNT_application::rewrite(const TMask& m) { - m.autosave(_rel); + m.autosave(*_rel); const int err = _rel->rewrite(); _registra = err == NOERR; return err; @@ -181,7 +181,7 @@ int TQuadriNT_application::rewrite(const TMask& m) int TQuadriNT_application::write(const TMask& m) { - m.autosave(_rel); + m.autosave(*_rel); const int err = _rel->write(); _registra = err == NOERR; return err; @@ -303,6 +303,12 @@ bool TQuadriNT_application::codtrib_handler(TMask_field& f, KEY k) bool TQuadriNT_application::nprog_handler(TMask_field& f, KEY k) { + if (k == K_CTRL+K_TAB) + { + f.set_dirty(); + return TRUE; + } + if (k == K_TAB) { TMask& m = f.mask(); @@ -323,13 +329,14 @@ bool TQuadriNT_application::nprog_handler(TMask_field& f, KEY k) TString16 nprog_str; nprog_str << nprog; f.mask().set(QNF_NPROG, nprog_str); } +/* // Quando la maschera e' running, se c'e' NPROG la chiude else { TString nprogstr(f.get()); if (nprogstr.not_empty()) m.stop_run(K_AUTO_ENTER); - } + } */ } return TRUE; }