root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Aggiustamenti per videi veloci:

Browse Source 
Con queste modifiche e' finita la prima unita' di test per Omero


git-svn-id: svn://10.65.10.50/trunk@4036 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luciano 1997-01-07 08:05:19 +00:00
parent e74f67bdcb
commit f513638262
9 changed files with 2986 additions and 2920 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
m770/776600.cpp
View File

@ -21,9 +21,9 @@ class TEstinti_app : public TApplication
TRelation* _rel;
TCursor* _cur;
TBrowse_sheet* _estint_sheet;
TRectype& _rec;
static bool show_estinti(TMask_field& f, KEY k);
void force_output(int dlg, const long cod);
protected:
virtual bool create();
virtual bool destroy();
@ -31,10 +31,24 @@ class TEstinti_app : public TApplication
bool save(TMask& m, const long coddic_prec);
bool set_codditta(TMask_field& f);
bool main_loop();
public:
TEstinti_app();
~TEstinti_app() {};
};
TEstinti_app& app() { return (TEstinti_app&) main_app(); }
TEstinti_app::TEstinti_app():
_base(NULL),
_basebis(NULL),
_rel(NULL),
_msk(NULL),
_cur(NULL),
_estint_sheet(NULL)
{}
bool TEstinti_app::set_codditta(TMask_field& f)
{
TString16 codditta;
@ -102,19 +116,29 @@ void TEstinti_app::force_output(int dlg, const long codditta)
bool TEstinti_app::save(TMask& m, const long codic_prec)
{
const long new_codic = m.get_long(F_CODDIC);
_rec = _base->curr();
TRectype _rec = _base->curr();
_base->setkey(1);
_rec.zero();
_rec.put("TIPOQUA", ' ');
_rec.put("CODDITTA",(long)_codditta);
_base->read(_rec);
if (_base->read(_rec) == NOERR)
{
_rec.put("CODDIC",(long)new_codic);
_base->rewrite(_rec);
}
// Stessa cosa su basebis
_basebis->zero();
_basebis->put("CODDITTA", (long)_codditta);
_basebis->put("CODDIC", (long)new_codic);
_basebis->rewrite();
TRectype _recbis = _basebis->curr();
_basebis->setkey(1);
_recbis.zero();
_recbis.put("TIPOQUA", ' ');
_recbis.put("CODDITTA",(long)_codditta);
if (_basebis->read(_recbis) == NOERR)
{
_recbis.put("CODDIC",(long)new_codic);
_basebis->rewrite(_rec);
}
// Crea il record globale per il dichiarante scelto se non esiste
// 3.4.96 - Solo se il dichiarante e' diverso da 0, senno' quando si vuol cancellare
@ -142,15 +166,10 @@ bool TEstinti_app::main_loop()
const bool dichiarante = sogg_dic(_codditta);
long coddic = 0L;
if (!dichiarante)
{
coddic = sogg_estinto(_codditta);
if (coddic > 0L && coddic < COD_QUA_I_DIC)
{
_msk->set(F_CODDIC, coddic);
// _msk->field(F_CODDIC).check();
force_output(F_RAGSOC, coddic);
}
}
_msk->enable(F_CODDIC, !dichiarante);
_msk->enable(F_ESTINTI, dichiarante);
_msk->enable(DLG_SAVEREC,!dichiarante);

5
m770/77lib01.cpp
View File

@ -405,6 +405,11 @@ bool enter_dichiar_770(long codditta, int anno_dic, bool sogg_dich)
TLocalisamfile base(LF_BASE);
TLocalisamfile basebis(LF_BASEBIS);
rc1wr = NOERR;
rc1rw = NOERR;
rc2wr = NOERR;
rc2rw = NOERR;
base.zero();
base.put("CODDITTA", (long)codditta);
base.put("ANNODIC", (long)anno_dic);

2
m770/77qb.h
View File

@ -45,8 +45,6 @@
#define QBF_ANADIP_CODDIP 224
#define QBF_QUAB_CODDIP 225
#define QBF_HCODDIP 228
#define QBF_COGNOME 226
#define QBF_NOME 227

1
m770/77qb1.h
View File

@ -19,7 +19,6 @@
#define QB1F_COGNOME 198
#define QB1F_NOME 199
#define QB1F_HCODDIP 200
#define QB1G_ANADIP 1
#define QB1G_QUADROB 2

55
m770/77qb1a.uml
View File

@ -3,10 +3,7 @@ TOOLBAR "" 0 20 0 2
#include <toolbar.h>
ENDPAGE
#define QB1F_CODDIP 197
#define QB1F_NPROG 183
PAGE "MODULO 770 - Manutenzione Quadro B1" -1 -1 78 21
PAGE "Quadro B1" -1 -1 78 21
GROUPBOX DLG_NULL 78 3
BEGIN
@ -33,7 +30,7 @@ END
NUMBER QB1F_ANNODIC 4
BEGIN
PROMPT 52 4 "Anno dichiarazione "
PROMPT 52 3 "Anno dichiarazione "
FLAGS "DR"
END
@ -42,7 +39,7 @@ BEGIN
PROMPT 1 7 "@bDati dipendente"
END
NUMBER QB1F_HCODDIP 6
NUMBER QB1F_CODDIP 6
BEGIN
PROMPT 80 80 ""
FLAGS "D"
@ -51,20 +48,42 @@ BEGIN
KEY 1
END
NUMBER QB1F_CODDIP 6
NUMBER QB1F_CODDIP_ANAG 6
BEGIN
PROMPT 1 8 "@bCodice "
USE LF_DIPEND KEY 1 SELECT ((CODDITTA=#QB1F_CODDITTA))
INPUT CODDITTA QB1F_CODDITTA
INPUT CODIP QB1F_CODDIP
DISPLAY "Codice " CODIP
USE LF_DIPEND KEY 1
INPUT CODDITTA QB1F_CODDITTA SELECT
INPUT CODDIP QB1F_CODDIP_ANAG
DISPLAY "Codice " CODDIP
DISPLAY "Cognome@24" COGNOME
DISPLAY "Nome@20" NOME
OUTPUT QB1F_CODDIP CODIP
OUTPUT QB1F_CODDIP_ANAG CODDIP
OUTPUT QB1F_COGNOME COGNOME
OUTPUT QB1F_NOME NOME
ADD RUN 773 -1 771150a 45 "Anagrafica dipendenti"
MESSAGE COPY, QB1F_HCODDIP
ADD RUN 773mod -1 771150a 45 "Anagrafica dipendenti"
MESSAGE COPY, QB1F_CODDIP
MESSAGE COPY,QB1F_CODDIP
FLAGS "H"
GROUP QB1G_ANADIP
END
NUMBER QB1F_CODDIP_QB1 6
BEGIN
PROMPT 1 8 "@bCodice "
USE LF_QUAB1 KEY 1
JOIN LF_DIPEND KEY 1 INTO CODDITTA==CODDITTA CODDIP==CODDIP
INPUT CODDITTA QB1F_CODDITTA SELECT
INPUT CODDIP QB1F_CODDIP_QB1
DISPLAY "Codice " CODDIP
DISPLAY "Cognome@24" LF_DIPEND->COGNOME
DISPLAY "Nome@20" LF_DIPEND->NOME
DISPLAY "N°@4" NPROG
OUTPUT QB1F_CODDIP_QB1 CODDIP
OUTPUT QB1F_COGNOME LF_DIPEND->COGNOME
OUTPUT QB1F_NOME LF_DIPEND->NOME
MESSAGE COPY, QB1F_CODDIP
GROUP QB1G_QUADROB
KEY 1
END
STRING QB1F_COGNOME 24
@ -83,9 +102,9 @@ NUMBER QB1F_NPROG 4
BEGIN
PROMPT 1 10 "@bNumero "
CHECKTYPE REQUIRED
USE LF_QUAB1 KEY 1 SELECT ((CODDITTA=#QB1F_CODDITTA))
JOIN LF_DIPEND KEY 1 INTO CODIP=CODDIP
INPUT CODDITTA QB1F_CODDITTA
USE LF_QUAB1 KEY 1
JOIN LF_DIPEND KEY 1 INTO CODDITTA==CODDITTA CODDIP==CODDIP
INPUT CODDITTA QB1F_CODDITTA SELECT
INPUT CODDIP QB1F_CODDIP
INPUT NPROG QB1F_NPROG
DISPLAY "Codice@10" CODDIP
@ -94,6 +113,8 @@ BEGIN
DISPLAY "N°@4" NPROG
OUTPUT QB1F_CODDIP CODDIP
OUTPUT QB1F_NPROG NPROG
OUTPUT QB1F_COGNOME LF_DIPEND->COGNOME
OUTPUT QB1F_NOME LF_DIPEND->NOME
FIELD LF_QUAB1->NPROG
KEY 1
END

8
m770/77qb1b.uml
View File

@ -4,12 +4,12 @@ TOOLBAR "" 0 20 0 2
#include <toolbar.h>
ENDPAGE
PAGE "MODULO 770 - QUADRO B1" -1 -1 78 18
PAGE "1" -1 -1 78 18
NUMBER QB1F_CODDITTA 5
BEGIN
PROMPT 3 1 "Ditta "
FLAGS "GRDH"
PROMPT 80 80 ""
FLAGS "D"
USE LF_NDITTE KEY 1
INPUT CODDITTA QB1F_CODDITTA
FIELD LF_QUAB1->CODDITTA
@ -28,7 +28,7 @@ BEGIN
USE LF_DIPEND KEY 1
FIELD LF_QUAB1->CODDIP
INPUT CODDITTA QB1F_CODDITTA
INPUT CODIP QB1F_CODDIP
INPUT CODDIP QB1F_CODDIP
DISPLAY "Cognome@24" COGNOME
DISPLAY "Nome@20" NOME
OUTPUT QB1F_COGNOME COGNOME

55
m770/77qba.uml
View File

@ -3,7 +3,7 @@ TOOLBAR "" 0 20 0 2
#include <toolbar.h>
ENDPAGE
PAGE "MODULO 770 - Manutenzione Quadro B" -1 -1 78 21
PAGE "Quadro B" -1 -1 78 21
GROUPBOX DLG_NULL 78 3
BEGIN
@ -30,7 +30,7 @@ END
NUMBER QBF_ANNODIC 4
BEGIN
PROMPT 52 4 "Anno dichiarazione "
PROMPT 52 3 "Anno dichiarazione "
FLAGS "DR"
END
@ -39,28 +39,51 @@ BEGIN
PROMPT 1 7 "@bDati dipendente"
END
NUMBER QBF_HCODDIP 6
NUMBER QBF_CODDIP 6
BEGIN
PROMPT 80 80 ""
FLAGS "D"
FIELD LF_QUAB->CODDIP
CHECKTYPE REQUIRED
KEY 1
END
NUMBER QBF_CODDIP 6
NUMBER QBF_CODDIP_ANAG 6
BEGIN
PROMPT 1 8 "@bCodice "
USE LF_DIPEND KEY 1 SELECT ((CODDITTA=#QBF_CODDITTA))
INPUT CODDITTA QBF_CODDITTA
INPUT CODIP QBF_CODDIP
DISPLAY "Codice " CODIP
USE LF_DIPEND KEY 1
INPUT CODDITTA QBF_CODDITTA SELECT
INPUT CODDIP QBF_CODDIP_ANAG
DISPLAY "Codice " CODDIP
DISPLAY "Cognome@24" COGNOME
DISPLAY "Nome@20" NOME
OUTPUT QBF_CODDIP CODIP
OUTPUT QBF_CODDIP_ANAG CODDIP
OUTPUT QBF_COGNOME COGNOME
OUTPUT QBF_NOME NOME
ADD RUN 773 -1 771150a 45 "Anagrafica dipendenti"
MESSAGE COPY,QBF_HCODDIP
ADD RUN 773mod -1 771150a 45 "Anagrafica dipendenti"
MESSAGE COPY,QBF_CODDIP
FLAGS "H"
GROUP QBG_ANADIP
KEY 1
END
NUMBER QBF_CODDIP_QB 6
BEGIN
PROMPT 1 8 "@bCodice "
USE LF_QUAB KEY 1
JOIN LF_DIPEND KEY 1 INTO CODDITTA==CODDITTA CODDIP==CODDIP
INPUT CODDITTA QBF_CODDITTA SELECT
INPUT CODDIP QBF_CODDIP_QB
DISPLAY "Codice " CODDIP
DISPLAY "Cognome@24" LF_DIPEND->COGNOME
DISPLAY "Nome@20" LF_DIPEND->NOME
DISPLAY "N°@4" NPROG
OUTPUT QBF_CODDIP_QB CODDIP
OUTPUT QBF_COGNOME LF_DIPEND->COGNOME
OUTPUT QBF_NOME LF_DIPEND->NOME
MESSAGE COPY, QBF_CODDIP
GROUP QBG_QUADROB
KEY 1
END
STRING QBF_COGNOME 24
@ -79,9 +102,9 @@ NUMBER QBF_NPROG 4
BEGIN
PROMPT 1 10 "@bNumero "
CHECKTYPE REQUIRED
USE LF_QUAB KEY 1 SELECT ((CODDITTA=#QBF_CODDITTA))
JOIN LF_DIPEND KEY 1 INTO CODIP=CODDIP
INPUT CODDITTA QBF_CODDITTA
USE LF_QUAB KEY 1
JOIN LF_DIPEND KEY 1 INTO CODDITTA=CODDITTA CODDIP=CODDIP
INPUT CODDITTA QBF_CODDITTA SELECT
INPUT CODDIP QBF_CODDIP
INPUT NPROG QBF_NPROG
DISPLAY "Codice@10" CODDIP
@ -89,8 +112,8 @@ BEGIN
DISPLAY "Nome@20" LF_DIPEND->NOME
DISPLAY "N°@4" NPROG
OUTPUT QBF_CODDIP CODDIP
OUTPUT QBF_COGNOME COGNOME
OUTPUT QBF_NOME NOME
OUTPUT QBF_COGNOME LF_DIPEND->COGNOME
OUTPUT QBF_NOME LF_DIPEND->NOME
OUTPUT QBF_NPROG NPROG
FIELD LF_QUAB->NPROG
CHECKTYPE REQUIRED

9
m770/77qbb.uml
View File

@ -1,15 +1,16 @@
// Quadro B
#include "77qb.h"
TOOLBAR "" 0 20 0 2
#include <toolbar.h>
ENDPAGE
PAGE "MODULO 770 - QUADRO B" -1 -1 78 18
PAGE "1" -1 -1 78 18
NUMBER QBF_CODDITTA 5
BEGIN
PROMPT 3 1 "Ditta "
FLAGS "H"
PROMPT 80 80 ""
FLAGS "D"
USE LF_NDITTE KEY 1
INPUT CODDITTA QBF_CODDITTA
FIELD LF_QUAB->CODDITTA
@ -412,7 +413,7 @@ END
ENDPAGE
PAGE "MODULO 770 - QUADRO B" -1 -1 78 18
PAGE "2" -1 -1 78 18
#define C1 2
#define C2 22

26
m770/quadb_b1.cpp
View File

@ -88,10 +88,10 @@ TQuadriBB1_application& app() { return (TQuadriBB1_application&)main_app(); }
bool TQuadriBB1_application::changing_mask(int mode)
{
if (mode == MODE_QUERY)
return _mode != MODE_QUERY;
if ((mode == MODE_MOD) && (_mode == MODE_INS))
return FALSE;
else
return TRUE;
return _mode != mode;
}
TMask* TQuadriBB1_application::get_mask(int mode)
@ -171,7 +171,7 @@ TMask* TQuadriBB1_application::load_mask(int n)
m->set_handler(QBF_TIND7494, QBCalcola37); // 28
m->set_handler(QBF_TRID, QBCalcola37); // 29
}
// m->disable(DLG_FINDREC);
m->disable(DLG_FINDREC);
break;
default:
break;
@ -353,13 +353,13 @@ void TQuadriBB1_application::init_query_mode(TMask& m)
m.set(ANNODIC77, _anno_dic);
if (QuadroB())
{
m.send_key(K_SHIFT+K_CTRL+'h', -QBG_ANADIP); // nasconde dipend.
m.send_key(K_SHIFT+K_CTRL+'s', -QBG_QUADROB); // ricerca su B
m.show(-QBG_QUADROB);
m.hide(-QBG_ANADIP);
}
else
{
m.send_key(K_SHIFT+K_CTRL+'h', -QB1G_ANADIP); // nasconde dipend.
m.send_key(K_SHIFT+K_CTRL+'s', -QB1G_QUADROB); // ricerca su B
m.show(-QB1G_QUADROB);
m.hide(-QB1G_ANADIP);
}
}
@ -368,13 +368,13 @@ void TQuadriBB1_application::init_query_insert_mode(TMask& m)
m.set(ANNODIC77, _anno_dic);
if (QuadroB())
{
m.send_key(K_SHIFT+K_CTRL+'h', -QBG_QUADROB); // group 1 Ricerca su ANAGR.DIPENDENTI
m.send_key(K_SHIFT+K_CTRL+'s', -QBG_ANADIP); // group 2 Nasconde QUADROB
m.hide(-QBG_QUADROB);
m.show(-QBG_ANADIP);
}
else
{
m.send_key(K_SHIFT+K_CTRL+'h', -QB1G_QUADROB); // group 1 Ricerca su ANAGR.DIPENDENTI
m.send_key(K_SHIFT+K_CTRL+'s', -QB1G_ANADIP); // group 2 Nasconde QUADROB
m.hide(-QB1G_QUADROB);
m.show(-QB1G_ANADIP);
}
}
@ -512,7 +512,7 @@ bool TQuadriBB1_application::NprogExitHandler(TMask_field& f, KEY k)
// volta, cioe' a meno che non esista ancora nessun record per il dip.
// (questo caso e' segnalato dal fallimento della EsisteGiaCodDip) )
if (app().EsisteGiaCodDip(m) && !app().EsisteGiaRecordDip(m))
return warning_box("Esiste già una riga per questo dipendente");
return f.warning_box("Esiste già una riga per questo dipendente");
// Compila cognome e nome se vuoti
BB1SettaCognomeNome(m);