Patch level : nopatch

Files correlati     :
Commento        :

Implementazione FP
This commit is contained in:
Alessandro Bonazzi 2021-12-17 17:04:04 +01:00
parent ed176f1c39
commit 830e58a74f
9 changed files with 381 additions and 341 deletions

View File

@ -1,11 +1,11 @@
#ifdef WIN32 #ifdef WIN32
#define _CRT_NONSTDC_NO_DEPRECATE 1 #define _CRT_NONSTDC_NO_DEPRECATE 1
#define _CRT_SECURE_NO_WARNINGS 1 #define _CRT_SECURE_NO_WARNINGS 1
#include <io.h> #include <io.h>
#include <share.h> #include <share.h>
#else #else
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#include <sys/stat.h> #include <sys/stat.h>
@ -13,11 +13,9 @@
#include "ba1100.h" #include "ba1100.h"
#include "ba1103.h" #include "ba1103.h"
#include <applicat.h>
#include <dongle.h> #include <dongle.h>
#include <printer.h> #include <relapp.h>
#include <progind.h> #include <progind.h>
#include <reputils.h>
#include <utility.h> #include <utility.h>
#include <user.h> #include <user.h>
@ -35,59 +33,6 @@
#define Dir_file "dir.gen" #define Dir_file "dir.gen"
#define Trc_file "trc.gen" #define Trc_file "trc.gen"
class TManutenzione_app : public TSkeleton_application
{
TDir_sheet* _browse;
TArray _dirs;
TArray _recs;
TMask* _mask;
long _firm;
long _level;
long _history_firm;
TRec_sheet* _rec;
TLog_report* _log;
bool _print_log;
bool _superprassi;
protected:
virtual void main_loop();
virtual bool create () ;
virtual bool destroy();
void insert_riga(long, TToken_string&);
void edit_riga(long, TToken_string&);
void edit_riga(const TString&);
void delete_riga(long);
virtual bool extended_firm() const { return true; }
bool set_converting();
bool reset_converting();
bool try_to_recover(TSystemisamfile& f, int err);
void update();
void update_dir();
void convert_dir();
virtual void print();
virtual void do_print(TPrinter & p, TRec_sheet & r);
const char* dumpfilename(const FileDes& dep) const;
void load_des();
void open_history();
void put_history(const char* firm);
void close_history();
void dump_trc(const char * dir, const bool des_too, const long modules);
void repair_file(int i);
void save_file(const char * file);
void open_log();
void write_log(const char* line, const int severity = 0);
void close_log();
bool moveable_file(int file) const;
public:
TManutenzione_app();
};
HIDDEN bool browse_file_handler(TMask_field& f, KEY k) HIDDEN bool browse_file_handler(TMask_field& f, KEY k)
{ {
if (k == K_F9) if (k == K_F9)
@ -117,51 +62,51 @@ TManutenzione_app::TManutenzione_app() : _browse(NULL), _mask(NULL), _firm(0), _
strncpy_s(fd.SysName, "$dir.gen", sizeof(fd.SysName)); strncpy_s(fd.SysName, "$dir.gen", sizeof(fd.SysName));
strncpy_s(fd.Des, "Directory", sizeof(fd.Des)); strncpy_s(fd.Des, "Directory", sizeof(fd.Des));
strncpy_s(fd.FCalc, "0", sizeof(fd.FCalc)); strncpy_s(fd.FCalc, "0", sizeof(fd.FCalc));
strncpy_s(fd.GenPrompt,"", sizeof(fd.GenPrompt)); strncpy_s(fd.GenPrompt, "", sizeof(fd.GenPrompt));
fd.LenR =160; fd.LenR = 160;
fd.EOD = fd.EOX = 1L; fd.EOD = fd.EOX = 1L;
fd.Flags = 0; fd.Flags = 0;
#ifdef WIN32 #ifdef WIN32
int handle = sopen(Dir_file, O_RDWR|O_BINARY|O_CREAT,SH_DENYNO,S_IREAD|S_IWRITE); int handle = sopen(Dir_file, O_RDWR | O_BINARY | O_CREAT, SH_DENYNO, S_IREAD | S_IWRITE);
#else #else
int handle = open(Dir_file, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); int handle = open(Dir_file, O_RDWR | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
#endif #endif
if (handle != -1) if (handle != -1)
{ {
if (write( handle, &fd, sizeof(FileDes)) == -1) if (write(handle, &fd, sizeof(FileDes)) == -1)
fatal_box("Impossibile scrivere il file dir.gen per dati standard: errore %d",errno); fatal_box("Impossibile scrivere il file dir.gen per dati standard: errore %d", errno);
close(handle); close(handle);
} }
else else
fatal_box("Impossibile creare il file dir.gen per dati standard: errore %d",errno); fatal_box("Impossibile creare il file dir.gen per dati standard: errore %d", errno);
} }
if (!fexist(Trc_file)) if (!fexist(Trc_file))
{ {
TTrec r; TTrec r;
RecDes& rd = r.rec(); RecDes& rd = r.rec();
#ifdef WIN32 #ifdef WIN32
int handle = sopen(Trc_file, O_RDWR|O_BINARY|O_CREAT,SH_DENYNO,S_IREAD|S_IWRITE); int handle = sopen(Trc_file, O_RDWR | O_BINARY | O_CREAT, SH_DENYNO, S_IREAD | S_IWRITE);
#else #else
int handle = open(Trc_file, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); int handle = open(Trc_file, O_RDWR | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
#endif #endif
if (handle != -1) if (handle != -1)
{ {
if (write( handle, (void*)&rd, sizeof(RecDes)) == -1) if (write(handle, (void*)&rd, sizeof(RecDes)) == -1)
fatal_box("Impossibile scrivere il file trc.gen per dati standard: errore %d",errno); fatal_box("Impossibile scrivere il file trc.gen per dati standard: errore %d", errno);
close(handle); close(handle);
} }
else else
fatal_box("Impossibile creare il file trc.gen per dati standard: errore %d",errno); fatal_box("Impossibile creare il file trc.gen per dati standard: errore %d", errno);
} }
} }
void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r) void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r)
{ {
const char* table[] = {"", TR("Alfanumerico"), TR("Intero"), TR("Intero Lungo"), const char* table[] = { "", TR("Alfanumerico"), TR("Intero"), TR("Intero Lungo"),
TR("Reale"), TR("Data"), TR("Intero"), TR("Carattere"), TR("Reale"), TR("Data"), TR("Intero"), TR("Carattere"),
TR("Booleano"), TR("Intero Zerofilled"), TR("Intero Lungo Zerofilled"),TR("Memo")}; TR("Booleano"), TR("Intero Zerofilled"), TR("Intero Lungo Zerofilled"),TR("Memo") };
TPrintrow row; TPrintrow row;
TToken_string s; TToken_string s;
TParagraph_string d("", 25); TParagraph_string d("", 25);
@ -180,7 +125,7 @@ void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r)
row.reset(); row.reset();
if (istab) if (istab)
row.put(format(FR("Lista tabella %s "), (const char *) tab), 2); row.put(format(FR("Lista tabella %s "), (const char *)tab), 2);
else else
row.put(format(FR("Lista tracciato %s (%s)"), dir.des(), dir.name()), 2); row.put(format(FR("Lista tracciato %s (%s)"), dir.des(), dir.name()), 2);
row.put(TR("Pag. @#"), 69); row.put(TR("Pag. @#"), 69);
@ -202,7 +147,7 @@ void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r)
int i; int i;
for (i = 0; i < rec.fields(); i ++) for (i = 0; i < rec.fields(); i++)
{ {
row.reset(); row.reset();
s = rec.fielddef(i); s = rec.fielddef(i);
@ -228,7 +173,7 @@ void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r)
} }
p.print(row); p.print(row);
wd = d.get(); wd = d.get();
while(wd != NULL) while (wd != NULL)
{ {
row.reset(); row.reset();
row.put(wd, 53); row.put(wd, 53);
@ -254,7 +199,7 @@ void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r)
p.print(row); p.print(row);
} }
for (i = 0; i < rec.keys(); i ++) for (i = 0; i < rec.keys(); i++)
{ {
row.reset(); row.reset();
s = rec.keydef(i); s = rec.keydef(i);
@ -318,11 +263,10 @@ void TManutenzione_app::print()
bool TManutenzione_app::create() // initvar e arrmask bool TManutenzione_app::create() // initvar e arrmask
{ {
_firm = get_firm(); TString sw(argc() > 2 ? argv(2) : "");
TString sw(argc()>2 ? argv(2) : "");
// Posso fare le operazione avanzate solo se sono ammistratore // Posso fare le operazione avanzate solo se sono ammistratore
// e NON mi trovo su di una installazione di tipo client // e NON mi trovo su di una installazione di tipo client
xvt_vobj_show(TASK_WIN); xvt_vobj_show(TASK_WIN);
_superprassi = user() == ::dongle().administrator() && !::dongle().demo(); _superprassi = user() == ::dongle().administrator() && !::dongle().demo();
if (_superprassi) if (_superprassi)
@ -356,12 +300,13 @@ bool TManutenzione_app::create() // initvar e arrmask
modules = atol(argv(5)); modules = atol(argv(5));
prefix().set(""); prefix().set("");
load_des(); load_des();
dump_trc(dir,des_too,modules); dump_trc(dir, des_too, modules);
return false; return false;
} }
else else
if (!::dongle().demo() && !set_firm()) if (!::dongle().demo() && !set_firm())
return false; return false;
_firm = atol(prefix().name());
load_des(); load_des();
_mask = new TMask("ba1100a"); _mask = new TMask("ba1100a");
@ -385,6 +330,24 @@ bool TManutenzione_app::destroy()
return TApplication::destroy(); return TApplication::destroy();
} }
void TManutenzione_app::show_log()
{
if (db_log())
{
if (admin())
{
TLog_mask m;
m.run();
}
else
message_box(TR("Il log delle transazioni è visualizzabile dall'amministratore"));
}
else
message_box(TR("Il log delle transazioni è disattivato"));
}
void TManutenzione_app::open_log() void TManutenzione_app::open_log()
{ {
_print_log = false; _print_log = false;
@ -434,13 +397,13 @@ void TManutenzione_app::save_file(const char * file)
FOR_EACH_ARRAY_ROW_BACK(files_to_copy, row, fname) FOR_EACH_ARRAY_ROW_BACK(files_to_copy, row, fname)
{ {
TFilename source_file(*fname); TFilename source_file(*fname);
TFilename dest_file(dest_path); dest_file << '/' << (const char *) source_file.name(); TFilename dest_file(dest_path); dest_file << '/' << (const char *)source_file.name();
fcopy((const char *) source_file, dest_file); fcopy((const char *)source_file, dest_file);
} }
} }
void TManutenzione_app::insert_riga (long riga_sel, TToken_string& riga) void TManutenzione_app::insert_riga(long riga_sel, TToken_string& riga)
{ {
const int logicnum = int(riga_sel) + 1; const int logicnum = int(riga_sel) + 1;
const int num_files = (int)_browse->items(); const int num_files = (int)_browse->items();
@ -449,30 +412,30 @@ void TManutenzione_app::insert_riga (long riga_sel, TToken_string& riga)
_mask->disable(DLG_RECORD); _mask->disable(DLG_RECORD);
_mask->disable(DLG_LOAD); _mask->disable(DLG_LOAD);
_mask->disable(DLG_DUMP); _mask->disable(DLG_DUMP);
_mask->show(F_TAB, (logicnum >= LF_TABGEN && logicnum <= LF_TAB)||(logicnum == LF_TABMOD)); _mask->show(F_TAB, (logicnum >= LF_TABGEN && logicnum <= LF_TAB) || (logicnum == LF_TABMOD));
_mask->hide(FLD_EXTEND); _mask->hide(FLD_EXTEND);
_mask->hide(FLD_EOX); _mask->hide(FLD_EOX);
_mask->set (FLD_NUM, riga.get(0)); _mask->set(FLD_NUM, riga.get(0));
_mask->reset (F_TAB); _mask->reset(F_TAB);
if (_mask->run() == K_ENTER) if (_mask->run() == K_ENTER)
{ {
/* shift di uno in avanti degli elementi del direttorio partendo dall'ultimo */ /* shift di uno in avanti degli elementi del direttorio partendo dall'ultimo */
for (int i=num_files; i>=logicnum; i--) for (int i = num_files; i >= logicnum; i--)
{ {
_browse->dir().get (i, _nolock, _nordir, _sysdirop); _browse->dir().get(i, _nolock, _nordir, _sysdirop);
_browse->dir().put (i + 1, _nordir, _sysdirop); _browse->dir().put(i + 1, _nordir, _sysdirop);
_browse->rec().get (i); _browse->rec().get(i);
_browse->rec().put (i + 1); _browse->rec().put(i + 1);
} }
_browse->dir().set(_mask->get(FLD_NOME), _mask->get_long(FLD_EOD), _browse->dir().set(_mask->get(FLD_NOME), _mask->get_long(FLD_EOD),
_mask->get_long(FLD_FLAG), _mask->get (FLD_DESC), _mask->get_long(FLD_FLAG), _mask->get(FLD_DESC),
_mask->get (FLD_FORMULA)); _mask->get(FLD_FORMULA));
_browse->dir().put(logicnum, _nordir, _sysdirop); _browse->dir().put(logicnum, _nordir, _sysdirop);
_browse->rec().zero(); _browse->rec().zero();
_browse->rec().put(logicnum); _browse->rec().put(logicnum);
_browse->dir().get(LF_DIR); _browse->dir().get(LF_DIR);
_browse->dir().set_eod(_browse->dir().eod()+1); _browse->dir().set_eod(_browse->dir().eod() + 1);
_browse->set_items(_browse->dir().eod()); _browse->set_items(_browse->dir().eod());
_browse->dir().put(LF_DIR); _browse->dir().put(LF_DIR);
} }
@ -480,32 +443,32 @@ void TManutenzione_app::insert_riga (long riga_sel, TToken_string& riga)
void TManutenzione_app::open_history() void TManutenzione_app::open_history()
{ {
FILE *fp = fopen(History_file,"r"); FILE *fp = fopen(History_file, "r");
if (fp != NULL) if (fp != NULL)
{ {
char line[16]; char line[16];
fgets(line,16,fp); fgets(line, 16, fp);
int l = strlen(line); int l = strlen(line);
line[l > 0 ? l -1 : 0 ] = '\0'; line[l > 0 ? l - 1 : 0] = '\0';
if (l==0) if (l == 0)
_history_firm = -1; _history_firm = -1;
else else
_history_firm = atol(line); _history_firm = atol(line);
} }
else else
{ {
fp = fopen(History_file,"w"); fp = fopen(History_file, "w");
_history_firm = -1; _history_firm = -1;
} }
fclose (fp); fclose(fp);
} }
void TManutenzione_app::put_history(const char* firm) void TManutenzione_app::put_history(const char* firm)
{ {
FILE * fp = fopen(History_file,"w"); FILE * fp = fopen(History_file, "w");
fprintf(fp,"%s\n",firm); fprintf(fp, "%s\n", firm);
fclose (fp); fclose(fp);
} }
void TManutenzione_app::close_history() void TManutenzione_app::close_history()
@ -518,7 +481,7 @@ void TManutenzione_app::dump_trc(const char * dir, const bool des_too, const lon
{ {
TDir d; TDir d;
d.get(LF_DIR); d.get(LF_DIR);
const int items = (int) d.eod(); const int items = (int)d.eod();
const long flags = d.flags(); // livello archivi const long flags = d.flags(); // livello archivi
TFilename fn(dir); TFilename fn(dir);
fn << "/level.dir"; fn << "/level.dir";
@ -531,7 +494,7 @@ void TManutenzione_app::dump_trc(const char * dir, const bool des_too, const lon
s << dir; s << dir;
TProgind p(items ? items : 1, s, false, true); TProgind p(items ? items : 1, s, false, true);
p.setstatus(1); p.setstatus(1);
for (int i=2;i<=items;i++) //Salta il primo (dir.gen) for (int i = 2; i <= items; i++) //Salta il primo (dir.gen)
{ {
p.addstatus(1); p.addstatus(1);
TTrec& rc = (TTrec&)_recs[i]; TTrec& rc = (TTrec&)_recs[i];
@ -546,11 +509,11 @@ void TManutenzione_app::dump_trc(const char * dir, const bool des_too, const lon
if (fd != NULL) if (fd != NULL)
fclose(fd); fclose(fd);
} }
TConfig conf_des(descfname,DESCPAR); TConfig conf_des(descfname, DESCPAR);
if (des_too) rc.set_des(&conf_des); if (des_too) rc.set_des(&conf_des);
fn = dir; fn = dir;
fn << "/f";fn << i; fn << "/f"; fn << i;
fn.ext("trr"); fn.ext("trr");
ofstream out(fn); ofstream out(fn);
out << rc; out << rc;
@ -573,21 +536,21 @@ const char* TManutenzione_app::dumpfilename(const FileDes& dep) const
return tmp; return tmp;
} }
void TManutenzione_app::edit_riga (const TString& name) void TManutenzione_app::edit_riga(const TString& name)
{ {
const TFilename n(name); const TFilename n(name);
TExternisamfile* f = new TExternisamfile(n); TExternisamfile* f = new TExternisamfile(n);
_mask->set (FLD_NUM, ""); _mask->set(FLD_NUM, "");
_mask->set (FLD_NOME, n); _mask->set(FLD_NOME, n);
_mask->set (FLD_EOD, f->items()); _mask->set(FLD_EOD, f->items());
_mask->set (FLD_EOX, f->items()); _mask->set(FLD_EOX, f->items());
_mask->set (F_LEN, f->curr().len()); _mask->set(F_LEN, f->curr().len());
_mask->set (FLD_DESC, f->description()); _mask->set(FLD_DESC, f->description());
_mask->set (FLD_FORMULA, ""); _mask->set(FLD_FORMULA, "");
_mask->set (FLD_FLAG, ""); _mask->set(FLD_FLAG, "");
_mask->reset (FLD_EXTEND); _mask->reset(FLD_EXTEND);
_mask->reset (F_TAB); _mask->reset(F_TAB);
_mask->disable(-1); _mask->disable(-1);
_mask->enable(DLG_RECORD, _superprassi); _mask->enable(DLG_RECORD, _superprassi);
@ -612,7 +575,7 @@ void TManutenzione_app::edit_riga (const TString& name)
} }
} }
void TManutenzione_app::edit_riga (long riga_sel, TToken_string& riga) void TManutenzione_app::edit_riga(long riga_sel, TToken_string& riga)
{ {
const int logicnum = int(riga_sel) + 1; const int logicnum = int(riga_sel) + 1;
@ -622,16 +585,16 @@ void TManutenzione_app::edit_riga (long riga_sel, TToken_string& riga)
_mask->enable(DLG_DUMP); _mask->enable(DLG_DUMP);
_mask->show(F_TAB, logicnum >= LF_TABGEN && logicnum <= LF_TAB); _mask->show(F_TAB, logicnum >= LF_TABGEN && logicnum <= LF_TAB);
_mask->set (FLD_NUM, riga.get(0)); _mask->set(FLD_NUM, riga.get(0));
_mask->set (FLD_NOME, riga.get()); _mask->set(FLD_NOME, riga.get());
_mask->set (FLD_EOD, riga.get()); _mask->set(FLD_EOD, riga.get());
_mask->set (FLD_EOX, riga.get()); _mask->set(FLD_EOX, riga.get());
_mask->set (F_LEN, riga.get()); _mask->set(F_LEN, riga.get());
_mask->set (FLD_DESC, riga.get()); _mask->set(FLD_DESC, riga.get());
_mask->set (FLD_FORMULA, riga.get()); _mask->set(FLD_FORMULA, riga.get());
_mask->set (FLD_FLAG, riga.get()); _mask->set(FLD_FLAG, riga.get());
_mask->reset (FLD_EXTEND); _mask->reset(FLD_EXTEND);
_mask->reset (F_TAB); _mask->reset(F_TAB);
const TRecnotype oldeox = _mask->get_long(FLD_EOX); const TRecnotype oldeox = _mask->get_long(FLD_EOX);
const bool com = prefix().is_com() || !*prefix().name(); const bool com = prefix().is_com() || !*prefix().name();
@ -668,11 +631,11 @@ void TManutenzione_app::edit_riga (long riga_sel, TToken_string& riga)
case K_ENTER: case K_ENTER:
{ {
FileDes dep; FileDes dep;
strncpy (dep.SysName,_mask->get(FLD_NOME), sizeof(dep.SysName)); strncpy(dep.SysName, _mask->get(FLD_NOME), sizeof(dep.SysName));
dep.EOD = atol(_mask->get (FLD_EOD)); dep.EOD = atol(_mask->get(FLD_EOD));
dep.Flags = atol(_mask->get (FLD_FLAG)); dep.Flags = atol(_mask->get(FLD_FLAG));
strncpy (dep.Des,_mask->get (FLD_DESC), sizeof(dep.Des)); strncpy(dep.Des, _mask->get(FLD_DESC), sizeof(dep.Des));
strncpy (dep.FCalc,_mask->get (FLD_FORMULA), sizeof(dep.FCalc)); strncpy(dep.FCalc, _mask->get(FLD_FORMULA), sizeof(dep.FCalc));
const TRecnotype eox = _mask->get_bool(FLD_EXTEND) ? _mask->get_long(FLD_EOX) : oldeox; const TRecnotype eox = _mask->get_bool(FLD_EXTEND) ? _mask->get_long(FLD_EOX) : oldeox;
TDir& dir = _browse->dir(); TDir& dir = _browse->dir();
@ -698,7 +661,7 @@ void TManutenzione_app::edit_riga (long riga_sel, TToken_string& riga)
{ {
f.packfile(true); f.packfile(true);
f.packindex(true); f.packindex(true);
// le 4 righe seguenti servono per allineare i valori di EOD ed EOX dopo una compattazione forzata // le 4 righe seguenti servono per allineare i valori di EOD ed EOX dopo una compattazione forzata
dir.get(logicnum, _nolock, _nordir, _sysdirop); dir.get(logicnum, _nolock, _nordir, _sysdirop);
dir.set(dep.SysName, dep.EOD, dep.Flags, dep.Des, dep.FCalc); dir.set(dep.SysName, dep.EOD, dep.Flags, dep.Des, dep.FCalc);
dir.set_eox(_browse->dir().eod()); dir.set_eox(_browse->dir().eod());
@ -770,19 +733,19 @@ void TManutenzione_app::edit_riga (long riga_sel, TToken_string& riga)
} }
} }
void TManutenzione_app::delete_riga (long riga_sel) void TManutenzione_app::delete_riga(long riga_sel)
{ {
const int num_files = (int)_browse->items(); const int num_files = (int)_browse->items();
const int logicnum = int(riga_sel) + 1; const int logicnum = int(riga_sel) + 1;
if (riga_sel == num_files-1 && yesno_box(FR("Si conferma l'eliminazione del file %d"), logicnum)) if (riga_sel == num_files - 1 && yesno_box(FR("Si conferma l'eliminazione del file %d"), logicnum))
{ {
/* shift di uno in avanti degli elementi del direttorio partendo dall'ultimo */ /* shift di uno in avanti degli elementi del direttorio partendo dall'ultimo */
for (int i = logicnum + 1; i <= num_files; i++) for (int i = logicnum + 1; i <= num_files; i++)
{ {
_browse->dir().get (i, _nolock, _nordir, _sysdirop); _browse->dir().get(i, _nolock, _nordir, _sysdirop);
_browse->dir().put (i - 1, _nordir, _sysdirop); _browse->dir().put(i - 1, _nordir, _sysdirop);
_browse->rec().get (i); _browse->rec().get(i);
_browse->rec().put (i - 1); _browse->rec().put(i - 1);
} }
_browse->dir().get(LF_DIR); _browse->dir().get(LF_DIR);
@ -790,7 +753,7 @@ void TManutenzione_app::delete_riga (long riga_sel)
TTrec r; TTrec r;
r.zero(); r.zero();
r.put(_browse->dir().eod()); r.put(_browse->dir().eod());
_browse->dir().set_eod(_browse->dir().eod()-1); _browse->dir().set_eod(_browse->dir().eod() - 1);
_browse->set_items(_browse->dir().eod()); _browse->set_items(_browse->dir().eod());
_browse->dir().put(LF_DIR); _browse->dir().put(LF_DIR);
_browse->force_update(); _browse->force_update();
@ -883,7 +846,7 @@ void TManutenzione_app::update_dir()
if (!p.setstatus(i)) if (!p.setstatus(i))
break; break;
const TDir & ds = (const TDir &) _dirs[i]; const TDir & ds = (const TDir &)_dirs[i];
const bool is_firm = ds.is_firm(); const bool is_firm = ds.is_firm();
const bool to_create = (is_com ? ds.is_com() : ds.is_firm()); const bool to_create = (is_com ? ds.is_com() : ds.is_firm());
@ -1025,7 +988,7 @@ void TManutenzione_app::update_dir()
if (!valid_file) if (!valid_file)
d.set(ds.name(), d.eox(), d.eod(), ds.des(), d.expr()); d.set(ds.name(), d.eox(), d.eod(), ds.des(), d.expr());
else else
strcpy((char *) d.des(), ds.des()); strcpy((char *)d.des(), ds.des());
} }
} }
if (is_com && valid_file && d.name()[0] == '$') if (is_com && valid_file && d.name()[0] == '$')
@ -1080,7 +1043,7 @@ void TManutenzione_app::convert_dir()
if (is_com) if (is_com)
s << TR("comuni"); s << TR("comuni");
else else
s << TR("ditta ") << atol (pref); s << TR("ditta ") << atol(pref);
s << ".\n"; s << ".\n";
TProgress_monitor p(update_items, s, is_power_station()); TProgress_monitor p(update_items, s, is_power_station());
@ -1222,10 +1185,10 @@ void TManutenzione_app::load_des()
// Cerca in RECDESC i files f[nnn].dir // Cerca in RECDESC i files f[nnn].dir
TString ws; TString ws;
TFilename fn; TFilename fn;
TDir td,new_dir; TDir td, new_dir;
TTrec tr; TTrec tr;
int ln = items,last_newln = items; int ln = items, last_newln = items;
tr.zero(); tr.zero();
fn << DESCDIR << "/level.dir"; fn << DESCDIR << "/level.dir";
@ -1241,7 +1204,7 @@ void TManutenzione_app::load_des()
// eventuali "buchi" oltre al numero attuale di items vengono rimpiazzati // eventuali "buchi" oltre al numero attuale di items vengono rimpiazzati
// con tracciati vuoti. // con tracciati vuoti.
fn.format("%s/f*.dir",DESCDIR); fn.format("%s/f*.dir", DESCDIR);
TString_array list; TString_array list;
const int totfiles = list_files(fn, list); const int totfiles = list_files(fn, list);
@ -1258,16 +1221,16 @@ void TManutenzione_app::load_des()
const bool is_new = ln > last_newln; // memorizza l'ultimo record scritto come nuovo const bool is_new = ln > last_newln; // memorizza l'ultimo record scritto come nuovo
if (is_new) // aggiunge i files che mancano if (is_new) // aggiunge i files che mancano
{ {
for (int i = last_newln+1; i<ln; i++) for (int i = last_newln + 1; i < ln; i++)
{ {
ws.format("$f%d",i); ws.format("$f%d", i);
new_dir.set(ws,0L,-1L, TR("File non presente"),""); new_dir.set(ws, 0L, -1L, TR("File non presente"), "");
new_dir.put(i,_nordir,_sysdirop); new_dir.put(i, _nordir, _sysdirop);
tr.put(i); tr.put(i);
} }
last_newln = ln; last_newln = ln;
} }
td.put(ln,_nordir,_sysdirop); td.put(ln, _nordir, _sysdirop);
if (is_new) if (is_new)
tr.put(ln); tr.put(ln);
} }
@ -1276,10 +1239,10 @@ void TManutenzione_app::load_des()
d.set_eox(last_newln); d.set_eox(last_newln);
d.set_flags(_level = flags); d.set_flags(_level = flags);
prefix().set_stdlevel(flags); prefix().set_stdlevel(flags);
d.put(LF_DIR,_nordir,_sysdirop); d.put(LF_DIR, _nordir, _sysdirop);
} }
items = (int) d.eod(); items = (int)d.eod();
TString80 s = TR("Caricamento descrizioni archivi "); TString80 s = TR("Caricamento descrizioni archivi ");
if (standard) if (standard)
@ -1287,7 +1250,7 @@ void TManutenzione_app::load_des()
else else
{ {
if (prefix().is_com()) s << TR("comuni"); if (prefix().is_com()) s << TR("comuni");
else s << TR("ditta ") << atol (pref); else s << TR("ditta ") << atol(pref);
} }
TProgress_monitor p(items ? items : 1, s, false); TProgress_monitor p(items ? items : 1, s, false);
@ -1489,12 +1452,12 @@ void TManutenzione_app::main_loop()
case K_F6: case K_F6:
riga_selezionata = _browse->selected(); riga_selezionata = _browse->selected();
riga = _browse->row(); riga = _browse->row();
insert_riga (riga_selezionata, riga); insert_riga(riga_selezionata, riga);
break; break;
case K_ENTER: case K_ENTER:
riga_selezionata = _browse->selected(); riga_selezionata = _browse->selected();
riga = _browse->row(); riga = _browse->row();
edit_riga (riga_selezionata, riga); edit_riga(riga_selezionata, riga);
break; break;
case K_DEL: case K_DEL:
riga_selezionata = _browse->selected(); riga_selezionata = _browse->selected();
@ -1511,7 +1474,7 @@ void TManutenzione_app::main_loop()
_browse->add(); _browse->add();
riga_selezionata = _browse->items() - 1; riga_selezionata = _browse->items() - 1;
riga = _browse->row(riga_selezionata); riga = _browse->row(riga_selezionata);
edit_riga (riga_selezionata, riga); edit_riga(riga_selezionata, riga);
break; break;
case K_F5: // Other file case K_F5: // Other file
{ {
@ -1534,4 +1497,3 @@ int ba1100(int argc, char** argv)
a.run(argc, argv, TR("Gestione files")); a.run(argc, argv, TR("Gestione files"));
return 0; return 0;
} }

View File

@ -1,6 +1,10 @@
#ifndef __BA1100_H #ifndef __BA1100_H
#define __BA1100_H #define __BA1100_H
#ifndef __APPLICAT_H
#include <applicat.h>
#endif
#ifndef __CONFIG_H #ifndef __CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
@ -17,6 +21,14 @@
class TMask_field; class TMask_field;
#endif #endif
#ifndef __PRINTER_H
#include <printer.h>
#endif
#ifndef __REPUTILS_H
#include <reputils.h>
#endif
#include "ba1100a.h" #include "ba1100a.h"
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
@ -38,10 +50,10 @@ public:
const TDir& dir() const { return _dir; } const TDir& dir() const { return _dir; }
TDir& dir() { return _dir; } TDir& dir() { return _dir; }
const TTrec& rec() const { return _rec; } const TTrec& rec() const { return _rec; }
TTrec& rec(){ return _rec; } TTrec& rec() { return _rec; }
void set_items(long items) { _items = items; } void set_items(long items) { _items = items; }
void add(); void add();
void rebuild() { _items = _dir.items();} void rebuild() { _items = _dir.items(); }
TDir_sheet(const char* title, bool superprassi); TDir_sheet(const char* title, bool superprassi);
}; };
@ -70,7 +82,7 @@ protected:
public: public:
const TDir& dir() const { return _dir; } const TDir& dir() const { return _dir; }
const TTrec& rec() const { return _rec; } const TTrec& rec() const { return _rec; }
const char* descfname() const { return _descfname;} const char* descfname() const { return _descfname; }
const char* tab() const { return _tab; } const char* tab() const { return _tab; }
void edit(); void edit();
@ -92,4 +104,62 @@ public:
virtual ~TEdit_file() {} virtual ~TEdit_file() {}
}; };
class TManutenzione_app : public TSkeleton_application
{
TDir_sheet* _browse;
TArray _dirs;
TArray _recs;
TMask* _mask;
long _firm;
long _level;
long _history_firm;
TRec_sheet* _rec;
TLog_report* _log;
bool _print_log;
bool _superprassi;
protected:
virtual void main_loop();
virtual bool create();
virtual bool destroy();
void insert_riga(long, TToken_string&);
void edit_riga(long, TToken_string&);
void edit_riga(const TString&);
void delete_riga(long);
virtual bool extended_firm() const { return true; }
bool set_converting();
bool reset_converting();
bool try_to_recover(TSystemisamfile& f, int err);
void update();
void update_dir();
void convert_dir();
virtual void print();
virtual void do_print(TPrinter & p, TRec_sheet & r);
const char* dumpfilename(const FileDes& dep) const;
void load_des();
void open_history();
void put_history(const char* firm);
void close_history();
void dump_trc(const char * dir, const bool des_too, const long modules);
void repair_file(int i);
void save_file(const char * file);
virtual void show_log();
void open_log();
void write_log(const char* line, const int severity = 0);
void close_log();
bool moveable_file(int file) const;
public:
long get_firm() const { return _firm; }
TManutenzione_app();
};
inline TManutenzione_app & app() { return (TManutenzione_app &)main_app(); }
#endif #endif

