From 0ffb9829413b1c607ba7d1495cdb46739d501597 Mon Sep 17 00:00:00 2001 From: angelo Date: Fri, 9 Sep 1994 08:37:55 +0000 Subject: [PATCH] Tolta l'inutile disabilitazione dei campi, l'autorizzazione dei moduli ft e sp; sistemate funzioni di init_..._mode. Corretto costruttore di TClifoVI. git-svn-id: svn://10.65.10.50/trunk@201 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg0200.cpp | 52 +++++++++++++-------------------------------------- cg/cg0201.cpp | 7 ++----- 2 files changed, 15 insertions(+), 44 deletions(-) diff --git a/cg/cg0200.cpp b/cg/cg0200.cpp index 9ccc04675..a631610b1 100755 --- a/cg/cg0200.cpp +++ b/cg/cg0200.cpp @@ -24,7 +24,6 @@ bool gest_vend() class CG0200_application : public TRelation_application { TMask* _msk; - //TRelation *_rel; TClifoVI *_rel; TLocalisamfile* _saldi; TLocalisamfile* _anag; @@ -39,7 +38,9 @@ class CG0200_application : public TRelation_application virtual bool protected_record(TRectype &rec); virtual const char* get_next_key(); virtual void init_query_mode(TMask& m); - virtual void init_insert_mode(TMask& m); + virtual void init_query_insert_mode(TMask& m) {init_query_mode(m);} + virtual void init_insert_mode(TMask& m) {init_query_mode(m);} + virtual void init_modify_mode(TMask& m) {init_query_mode(m);} //////////// static bool indsp_notify(int r, KEY key); @@ -330,24 +331,6 @@ HIDDEN bool codalleg_handler(TMask_field& f, KEY key) return TRUE; } -void CG0200_application::init_insert_mode(TMask& m) -{ - if (!gest_vend()) - { - for (int j=3; j<8;j++) - m.disable_page(j); - for (int i=F_CODINDDOC; i<= F_SHEET_G_VEN; i++) - m.disable(i); - } - else - { - for (int j=3; j<8;j++) - m.enable_page(j); - for (int i=F_CODINDDOC; i<= F_SHEET_G_VEN; i++) - m.enable(i); - } -} - void CG0200_application::init_query_mode(TMask& m) { @@ -362,15 +345,15 @@ void CG0200_application::init_query_mode(TMask& m) { for (int j=3; j<8;j++) m.disable_page(j); - for (int i=F_CODINDDOC; i<= F_SHEET_G_VEN; i++) - m.disable(i); + // for (int i=F_CODINDDOC; i<= F_SHEET_G_VEN; i++) + // m.disable(i); } else { for (int j=3; j<8;j++) m.enable_page(j); - for (int i=F_CODINDDOC; i<= F_SHEET_G_VEN; i++) - m.enable(i); + // for (int i=F_CODINDDOC; i<= F_SHEET_G_VEN; i++) + // m.enable(i); } } @@ -476,11 +459,11 @@ bool CG0200_application::indsp_notify(int r, KEY key) // Request to delete the row #r // I need an empty record; leave only TIPOCF CODCF & CODIND // so it returns FALSE because I don't want it to remove this row - // see cg0200b.uml + // see cg0200b.uml; avoided K_DEL, sent K_ENTER instead. return FALSE; break; - case K_SPACE: //request to modify row #r - // I hope it's always something like K_SPACE (Request to modify) + case K_SPACE: + // Request to modify row #r // Disable field # 101 (CODIND) update # of row TMask& m = indsp.sheet_mask(); @@ -488,7 +471,9 @@ bool CG0200_application::indsp_notify(int r, KEY key) m.set(101,(long)indsp.items()); m.disable(101); break; - case K_INS: // request to add the row #r + case K_INS: + // request to add the row #r + // To avoid rewriting of existing record. if (indsp.items() == 999) { error_box("Raggiunto il numero massimo degli indirizzi per questo C/F"); @@ -503,9 +488,6 @@ bool CG0200_application::indsp_notify(int r, KEY key) bool CG0200_application::user_create() // initvar e arrmask { - const bool ftaut = has_module(FTAUT); - const bool spaut = has_module(SPAUT); - const bool anyaut = spaut || ftaut; _rel = new TClifoVI; @@ -515,14 +497,6 @@ bool CG0200_application::user_create() // initvar e arrmask _pcon = new TLocalisamfile(LF_PCON); _comuni = new TLocalisamfile(LF_COMUNI); _msk = new TMask("cg0200a") ; - _msk->enable(F_CODVAL,ftaut); - _msk->enable(F_CODVETT1,ftaut); - _msk->enable(F_CODVETT2,ftaut); - _msk->enable(F_CODVETT3,ftaut); - _msk->enable(F_FIDO,spaut); - _msk->enable(F_CODABI, anyaut); - _msk->enable(F_CODBAN, anyaut); - _msk->enable(F_CODAG, anyaut); _msk->set_handler(F_OCCASIONALE, occas_handler); _msk->set_handler(F_COFI, autoexit_handler); _msk->set_handler(F_PAIV, autoexit_handler); diff --git a/cg/cg0201.cpp b/cg/cg0201.cpp index 3291d0b0e..88ff6de24 100755 --- a/cg/cg0201.cpp +++ b/cg/cg0201.cpp @@ -8,11 +8,8 @@ extern bool gest_vend(); TClifoVI::TClifoVI():TRelation(LF_CLIFO), _oldindirizzi(0) { - if (gest_vend()) - { - add(LF_CFVEN,"TIPOCF=TIPOCF|CODCF=CODCF"); - add(LF_INDSP,"TIPOCF=TIPOCF|CODCF=CODCF"); - } + add(LF_CFVEN,"TIPOCF=TIPOCF|CODCF=CODCF"); + add(LF_INDSP,"TIPOCF=TIPOCF|CODCF=CODCF"); } void TClifoVI::destroy_rows()