Commit globale

git-svn-id: svn://10.65.10.50/trunk@3003 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
nik 1996-06-17 09:47:09 +00:00
parent eb24e03b95
commit 5c5b5bacf5
18 changed files with 1308 additions and 1303 deletions

View File

@ -122,7 +122,6 @@ int TQuadroG::read(TMask& m)
void TQuadroG::init_modify_mode (TMask& m)
{
init_mask(m);
m.disable(DLG_DELREC);
}
@ -135,13 +134,8 @@ void TQuadroG::init_query_mode (TMask& m)
m.field(F_CODDITTA).check();
}
m.send_key(K_AUTO_ENTER,0);
init_mask(m);
}
void TQuadroG::init_mask (TMask& m)
{}
void TQuadroG::update_totals(TSheet_field& f, int ss)
{
int i = 0;

View File

@ -44,7 +44,6 @@ class TQuadroG : public TRelation_application
virtual bool changing_mask(int mode) { return FALSE; }
virtual void init_query_mode (TMask&);
virtual void init_modify_mode (TMask&);
void init_mask (TMask&);
void fill_ss(TMask& m);
void fill_arr(TMask& m);
void ss2rel(const TMask& m);
@ -119,6 +118,7 @@ class TQuadroG1 : public TRelation_application
virtual bool user_create();
virtual bool user_destroy();
virtual int rewrite(const TMask& m);
virtual int read(TMask& m);
virtual int write (const TMask& m);
virtual bool remove();
virtual TRelation* get_relation() const { return _rel; }
@ -126,10 +126,8 @@ class TQuadroG1 : public TRelation_application
virtual bool changing_mask(int mode) { return FALSE; }
virtual void init_query_mode (TMask&);
virtual void init_modify_mode (TMask&);
void init_mask (TMask&);
// void fill_ss(TMask& m);
// void init_mask (TMask&);
void fill_arr(TMask& m);
// void ss2rel(const TMask& m);
void arr2rel(const TMask& m);
public:
const char* taitol() { return (const char*)_title; }

View File

@ -161,9 +161,11 @@ bool M71310_application::auto_premi(TMask_field& f, KEY k)
{
if (k == K_TAB && f.mask().is_running())
{
TLocalisamfile qual (LF_QUAL,FALSE);
// TLocalisamfile qual (LF_QUAL,FALSE);
TRelation* rel = app()._rel;
TMask& m = f.mask();
long codditta = m.get_long(F_CODDITTA);
m.autosave(rel);
/* long codditta = m.get_long(F_CODDITTA);
TDate datavers (m.get(F_QLDATAVERS));
TString data = datavers.string();
int mesepag = m.get_int(F_QLMESEPAG);
@ -172,9 +174,8 @@ bool M71310_application::auto_premi(TMask_field& f, KEY k)
char tipovers = m.get (F_QLTIPOVERS)[0];
long codtrib = m.get_long(F_QLCODTRIB);
int artbil = m.get_int(F_ARTBIL);
TString serie(m.get(FH_ABISERIE));
TString numero(m.get(FH_NUMERO));
TString numero(m.get(FH_NUMERO)); */
// TString cab(m.get(FH_CAB));
// TString nprog(m.get(FH_NPROG));
@ -182,6 +183,7 @@ bool M71310_application::auto_premi(TMask_field& f, KEY k)
// if (tipovers == DELEGA_BANCARIA)
// numero << nprog;
/*
qual.setkey(1);
qual.zero();
qual.put(QUL_CODDITTA, codditta);
@ -193,9 +195,11 @@ bool M71310_application::auto_premi(TMask_field& f, KEY k)
qual.put(QUL_QLCT, (long)codtrib);
qual.put(QUL_QLAB, (long)artbil);
qual.put(QUL_QLSERIE, serie);
qual.put(QUL_QLNUMERO, numero);
qual.put(QUL_QLNUMERO, numero); */
if (qual.read() == NOERR)
// if (qual.read() == NOERR)
if (rel->read() == NOERR)
f.mask().stop_run(K_AUTO_ENTER);
else
f.mask().stop_run(K_INS);

View File

@ -110,8 +110,6 @@ BEGIN
OUTPUT F_ARTBIL QLAB
OUTPUT F_QLSERIE QLSERIE
OUTPUT F_ABI QLSERIE
OUTPUT FH_NUMERO QLNUMERO
OUTPUT FH_ABISERIE QLSERIE
OUTPUT F_CAB1 QLNUMERO[1,5]
OUTPUT F_CAB QLNUMERO[6,11]
FIELD LF_QUAL->QLAP
@ -180,58 +178,36 @@ BEGIN
KEY 1
END
STRING FH_ABISERIE 5
BEGIN
PROMPT 0 1 "HABISERIE"
FIELD LF_QUAL->QLSERIE
FLAGS "D"
KEY 1
GROUP GH
END
STRING FH_NUMERO 11
BEGIN
PROMPT 0 2 "HNUMERO"
FIELD LF_QUAL->QLNUMERO
KEY 1
FLAGS "D"
GROUP GH
END
STRING F_QLSERIE 5
BEGIN
PROMPT 23 10 ""
FIELD LF_QUAL->QLSERIE
MESSAGE COPY,FH_ABISERIE
GROUP NUM_SERIE
// KEY 1
KEY 1
END
STRING F_QLNUMERO 11
BEGIN
PROMPT 63 10 ""
FIELD LF_QUAL->QLNUMERO
// MESSAGE COPY,FH_NUMERO
GROUP NUM_SERIE
// KEY 1
KEY 1
END
NUMBER F_ABI 5
BEGIN
PROMPT 23 10 ""
FIELD LF_QUAL->QLSERIE
MESSAGE COPY,FH_ABISERIE
GROUP ABI_CAB
// KEY 1
KEY 1
END
NUMBER F_CAB1 5
BEGIN
PROMPT 63 10 ""
FIELD LF_QUAL->QLNUMERO[1,5]
// MESSAGE COPY,FH_NUMERO
GROUP ABI_CAB
// KEY 1
KEY 1
END
NUMBER F_CAB 6
@ -239,9 +215,8 @@ BEGIN
PROMPT 69 10 ""
FIELD LF_QUAL->QLNUMERO[6,11]
FLAGS "Z"
// MESSAGE ADD,FH_NUMERO
GROUP ABI_CAB
// KEY 1
KEY 1
END
LIST F_QUADRO 2

View File

@ -7,14 +7,14 @@
#include <utility.h>
#include <sort.h>
#include <lffiles.h>
#include "scperc.h"
#include "rpag.h"
#include "rver.h"
#include <scperc.h>
#include <rpag.h>
#include <rver.h>
#include <comuni.h>
#include <nditte.h>
#include <anagr.h>
#include <anafis.h>
#include "perc.h"
#include <perc.h>
#include <mailbox.h>
#include <execp.h>

View File

@ -7,13 +7,13 @@
#include <sort.h>
#include <progind.h>
#include <lffiles.h>
#include "scperc.h"
#include "rpag.h"
#include <scperc.h>
#include <rpag.h>
#include <comuni.h>
#include <nditte.h>
#include <anagr.h>
#include <anafis.h>
#include "perc.h"
#include <perc.h>
#include <config.h>
#include "772.h"
#include "772200.h"

View File

@ -12,14 +12,14 @@
#include <assoc.h>
#include <config.h>
#include <lffiles.h>
#include "scperc.h"
#include "rpag.h"
#include "rver.h"
#include <scperc.h>
#include <rpag.h>
#include <rver.h>
#include <comuni.h>
#include <nditte.h>
#include <anagr.h>
#include <anafis.h>
#include "perc.h"
#include <perc.h>
#include <mailbox.h>
#include <execp.h>

View File

@ -7,12 +7,12 @@
#include <sort.h>
#include <progind.h>
#include <lffiles.h>
#include "scperc.h"
#include "rpag.h"
#include "rver.h"
#include <scperc.h>
#include <rpag.h>
#include <rver.h>
#include <anagr.h>
#include <nditte.h>
#include "perc.h"
#include <perc.h>
#include <config.h>
#include "772.h"
#include "772400.h"

View File

@ -260,7 +260,7 @@ void TGenera::dati_rver(TLocalisamfile& rver,TSchedaP& sch, long numvers)
_tipover = rver.get_char(VER_TIPOVERS);
_serie = rver.get (VER_SERIE);
_numero = rver.get (VER_NUMERO);
_sNrog = rver.get (VER_PROGBANC);
_sNprog = rver.get (VER_PROGBANC);
_sNprog.trim();
if (_sNprog.not_empty())
_numero << _sNprog;
@ -296,7 +296,10 @@ void TGenera::arrotonda()
progn.addstatus(1);
const long codditta = qual.get_long(QUL_CODDITTA);
if (codditta != _codditta)
{
progn.addstatus(1); // per far andare fino alla fine il "termometro" (sic)
continue;
}
importo = qual.get_real(QUL_QLRITVER);
importo = round_770(importo);
qual.reread(_testandlock);

View File

@ -9,7 +9,6 @@
#include <lffiles.h>
#include <mailbox.h>
#include <execp.h>
#include "776.h"
#include "776500.h"
#include "77lib.h"
@ -18,23 +17,17 @@ class TParametri_genera : public TApplication
{
char _liv; // Se stampa a livello di studio
int _anno_dic; // Anno dichiarazione nei paramentri utente o studio
TRelation* _rel;
// Configurazione
TString16 _section;
TConfig* _cnf;
int _risposta;
bool init_print();
protected:
static bool ProgBancaHnd(TMask_field& f, KEY k);
virtual void on_config_change();
virtual bool create() ;
virtual bool destroy();
virtual bool menu(MENU_TAG m);
public:
bool main_loop();
// D = stampa ditta, S = stampa a livello di studio
@ -49,10 +42,32 @@ void TParametri_genera::on_config_change()
_anno_dic = (int)conf.get_long(ANNO_SEL, _section);
}
// Copia su NUMERO CAB+PROGBANCA
bool TParametri_genera::ProgBancaHnd(TMask_field& f, KEY k)
{
TMask& m = f.mask();
if (k == K_TAB && m.is_running())
{
char tipov = m.get(F_TIPOVERS)[0];
TString cab(m.get(F_CAB));
TString prg(m.get(F_PROGBANCA));
TString numero;
if (tipov == DELEGA_BANCARIA)
{
numero = cab;
numero << prg;
m.set(FH_NUMERO, numero);
}
}
return TRUE;
}
bool TParametri_genera::main_loop()
{
KEY tasto;
TMask msk ("776500a");
msk.set_handler(F_CAB, ProgBancaHnd);
msk.set_handler(F_PROGBANCA, ProgBancaHnd);
long codditta, codditta_prec;
int i = 0;
@ -134,15 +149,11 @@ bool TParametri_genera::destroy()
{
TString appname = "771mod -3";
TString body = "";
body << _risposta;
TMessage msg (appname,"",(const char*) body);
TMailbox mb;
mb.send(msg);
}
return TApplication::destroy();
}

View File

@ -8,3 +8,5 @@
#define F_NUMERO 107
#define F_ABI 108
#define F_CAB 109
#define F_PROGBANCA 110
#define FH_NUMERO 111

View File

@ -97,15 +97,11 @@ BEGIN
PROMPT 46 7 "Tipo versamento "
ITEM "B|Delega bancaria"
MESSAGE SHOW,97|SHOW,99|SHOW,F_ABI|SHOW,F_CAB|HIDE,96|HIDE,98|HIDE,F_SERIE|HIDE,F_NUMERO
// MESSAGE HIDE,GSERIE@|SHOW,ABI_CAB@
// MESSAGE ENABLE,F_ABI
ITEM "D|Distinta"
MESSAGE SHOW,96|SHOW,98|SHOW,F_SERIE|SHOW,F_NUMERO|HIDE,97|HIDE,99|HIDE,F_ABI|HIDE,F_CAB
// MESSAGE HIDE,ABI_CAB@|SHOW,GSERIE@
MESSAGE ENABLE,F_SERIE
ITEM "C|C/C Postale"
MESSAGE SHOW,96|SHOW,98|SHOW,F_SERIE|SHOW,F_NUMERO|HIDE,97|HIDE,99|HIDE,F_ABI|HIDE,F_CAB
// MESSAGE HIDE,ABI_CAB@|SHOW,GSERIE@
MESSAGE CLEAR,F_SERIE|DISABLE,F_SERIE
FIELD LF_BASE->TIPOVERS
END
@ -114,13 +110,32 @@ NUMBER F_ABI 5
BEGIN
PROMPT 18 13 ""
FIELD LF_BASE->SERIE
FLAGS "RZ"
GROUP ABI_CAB
END
NUMBER F_CAB 11
STRING FH_NUMERO 11
BEGIN
PROMPT 0 1 ""
FLAGS "D"
KEY 1
FIELD LF_BASE->NUMERO
END
NUMBER F_CAB 5
BEGIN
PROMPT 63 13 ""
FIELD LF_BASE->NUMERO
// FIELD LF_BASE->NUMERO
// MESSAGE COPY,FH_NUMERO
FLAGS "RZ"
GROUP ABI_CAB
END
NUMBER F_PROGBANCA 6
BEGIN
PROMPT 69 13 ""
FLAGS "RZ"
// MESSAGE ADD,FH_NUMERO
GROUP ABI_CAB
END

View File

@ -27,10 +27,18 @@ inline TQuadroG1& app() { return (TQuadroG1&) main_app(); }
void TQuadroG1::init_modify_mode (TMask& m)
{
init_mask(m);
// init_mask(m);
m.disable(DLG_DELREC);
}
int TQuadroG1::read(TMask& m)
{
int err = TRelation_application::read(m);
if (err == NOERR)
fill_arr(m);
return err;
}
void TQuadroG1::init_query_mode (TMask& m)
{
TString16 codditta; codditta << _codditta;
@ -40,14 +48,10 @@ void TQuadroG1::init_query_mode (TMask& m)
m.field(F_CODDITTA).check();
}
m.send_key(K_AUTO_ENTER,0);
init_mask(m);
// init_mask(m);
}
void TQuadroG1::init_mask (TMask& m)
{
fill_arr(m);
}
//void TQuadroG1::init_mask (TMask& m){}
void TQuadroG1::update_totals(TSheet_field& f)
{
@ -100,12 +104,12 @@ bool TQuadroG1::user_destroy()
void TQuadroG1::arr2rel(const TMask& m)
{
TToken_string p3a(200);
TToken_string p3b(200);
TToken_string p3c(200);
TToken_string p3d(200);
TToken_string p3e(200);
TToken_string p3f(200);
TToken_string p3a;
TToken_string p3b;
TToken_string p3c;
TToken_string p3d;
TToken_string p3e;
TToken_string p3f;
TRectype& r = _rel->curr();
int dlg; dlg = 0;

View File

@ -124,7 +124,7 @@ class TNikArray_sheet : public TArray_sheet
TNikArray_sheet(short x, short y, short dx, short dy, const char* caption,
const char* head, byte buttons = 0, WINDOW parent = NULL_WIN,
int visible=0)
: TArray_sheet(x, y, dx, dy, caption,head, buttons),
: TArray_sheet(x, y, dx, dy, caption,head, buttons, parent),
_visible_items(visible) {}
bool destroy(int i = -1);

View File

@ -7,13 +7,13 @@
#include <form.h>
#include <printer.h>
#include <progind.h>
#include "base.h"
#include <base.h>
#include <urldefid.h>
#include <nditte.h>
#include <anagr.h>
#include "quadrod.h"
#include "quadrod1.h"
#include <quadrod1.h>
#include "quadrogd.h"
#include "quadrif.h"
#include "77stqd.h"
@ -3319,13 +3319,12 @@ int stampa_quadro(int argc, char* argv[])
TStampaQuadroG1 app(quadro, livello);
app.run(argc, argv, app.taitol());
}
/*
if (quadro == "H")
{
TStampaQuadroH app(quadro, livello);
app.run(argc, argv, app.taitol());
}
*/
}
return 0;
}