View File

@ -275,9 +275,17 @@ void TRec_sheet::edit()
} }
f2.set_notify(key_notify); f2.set_notify(key_notify);
f2.set_append(FALSE); f2.set_append(FALSE);
int nkeys = _rec.keys(); int nkeys = _rec.keys();
for (i = 0; i < nkeys; i++) f2.row(i) = _rec.keydef(i);
for (i = 0; i < nkeys; i++)
f2.row(i) = _rec.keydef(i);
f2.disable_cell(0, 1); f2.disable_cell(0, 1);
const bool enable_save = (_dir.is_com() && app().get_firm() == 0) ||
(_dir.is_firm() && app().get_firm() > 0);
_mask->enable(DLG_SAVEREC, enable_save);
while (true) while (true)
{ {
f1.force_update(0); // Non togliere, serve per fare l'update della descrizione quando si fa l'import!! f1.force_update(0); // Non togliere, serve per fare l'update della descrizione quando si fa l'import!!

View File

@ -136,7 +136,7 @@ protected:
bool dir_gen() const; bool dir_gen() const;
bool trc_gen() const; bool trc_gen() const;
bool export_manager(const TString generalErrors) const; bool export_manager(const TString generalErrors) const;
bool show_log(); bool show_export_log();
void log(int severity, const char* msg); void log(int severity, const char* msg);
public: public:
@ -980,7 +980,7 @@ bool TMSSQLExport_app::export_manager(TString generalErrors) const
return true; return true;
} }
bool TMSSQLExport_app::show_log() bool TMSSQLExport_app::show_export_log()
{ {
if (_log) if (_log)
{ {
@ -1089,7 +1089,7 @@ void TMSSQLExport_app::main_loop()
} }
message_box("Migrazione effettuata correttamente!"); message_box("Migrazione effettuata correttamente!");
} while (loop); } while (loop);
show_log(); show_export_log();
} }
else else
message_box("Fallita connessione"); message_box("Fallita connessione");

View File

@ -52,26 +52,24 @@ bool TTestrel_application::user_destroy()
// Testmask // Testmask
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
class TTest_application : public TApplication class TTest_application : public TSkeleton_application
{ {
const char* _maskname; const char* _maskname;
protected: protected:
bool create() { return menu(0); } void main_loop();
bool destroy() { return TRUE; }
bool menu(MENU_TAG);
public: public:
TTest_application(const char* name) : _maskname(name) {} TTest_application(const char* name) : _maskname(name) {}
}; };
bool TTest_application::menu(MENU_TAG) void TTest_application::main_loop()
{ {
if (*_maskname) if (*_maskname)
{ {
TMask m(_maskname); TMask m(_maskname);
KEY k = m.run();
if (k == K_QUIT) stop_run(); while (m.run() == K_ENTER);
} }
else else
{ {
@ -83,8 +81,6 @@ bool TTest_application::menu(MENU_TAG)
m.run(); m.run();
} }
} }
return FALSE;
} }
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////

View File

@ -4,7 +4,7 @@ PAGE "Richiesta" -1 -1 76 12
STRING F_NOME 50 STRING F_NOME 50
BEGIN BEGIN
PROMPT 3 3 "Nome maschera" PROMPT 3 3 "Maschera "
END END
BUTTON DLG_OK 10 2 BUTTON DLG_OK 10 2

View File

@ -1742,6 +1742,7 @@ class TMailer : public TSkeleton_application
bool _start_full_screen; bool _start_full_screen;
protected: protected:
virtual bool task_win_iconized() const { return !_start_full_screen && xvt_win_is_taskbar_visible(); }
virtual bool create(); virtual bool create();
virtual void main_loop(); virtual void main_loop();
}; };
@ -1767,7 +1768,7 @@ void TMailer::main_loop()
WINDOW tray = xvt_trayicon_create(TASK_WIN, 9013, appname); // CampoServer.ico WINDOW tray = xvt_trayicon_create(TASK_WIN, 9013, appname); // CampoServer.ico
open_files(LF_USER, 0); open_files(LF_USER, 0);
if (!_start_full_screen && xvt_win_is_taskbar_visible()) /* if (!_start_full_screen && xvt_win_is_taskbar_visible())
{ {
if (tray != NULL_WIN) if (tray != NULL_WIN)
{ {
@ -1778,7 +1779,7 @@ void TMailer::main_loop()
if (xvt_rect_get_width(&rct_postman) >= xvt_rect_get_width(&rct_screen) - 64) if (xvt_rect_get_width(&rct_postman) >= xvt_rect_get_width(&rct_screen) - 64)
xvt_vobj_set_visible(TASK_WIN, FALSE); xvt_vobj_set_visible(TASK_WIN, FALSE);
} }
} } */
TMailer_mask mm; TMailer_mask mm;

View File

@ -46,7 +46,7 @@ BEGIN
WARNING "Manca la descrizione" WARNING "Manca la descrizione"
END END
LIST LST_TABIVA_S1 2 20 LIST LST_TABIVA_S1 2 28
BEGIN BEGIN
PROMPT 2 2 "Tipo " PROMPT 2 2 "Tipo "
FIELD S1 FIELD S1
@ -70,11 +70,15 @@ BEGIN
MESSAGE CLEAR,FLD_TABIVA_R0|CLEAR,FLD_TABIVA_I0 MESSAGE CLEAR,FLD_TABIVA_R0|CLEAR,FLD_TABIVA_I0
MESSAGE ENABLE,FLD_TABIVA_I3|ENABLE,FLD_TABIVA_I4|SHOW,CHK_TABIVA_B5 MESSAGE ENABLE,FLD_TABIVA_I3|ENABLE,FLD_TABIVA_I4|SHOW,CHK_TABIVA_B5
MESSAGE ENABLE,FLD_TABIVA_S6 MESSAGE ENABLE,FLD_TABIVA_S6
END ITEM "RC|Reverse Charge (vendite)"
MESSAGE CLEAR,FLD_TABIVA_R0|CLEAR,FLD_TABIVA_I0
MESSAGE CLEAR,FLD_TABIVA_I3|CLEAR,FLD_TABIVA_I4|HIDE,CHK_TABIVA_B5
MESSAGE ENABLE,FLD_TABIVA_S6
END
STRING FLD_TABIVA_S6 4 STRING FLD_TABIVA_S6 4
BEGIN BEGIN
PROMPT 39 2 "C.IVA a cui ventilare " PROMPT 44 2 "C.IVA a cui ventilare "
FLAGS "U" FLAGS "U"
FIELD S6 FIELD S6
COPY USE FLD_TABIVA_CODTAB COPY USE FLD_TABIVA_CODTAB
@ -146,7 +150,7 @@ END
BOOLEAN CHK_TABIVA_B5 BOOLEAN CHK_TABIVA_B5
BEGIN BEGIN
PROMPT 30 5 "Escluso dal calcolo dei bolli sufatture esenti" PROMPT 30 5 "Escluso dal calcolo dei bolli su fatture esenti"
FIELD B5 FIELD B5
END END
@ -188,6 +192,8 @@ BEGIN
INPUT FLD_TABIVA_I3 INPUT FLD_TABIVA_I3
OUTPUT FLD_TABIVA_I3 OUTPUT FLD_TABIVA_I3
ITEM " |Nessuno" ITEM " |Nessuno"
ITEM "14|Passaggi interni"
ITEM "16|Cessioni beni ammortizzabili"
ITEM "20|Operazioni non imponibili (comma 1, artt.8, 8bis e 9)" ITEM "20|Operazioni non imponibili (comma 1, artt.8, 8bis e 9)"
ITEM "21|Operazioni non imponibili a seguito di dich. d'intento" ITEM "21|Operazioni non imponibili a seguito di dich. d'intento"
ITEM "22|Altre operazioni non imponibili" ITEM "22|Altre operazioni non imponibili"
@ -201,6 +207,7 @@ BEGIN
ITEM "36|Cessione di microprocessori" ITEM "36|Cessione di microprocessori"
ITEM "37|Prestazioni comparto edile e settori connessi" ITEM "37|Prestazioni comparto edile e settori connessi"
ITEM "38|Operazioni settore energetico" ITEM "38|Operazioni settore energetico"
ITEM "39|Reverse charge altri casi"
ITEM "B1|Ammontare op. es. escluse da nr. 1 a 9 e 11 art. 10" ITEM "B1|Ammontare op. es. escluse da nr. 1 a 9 e 11 art. 10"
ITEM "B2|Ammontare op. es. di cui al nr. 11 art. 10" ITEM "B2|Ammontare op. es. di cui al nr. 11 art. 10"
ITEM "B3|Ammontare op. es. di cui ai nr. 1 a 9 art. 10" ITEM "B3|Ammontare op. es. di cui ai nr. 1 a 9 art. 10"

View File

@ -1,7 +1,3 @@
9 9
1 1
<<<<<<< HEAD
%nditte|0|0|652|0|Ditte|||
=======
%nditte|0|0|754|0|Ditte||| %nditte|0|0|754|0|Ditte|||
>>>>>>> 0cadcd6dee4a4a67021c26174d7dea2a761fe182