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

Patch level : 2.2 101

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :

Riportata la versione 2.1 300


git-svn-id: svn://10.65.10.50/trunk@13091 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2005-05-16 23:44:23 +00:00
parent f1c9448617
commit 8b5b16f9f7
137 changed files with 8471 additions and 2990 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ba/ba3100.cpp
View File

@ -16,6 +16,7 @@
#include "batbnot.h" #include "batbnot.h"
#define REG_JOURNAL 5 #define REG_JOURNAL 5
#define REG_DICHINT 10
#define TAB_BANCHE "%BAN" #define TAB_BANCHE "%BAN"
#define TAB_CAMBI "CAM" #define TAB_CAMBI "CAM"
#define TAB_DELEGHE "%DEL" #define TAB_DELEGHE "%DEL"
@ -32,6 +33,7 @@ class TGeneric_table_app : public TTable_application
long _oldditta; long _oldditta;
int _oldanno; int _oldanno;
bool _exist_journal; bool _exist_journal;
bool _exist_dich_int;
bool _stampa_intest; bool _stampa_intest;
// ------------- specifiche tabella versamenti ed interessi IVA // ------------- specifiche tabella versamenti ed interessi IVA
@ -64,6 +66,7 @@ protected:
public: public:
bool exist_journal() { return _exist_journal; } bool exist_journal() { return _exist_journal; }
bool exist_dich_int() { return _exist_dich_int; }
char frequenza_versamenti(long firm, int year) const; char frequenza_versamenti(long firm, int year) const;
TGeneric_table_app(); TGeneric_table_app();
@ -140,32 +143,33 @@ void TGeneric_table_app::init_insert_mode(TMask& m)
m.set(F_STAMPA_INTESTAZIONE, _stampa_intest ? "X" : ""); m.set(F_STAMPA_INTESTAZIONE, _stampa_intest ? "X" : "");
if (ditta != _oldditta || anno != _oldanno)
{
_oldditta = ditta;
_oldanno = anno;
TTable reg(TAB_REGISTRI); TTable reg(TAB_REGISTRI);
reg.put("CODTAB", m.get(F_ANNO)); reg.put("CODTAB", m.get(F_ANNO));
const TRectype to(reg.curr()); const TRectype to(reg.curr());
_exist_journal = FALSE; _exist_journal = FALSE;
_exist_dich_int = FALSE;
for (reg.read(_isgteq); !_exist_journal && reg.good() && reg.curr() <= to; reg.next()) for (reg.read(_isgteq); !_exist_journal && reg.good() && reg.curr() <= to; reg.next())
_exist_journal = (reg.get_long("I0") == REG_JOURNAL); _exist_journal = (reg.get_long("I0") == REG_JOURNAL);
reg.zero();
reg.put("CODTAB", m.get(F_ANNO));
for (reg.read(_isgteq); !_exist_dich_int && reg.good() && reg.curr() <= to; reg.next())
_exist_dich_int = (reg.get_long("I0") == REG_DICHINT);
} }
} else else
if (n == TAB_VERSAMENTI) if (n == TAB_VERSAMENTI)
{ {
// Se il record e' nuovo prima carica il record precedente // Se il record e' nuovo prima carica il record precedente
load_rec_in_disabled_fields(m); load_rec_in_disabled_fields(m);
// poi copia il contenuto nei campi di input, come valori predefiniti // poi copia il contenuto nei campi di input, come valori predefiniti
copy_rec_in_insert_fields(m); copy_rec_in_insert_fields(m);
} else
if (n == TAB_VALUTE)
{
m.enable(-3);
} }
else
if (n == TAB_VALUTE)
m.enable(-3);
} }
void TGeneric_table_app::init_modify_mode(TMask& m) void TGeneric_table_app::init_modify_mode(TMask& m)
@ -227,10 +231,13 @@ bool TGeneric_table_app::protected_record(TRectype& rec)
HIDDEN bool tiporeg_handler(TMask_field& f, KEY k) HIDDEN bool tiporeg_handler(TMask_field& f, KEY k)
{ {
if ((k == K_TAB || k == K_ENTER) && app().exist_journal() && const int tipo = atoi(f.get());
(atoi(f.get()) == REG_JOURNAL) if ((k == K_TAB || k == K_ENTER) && app().exist_journal() && (tipo == REG_JOURNAL))
)
return f.error_box(TR("Non e' possibile avere due registri giornale nello stesso anno")); return f.error_box(TR("Non e' possibile avere due registri giornale nello stesso anno"));
if ((k == K_TAB || k == K_ENTER) && app().exist_dich_int() && (tipo == REG_DICHINT))
return f.error_box(TR("Non e' possibile avere due registri dichiarazioni d'intenti nello stesso anno"));
if (k == K_SPACE)
f.mask().enable_page(1, tipo != REG_DICHINT);
return TRUE; return TRUE;
} }

845
ba/ba3800.cpp
View File

File diff suppressed because it is too large Load Diff

3
ba/ba4300.h
View File

@ -136,6 +136,9 @@
#define FLD_IN_DESSOGDEL 201 #define FLD_IN_DESSOGDEL 201
#define CHK_IN_NONOBBSTAT 202 #define CHK_IN_NONOBBSTAT 202
#define F_INTCAF 203
#define F_DICHP 204
#define F_MAIL 203 #define F_MAIL 203
#endif // __BA4300_H #endif // __BA4300_H

88
ba/ba4300a.uml
View File

@ -599,7 +599,7 @@ END
STRING FLD_GD3_FIRMAT 5 STRING FLD_GD3_FIRMAT 5
BEGIN BEGIN
PROMPT 1 4 "Firmatario " PROMPT 1 4 "Intermediario "
FIELD LF_NDITTE->FIRMAT FIELD LF_NDITTE->FIRMAT
FLAGS "R" FLAGS "R"
USE LF_ANAG KEY 1 USE LF_ANAG KEY 1
@ -610,7 +610,7 @@ BEGIN
DISPLAY "Nome@50" RAGSOC DISPLAY "Nome@50" RAGSOC
OUTPUT FLD_GD3_FIRMAT CODANAGR OUTPUT FLD_GD3_FIRMAT CODANAGR
OUTPUT FLD_GD3_FIRMAT_ANAGR_RAGSOC RAGSOC OUTPUT FLD_GD3_FIRMAT_ANAGR_RAGSOC RAGSOC
HELP "Codice anagrafico del firmatario degli atti" HELP "Codice anagrafico dell'intermediario"
CHECKTYPE NORMAL CHECKTYPE NORMAL
WARNING "Anagrafica assente" WARNING "Anagrafica assente"
ADD RUN ba4 -1 ADD RUN ba4 -1
@ -619,7 +619,7 @@ END
STRING FLD_GD3_FIRMAT_ANAGR_RAGSOC 50 STRING FLD_GD3_FIRMAT_ANAGR_RAGSOC 50
BEGIN BEGIN
PROMPT 17 5 "" PROMPT 17 5 ""
HELP "Nome del firmatario degli atti" HELP "Nome dell'intermediario"
USE LF_ANAG KEY 2 USE LF_ANAG KEY 2
INPUT TIPOA "F" INPUT TIPOA "F"
INPUT RAGSOC FLD_GD3_FIRMAT_ANAGR_RAGSOC INPUT RAGSOC FLD_GD3_FIRMAT_ANAGR_RAGSOC
@ -631,82 +631,104 @@ BEGIN
ADD RUN ba4 -1 ADD RUN ba4 -1
END END
STRING F_INTCAF 10
BEGIN
PROMPT 1 6 "Iscriz. al CAF "
HELP "Nome dell'intermediario"
FIELD INTCAF
HELP "Indicare l'iscrizione al CAF dell' intermediario"
END
DATE FLD_GD3_DECCARRAPP
BEGIN
PROMPT 52 6 "Decorrenza "
FIELD LF_NDITTE->DECCARRAPP
HELP "Data di decorrenza della rappresentanza legale"
WARNING "Data non coerente"
VALIDATE DATE_CMP_FUNC >= FLD_GD2_DINIZIOATT
END
LIST F_DICHP 15
BEGIN
PROMPT 1 7 "Dichiarazione predisposta da "
FIELD DICHP
ITEMS "C|Contribuente"
ITEMS "I|Intermediario"
HELP "Indicare chi predispone la dichiarazione"
END
BOOLEAN CHK_GD3_ESILOR BOOLEAN CHK_GD3_ESILOR
BEGIN BEGIN
PROMPT 1 6 "Esenzione ILOR" PROMPT 1 9 "Esenzione ILOR"
FIELD LF_NDITTE->ESILOR FIELD LF_NDITTE->ESILOR
HELP "Indicare se la ditta e' soggetta ad esenzione ILOR" HELP "Indicare se la ditta e' soggetta ad esenzione ILOR"
END END
BOOLEAN CHK_GD3_REGSTATSP BOOLEAN CHK_GD3_REGSTATSP
BEGIN BEGIN
PROMPT 27 6 "Statuto speciale" PROMPT 27 9 "Statuto speciale"
FIELD LF_NDITTE->REGSTATSP FIELD LF_NDITTE->REGSTATSP
HELP "Indicare se la regione di residenza e' a statuto speciale" HELP "Indicare se la regione di residenza e' a statuto speciale"
END END
BOOLEAN CHK_GD3_AZCONIUG BOOLEAN CHK_GD3_AZCONIUG
BEGIN BEGIN
PROMPT 54 6 "Azienda coniugale" PROMPT 54 9 "Azienda coniugale"
FIELD LF_NDITTE->AZCONIUG FIELD LF_NDITTE->AZCONIUG
HELP "Indicare se si tratta di impresa coniugale" HELP "Indicare se si tratta di impresa coniugale"
END END
BOOLEAN CHK_GD3_CONDFAM BOOLEAN CHK_GD3_CONDFAM
BEGIN BEGIN
PROMPT 1 7 "Conduzione familiare" PROMPT 1 10 "Conduzione familiare"
FIELD LF_NDITTE->CONDFAM FIELD LF_NDITTE->CONDFAM
HELP "Indicare se la ditta e' a conduzione familiare" HELP "Indicare se la ditta e' a conduzione familiare"
END END
BOOLEAN CHK_GD3_DEDART13 BOOLEAN CHK_GD3_DEDART13
BEGIN BEGIN
PROMPT 27 7 "Deduzioni art.120 C2" PROMPT 27 10 "Deduzioni art.120 C2"
FIELD LF_NDITTE->DEDART13 FIELD LF_NDITTE->DEDART13
HELP "Indicare se la ditta ha diritto a deduzioni ex articolo 13" HELP "Indicare se la ditta ha diritto a deduzioni ex articolo 13"
END END
BOOLEAN CHK_GD3_RICSUP20 BOOLEAN CHK_GD3_RICSUP20
BEGIN BEGIN
PROMPT 54 7 "Ricavi > 20%" PROMPT 54 10 "Ricavi > 20%"
FIELD LF_NDITTE->RICSUP20% FIELD LF_NDITTE->RICSUP20%
HELP "Indicare se i ricavi sono superiore al 20%" HELP "Indicare se i ricavi sono superiore al 20%"
END END
LIST FLD_GD3_CARRAPP 23 LIST FLD_GD3_CARRAPP 31
BEGIN BEGIN
PROMPT 1 8 "Carica " PROMPT 1 11 "Carica "
FIELD LF_NDITTE->CARRAPP FIELD LF_NDITTE->CARRAPP
HELP "Codice della carica del rappresentante legale" HELP "Codice della carica del rappresentante legale"
ITEMS " |Nessun rappresentante" ITEMS " |Nessun rappresentante"
MESSAGE RESET,4@|DISABLE,4@ MESSAGE RESET,4@|DISABLE,4@
ITEMS "1|Rappresentante legale" ITEMS "1|1 - Rappresentante legale"
MESSAGE ENABLE,4@ MESSAGE ENABLE,4@
ITEMS "2|Curatore fallimentare" ITEMS "2|2 - Rappresentante di minore"
MESSAGE ENABLE,4@ MESSAGE ENABLE,4@
ITEMS "3|Liquidatore" ITEMS "3|3 - Curatore fallimentare"
MESSAGE ENABLE,4@ MESSAGE ENABLE,4@
ITEMS "4|Socio amministratore" ITEMS "4|4 - Commissario liquidatore"
MESSAGE ENABLE,4@ MESSAGE ENABLE,4@
ITEMS "5|Erede" ITEMS "5|5 - Commissario giudiziale"
MESSAGE ENABLE,4@ MESSAGE ENABLE,4@
ITEMS "6|Curatore di eredita'" ITEMS "6|6 - Rappr.fiscale sogg.non res."
MESSAGE ENABLE,4@
ITEMS "7|7 - Erede"
MESSAGE ENABLE,4@
ITEMS "8|8 - Liquidatore (Liquid.vol.)"
MESSAGE ENABLE,4@
ITEMS "9|9 - Soggetto tenuto alla pres."
MESSAGE ENABLE,4@ MESSAGE ENABLE,4@
END
DATE FLD_GD3_DECCARRAPP
BEGIN
PROMPT 50 8 "Decorrenza "
FIELD LF_NDITTE->DECCARRAPP
GROUP 4
HELP "Data di decorrenza della rappresentanza legale"
WARNING "Data non coerente"
VALIDATE DATE_CMP_FUNC >= FLD_GD2_DINIZIOATT
END END
STRING FLD_GD3_RAPPR 5 STRING FLD_GD3_RAPPR 5
BEGIN BEGIN
PROMPT 1 9 "Rappresentante " PROMPT 1 12 "Rappresentante "
FIELD LF_NDITTE->RAPPR FIELD LF_NDITTE->RAPPR
FLAGS "R" FLAGS "R"
GROUP 4 GROUP 4
@ -724,7 +746,7 @@ END
STRING FLD_GD3_RAPPR_ANAGR_RAGSOC 50 STRING FLD_GD3_RAPPR_ANAGR_RAGSOC 50
BEGIN BEGIN
PROMPT 17 10 "" PROMPT 17 13 ""
HELP "Nome del rappresentate legale" HELP "Nome del rappresentate legale"
COPY USE FLD_GD3_FIRMAT_ANAGR_RAGSOC COPY USE FLD_GD3_FIRMAT_ANAGR_RAGSOC
INPUT RAGSOC FLD_GD3_RAPPR_ANAGR_RAGSOC INPUT RAGSOC FLD_GD3_RAPPR_ANAGR_RAGSOC
@ -737,26 +759,26 @@ END
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 1 11 "Denominazione Estesa" PROMPT 1 14 "Denominazione Estesa"
END END
STRING FLD_DE_DENEST1 70 STRING FLD_DE_DENEST1 70
BEGIN BEGIN
PROMPT 3 12 "" PROMPT 3 15 ""
FIELD LF_NDITTE->DENEST1 FIELD LF_NDITTE->DENEST1
HELP "Denominazione estesa della ditta" HELP "Denominazione estesa della ditta"
END END
STRING FLD_DE_DENEST2 70 STRING FLD_DE_DENEST2 70
BEGIN BEGIN
PROMPT 3 13 "" PROMPT 3 16 ""
FIELD LF_NDITTE->DENEST2 FIELD LF_NDITTE->DENEST2
HELP "Denominazione estesa della ditta" HELP "Denominazione estesa della ditta"
END END
STRING FLD_DE_DENEST3 70 STRING FLD_DE_DENEST3 70
BEGIN BEGIN
PROMPT 3 14 "" PROMPT 3 17 ""
FIELD LF_NDITTE->DENEST3 FIELD LF_NDITTE->DENEST3
HELP "Denominazione estesa della ditta" HELP "Denominazione estesa della ditta"
END END

74
ba/bacnv.cpp
View File

@ -21,13 +21,14 @@
#include <causali.h> #include <causali.h>
#include <clifo.h> #include <clifo.h>
#include <mov.h> #include <mov.h>
#include <pconti.h>
#include <rmov.h> #include <rmov.h>
#include <saldi.h> #include <saldi.h>
#include "..\cg\cglib02.h" #include "..\cg\cglib02.h"
#define usage "Errore - uso : bacnv [1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21] ditta" #define usage "Errore - uso : bacnv [1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22] ditta"
/////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////
// Applicazione di conversione archivi XBase, valida per tutti e 4 i tipi di DLL // Applicazione di conversione archivi XBase, valida per tutti e 4 i tipi di DLL
@ -195,6 +196,7 @@ public:
void change_ca7(TRectype& rec) const; void change_ca7(TRectype& rec) const;
void convert_quadst() const; void convert_quadst() const;
void convert_clifo_privati(); void convert_clifo_privati();
void convert_pcon_ivd();
TConversione_archivi() : _oldditta(0), _codditta(0), _error(0) {} TConversione_archivi() : _oldditta(0), _codditta(0), _error(0) {}
@ -355,6 +357,9 @@ bool TConversione_archivi::menu(MENU_TAG)
break; break;
case 21: case 21:
convert_clifo_privati(); convert_clifo_privati();
break;
case 22:
convert_pcon_ivd();
default: default:
break; break;
} }
@ -1860,6 +1865,71 @@ void TConversione_archivi::convert_clifo_privati()
prefix().set(pref); prefix().set(pref);
} }
////////////////////////////////////////////////////////////////
// Effettua conversione campo NUMIVD E NUMIVDOPP sul piano dei conti
////////////////////////////////////////////////////////////////
void TConversione_archivi::convert_pcon_ivd()
{
long firm = get_firm();
TString pref;
if (firm == 0)
pref = prefix().name();
TLocalisamfile ditte(LF_NDITTE);
for (ditte.first(); !ditte.eof(); ditte.next())
{
const long codditta = ditte.get_long("CODDITTA");
if (prefix().exist(codditta))
{
set_firm(codditta);
{
TRelation rel(LF_PCON);
TRectype& curr = rel.curr();
TCursor cursore(&rel);
const long items = cursore.items();
cursore.freeze();
TProgind pi(items, "Conversione Codici IV Direttiva CEE..", FALSE, TRUE);
for (cursore=0; cursore.pos()<items; ++cursore)
{
pi.addstatus(1);
TString16 numivd = curr.get(PCN_NUMIVD);
bool rew = false;
if (numivd.len() == 1)
{
numivd.insert("0");
curr.put(PCN_NUMIVD, numivd);
rew = true;
}
TString16 numivdopp = curr.get(PCN_NUMIVDOPP);
if (numivdopp.len() == 1)
{
numivdopp.insert("0");
curr.put(PCN_NUMIVDOPP, numivdopp);
rew = true;
}
if (rew)
rel.rewrite();
}
}
}
}
if (firm > 0)
set_firm(firm);
else
prefix().set(pref);
}
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// Programma di conversione archivi speciale // Programma di conversione archivi speciale
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
@ -1868,7 +1938,7 @@ int main(int argc,char** argv)
{ {
const int r = (argc > 1) ? abs(atoi(argv[1])) : 0; const int r = (argc > 1) ? abs(atoi(argv[1])) : 0;
if (r < 0 || r > 21) if (r < 0 || r > 22)
{ {
error_box(usage); error_box(usage);
return 100; return 100;

21
ba/bastivd.uml
View File

@ -16,16 +16,16 @@ BEGIN
INPUT CODTAB[1,1] F_INIZIO1 INPUT CODTAB[1,1] F_INIZIO1
INPUT CODTAB[2,2] F_INIZIO2 INPUT CODTAB[2,2] F_INIZIO2
INPUT CODTAB[3,6] F_INIZIO3 INPUT CODTAB[3,6] F_INIZIO3
INPUT CODTAB[7,8] F_INIZIO4 INPUT CODTAB[7,10] F_INIZIO4
DISPLAY "Sezione" CODTAB[1,1] DISPLAY "Sezione" CODTAB[1,1]
DISPLAY "Lettera" CODTAB[2,2] DISPLAY "Lettera" CODTAB[2,2]
DISPLAY "Classe " CODTAB[3,6] DISPLAY "Classe " CODTAB[3,6]
DISPLAY "Numero" CODTAB[7,8] DISPLAY "Numero" CODTAB[7,10]
DISPLAY "Descrizione@50" S0 DISPLAY "Descrizione@50" S0
OUTPUT F_INIZIO1 CODTAB[1,1] OUTPUT F_INIZIO1 CODTAB[1,1]
OUTPUT F_INIZIO2 CODTAB[2,2] OUTPUT F_INIZIO2 CODTAB[2,2]
OUTPUT F_INIZIO3 CODTAB[3,6] OUTPUT F_INIZIO3 CODTAB[3,6]
OUTPUT F_INIZIO4 CODTAB[7,8] OUTPUT F_INIZIO4 CODTAB[7,10]
GROUP 1 GROUP 1
END END
@ -47,11 +47,10 @@ BEGIN
GROUP 1 GROUP 1
END END
NUMBER F_INIZIO4 2 STRING F_INIZIO4 4
BEGIN BEGIN
PROMPT 52 2 "Numero " PROMPT 52 2 "Numero "
FLAGS "RZ" FIELD CODTAB[7,10]
FIELD FROM[7,8]
COPY ALL F_INIZIO1 COPY ALL F_INIZIO1
GROUP 1 GROUP 1
END END
@ -70,12 +69,12 @@ BEGIN
INPUT CODTAB[1,1] F_FINE1 INPUT CODTAB[1,1] F_FINE1
INPUT CODTAB[2,2] F_FINE2 INPUT CODTAB[2,2] F_FINE2
INPUT CODTAB[3,6] F_FINE3 INPUT CODTAB[3,6] F_FINE3
INPUT CODTAB[7,8] F_FINE4 INPUT CODTAB[7,10] F_FINE4
COPY DISPLAY F_INIZIO1 COPY DISPLAY F_INIZIO1
OUTPUT F_FINE1 CODTAB[1,1] OUTPUT F_FINE1 CODTAB[1,1]
OUTPUT F_FINE2 CODTAB[2,2] OUTPUT F_FINE2 CODTAB[2,2]
OUTPUT F_FINE3 CODTAB[3,6] OUTPUT F_FINE3 CODTAB[3,6]
OUTPUT F_FINE4 CODTAB[7,8] OUTPUT F_FINE4 CODTAB[7,10]
GROUP 2 GROUP 2
END END
@ -97,11 +96,10 @@ BEGIN
GROUP 2 GROUP 2
END END
NUMBER F_FINE4 2 STRING F_FINE4 4
BEGIN BEGIN
PROMPT 52 5 "Numero " PROMPT 52 5 "Numero "
FLAGS "RZ" FIELD CODTAB[7,10]
FIELD TO[7,8]
COPY ALL F_FINE1 COPY ALL F_FINE1
GROUP 2 GROUP 2
END END
@ -118,4 +116,3 @@ END
ENDPAGE ENDPAGE
ENDMASK ENDMASK

15
ba/batbivd.uml
View File

@ -53,7 +53,7 @@ BEGIN
FIELD %IVD->CODTAB[3,6] FIELD %IVD->CODTAB[3,6]
FLAGS "MZ" FLAGS "MZ"
KEY 1 KEY 1
USE %IVD SELECT CODTAB[7,8]=="" USE %IVD SELECT CODTAB[7,10]==""
COPY INPUT F_LETT COPY INPUT F_LETT
INPUT CODTAB[3,6] F_CLASSE INPUT CODTAB[3,6] F_CLASSE
DISPLAY "Sezione" CODTAB[1,1] DISPLAY "Sezione" CODTAB[1,1]
@ -75,21 +75,20 @@ BEGIN
FLAGS "D" FLAGS "D"
END END
NUMBER F_NUM 2 STRING F_NUM 4
BEGIN BEGIN
PROMPT 1 7 "Numero " PROMPT 1 7 "Numero "
FIELD %IVD->CODTAB[7,8] FIELD %IVD->CODTAB[7,10]
FLAGS "RZ"
KEY 1 KEY 1
USE %IVD USE %IVD
COPY INPUT F_CLASSE COPY INPUT F_CLASSE
INPUT CODTAB[7,8] F_NUM INPUT CODTAB[7,10] F_NUM
DISPLAY "Sezione" CODTAB[1,1] DISPLAY "Sezione" CODTAB[1,1]
DISPLAY "Lettera" CODTAB[2,2] DISPLAY "Lettera" CODTAB[2,2]
DISPLAY "Classe @M" CODTAB[3,6] DISPLAY "Classe @M" CODTAB[3,6]
DISPLAY "Numero" CODTAB[7,8] DISPLAY "Numero" CODTAB[7,10]
DISPLAY "Descrizione@50" S0 DISPLAY "Descrizione@50" S0
OUTPUT F_NUM CODTAB[7,8] OUTPUT F_NUM CODTAB[7,10]
OUTPUT F_SEZ CODTAB[1,1] OUTPUT F_SEZ CODTAB[1,1]
OUTPUT F_LETT CODTAB[2,2] OUTPUT F_LETT CODTAB[2,2]
OUTPUT F_CLASSE CODTAB[3,6] OUTPUT F_CLASSE CODTAB[3,6]
@ -114,7 +113,7 @@ BEGIN
DISPLAY "Sezione" CODTAB[1,1] DISPLAY "Sezione" CODTAB[1,1]
DISPLAY "Lettera" CODTAB[2,2] DISPLAY "Lettera" CODTAB[2,2]
DISPLAY "Classe @M" CODTAB[3,6] DISPLAY "Classe @M" CODTAB[3,6]
DISPLAY "Numero" CODTAB[7,8] DISPLAY "Numero" CODTAB[7,10]
COPY OUTPUT F_NUM COPY OUTPUT F_NUM
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
WARNING "Manca la descrizione" WARNING "Manca la descrizione"

3
ba/batbreg.h
View File

@ -77,3 +77,6 @@
#define GRP_NOGIORNMAG 12 #define GRP_NOGIORNMAG 12
#define GRP_SOLOGIORNALE 13 #define GRP_SOLOGIORNALE 13
#define GRP_NOGIORNALE 14 #define GRP_NOGIORNALE 14
#define GRP_INTENTI 15
#define GRP_NOINTENTI 16

30
ba/batbreg.uml
View File

@ -146,6 +146,8 @@ BEGIN
ITEM "9|9) Giornale di magazzino" ITEM "9|9) Giornale di magazzino"
MESSAGE HIDE,GRP_VENDITE@|HIDE,GRP_ACQUISTI@|HIDE,GRP_RIEPIVA@|HIDE,GRP_INCASSI@|HIDE,GRP_GIORNALE@|HIDE,GRP_LSOCIALI@|HIDE,GRP_CESPITI@|HIDE,GRP_INVENTARI@|SHOW,GRP_GIORNMAG@ MESSAGE HIDE,GRP_VENDITE@|HIDE,GRP_ACQUISTI@|HIDE,GRP_RIEPIVA@|HIDE,GRP_INCASSI@|HIDE,GRP_GIORNALE@|HIDE,GRP_LSOCIALI@|HIDE,GRP_CESPITI@|HIDE,GRP_INVENTARI@|SHOW,GRP_GIORNMAG@
MESSAGE "",GRP_NOGIORNMAG@|"",F_ATTIVITA MESSAGE "",GRP_NOGIORNMAG@|"",F_ATTIVITA
ITEM "10|10) Dichiarazione d'intenti"
MESSAGE HIDE,GRP_NOINTENTI@|SHOW,GRP_INTENTI@
END END
STRING F_CONSPRESSO 50 STRING F_CONSPRESSO 50
@ -161,7 +163,7 @@ BEGIN
PROMPT 1 8 "Codice attivita' " PROMPT 1 8 "Codice attivita' "
FIELD S8 FIELD S8
FLAGS "URZ" FLAGS "URZ"
GROUP GRP_VENDITE GRP_ACQUISTI GRP_RIEPIVA GROUP GRP_VENDITE GRP_ACQUISTI GRP_RIEPIVA GRP_NOINTENTI
USE LF_ATTIV USE LF_ATTIV
INPUT CODDITTA F_CODDITTA SELECT INPUT CODDITTA F_CODDITTA SELECT
INPUT CODATT F_ATTIVITA INPUT CODATT F_ATTIVITA
@ -178,7 +180,7 @@ NUMBER F_CODULC 3
BEGIN BEGIN
PROMPT 35 8 "Unita' locale " PROMPT 35 8 "Unita' locale "
FLAGS "R" FLAGS "R"
GROUP GRP_VENDITE GRP_ACQUISTI GRP_RIEPIVA GRP_INCASSI GRP_GIORNALE GRP_LSOCIALI GRP_GIORNMAG GROUP GRP_VENDITE GRP_ACQUISTI GRP_RIEPIVA GRP_INCASSI GRP_GIORNALE GRP_LSOCIALI GRP_GIORNMAG GRP_NOINTENTI
FIELD I7 FIELD I7
USE LF_UNLOC USE LF_UNLOC
JOIN LF_COMUNI TO LF_UNLOC KEY 1 INTO COM=COMULC JOIN LF_COMUNI TO LF_UNLOC KEY 1 INTO COM=COMULC
@ -204,9 +206,17 @@ BEGIN
GROUP 1 GROUP 1
END END
DATE F_ULTIMA_DATA_DI_STAMPA
BEGIN
PROMPT 26 10 "Ultima data di stampa "
HELP "Data dell'ultima stampa effettuata"
FIELD D3
GROUP 1
END
NUMBER F_PAGNUM 5 NUMBER F_PAGNUM 5
BEGIN BEGIN
PROMPT 35 10 "Pagine numerate " PROMPT 60 10 "Pagine numerate "
HELP "numero di pagine di cui e' stata stampata la numerazione" HELP "numero di pagine di cui e' stata stampata la numerazione"
FIELD I2 FIELD I2
GROUP 1 GROUP 1
@ -216,6 +226,7 @@ BOOLEAN F_STAMPA_NUMERI
BEGIN BEGIN
PROMPT 1 11 "Stampa numeri di pagina durante la stampa del registro" PROMPT 1 11 "Stampa numeri di pagina durante la stampa del registro"
FIELD S11 FIELD S11
GROUP 1
END END
DATE F_DATAVID DATE F_DATAVID
@ -240,7 +251,7 @@ BEGIN
FIELD S6 FIELD S6
HELP "Codice del libro unico a cui fa riferimento" HELP "Codice del libro unico a cui fa riferimento"
FLAGS "UZ" FLAGS "UZ"
GROUP GRP_VENDITE GRP_ACQUISTI GRP_RIEPIVA GROUP GRP_VENDITE GRP_ACQUISTI GRP_RIEPIVA GRP_NOINTENTI
USE %LBU USE %LBU
INPUT CODTAB[1,4] F_ANNO INPUT CODTAB[1,4] F_ANNO
INPUT CODTAB[5,7] F_CODLBU INPUT CODTAB[5,7] F_CODLBU
@ -257,11 +268,13 @@ END
BOOLEAN F_CONFIG BOOLEAN F_CONFIG
BEGIN BEGIN
PROMPT 1 17 "Stampante configurata" PROMPT 1 17 "Stampante configurata"
GROUP GRP_NOINTENTI
END END
BUTTON F_PRINTER 30 2 BUTTON F_PRINTER 30 2
BEGIN BEGIN
PROMPT 40 17 "Configurazione ~stampante" PROMPT 40 17 "Configurazione ~stampante"
GROUP GRP_NOINTENTI
END END
ENDPAGE ENDPAGE
@ -486,16 +499,9 @@ BEGIN
GROUP GRP_VENDITE GRP_ACQUISTI GRP_INCASSI GRP_GIORNALE GROUP GRP_VENDITE GRP_ACQUISTI GRP_INCASSI GRP_GIORNALE
END END
DATE F_ULTIMA_DATA_DI_STAMPA
BEGIN
PROMPT 1 17 "Ultima data di stampa "
HELP "Data dell'ultima stampa effettuata"
FIELD D3
END
BOOLEAN F_STAMPA_INTESTAZIONE BOOLEAN F_STAMPA_INTESTAZIONE
BEGIN BEGIN
PROMPT 46 17 "Stampa intestazione ditta" PROMPT 1 17 "Stampa intestazione ditta"
HELP "Indicare se stampare l'intestazione della ditta" HELP "Indicare se stampare l'intestazione della ditta"
FIELD B9 FIELD B9
GROUP 1 GROUP 1

4
ba/cgarea.men
View File

@ -5,5 +5,5 @@ Module = 0
Item_01 = "Contabilita' generale", <cgmenu.men> Item_01 = "Contabilita' generale", <cgmenu.men>
Item_02 = "Gestione cespiti", <cemenu.men> Item_02 = "Gestione cespiti", <cemenu.men>
Item_03 = "Gestione percipienti", <77menu.men> Item_03 = "Gestione percipienti", <77menu.men>
Item_04 = "Contabilita' analitica", <camenu.men> Item_04 = "Elenchi Intracomunitari", <inmenu.men>
Item_05 = "Elenchi Intracomunitari", <inmenu.men> Item_05 = "Dichiarazioni d'intento", <limenu.men>

2
ba/f9.dir
View File

@ -1,3 +1,3 @@
9 9
1 1
%nditte|0|0|560|0|Ditte|#6|| %nditte|0|0|571|0|Ditte|#6||

4
ba/f9.trr
View File

@ -1,5 +1,5 @@
9 9
53 55
CODDITTA|3|5|0| CODDITTA|3|5|0|
TIPOA|1|1|0| TIPOA|1|1|0|
CODANAGR|3|5|0| CODANAGR|3|5|0|
@ -53,6 +53,8 @@ FREQACQ|1|1|0|Frequenza riepiloghi acquisti INTRA
TIPOSOGDEL|1|1|0|Tipo anagrafico del soggetto delegato TIPOSOGDEL|1|1|0|Tipo anagrafico del soggetto delegato
CODSOGDEL|3|6|0|Codice del soggetto delegato CODSOGDEL|3|6|0|Codice del soggetto delegato
NONOBBSTAT|8|1|0|Non obbligato alla compilazione del valore statistico se mensile NONOBBSTAT|8|1|0|Non obbligato alla compilazione del valore statistico se mensile
INTCAF|1|10|0|N.ro Iscrizione al CAF dell'intemediario (firmatario)
DICHP|1|1|0|Dichiarazione predisposta da <C>ontribuente, <I>ntermediario
4 4
CODDITTA| CODDITTA|
UPPER(RAGSOC)|X UPPER(RAGSOC)|X

2
ce/ce1500.cpp
View File

@ -240,7 +240,7 @@ void TMov_qmask::on_firm_change()
TMov_qmask::TMov_qmask() : TAutomask("ce1500a") TMov_qmask::TMov_qmask() : TAutomask("ce1500a")
{ {
first_focus(F_IDMOV); first_focus(F_IDMOV);
create_fields(1, 14, F_USER); create_fields(1, 9, F_USER);
} }
//metodo per la generazione dei campi di ricerca personalizzati //metodo per la generazione dei campi di ricerca personalizzati

51
ce/ce1500a.uml
View File

@ -8,20 +8,20 @@ ENDPAGE
PAGE "Movimenti cespiti" -1 -1 78 18 PAGE "Movimenti cespiti" -1 -1 78 18
GROUPBOX DLG_NULL 78 5 GROUPBOX DLG_NULL 78 8
BEGIN BEGIN
PROMPT 0 1 "@bParametri ditta" PROMPT 0 0 "@bParametri di selezione"
END END
NUMBER F_DITTA 5 NUMBER F_DITTA 5
BEGIN BEGIN
PROMPT 1 2 "Ditta " PROMPT 1 1 "Ditta "
FLAGS "DF" FLAGS "DF"
END END
STRING F_RAGSOC 50 STRING F_RAGSOC 50
BEGIN BEGIN
PROMPT 26 2 "" PROMPT 26 1 ""
USE LF_NDITTE USE LF_NDITTE
INPUT CODDITTA F_DITTA INPUT CODDITTA F_DITTA
OUTPUT F_RAGSOC RAGSOC OUTPUT F_RAGSOC RAGSOC
@ -31,7 +31,7 @@ END
NUMBER F_ESERCIZIO 4 NUMBER F_ESERCIZIO 4
BEGIN BEGIN
PROMPT 1 3 "Esercizio " PROMPT 1 2 "Esercizio "
FLAGS "AZ" FLAGS "AZ"
USE CCE USE CCE
JOIN ESC ALIAS 104 INTO CODTAB==CODTAB JOIN ESC ALIAS 104 INTO CODTAB==CODTAB
@ -47,25 +47,25 @@ END
DATE F_INIZIO_ES DATE F_INIZIO_ES
BEGIN BEGIN
PROMPT 26 3 "Inizio " PROMPT 26 2 "Inizio "
FLAGS "D" FLAGS "D"
END END
DATE F_FINE_ES DATE F_FINE_ES
BEGIN BEGIN
PROMPT 50 3 "Fine " PROMPT 50 2 "Fine "
FLAGS "D" FLAGS "D"
END END
NUMBER F_GRUPPO 2 NUMBER F_GRUPPO 2
BEGIN BEGIN
PROMPT 1 4 "Gruppo " PROMPT 1 3 "Gruppo "
FLAGS "Z" FLAGS "Z"
END END
STRING F_SPECIE 4 STRING F_SPECIE 4
BEGIN BEGIN
PROMPT 16 4 "Specie " PROMPT 16 3 "Specie "
FLAGS "_" FLAGS "_"
USE CCB USE CCB
JOIN %CAT ALIAS 400 INTO CODTAB=CODTAB[5,10] JOIN %CAT ALIAS 400 INTO CODTAB=CODTAB[5,10]
@ -84,18 +84,13 @@ END
STRING F_DESC_GRSP 60 45 STRING F_DESC_GRSP 60 45
BEGIN BEGIN
PROMPT 31 4 "" PROMPT 31 3 ""
FLAGS "D" FLAGS "D"
END END
GROUPBOX DLG_NULL 78 4
BEGIN
PROMPT 0 6 "@bSelezione per..."
END
NUMBER F_IMPIANTO 10 NUMBER F_IMPIANTO 10
BEGIN BEGIN
PROMPT 1 7 "Impianto " PROMPT 1 4 "Impianto "
FLAGS "Z" FLAGS "Z"
USE CIM USE CIM
INPUT CODTAB F_IMPIANTO INPUT CODTAB F_IMPIANTO
@ -106,9 +101,9 @@ BEGIN
CHECKTYPE NORMAL CHECKTYPE NORMAL
END END
STRING F_DESC_IMP 50 STRING F_DESC_IMP 50 48
BEGIN BEGIN
PROMPT 24 7 "" PROMPT 27 4 ""
FLAGS "Z" FLAGS "Z"
USE CIM KEY 2 USE CIM KEY 2
INPUT S0 F_DESC_IMP INPUT S0 F_DESC_IMP
@ -120,7 +115,7 @@ END
STRING F_IDCESPITE 10 STRING F_IDCESPITE 10
BEGIN BEGIN
PROMPT 1 8 "Cespite " PROMPT 1 5 "Cespite "
FLAGS "UZ" FLAGS "UZ"
USE LF_CESPI USE LF_CESPI
INPUT IDCESPITE F_IDCESPITE INPUT IDCESPITE F_IDCESPITE
@ -137,9 +132,9 @@ BEGIN
CHECKTYPE NORMAL CHECKTYPE NORMAL
END END
STRING F_DESC_CES 50 STRING F_DESC_CES 50 48
BEGIN BEGIN
PROMPT 24 8 "" PROMPT 27 5 ""
USE LF_CESPI KEY 2 USE LF_CESPI KEY 2
INPUT DESC F_DESC_CES INPUT DESC F_DESC_CES
DISPLAY "Desc@50" DESC DISPLAY "Desc@50" DESC
@ -156,7 +151,7 @@ END
NUMBER F_IDMOV 11 NUMBER F_IDMOV 11
BEGIN BEGIN
PROMPT 1 10 "Movimento " PROMPT 1 6 "Movimento "
FLAGS "Z" FLAGS "Z"
USE LF_MOVCE USE LF_MOVCE
JOIN LF_CESPI INTO IDCESPITE==IDCESPITE JOIN LF_CESPI INTO IDCESPITE==IDCESPITE
@ -179,15 +174,15 @@ BEGIN
KEY 1 KEY 1
END END
STRING F_DESC_MOV 50 STRING F_DESC_MOV 50 48
BEGIN BEGIN
PROMPT 27 10 "" PROMPT 27 6 ""
FLAGS "D" FLAGS "D"
END END
NUMBER F_NUMREG 7 NUMBER F_NUMREG 7
BEGIN BEGIN
PROMPT 1 11 "Selezione per numero di registrazione di prima nota " PROMPT 1 14 "Selezione per numero di registrazione di prima nota "
USE LF_MOVCE KEY 3 USE LF_MOVCE KEY 3
JOIN LF_CESPI INTO IDCESPITE==IDCESPITE JOIN LF_CESPI INTO IDCESPITE==IDCESPITE
INPUT NUMREG F_NUMREG INPUT NUMREG F_NUMREG
@ -206,7 +201,7 @@ END
SPREADSHEET F_CGROWS 0 -2 SPREADSHEET F_CGROWS 0 -2
BEGIN BEGIN
PROMPT 0 12 "" PROMPT 0 15 ""
ITEM "Importo@18" ITEM "Importo@18"
ITEM "Residuo@18" ITEM "Residuo@18"
ITEM "Gruppo" ITEM "Gruppo"
@ -230,9 +225,9 @@ BEGIN
GROUP 8 GROUP 8
END END
GROUPBOX DLG_NULL 78 10 GROUPBOX DLG_NULL 78 6
BEGIN BEGIN
PROMPT 0 13 "@bRicerce personalizzate" PROMPT 0 8 "@bRicerche personalizzate"
END END
ENDPAGE ENDPAGE

13
ce/ce2200.cpp
View File

@ -126,7 +126,7 @@ protected:
void incr_zero(TRectype& rec, const char* val, const char* valp) const; void incr_zero(TRectype& rec, const char* val, const char* valp) const;
public: public:
void crea_esercizio(int oldes, int newes, const TDate& ies, const TDate& fes) const; bool crea_esercizio(int oldes, int newes, const TDate& ies, const TDate& fes) const;
void crea_attivita(int oldes, int newes) const; void crea_attivita(int oldes, int newes) const;
void crea_registro(int oldes, int newes) const; void crea_registro(int oldes, int newes) const;
void crea_categorie(int oldes, int newes) const; void crea_categorie(int oldes, int newes) const;
@ -164,7 +164,7 @@ real TOpenesc::calc_coeff(const TDate& ies, const TDate& fes) const
return coeff; return coeff;
} }
void TOpenesc::crea_esercizio(int oldes, int newes, const TDate& ies, const TDate& fes) const bool TOpenesc::crea_esercizio(int oldes, int newes, const TDate& ies, const TDate& fes) const
{ {
// Crea l'esercizio contabile se necessario // Crea l'esercizio contabile se necessario
TTable esc("ESC"); TTable esc("ESC");
@ -185,7 +185,8 @@ void TOpenesc::crea_esercizio(int oldes, int newes, const TDate& ies, const TDat
} }
} }
else else
warning_box(TR("Attenzione: non esiste ancora l'esercizio contabile %04d"), newes); return error_box(TR("Attenzione: non esiste ancora l'esercizio contabile %04d"), newes);
} }
// Crea l'esercizio cespiti se necessario // Crea l'esercizio cespiti se necessario
@ -213,6 +214,8 @@ void TOpenesc::crea_esercizio(int oldes, int newes, const TDate& ies, const TDat
cce.rewrite(); cce.rewrite();
else else
cce.write(); cce.write();
return true;
} }
void TOpenesc::crea_attivita(int oldes, int newes) const void TOpenesc::crea_attivita(int oldes, int newes) const
@ -408,7 +411,8 @@ void TOpenesc::main_loop()
const int newes = m.get_int(F_NEWES); const int newes = m.get_int(F_NEWES);
const TDate ies(m.get(F_NEWINIZIO)); const TDate ies(m.get(F_NEWINIZIO));
const TDate fes(m.get(F_NEWFINE)); const TDate fes(m.get(F_NEWFINE));
crea_esercizio(oldes, newes, ies, fes); if (crea_esercizio(oldes, newes, ies, fes))
{
crea_attivita(oldes, newes); crea_attivita(oldes, newes);
crea_registro(oldes, newes); crea_registro(oldes, newes);
crea_categorie(oldes, newes); crea_categorie(oldes, newes);
@ -416,6 +420,7 @@ void TOpenesc::main_loop()
crea_ammortamenti(oldes, newes); crea_ammortamenti(oldes, newes);
ditta_cespiti().set_attivita(newes, 0, NULL); ditta_cespiti().set_attivita(newes, 0, NULL);
} }
}
} }
int ce2200(int argc, char* argv[]) int ce2200(int argc, char* argv[])

4
cg/cg0100.cpp
View File

@ -228,8 +228,8 @@ void TPianoconti_app::init_insert_mode(TMask& m)
else else
s3.right_just(4,'0'); s3.right_just(4,'0');
if (!s4.empty()) // if (!s4.empty())
s4.right_just(2,'0'); // s4.right_just(2,'0');
key.format("%1d%1s%s%s", s1, (const char*) s2,(const char*) s3, (const char*) s4); key.format("%1d%1s%s%s", s1, (const char*) s2,(const char*) s3, (const char*) s4);
s5 = cache().get("%IVD", key, "S0"); s5 = cache().get("%IVD", key, "S0");

84
cg/cg0100a.uml
View File

@ -18,7 +18,7 @@ NUMBER FLD_CM1_GRUPPO 3
BEGIN BEGIN
PROMPT 2 1 "Gruppo " PROMPT 2 1 "Gruppo "
HELP "Codice del gruppo" HELP "Codice del gruppo"
FIELD LF_PCON->GRUPPO FIELD GRUPPO
FLAGS "R" FLAGS "R"
KEY 1 KEY 1
USE LF_PCON KEY 1 SELECT CONTO="" USE LF_PCON KEY 1 SELECT CONTO=""
@ -40,7 +40,7 @@ NUMBER FLD_CM1_CONTO 3
BEGIN BEGIN
PROMPT 2 2 "Conto " PROMPT 2 2 "Conto "
HELP "Codice dell'eventuale conto" HELP "Codice dell'eventuale conto"
FIELD LF_PCON->CONTO FIELD CONTO
FLAGS "R" FLAGS "R"
KEY 1 KEY 1
USE LF_PCON KEY 1 SELECT ((CONTO!="")&&(SOTTOCONTO="")) USE LF_PCON KEY 1 SELECT ((CONTO!="")&&(SOTTOCONTO=""))
@ -67,7 +67,7 @@ NUMBER FLD_CM1_SOTTOCONTO 6
BEGIN BEGIN
PROMPT 2 3 "Sottoconto " PROMPT 2 3 "Sottoconto "
HELP "Codice dell'eventuale sottoconto" HELP "Codice dell'eventuale sottoconto"
FIELD LF_PCON->SOTTOCONTO FIELD SOTTOCONTO
KEY 1 KEY 1
USE LF_PCON KEY 1 SELECT SOTTOCONTO!="" USE LF_PCON KEY 1 SELECT SOTTOCONTO!=""
COPY INPUT FLD_CM1_CONTO COPY INPUT FLD_CM1_CONTO
@ -97,7 +97,7 @@ END
STRING FLD_CM1_DESC 50 STRING FLD_CM1_DESC 50
BEGIN BEGIN
PROMPT 24 3 "" PROMPT 24 3 ""
FIELD LF_PCON->DESCR FIELD DESCR
KEY 2 KEY 2
USE LF_PCON KEY 2 USE LF_PCON KEY 2
INPUT DESCR FLD_CM1_DESC INPUT DESCR FLD_CM1_DESC
@ -116,7 +116,7 @@ NUMBER FLD_CM1_CODTABANALISI 12
BEGIN BEGIN
PROMPT 1 5 "Codice Tabella Analisi " PROMPT 1 5 "Codice Tabella Analisi "
HELP "Codice di raggruppamento per l'analisi di bilancio" HELP "Codice di raggruppamento per l'analisi di bilancio"
FIELD LF_PCON->CODCBL FIELD CODCBL
USE LF_ABPCON USE LF_ABPCON
INPUT CODCBL FLD_CM1_CODTABANALISI INPUT CODCBL FLD_CM1_CODTABANALISI
DISPLAY "Codice@12" CODCBL DISPLAY "Codice@12" CODCBL
@ -148,7 +148,7 @@ END
LIST FLD_CM1_INDBIL 1 22 LIST FLD_CM1_INDBIL 1 22
BEGIN BEGIN
PROMPT 1 6 "Sezione di bilancio " PROMPT 1 6 "Sezione di bilancio "
FIELD LF_PCON->INDBIL FIELD INDBIL
GROUP 1 3 GROUP 1 3
HELP "Sezione di appartenenza del conto" HELP "Sezione di appartenenza del conto"
ITEM "1|1. Attivita'" ITEM "1|1. Attivita'"
@ -161,7 +161,7 @@ END
LIST FLD_CM1_SEZIVD 1 22 LIST FLD_CM1_SEZIVD 1 22
BEGIN BEGIN
PROMPT 1 7 "Sez. e classe IV dir. " PROMPT 1 7 "Sez. e classe IV dir. "
FIELD LF_PCON->SEZIVD FIELD SEZIVD
ITEM "0|0. Nessuna" MESSAGE CLEAR,5@|CLEAR,6@ ITEM "0|0. Nessuna" MESSAGE CLEAR,5@|CLEAR,6@
ITEM "1|1. Attivita'" MESSAGE ENABLE,5@|ENABLE,6@ ITEM "1|1. Attivita'" MESSAGE ENABLE,5@|ENABLE,6@
ITEM "2|2. Passivita'" MESSAGE ENABLE,5@|ENABLE,6@ ITEM "2|2. Passivita'" MESSAGE ENABLE,5@|ENABLE,6@
@ -175,64 +175,63 @@ END
STRING FLD_CM1_LETTIVD 1 1 STRING FLD_CM1_LETTIVD 1 1
BEGIN BEGIN
PROMPT 57 7 "" PROMPT 56 7 ""
HELP "Codice del conto secondo la IV direttiva CEE" HELP "Codice del conto secondo la IV direttiva CEE"
FIELD LF_PCON->LETTIVD FIELD LETTIVD
GROUP 1 5 GROUP 1 5
FLAGS "U" FLAGS "U"
END END
STRING FLD_CM1_LETTIVDH 1 STRING FLD_CM1_LETTIVDH 1
BEGIN BEGIN
PROMPT 57 7 "" PROMPT 55 7 ""
FLAGS "HDU" FLAGS "HDU"
GROUP 1 5 GROUP 1 5
END END
NUMBER FLD_CM1_NUMRIVD 8 4 NUMBER FLD_CM1_NUMRIVD 8 4
BEGIN BEGIN
PROMPT 61 7 "" PROMPT 59 7 ""
HELP "Codice del conto secondo la IV direttiva CEE" HELP "Codice del conto secondo la IV direttiva CEE"
FIELD LF_PCON->NUMRIVD FIELD NUMRIVD
GROUP 1 5 GROUP 1 5
FLAGS "MZ" FLAGS "MZ"
END END
NUMBER FLD_CM1_NUMRIVDH 8 4 NUMBER FLD_CM1_NUMRIVDH 8 4
BEGIN BEGIN
PROMPT 61 7 "" PROMPT 59 7 ""
FLAGS "HDMZ" FLAGS "HDMZ"
GROUP 1 5 GROUP 1 5
END END
NUMBER FLD_CM1_NUMIVD 2 STRING FLD_CM1_NUMIVD 4
BEGIN BEGIN
PROMPT 72 7 "" PROMPT 70 7 ""
FIELD LF_PCON->NUMIVD FIELD NUMIVD
FLAGS "Z"
GROUP 1 5 GROUP 1 5
USE %IVD USE %IVD
INPUT CODTAB[1,1] FLD_CM1_SEZIVD INPUT CODTAB[1,1] FLD_CM1_SEZIVD
INPUT CODTAB[2,2] FLD_CM1_LETTIVD INPUT CODTAB[2,2] FLD_CM1_LETTIVD
INPUT CODTAB[3,6] FLD_CM1_NUMRIVD INPUT CODTAB[3,6] FLD_CM1_NUMRIVD
INPUT CODTAB[7,8] FLD_CM1_NUMIVD INPUT CODTAB[7,10] FLD_CM1_NUMIVD
DISPLAY "Sezione" CODTAB[1,1] DISPLAY "Sezione" CODTAB[1,1]
DISPLAY "Lettera" CODTAB[2,2] DISPLAY "Lettera" CODTAB[2,2]
DISPLAY "Classe @M" CODTAB[3,6] DISPLAY "Classe @M" CODTAB[3,6]
DISPLAY "Numero" CODTAB[7,8] DISPLAY "Numero" CODTAB[7,10]
DISPLAY "Descrizione@50" S0 DISPLAY "Descrizione@50" S0
OUTPUT FLD_CM1_SEZIVD CODTAB[1,1] OUTPUT FLD_CM1_SEZIVD CODTAB[1,1]
OUTPUT FLD_CM1_LETTIVD CODTAB[2,2] OUTPUT FLD_CM1_LETTIVD CODTAB[2,2]
OUTPUT FLD_CM1_NUMRIVD CODTAB[3,6] OUTPUT FLD_CM1_NUMRIVD CODTAB[3,6]
OUTPUT FLD_CM1_NUMIVD CODTAB[7,8] OUTPUT FLD_CM1_NUMIVD CODTAB[7,10]
OUTPUT FLD_CM1_DESCIVD S0 OUTPUT FLD_CM1_DESCIVD S0
CHECKTYPE NORMAL CHECKTYPE NORMAL
WARNING "Codice non presente" WARNING "Codice non presente"
END END
NUMBER FLD_CM1_NUMIVDH 2 STRING FLD_CM1_NUMIVDH 4
BEGIN BEGIN
PROMPT 72 7 "" PROMPT 70 7 ""
FLAGS "HDZ" FLAGS "HDZ"
GROUP 1 5 GROUP 1 5
END END
@ -246,7 +245,7 @@ BEGIN
DISPLAY "Sezione" CODTAB[1,1] DISPLAY "Sezione" CODTAB[1,1]
DISPLAY "Lettera" CODTAB[2,2] DISPLAY "Lettera" CODTAB[2,2]
DISPLAY "Classe @M" CODTAB[3,6] DISPLAY "Classe @M" CODTAB[3,6]
DISPLAY "Numero" CODTAB[7,8] DISPLAY "Numero" CODTAB[7,10]
COPY OUTPUT FLD_CM1_NUMIVD COPY OUTPUT FLD_CM1_NUMIVD
CHECKTYPE NORMAL CHECKTYPE NORMAL
GROUP 1 5 GROUP 1 5
@ -262,7 +261,7 @@ END
LIST FLD_CM1_SEZIVDOPP 1 22 LIST FLD_CM1_SEZIVDOPP 1 22
BEGIN BEGIN
PROMPT 1 9 "Classe segno opposto " PROMPT 1 9 "Classe segno opposto "
FIELD LF_PCON->SEZIVDOPP FIELD SEZIVDOPP
GROUP 1 2 4 6 GROUP 1 2 4 6
ITEM "0|0. Nessuna" MESSAGE CLEAR,7@ ITEM "0|0. Nessuna" MESSAGE CLEAR,7@
ITEM "1|1. Attivita'" MESSAGE ENABLE,7@ ITEM "1|1. Attivita'" MESSAGE ENABLE,7@
@ -276,39 +275,38 @@ END
STRING FLD_CM1_LETTIVDOPP 1 STRING FLD_CM1_LETTIVDOPP 1
BEGIN BEGIN
PROMPT 57 9 "" PROMPT 55 9 ""
HELP "Codice del conto di sezione opposta secondo la IV direttiva CEE" HELP "Codice del conto di sezione opposta secondo la IV direttiva CEE"
FIELD LF_PCON->LETTIVDOPP FIELD LETTIVDOPP
FLAGS "U" FLAGS "U"
GROUP 1 2 4 7 GROUP 1 2 4 7
END END
NUMBER FLD_CM1_NUMRIVDOPP 8 4 NUMBER FLD_CM1_NUMRIVDOPP 8 4
BEGIN BEGIN
PROMPT 61 9 "" PROMPT 59 9 ""
HELP "Codice del conto di sezione opposta secondo la IV direttiva CEE" HELP "Codice del conto di sezione opposta secondo la IV direttiva CEE"
FIELD LF_PCON->NUMRIVDOPP FIELD NUMRIVDOPP
FLAGS "MZ" FLAGS "MZ"
GROUP 1 2 4 7 GROUP 1 2 4 7
END END
NUMBER FLD_CM1_NUMIVDOPP 2 STRING FLD_CM1_NUMIVDOPP 4
BEGIN BEGIN
PROMPT 72 9 "" PROMPT 70 9 ""
HELP "Codice del conto di sezione opposta secondo la IV direttiva CEE" HELP "Codice del conto di sezione opposta secondo la IV direttiva CEE"
FIELD LF_PCON->NUMIVDOPP FIELD NUMIVDOPP
FLAGS "Z"
GROUP 1 2 4 7 GROUP 1 2 4 7
COPY USE FLD_CM1_NUMIVD COPY USE FLD_CM1_NUMIVD
INPUT CODTAB[1,1] FLD_CM1_SEZIVDOPP INPUT CODTAB[1,1] FLD_CM1_SEZIVDOPP
INPUT CODTAB[2,2] FLD_CM1_LETTIVDOPP INPUT CODTAB[2,2] FLD_CM1_LETTIVDOPP
INPUT CODTAB[3,6] FLD_CM1_NUMRIVDOPP INPUT CODTAB[3,6] FLD_CM1_NUMRIVDOPP
INPUT CODTAB[7,8] FLD_CM1_NUMIVDOPP INPUT CODTAB[7,10] FLD_CM1_NUMIVDOPP
COPY DISPLAY FLD_CM1_NUMIVD COPY DISPLAY FLD_CM1_NUMIVD
OUTPUT FLD_CM1_SEZIVDOPP CODTAB[1,1] OUTPUT FLD_CM1_SEZIVDOPP CODTAB[1,1]
OUTPUT FLD_CM1_LETTIVDOPP CODTAB[2,2] OUTPUT FLD_CM1_LETTIVDOPP CODTAB[2,2]
OUTPUT FLD_CM1_NUMRIVDOPP CODTAB[3,6] OUTPUT FLD_CM1_NUMRIVDOPP CODTAB[3,6]
OUTPUT FLD_CM1_NUMIVDOPP CODTAB[7,8] OUTPUT FLD_CM1_NUMIVDOPP CODTAB[7,10]
OUTPUT FLD_CM1_DESCIVDOPP S0 OUTPUT FLD_CM1_DESCIVDOPP S0
CHECKTYPE NORMAL CHECKTYPE NORMAL
WARNING "Codice non presente" WARNING "Codice non presente"
@ -324,7 +322,7 @@ BEGIN
DISPLAY "Sezione" CODTAB[1,1] DISPLAY "Sezione" CODTAB[1,1]
DISPLAY "Lettera" CODTAB[2,2] DISPLAY "Lettera" CODTAB[2,2]
DISPLAY "Classe @M" CODTAB[3,6] DISPLAY "Classe @M" CODTAB[3,6]
DISPLAY "Numero" CODTAB[7,8] DISPLAY "Numero" CODTAB[7,10]
COPY OUTPUT FLD_CM1_NUMIVDOPP COPY OUTPUT FLD_CM1_NUMIVDOPP
CHECKTYPE NORMAL CHECKTYPE NORMAL
END END
@ -332,7 +330,7 @@ END
LIST FLD_CM1_TIPOSPRIC 1 50 LIST FLD_CM1_TIPOSPRIC 1 50
BEGIN BEGIN
PROMPT 1 11 "Tipo Spesa/Ricavo " PROMPT 1 11 "Tipo Spesa/Ricavo "
FIELD LF_PCON->TIPOSPRIC FIELD TIPOSPRIC
GROUP 1 2 GROUP 1 2
HELP "Specificare il tipo do conto" HELP "Specificare il tipo do conto"
ITEM "0|0. Acquisti o vendite in genere" ITEM "0|0. Acquisti o vendite in genere"
@ -393,7 +391,7 @@ END
LIST FLD_CM1_TMCF 1 13 LIST FLD_CM1_TMCF 1 13
BEGIN BEGIN
PROMPT 1 13 "Tipo sottoconti " PROMPT 1 13 "Tipo sottoconti "
FIELD LF_PCON->TMCF FIELD TMCF
GROUP 1 3 GROUP 1 3
HELP "Tipo dei sottoconti (Normale o clienti/fornitori)" HELP "Tipo dei sottoconti (Normale o clienti/fornitori)"
ITEM " |Normali" ITEM " |Normali"
@ -405,7 +403,7 @@ LIST FLD_CM2_SEZSALDI 1 10
BEGIN BEGIN
PROMPT 1 14 "Controllo saldo primanota " PROMPT 1 14 "Controllo saldo primanota "
HELP "Tipo di controllo del saldo in prima nota" HELP "Tipo di controllo del saldo in prima nota"
FIELD LF_PCON->SEZSALDI FIELD SEZSALDI
GROUP 1 GROUP 1
ITEM " |Nessuno" ITEM " |Nessuno"
ITEM "A|Avere" ITEM "A|Avere"
@ -416,7 +414,7 @@ BOOLEAN FLD_CM2_STSOTTBIL
BEGIN BEGIN
PROMPT 1 15 "Non stampare dett.sottoc. su bilanci a sezioni" PROMPT 1 15 "Non stampare dett.sottoc. su bilanci a sezioni"
HELP "Indicare se stampare il dettaglio dei sottoconti nei bilanci a sezioni contrapposte" HELP "Indicare se stampare il dettaglio dei sottoconti nei bilanci a sezioni contrapposte"
FIELD LF_PCON->STSOTTBIL FIELD STSOTTBIL
GROUP 1 3 GROUP 1 3
END END
@ -424,7 +422,7 @@ BOOLEAN FLD_CM2_COMPENS
BEGIN BEGIN
PROMPT 56 15 "Compensazione saldi" PROMPT 56 15 "Compensazione saldi"
HELP "Indicare se e' ammessa la compensazione dei saldi" HELP "Indicare se e' ammessa la compensazione dei saldi"
FIELD LF_PCON->COMPENS FIELD COMPENS
GROUP 1 3 GROUP 1 3
END END
@ -432,7 +430,7 @@ BOOLEAN FLD_CM2_STSOTTAB
BEGIN BEGIN
PROMPT 1 16 "Stampa dettaglio sottoconti su analisi" PROMPT 1 16 "Stampa dettaglio sottoconti su analisi"
HELP "Indicare se stampare il dettaglio dei sottoconti nell'analisi di bilancio" HELP "Indicare se stampare il dettaglio dei sottoconti nell'analisi di bilancio"
FIELD LF_PCON->STSOTTAB FIELD STSOTTAB
// FLAGS "H" // FLAGS "H"
GROUP 1 3 GROUP 1 3
MESSAGE COPY,FLD_CM2_STSOTTABS MESSAGE COPY,FLD_CM2_STSOTTABS
@ -441,7 +439,7 @@ END
BOOLEAN FLD_CM2_STSOTTABS BOOLEAN FLD_CM2_STSOTTABS
BEGIN BEGIN
PROMPT 1 16 "Stampa dettaglio movimenti su analisi " PROMPT 1 16 "Stampa dettaglio movimenti su analisi "
FIELD LF_PCON->STSOTTAB FIELD STSOTTAB
// FLAGS "H" // FLAGS "H"
GROUP 1 2 GROUP 1 2
MESSAGE COPY,FLD_CM2_STSOTTAB MESSAGE COPY,FLD_CM2_STSOTTAB
@ -451,7 +449,7 @@ BOOLEAN FLD_CM2_SOSPESO
BEGIN BEGIN
PROMPT 56 16 "Conto sospeso" PROMPT 56 16 "Conto sospeso"
HELP "Indicare se sospendere il conto in prima nota" HELP "Indicare se sospendere il conto in prima nota"
FIELD LF_PCON->SOSPESO FIELD SOSPESO
GROUP 1 2 GROUP 1 2
END END

461
cg/cg1100.cpp
View File

@ -6,6 +6,7 @@
#include <mask.h> #include <mask.h>
#include <printapp.h> #include <printapp.h>
#include <sort.h> #include <sort.h>
#include <recarray.h>
#include <tabutil.h> #include <tabutil.h>
#include <utility.h> #include <utility.h>
#include <progind.h> #include <progind.h>
@ -16,11 +17,8 @@
#include "cg1.h" #include "cg1.h"
#include "cg1100.h" #include "cg1100.h"
const char * TAB_ANABIL = "%IVD";
const char * TAB_IVD = "%IVD"; const char * TAB_IVD = "%IVD";
const int CODTABLEN = 15;
enum stampe { enum stampe {
completa=1, completa=1,
con_IV_direttiva, con_IV_direttiva,
@ -30,8 +28,6 @@ enum stampe {
senza_ana_bil senza_ana_bil
}; };
/* modifica inutile per provare cvs remoto */
class CG1100_application : public TPrintapp class CG1100_application : public TPrintapp
{ {
struct bil_ivd struct bil_ivd
@ -39,7 +35,7 @@ class CG1100_application : public TPrintapp
char sez; char sez;
char let; char let;
char numr[5]; char numr[5];
char num[4]; char num[5];
char gruppo[4]; char gruppo[4];
char conto[4]; char conto[4];
char sottoc[8]; char sottoc[8];
@ -47,37 +43,32 @@ class CG1100_application : public TPrintapp
char sez_opp; char sez_opp;
char let_opp; char let_opp;
char numr_opp[5]; char numr_opp[5];
int num_opp; char num_opp[5];
}; };
bil_ivd* _bil; bil_ivd* _bil;
TTable* _tab; // tabella codici IV direttiva
TIsamtempfile* _tpcon;
TLocalisamfile* _pcon;
TRectype* _rec; TRectype* _rec;
TSort* _sort; TSort* _sort;
TRelation* _rel, *_relt; TRelation * _rel;
TMask* _msk; TMask* _msk;
const char* _buf; const char* _buf;
stampe _tipo_stampa; stampe _tipo_stampa;
bool _salto_pag,_resetta_righe_stampa; bool _salto_pag,_resetta_righe_stampa;
int _old_gruppo; int _old_gruppo;
int _pcont_reclen,_i; int _i;
int _cur_c1, _cur_c2, _cur_c3; int _cur_c1, _cur_c2;
TString _clivd, _clivdo; TString _clivd, _clivdo;
TParagraph_string _d1, _d2; // qui TParagraph_string _d1, _d2, _d3;
char _sez_da_stamp,_sez_stamp,_let_da_stamp,_let_stamp; char _sez_da_stamp,_sez_stamp,_let_da_stamp,_let_stamp;
TString _numr_da_stamp,_numr_stamp; TString _numr_da_stamp,_numr_stamp, _num_stamp, _num_da_stamp;
int _gruppo,_conto,_num_da_stamp,_num_stamp,_g_prec,_c_prec; int _gruppo,_conto, _g_prec,_c_prec;
long _sottoc,_s_prec; long _sottoc,_s_prec;
TString _classe_da_stampare,_classe_stampata,_codcbl_da_stamp,_codcbl_stamp; TString _classe_da_stampare,_classe_stampata,_codcbl_da_stamp,_codcbl_stamp;
bool _conto_classificato,_stampa_riga_vuota; bool _conto_classificato,_stampa_riga_vuota;
int _sottoc_classificato; int _sottoc_classificato;
bool _prima_volta, _stampa_g, _stampa_c; bool _prima_volta;
TDate _data_stampa; TDate _data_stampa;
TString tmp; // Stringa per porcate galattiche
public: public:
virtual bool user_destroy() ; virtual bool user_destroy() ;
@ -87,7 +78,6 @@ public:
virtual bool preprocess_print (int,int); virtual bool preprocess_print (int,int);
virtual bool preprocess_page (int,int); virtual bool preprocess_page (int,int);
virtual print_action postprocess_page (int,int); virtual print_action postprocess_page (int,int);
virtual void postclose_print ();
virtual bool set_print(int); virtual bool set_print(int);
@ -99,24 +89,20 @@ public:
void set_con_IV (); void set_con_IV ();
void set_senza_IV_ana (); void set_senza_IV_ana ();
void set_con_ana (); void set_con_ana ();
// void set_senza_ana ();
void prepara_pcon_temp();
void cancella(int,int,long);
void init_sort(); void init_sort();
const char* descrizione_numero(char, char, int, int); const TString & descrizione_numero(char, char, int, const char *);
const char* descrizione_codcbl(TString&); const TString & descrizione_codcbl(const TString &);
// void setta_righe_descr(TParagraph_string*);
int leggo_sottoc(int,int,long); int leggo_sottoc(int,int,long);
void riempi_record(char,char,const TString&,int,int,int,long,const TString&,char,char,const TString&,int); void riempi_record(char,char,const TString&, const TString &,int,int,long,const TString&,char,char,const TString&, const TString &);
void set_bil_key(bil_ivd* b, char sezione, char lettera, void set_bil_key(bil_ivd* b, char sezione, char lettera,
const char* numero_romano, int numero, const char* numero_romano, const char * numero,
int gruppo = 0, int conto = 0, long sottoconto = 0L); int gruppo = 0, int conto = 0, long sottoconto = 0L);
void set_bil_val(bil_ivd* b, const char* descr,char sez_opp,char let_opp, void set_bil_val(bil_ivd* b, const char* descr,char sez_opp,char let_opp,
const char* numr_opp,int num_opp); const char* numr_opp, const char * num_opp);
virtual bool process_link(int id, const char* txt); virtual bool process_link(int id, const char* txt);
CG1100_application() : _clivd(8), _clivdo(8), _d1("", 30), _d2("", 40) {} CG1100_application() : _clivd(8), _clivdo(8), _d1("", 30), _d2("", 40), _d3("", 40) {}
}; };
bool CG1100_application::process_link(int id, const char* txt) bool CG1100_application::process_link(int id, const char* txt)
@ -139,7 +125,7 @@ void CG1100_application::init_sort()
_sort -> addsortkey ((char*)&(_bil->sez) - (char*)&(_bil->sez),1); _sort -> addsortkey ((char*)&(_bil->sez) - (char*)&(_bil->sez),1);
_sort -> addsortkey ((char*)&(_bil->let) - (char*)&(_bil->sez),1); _sort -> addsortkey ((char*)&(_bil->let) - (char*)&(_bil->sez),1);
_sort -> addsortkey ((char*)&(_bil->numr) - (char*)&(_bil->sez),4); _sort -> addsortkey ((char*)&(_bil->numr) - (char*)&(_bil->sez),4);
_sort -> addsortkey ((char*)&(_bil->num) - (char*)&(_bil->sez),2); _sort -> addsortkey ((char*)&(_bil->num) - (char*)&(_bil->sez),4);
_sort -> addsortkey ((char*)&(_bil->gruppo) - (char*)&(_bil->sez),3); _sort -> addsortkey ((char*)&(_bil->gruppo) - (char*)&(_bil->sez),3);
_sort -> addsortkey ((char*)&(_bil->conto) - (char*)&(_bil->sez),3); _sort -> addsortkey ((char*)&(_bil->conto) - (char*)&(_bil->sez),3);
_sort -> addsortkey ((char*)&(_bil->sottoc) - (char*)&(_bil->sez),6); _sort -> addsortkey ((char*)&(_bil->sottoc) - (char*)&(_bil->sez),6);
@ -165,13 +151,13 @@ void CG1100_application::init_sort()
} }
void CG1100_application::set_bil_key(bil_ivd* b, char sezione, char lettera, void CG1100_application::set_bil_key(bil_ivd* b, char sezione, char lettera,
const char* numero_romano, int numero, const char* numero_romano, const char * numero,
int gruppo, int conto,long sottoconto) int gruppo, int conto,long sottoconto)
{ {
b->sez = sezione; b->sez = sezione;
b->let = lettera; b->let = lettera;
strcpy(b->numr, numero_romano); strcpy(b->numr, numero_romano);
sprintf(b->num , "%2d", numero); sprintf(b->num , "%-4s", numero);
sprintf(b->gruppo , "%3d", gruppo); sprintf(b->gruppo , "%3d", gruppo);
sprintf(b->conto , "%3d", conto); sprintf(b->conto , "%3d", conto);
sprintf(b->sottoc , "%6ld", sottoconto); sprintf(b->sottoc , "%6ld", sottoconto);
@ -179,34 +165,26 @@ void CG1100_application::set_bil_key(bil_ivd* b, char sezione, char lettera,
void CG1100_application::set_bil_val(bil_ivd* b, const char* descr, void CG1100_application::set_bil_val(bil_ivd* b, const char* descr,
char sez_opp,char let_opp, char sez_opp,char let_opp,
const char* numr_opp,int num_opp) const char* numr_opp, const char * num_opp)
{ {
strcpy(b->descr, descr); strcpy(b->descr, descr);
b->sez_opp = sez_opp; b->sez_opp = sez_opp;
b->let_opp = let_opp; b->let_opp = let_opp;
strcpy(b->numr_opp, numr_opp); strcpy(b->numr_opp, numr_opp);
b->num_opp = num_opp; strcpy(b->num_opp, num_opp);
} }
void CG1100_application::riempi_record(char sez,char let,const TString& numr, void CG1100_application::riempi_record(char sez,char let,const TString& numr,
int numero,int g,int c,long s, const TString & numero,int g,int c,long s,
const TString& descr,char sez_opp, const TString& descr,char sez_opp,
char let_opp,const TString& numr_opp, char let_opp,const TString& numr_opp,
int num_opp) const TString& num_opp)
{ {
set_bil_key(_bil, sez, let, numr, numero, g, c, s); set_bil_key(_bil, sez, let, numr, numero, g, c, s);
set_bil_val(_bil, descr, sez_opp, let_opp, numr_opp, num_opp); set_bil_val(_bil, descr, sez_opp, let_opp, numr_opp, num_opp);
_sort->sort ((const char*) _bil); _sort->sort ((const char*) _bil);
} }
void CG1100_application::postclose_print()
{
if (_tipo_stampa == senza_ana_bil)
{
delete _relt;
}
}
print_action CG1100_application::postprocess_page(int file,int counter) print_action CG1100_application::postprocess_page(int file,int counter)
{ {
switch (_tipo_stampa) switch (_tipo_stampa)
@ -224,7 +202,7 @@ print_action CG1100_application::postprocess_page(int file,int counter)
_let_stamp = _let_da_stamp; _let_stamp = _let_da_stamp;
_numr_stamp = _numr_da_stamp; _numr_stamp = _numr_da_stamp;
_num_stamp = _num_da_stamp; _num_stamp = _num_da_stamp;
_classe_stampata.format("%c%c%s%2d",_sez_stamp,_let_stamp,(const char*)_numr_stamp,_num_stamp); _classe_stampata.format("%c%c%s%-4s",_sez_stamp,_let_stamp,(const char*)_numr_stamp, (const char *) _num_stamp);
if ( (_buf = _sort->retrieve()) != NULL) if ( (_buf = _sort->retrieve()) != NULL)
{ {
@ -233,13 +211,11 @@ print_action CG1100_application::postprocess_page(int file,int counter)
_let_da_stamp = bil->let; _let_da_stamp = bil->let;
_numr_da_stamp = bil->numr; _numr_da_stamp = bil->numr;
_numr_da_stamp.ltrim(); _numr_da_stamp.ltrim();
_num_da_stamp = atoi(bil->num); _num_da_stamp = bil->num;
_gruppo = atoi(bil->gruppo); _gruppo = atoi(bil->gruppo);
_conto = atoi(bil->conto); _conto = atoi(bil->conto);
_sottoc = atol(bil->sottoc); _sottoc = atol(bil->sottoc);
_classe_da_stampare.format("%c%c%s%2d",_sez_da_stamp,_let_da_stamp,(const char*)_numr_da_stamp,_num_da_stamp); _classe_da_stampare.format("%c%c%s%-4s",_sez_da_stamp,_let_da_stamp,(const char*)_numr_da_stamp, (const char *) _num_da_stamp);
//set_auto_ff(FALSE);
return REPEAT_PAGE; return REPEAT_PAGE;
} }
@ -271,7 +247,6 @@ print_action CG1100_application::postprocess_page(int file,int counter)
void CG1100_application::set_page(int file,int counter) void CG1100_application::set_page(int file,int counter)
{ {
//intesta (_tipo_stampa);
switch (_tipo_stampa) switch (_tipo_stampa)
{ {
case con_IV_direttiva: case con_IV_direttiva:
@ -317,9 +292,9 @@ void CG1100_application::do_sort()
if (_tipo_stampa == con_IV_direttiva) if (_tipo_stampa == con_IV_direttiva)
{ {
char sez_conto,let_conto; char sez_conto,let_conto;
TString numr_conto; TString16 numr_conto;
int num_conto; TString16 num_conto;
bool classe_conto = FALSE; bool classe_conto = false;
_sort->init(); _sort->init();
select_cursor (_cur_c1); select_cursor (_cur_c1);
@ -329,7 +304,7 @@ void CG1100_application::do_sort()
long last = cursor->items(); long last = cursor->items();
TProgind prg (last, TR("Elaborazione Piano dei Conti... Prego attendere"), FALSE, TRUE, 30); TProgind prg (last, TR("Elaborazione Piano dei Conti... Prego attendere"), false, true, 30);
for ( *cursor = 0; cursor->pos() < last; ++(*cursor) ) for ( *cursor = 0; cursor->pos() < last; ++(*cursor) )
{ {
@ -343,13 +318,13 @@ void CG1100_application::do_sort()
char sez = rec.get_char(PCN_SEZIVD); char sez = rec.get_char(PCN_SEZIVD);
char let = rec.get_char(PCN_LETTIVD); char let = rec.get_char(PCN_LETTIVD);
TString numr = rec.get (PCN_NUMRIVD); const TString16 numr = rec.get (PCN_NUMRIVD);
int num = rec.get_int (PCN_NUMIVD); const TString16 num = rec.get (PCN_NUMIVD);
TString descr = rec.get (PCN_DESCR); TString descr = rec.get (PCN_DESCR);
char sez_opp = rec.get_char(PCN_SEZIVDOPP); char sez_opp = rec.get_char(PCN_SEZIVDOPP);
char let_opp = rec.get_char(PCN_LETTIVDOPP); char let_opp = rec.get_char(PCN_LETTIVDOPP);
TString numr_opp = rec.get (PCN_NUMRIVDOPP); const TString16 numr_opp = rec.get (PCN_NUMRIVDOPP);
int num_opp = rec.get_int (PCN_NUMIVDOPP); const TString16 num_opp = rec.get (PCN_NUMIVDOPP);
if ((g != 0) && (c != 0) && (s == 0)) if ((g != 0) && (c != 0) && (s == 0))
{ {
@ -367,11 +342,11 @@ void CG1100_application::do_sort()
numr_conto = numr; numr_conto = numr;
num_conto = num; num_conto = num;
classe_conto = TRUE; classe_conto = true;
riempi_record(sez_conto,let_conto,numr_conto,num_conto,g,c,s,descr,sez_opp,let_opp,numr_opp,num_opp); riempi_record(sez_conto,let_conto,numr_conto,num_conto,g,c,s,descr,sez_opp,let_opp,numr_opp,num_opp);
} }
else else
classe_conto = FALSE; classe_conto = false;
} }
if ((g != 0) && (c != 0) && (s != 0)) if ((g != 0) && (c != 0) && (s != 0))
@ -398,7 +373,7 @@ void CG1100_application::do_sort()
if (_tipo_stampa == con_ana_bil) if (_tipo_stampa == con_ana_bil)
{ {
bool livello_conto = FALSE; bool livello_conto = false;
_sort->init(); _sort->init();
@ -409,7 +384,7 @@ void CG1100_application::do_sort()
long last = cursor->items(); long last = cursor->items();
TProgind prg (last, TR("Elaborazione Piano dei Conti... Prego attendere"), FALSE, TRUE, 30); TProgind prg (last, TR("Elaborazione Piano dei Conti... Prego attendere"), false, true, 30);
TString c1(12); TString c1(12);
@ -419,14 +394,13 @@ void CG1100_application::do_sort()
{ {
prg.addstatus(1); prg.addstatus(1);
// int gruppo = rec.get_int (PCN_GRUPPO);
int conto = rec.get_int (PCN_CONTO); int conto = rec.get_int (PCN_CONTO);
long sottoc = rec.get_long(PCN_SOTTOCONTO); long sottoc = rec.get_long(PCN_SOTTOCONTO);
if (livello_conto && (conto != conto_p) ) if (livello_conto && (conto != conto_p) )
{ {
c1 = ""; c1 = "";
livello_conto = FALSE; livello_conto = false;
} }
conto_p = conto; conto_p = conto;
@ -441,7 +415,7 @@ void CG1100_application::do_sort()
else else
{ {
c1 = rec.get(PCN_CODCBL); c1 = rec.get(PCN_CODCBL);
livello_conto = TRUE; livello_conto = true;
} }
} }
else // Si tratta di un sottoconto else // Si tratta di un sottoconto
@ -457,108 +431,6 @@ void CG1100_application::do_sort()
} }
} }
void CG1100_application::cancella(int g, int c, long s)
{
_tpcon->setkey(1);
_tpcon->zero();
_tpcon->put(PCN_GRUPPO, g);
_tpcon->put(PCN_CONTO, c);
_tpcon->put(PCN_SOTTOCONTO, s);
if (_tpcon->read() == NOERR)
_tpcon->remove();
}
void CG1100_application::prepara_pcon_temp()
{
TLocalisamfile pcon (LF_PCON);
TRectype rec (LF_PCON);
bool gruppo_riclassificato = FALSE;
bool conto_riclassificato = FALSE;
int g_prec = -1;
int c_prec = -1;
long items = pcon.items();
TProgind prog (items,TR("Elaborazione Piano dei Conti... Prego attendere"), FALSE, TRUE, 30);
for (pcon.first(); !pcon.eof(); pcon.next())
{
prog.addstatus(1);
int g = pcon.get_int (PCN_GRUPPO);
int c = pcon.get_int (PCN_CONTO);
long s = pcon.get_long(PCN_SOTTOCONTO);
if (gruppo_riclassificato && g == g_prec)
continue;
else
gruppo_riclassificato = FALSE;
if (conto_riclassificato && (g == g_prec && c == c_prec) )
continue;
else
conto_riclassificato = FALSE;
TString16 codcbl = pcon.get(PCN_CODCBL);
if (c == 0) // Se si tratta di un gruppo
{
if (codcbl.empty())
{
rec = pcon.curr();
_tpcon->zero();
_tpcon->curr() = rec;
_tpcon->write();
}
else
gruppo_riclassificato = TRUE;
}
else
if (s == 0) // Se si tratta di un conto
{
if (codcbl.empty())
{
rec = pcon.curr();
_tpcon->zero();
_tpcon->curr() = rec;
_tpcon->write();
}
else
{
int gruppo = pcon.get_int(PCN_GRUPPO);
cancella(gruppo,0,0); // Cancella l'eventuale gruppo
conto_riclassificato = TRUE;
}
}
else // Se si tratta di un sottoconto
{
if (codcbl.empty())
{
rec = pcon.curr();
_tpcon->zero();
_tpcon->curr() = rec;
_tpcon->write();
}
else
{
int gruppo = pcon.get_int(PCN_GRUPPO);
int conto = pcon.get_int(PCN_CONTO);
cancella(gruppo,0,0); // Cancella l'eventuale gruppo
cancella(gruppo,conto,0); // Cancella l'eventuale conto
}
}
}
select_cursor(_cur_c3); // Seleziono il cursore definito sul piano dei conti temporaneo
_tpcon->first();
}
bool CG1100_application::preprocess_print (int file,int counter) bool CG1100_application::preprocess_print (int file,int counter)
{ {
switch (_tipo_stampa) switch (_tipo_stampa)
@ -578,16 +450,16 @@ bool CG1100_application::preprocess_print (int file,int counter)
_let_da_stamp = bil->let; _let_da_stamp = bil->let;
_numr_da_stamp = bil->numr; _numr_da_stamp = bil->numr;
_numr_da_stamp.ltrim(); _numr_da_stamp.ltrim();
_num_da_stamp = atoi(bil->num); _num_da_stamp = bil->num;
_gruppo = atoi(bil->gruppo); _gruppo = atoi(bil->gruppo);
_conto = atoi(bil->conto); _conto = atoi(bil->conto);
_sottoc = atol(bil->sottoc); _sottoc = atol(bil->sottoc);
_classe_da_stampare.format("%c%c%s%2d",_sez_da_stamp,_let_da_stamp,(const char*)_numr_da_stamp,_num_da_stamp); _classe_da_stampare.format("%c%c%s%-4s",_sez_da_stamp,_let_da_stamp,(const char*)_numr_da_stamp, (const char *)_num_da_stamp);
return TRUE; return true;
} }
else else
return FALSE; return false;
} }
break; break;
case con_ana_bil: case con_ana_bil:
@ -602,10 +474,10 @@ bool CG1100_application::preprocess_print (int file,int counter)
_conto = rec.get_int(PCN_CONTO); _conto = rec.get_int(PCN_CONTO);
_sottoc = rec.get_long(PCN_SOTTOCONTO); _sottoc = rec.get_long(PCN_SOTTOCONTO);
return TRUE; return true;
} }
else else
return FALSE; return false;
} }
break; break;
case senza_ana_bil: case senza_ana_bil:
@ -613,7 +485,7 @@ bool CG1100_application::preprocess_print (int file,int counter)
default: default:
break; break;
} }
return TRUE; return true;
} }
void CG1100_application::set_con_IV() void CG1100_application::set_con_IV()
@ -622,18 +494,18 @@ void CG1100_application::set_con_IV()
TString descrizione,descr; TString descrizione,descr;
char sez_opp,let_opp; char sez_opp,let_opp;
int num_opp,numr_opp; int numr_opp;
bool stampa_classe = TRUE; bool stampa_classe = true;
int numr = atoi(_numr_da_stamp); int numr = atoi(_numr_da_stamp);
TString numrom = itor(numr); TString numrom = itor(numr);
TString num_opp(bil->num_opp);
sez_opp = bil->sez_opp; sez_opp = bil->sez_opp;
let_opp = bil->let_opp; let_opp = bil->let_opp;
numr_opp = atoi(bil->numr_opp); numr_opp = atoi(bil->numr_opp);
TString numrom_opp = itor(numr_opp); TString numrom_opp = itor(numr_opp);
num_opp = bil->num_opp;
descrizione = descrizione_numero(_sez_da_stamp,_let_da_stamp,numr,_num_da_stamp); descrizione = descrizione_numero(_sez_da_stamp,_let_da_stamp,numr, _num_da_stamp);
descr = bil->descr; descr = bil->descr;
//Se la classe prelevata dal record corrente del sort e' diversa dalla classe //Se la classe prelevata dal record corrente del sort e' diversa dalla classe
@ -650,7 +522,7 @@ void CG1100_application::set_con_IV()
set_row (_i++,"@0g%c", app); set_row (_i++,"@0g%c", app);
set_row (_i++,FR("@0gCONTI D' ORDINE ATTIVI")); set_row (_i++,FR("@0gCONTI D' ORDINE ATTIVI"));
set_row (_i++,"@0g%c", app); set_row (_i++,"@0g%c", app);
stampa_classe = FALSE; stampa_classe = false;
} }
else else
if ((_sez_da_stamp == '1')&&(_let_da_stamp != 'Z')) if ((_sez_da_stamp == '1')&&(_let_da_stamp != 'Z'))
@ -667,7 +539,7 @@ void CG1100_application::set_con_IV()
set_row(_i++,"@0g%c", app); set_row(_i++,"@0g%c", app);
set_row (_i++,FR("@0gCONTI D' ORDINE PASSIVI")); set_row (_i++,FR("@0gCONTI D' ORDINE PASSIVI"));
set_row(_i++,"@0g%c", app); set_row(_i++,"@0g%c", app);
stampa_classe = FALSE; stampa_classe = false;
} }
else else
if ((_sez_da_stamp == '2')&&(_let_da_stamp != 'Z')) if ((_sez_da_stamp == '2')&&(_let_da_stamp != 'Z'))
@ -684,7 +556,7 @@ void CG1100_application::set_con_IV()
set_row(_i++,"@0g%c", app); set_row(_i++,"@0g%c", app);
set_row (_i++,FR("@0gCONTI D' ORDINE")); set_row (_i++,FR("@0gCONTI D' ORDINE"));
set_row(_i++,"@0g%c", app); set_row(_i++,"@0g%c", app);
stampa_classe = FALSE; stampa_classe = false;
} }
if (_sez_da_stamp == '9') if (_sez_da_stamp == '9')
@ -704,7 +576,7 @@ void CG1100_application::set_con_IV()
set_row (_i++,"@0g%c", app); set_row (_i++,"@0g%c", app);
set_row (_i++,FR("@0gCONTI D' ORDINE ATTIVI")); set_row (_i++,FR("@0gCONTI D' ORDINE ATTIVI"));
set_row (_i++,"@0g%c", app); set_row (_i++,"@0g%c", app);
stampa_classe = FALSE; stampa_classe = false;
} }
if ((_sez_da_stamp == '2')&&(_let_da_stamp == 'Z')) if ((_sez_da_stamp == '2')&&(_let_da_stamp == 'Z'))
{ {
@ -712,7 +584,7 @@ void CG1100_application::set_con_IV()
set_row(_i++,"@0g%c", app); set_row(_i++,"@0g%c", app);
set_row (_i++,FR("@0gCONTI D' ORDINE PASSIVI")); set_row (_i++,FR("@0gCONTI D' ORDINE PASSIVI"));
set_row(_i++,"@0g%c", app); set_row(_i++,"@0g%c", app);
stampa_classe = FALSE; stampa_classe = false;
} }
} }
@ -728,12 +600,10 @@ void CG1100_application::set_con_IV()
if (_numr_da_stamp != "") if (_numr_da_stamp != "")
set_row(_i,"@2g%8s", (const char*) numrom); set_row(_i,"@2g%8s", (const char*) numrom);
if (_num_da_stamp != 0) set_row(_i,"@11g%-4s", (const char *)_num_da_stamp);
set_row(_i,"@11g%2d", _num_da_stamp);
_d2 = (const char*) descrizione; _d2 = descrizione;
set_row(_i,"@14g#a", &_d2); set_row(_i,"@16g#a", &_d2);
// setta_righe_descr(_descr);
} }
} }
} }
@ -753,8 +623,8 @@ void CG1100_application::set_con_IV()
if (numr_opp != 0) if (numr_opp != 0)
set_row (_i,"@120g%8s", (const char*) numrom_opp); set_row (_i,"@120g%8s", (const char*) numrom_opp);
if (num_opp != 0) if (num_opp.not_empty())
set_row (_i++,"@129g%2d", num_opp); set_row (_i++,"@129g%-4s", num_opp);
} }
else else
_i++; _i++;
@ -777,25 +647,24 @@ void CG1100_application::set_senza_IV_ana()
{ {
_g_prec = gruppo; _g_prec = gruppo;
_c_prec = conto; _c_prec = conto;
_prima_volta = FALSE; _prima_volta = false;
} }
if (sottoc == 0L) // Se si tratta di un conto if (sottoc == 0L) // Se si tratta di un conto
{ {
if (gruppo != _g_prec) if (gruppo != _g_prec)
_stampa_riga_vuota = TRUE; _stampa_riga_vuota = true;
} }
else else
{ {
if (gruppo != _g_prec || conto != _c_prec) if (gruppo != _g_prec || conto != _c_prec)
_stampa_riga_vuota = TRUE; _stampa_riga_vuota = true;
} }
if (_stampa_riga_vuota) if (_stampa_riga_vuota)
{ {
char app = ' '; i++;
set_row (i++,"@0g%c", app); _stampa_riga_vuota = false;
_stampa_riga_vuota = FALSE;
} }
set_row (i, "$[b]@pn$[n] $[b]@pn$[n] $[b]@pn$[n]", set_row (i, "$[b]@pn$[n] $[b]@pn$[n] $[b]@pn$[n]",
@ -831,11 +700,7 @@ void CG1100_application::set_con_ana()
rec = _buf; rec = _buf;
TString descrizione,descr;
// bool stampa_codcbl = TRUE;
TString codcbl = rec.get(PCN_CODCBL); TString codcbl = rec.get(PCN_CODCBL);
// int gruppo = rec.get_int (PCN_GRUPPO);
int conto = rec.get_int (PCN_CONTO); int conto = rec.get_int (PCN_CONTO);
long sottoc = rec.get_long(PCN_SOTTOCONTO); long sottoc = rec.get_long(PCN_SOTTOCONTO);
bool stsobi = rec.get_bool(PCN_STSOTTAB); bool stsobi = rec.get_bool(PCN_STSOTTAB);
@ -844,16 +709,11 @@ void CG1100_application::set_con_ana()
else else
val = TR("No"); val = TR("No");
descrizione = descrizione_codcbl(codcbl);
descr = rec.get(PCN_DESCR);
char app = ' ';
set_row (_i++,"@0g%c", app);
if (_codcbl_da_stamp != _codcbl_stamp) if (_codcbl_da_stamp != _codcbl_stamp)
{ {
set_row (_i,"@0g%10s", (const char*) _codcbl_da_stamp); set_row (_i,"@0g%s", (const char*) _codcbl_da_stamp);
set_row (_i,"@11g%s", (const char*) descrizione); _d3 = descrizione_codcbl(codcbl);
set_row (_i,"@13g#a", &_d3);
} }
set_row (_i,"@62g$[b]%3d$[n]", _gruppo); set_row (_i,"@62g$[b]%3d$[n]", _gruppo);
@ -867,7 +727,7 @@ void CG1100_application::set_con_ana()
if (_gruppo > 99 || _conto > 99) if (_gruppo > 99 || _conto > 99)
set_row(_i,"@76g*"); set_row(_i,"@76g*");
set_row (_i,"@78g%.40s", (const char*) descr); set_row (_i,"@78g%.40s", (const char*) rec.get(PCN_DESCR));
if (conto != 0 && sottoc == 0l) if (conto != 0 && sottoc == 0l)
set_row (_i, "@121g%s", (const char*) val); set_row (_i, "@121g%s", (const char*) val);
@ -884,7 +744,6 @@ void CG1100_application::set_completa()
char sezione; char sezione;
int i; int i;
// int gruppo = rec.get_int (PCN_GRUPPO);
int conto = rec.get_int (PCN_CONTO); int conto = rec.get_int (PCN_CONTO);
long sottoc = rec.get_long(PCN_SOTTOCONTO); long sottoc = rec.get_long(PCN_SOTTOCONTO);
sezione = rec.get_char(PCN_SEZIVD); sezione = rec.get_char(PCN_SEZIVD);
@ -893,7 +752,7 @@ void CG1100_application::set_completa()
if (_prima_volta) if (_prima_volta)
{ {
_s_prec = 0; _s_prec = 0;
_prima_volta = FALSE; _prima_volta = false;
} }
if (sottoc != 0l && _s_prec != 0l) if (sottoc != 0l && _s_prec != 0l)
@ -924,7 +783,7 @@ void CG1100_application::set_completa()
} }
else else
if (_tipo_stampa == completa_bil) if (_tipo_stampa == completa_bil)
set_row (i, "@60g@10s", FLD(LF_PCON, PCN_CODCBL) ); set_row (i, "@60g@12s", FLD(LF_PCON, PCN_CODCBL) );
if (conto != 0 && sottoc == 0l) if (conto != 0 && sottoc == 0l)
{ {
@ -990,8 +849,8 @@ bool CG1100_application::elabora_riga()
} }
// Gestione salto pagina // Gestione salto pagina
if (_tipo_stampa == con_ana_bil) // || _tipo_stampa == con_IV_direttiva) if (_tipo_stampa == con_ana_bil)
return FALSE; return false;
int new_gruppo = curr_rec.get_int(PCN_GRUPPO); int new_gruppo = curr_rec.get_int(PCN_GRUPPO);
@ -1001,7 +860,7 @@ bool CG1100_application::elabora_riga()
_old_gruppo = new_gruppo; _old_gruppo = new_gruppo;
return salta; return salta;
} }
return FALSE; return false;
} }
int CG1100_application::leggo_sottoc(int gruppo,int conto,long sottoc) int CG1100_application::leggo_sottoc(int gruppo,int conto,long sottoc)
@ -1010,8 +869,8 @@ int CG1100_application::leggo_sottoc(int gruppo,int conto,long sottoc)
char sez; char sez;
int gr,co; int gr,co;
int esito = 0; int esito = 0;
bool esiste_conto_classificato = FALSE; bool esiste_conto_classificato = false;
bool esiste_conto_non_classificato = FALSE; bool esiste_conto_non_classificato = false;
pconti.zero(); pconti.zero();
pconti.put(PCN_GRUPPO, gruppo); pconti.put(PCN_GRUPPO, gruppo);
@ -1028,10 +887,10 @@ int CG1100_application::leggo_sottoc(int gruppo,int conto,long sottoc)
sez = pconti.get_char(PCN_SEZIVD); sez = pconti.get_char(PCN_SEZIVD);
if (sez != '0') if (sez != '0')
esiste_conto_classificato = TRUE; esiste_conto_classificato = true;
if (sez == '0') if (sez == '0')
esiste_conto_non_classificato = TRUE; esiste_conto_non_classificato = true;
} }
if (!esiste_conto_classificato && esiste_conto_non_classificato) if (!esiste_conto_classificato && esiste_conto_non_classificato)
@ -1048,7 +907,6 @@ int CG1100_application::leggo_sottoc(int gruppo,int conto,long sottoc)
bool CG1100_application::preprocess_page(int file,int counter) bool CG1100_application::preprocess_page(int file,int counter)
{ {
// static int c1 = 0;
static TString16 a1; static TString16 a1;
char sez; char sez;
TString16 codcbl; TString16 codcbl;
@ -1067,7 +925,7 @@ bool CG1100_application::preprocess_page(int file,int counter)
force_setpage(); force_setpage();
if (conto == 0) return FALSE; //Scarto i gruppi if (conto == 0) return false; //Scarto i gruppi
if (sottoc == 0L) // Se si tratta di un conto if (sottoc == 0L) // Se si tratta di un conto
{ {
@ -1077,24 +935,24 @@ bool CG1100_application::preprocess_page(int file,int counter)
{ {
_sottoc_classificato = byte(leggo_sottoc(gruppo,conto,sottoc)); _sottoc_classificato = byte(leggo_sottoc(gruppo,conto,sottoc));
if (_sottoc_classificato == 0) if (_sottoc_classificato == 0)
_conto_classificato = TRUE; _conto_classificato = true;
else else
if (_sottoc_classificato == 1) if (_sottoc_classificato == 1)
{ {
_conto_classificato = FALSE; _conto_classificato = false;
return FALSE; return false;
} }
else else
if (_sottoc_classificato == 2) if (_sottoc_classificato == 2)
{ {
_conto_classificato = TRUE; _conto_classificato = true;
return FALSE; return false;
} }
} }
else else
{ {
_conto_classificato = TRUE; _conto_classificato = true;
return FALSE; return false;
} }
} }
else // Se si tratta di un sottoconto else // Se si tratta di un sottoconto
@ -1104,10 +962,10 @@ bool CG1100_application::preprocess_page(int file,int counter)
char sezione = rec.get_char(PCN_SEZIVD); char sezione = rec.get_char(PCN_SEZIVD);
if (sezione != '0') if (sezione != '0')
return FALSE; return false;
} }
else else
return FALSE; return false;
} }
_g_prec = gruppo; _g_prec = gruppo;
_c_prec = conto; _c_prec = conto;
@ -1125,44 +983,12 @@ bool CG1100_application::preprocess_page(int file,int counter)
force_setpage(); force_setpage();
if (gruppo != _g_prec)
{
_stampa_g = TRUE;
_stampa_c = TRUE;
}
if ( (gruppo != _g_prec || conto != _c_prec) && _stampa_g)
_stampa_c = TRUE;
_g_prec = gruppo; _g_prec = gruppo;
_c_prec = conto; _c_prec = conto;
if (conto == 0) // Si tratta di un gruppo
{
_stampa_g = FALSE;
_stampa_c = FALSE;
return TRUE;
}
if (sottoc == 0) // Si tratta di un conto
{
if (_stampa_g)
{
_stampa_c = FALSE;
return TRUE;
}
else
return FALSE;
}
if (sottoc != 0) // Si tratta di un sottoconto
{
if (_stampa_c)
return TRUE;
else
return FALSE;
}
} }
return true;
} }
if (elabora_riga()) if (elabora_riga())
@ -1174,7 +1000,7 @@ bool CG1100_application::preprocess_page(int file,int counter)
_clivd = itor(c3); _clivd = itor(c3);
_clivdo = itor(o3); _clivdo = itor(o3);
return TRUE; return true;
} }
bool CG1100_application::set_print(int) bool CG1100_application::set_print(int)
@ -1186,21 +1012,22 @@ bool CG1100_application::set_print(int)
if (tasto == K_ENTER) if (tasto == K_ENTER)
{ {
select_cursor(_cur_c1);
current_cursor()->setfilter("");
_tipo_stampa = (stampe)_msk->get_int(F_SCELTA_STAMPA); _tipo_stampa = (stampe)_msk->get_int(F_SCELTA_STAMPA);
_salto_pag = _msk->get_bool(F_SALTO_PAGINA); _salto_pag = _msk->get_bool(F_SALTO_PAGINA);
_data_stampa = _msk->get(F_DATA_STAMPA); _data_stampa = _msk->get(F_DATA_STAMPA);
// scegli_cur();
enable_link(TR("Collegamento Piano dei conti: "), 'b'); enable_link(TR("Collegamento Piano dei conti: "), 'b');
set_multiple_link(TRUE); set_multiple_link(true);
_sez_stamp = ' '; _sez_stamp = ' ';
_let_stamp = ' '; _let_stamp = ' ';
_numr_stamp = ""; _numr_stamp = "";
_num_stamp = 0; _num_stamp = "";
_classe_stampata = ""; _classe_stampata = "";
_resetta_righe_stampa = TRUE; _resetta_righe_stampa = true;
reset_footer(); reset_footer();
if (_tipo_stampa == con_ana_bil) if (_tipo_stampa == con_ana_bil)
@ -1210,10 +1037,10 @@ bool CG1100_application::set_print(int)
if (_tipo_stampa == senza_IV_direttiva) if (_tipo_stampa == senza_IV_direttiva)
{ {
_conto_classificato = TRUE; _conto_classificato = true;
_sottoc_classificato = 0; _sottoc_classificato = 0;
_stampa_riga_vuota = FALSE; _stampa_riga_vuota = false;
_prima_volta = TRUE; _prima_volta = true;
} }
switch (_tipo_stampa) switch (_tipo_stampa)
@ -1225,14 +1052,7 @@ bool CG1100_application::set_print(int)
break; break;
case senza_ana_bil: case senza_ana_bil:
{ {
_tpcon = new TIsamtempfile (LF_PCON, "ab", TRUE); current_cursor()->setfilter("CODCBL==\"\"");
_relt = new TRelation (_tpcon);
TCursor *tcursor = new TCursor (_relt);
_cur_c3 = add_cursor (tcursor);
select_cursor(_cur_c1);
prepara_pcon_temp();
break; break;
} }
case con_IV_direttiva: case con_IV_direttiva:
@ -1243,15 +1063,14 @@ bool CG1100_application::set_print(int)
default: default:
break; break;
} }
//init_sort();
intesta (_tipo_stampa); intesta (_tipo_stampa);
printer().footerlen(5); printer().footerlen(5);
return TRUE; return true;
} }
return FALSE; return false;
} }
void CG1100_application::intesta (stampe tipo) void CG1100_application::intesta (stampe tipo)
@ -1290,7 +1109,7 @@ void CG1100_application::intesta (stampe tipo)
s.fill('-'); s.fill('-');
set_header (soh++, (const char *) s); set_header (soh++, (const char *) s);
set_header (soh++, FR("@58gCodici Piano@116gSez. e Classe")); set_header (soh++, FR("@58gCodici Piano@116gSez. e Classe"));
set_header (soh++, FR("Classe@14gDescrizione@58gdei Conti @73gDescrizione@116gdi segno opposto")); set_header (soh++, FR("Classe@16gDescrizione@58gdei Conti @73gDescrizione@116gdi segno opposto"));
break; break;
@ -1315,7 +1134,7 @@ void CG1100_application::intesta (stampe tipo)
s.fill('-'); s.fill('-');
set_header (soh++, (const char *) s); set_header (soh++, (const char *) s);
set_header (soh++, FR("Codice @62gCodici Piano@118gDet.alleg.bil.")); set_header (soh++, FR("Codice @62gCodici Piano@118gDet.alleg.bil."));
set_header (soh++, FR("Tabella@11gDescrizione@62gdei Conti @78gDescrizione@118gSot.con * Mov.")); set_header (soh++, FR("Tabella@13gDescrizione@62gdei Conti @78gDescrizione@118gSot.con * Mov."));
break; break;
case senza_ana_bil: case senza_ana_bil:
@ -1335,94 +1154,56 @@ void CG1100_application::intesta (stampe tipo)
} }
const char* CG1100_application::descrizione_numero(char sezione, char lettera, int numr, int numero) const TString & CG1100_application::descrizione_numero(char sezione, char lettera, int numr, const char * numero)
{ {
TTable& tabivd = *_tab; TString key;
TString dep,dep2;
tabivd.zero(); if (numr == 0)
if (numr == 0 && numero == 0) key.format("%c%c %-4s",sezione, lettera, numero);
dep = format("%c%c",sezione,lettera);
else else
if (numero == 0) key.format("%1c%1c%04d%-4s",sezione, lettera, numr, numero);
{ key.trim();
if (numr != 0)
dep = format("%1c%1c%04d",sezione, lettera, numr);
else
dep = format("%c%c ",sezione,lettera);
}
else
{
if (numr != 0)
dep = format("%1c%1c%04d%02d",sezione, lettera, numr,numero);
else
dep = format("%c%c %02d",sezione,lettera,numero);
}
tabivd.put("CODTAB", dep); const TRectype & ivd = cache().get(TAB_IVD, key);
tabivd.read();
dep2 = tabivd.get("CODTAB"); return ivd.get("S0");
if (dep == dep2)
tmp = tabivd.get("S0");
else
tmp = "";
return tmp;
} }
const char* CG1100_application::descrizione_codcbl(TString& codcbl) const TString & CG1100_application::descrizione_codcbl(const TString& codcbl)
{ {
TLocalisamfile abpcon (LF_ABPCON); const TRectype & abpcon = cache().get(LF_ABPCON, codcbl);
abpcon.setkey(1); return abpcon.get("DESCRIZ");
abpcon.zero();
abpcon.put("CODCBL", codcbl);
if (abpcon.read() == NOERR)
tmp = abpcon.get("DESCRIZ");
else
tmp = "";
return tmp;
} }
bool CG1100_application::user_create() bool CG1100_application::user_create()
{ {
open_files(LF_NDITTE, LF_PCON, LF_TABCOM, LF_TAB, 0);
_rel = new TRelation (LF_PCON); _rel = new TRelation (LF_PCON);
_tab = new TTable(TAB_IVD);
_msk = new TMask ("cg1100a") ; _msk = new TMask ("cg1100a") ;
_pcon = new TLocalisamfile (LF_PCON);
TCursor *cursor = new TCursor (_rel); TCursor *cursor = new TCursor (_rel);
_cur_c1 = add_cursor (cursor); _cur_c1 = add_cursor (cursor);
_rec = new TRectype (cursor->curr()); _rec = new TRectype (cursor->curr());
_pcont_reclen = _rec->len();
_sort = new TSort(_pcont_reclen);
_cur_c2 = add_cursor (NULL); _cur_c2 = add_cursor (NULL);
add_file(LF_PCON); add_file(LF_PCON);
_tipo_stampa = completa; _tipo_stampa = completa;
_salto_pag = FALSE; _salto_pag = false;
_bil = new bil_ivd; _bil = new bil_ivd;
_sort = new TSort(); _sort = new TSort();
return TRUE;
return true;
} }
bool CG1100_application::user_destroy() bool CG1100_application::user_destroy()
{ {
delete _rel; delete _rel;
delete _tab;
delete _pcon;
//delete _tpcon;
delete _msk; delete _msk;
delete _rec; delete _rec;
// delete _descr;
delete _bil; delete _bil;
delete _sort; delete _sort;
return TRUE; return true;
} }
int cg1100(int argc, char* argv[]) int cg1100(int argc, char* argv[])

88
cg/cg3200.cpp
View File

@ -87,7 +87,7 @@ class TMastrini_application : public TPrintapp
TDate _data_ini,_data_fine,_data_finese,_data_finesesucc,_ultima_data_reg; TDate _data_ini,_data_fine,_data_finese,_data_finesesucc,_ultima_data_reg;
TDate _datareg,_datadoc,_data_inizioese,_datareg_stampa,_inizioes; TDate _datareg,_datadoc,_data_inizioese,_datareg_stampa,_inizioes;
int _cur1,_cur2,_gruppo,_conto,_numcarat,_stampanum,_numivd,_annoiva; int _cur1,_cur2,_gruppo,_conto,_numcarat,_stampanum,_annoiva;
int _numrig,_natdoc,_tipo,_selez_mastrini,_g_prec,_c_prec,_numrivd_int; int _numrig,_natdoc,_tipo,_selez_mastrini,_g_prec,_c_prec,_numrivd_int;
real _progredare,_progreavere,_totprogre_dare_al,_totprogre_avere_al; real _progredare,_progreavere,_totprogre_dare_al,_totprogre_avere_al;
real _totprogre_dare,_totprogre_avere,_importo; real _totprogre_dare,_totprogre_avere,_importo;
@ -97,7 +97,7 @@ class TMastrini_application : public TPrintapp
real _saldo_movimenti,_saldo_progressivi,_totale_saldo,_riporto_footer_dare,_riporto_footer_avere; real _saldo_movimenti,_saldo_progressivi,_totale_saldo,_riporto_footer_dare,_riporto_footer_avere;
TString _ragsoc,_indulc,_civulc,_capulc,_com,_prov,_comulc; TString _ragsoc,_indulc,_civulc,_capulc,_com,_prov,_comulc;
long _codice_ditta,_s_prec; long _codice_ditta,_s_prec;
TString _tipodoc,_codcaus,_descrcaus,_descrdociva,_regiva,_g_contr,_c_contr,_s_contr,_descrcontr; TString _tipodoc,_codcaus,_descrcaus,_descrdociva,_regiva,_g_contr,_c_contr,_s_contr,_descrcontr,_numivd;
char _sezivd,_lettivd; char _sezivd,_lettivd;
TString _descrizione,_sezione,_numdoc,_descrizionemov,_numrivd,_descr; TString _descrizione,_sezione,_numdoc,_descrizionemov,_numrivd,_descr;
TString _dataregs, _datadocs; TString _dataregs, _datadocs;
@ -187,7 +187,7 @@ public:
const char* descrizione_gruppo(); const char* descrizione_gruppo();
const char* descrizione_conto(); const char* descrizione_conto();
const char* descrizione_sottoconto(); const char* descrizione_sottoconto();
const char* descrizione_classe(char,char,int,int); const char* descrizione_classe(char,char,int,const char *);
bool almeno_un_record(); bool almeno_un_record();
void ricerca_dati_ditta(); void ricerca_dati_ditta();
void conto(int,int,bool); void conto(int,int,bool);
@ -3385,20 +3385,20 @@ void TMastrini_application::ricerca_clifo()
_lettivd = pconti.get_char(PCN_LETTIVD); _lettivd = pconti.get_char(PCN_LETTIVD);
numrivd = pconti.get_int(PCN_NUMRIVD); numrivd = pconti.get_int(PCN_NUMRIVD);
_numrivd = itor(numrivd); _numrivd = itor(numrivd);
_numivd = pconti.get_int(PCN_NUMIVD); _numivd = pconti.get(PCN_NUMIVD);
descriz = descrizione_classe(_sezivd,_lettivd,numrivd,_numivd); descriz = descrizione_classe(_sezivd,_lettivd,numrivd, _numivd);
if (_numivd != 0) //Ora devo stampare la descrizione del livello della if (_numivd.not_empty()) //Ora devo stampare la descrizione del livello della
{ //classe immediatamente precedente a quello appena { //classe immediatamente precedente a quello appena
if (_numrivd != "") //stampato if (_numrivd.not_empty()) //stampato
descriz2 = descrizione_classe(_sezivd,_lettivd,_numrivd_int,0); descriz2 = descrizione_classe(_sezivd,_lettivd,_numrivd_int,"");
else else
descriz2 = descrizione_classe(_sezivd,_lettivd,0,0); descriz2 = descrizione_classe(_sezivd,_lettivd,0,"");
} }
else else
if (_numrivd != "") if (_numrivd.not_empty())
descriz2 = descrizione_classe(_sezivd,_lettivd,0,0); descriz2 = descrizione_classe(_sezivd,_lettivd,0,"");
else else
descriz2 = ""; descriz2 = "";
@ -3410,8 +3410,8 @@ void TMastrini_application::ricerca_clifo()
else else
set_header (4, "%s@8g%c", TR("Classe") , _lettivd); set_header (4, "%s@8g%c", TR("Classe") , _lettivd);
set_header (4, "@10g%-8s", (const char*) _numrivd); set_header (4, "@10g%-8s", (const char*) _numrivd);
if (_numivd != 0) if (_numivd.not_empty())
set_header (4, "@19g%2d", _numivd); set_header (4, "@19g%-4s", (const char *) _numivd);
if (descriz2 != "") if (descriz2 != "")
{ {
set_header (4,"@23g%-50s",(const char*) descriz2); set_header (4,"@23g%-50s",(const char*) descriz2);
@ -3515,20 +3515,20 @@ int TMastrini_application::ricerca_clifo(int start)
_lettivd = pconti.get_char(PCN_LETTIVD); _lettivd = pconti.get_char(PCN_LETTIVD);
numrivd = pconti.get_int(PCN_NUMRIVD); numrivd = pconti.get_int(PCN_NUMRIVD);
_numrivd = itor(numrivd); _numrivd = itor(numrivd);
_numivd = pconti.get_int(PCN_NUMIVD); _numivd = pconti.get(PCN_NUMIVD);
descriz = descrizione_classe(_sezivd,_lettivd,numrivd,_numivd); descriz = descrizione_classe(_sezivd,_lettivd,numrivd,_numivd);
if (_numivd != 0) //Ora devo stampare la descrizione del livello della if (_numivd.not_empty()) //Ora devo stampare la descrizione del livello della
{ //classe immediatamente precedente a quello appena { //classe immediatamente precedente a quello appena
if (_numrivd != "") //stampato if (_numrivd.not_empty()) //stampato
descriz2 = descrizione_classe(_sezivd,_lettivd,_numrivd_int,0); descriz2 = descrizione_classe(_sezivd,_lettivd,_numrivd_int,"");
else else
descriz2 = descrizione_classe(_sezivd,_lettivd,0,0); descriz2 = descrizione_classe(_sezivd,_lettivd,0,"");
} }
else else
if (_numrivd != "") if (_numrivd.not_empty())
descriz2 = descrizione_classe(_sezivd,_lettivd,0,0); descriz2 = descrizione_classe(_sezivd,_lettivd,0,"");
else else
descriz2 = ""; descriz2 = "";
@ -3540,9 +3540,9 @@ int TMastrini_application::ricerca_clifo(int start)
else else
set_row(r, "%s@8g%c", TR("Classe"), _lettivd); set_row(r, "%s@8g%c", TR("Classe"), _lettivd);
set_row(r, "@10g%-8s", (const char*) _numrivd); set_row(r, "@10g%-8s", (const char*) _numrivd);
if (_numivd != 0) if (_numivd.not_empty())
set_row(r, "@19g%2d", _numivd); set_row(r, "@19g%-4s", (const char *) _numivd);
if (descriz2 != "") if (descriz2.not_empty())
{ {
set_row(r,"@23g%-50s",(const char*) descriz2); set_row(r,"@23g%-50s",(const char*) descriz2);
set_row(r++,"@80g%-50s",(const char*) descriz); set_row(r++,"@80g%-50s",(const char*) descriz);
@ -3614,7 +3614,7 @@ void TMastrini_application::ricerca_classe_IV(bool scelta)
_lettivd = pconti.get_char(PCN_LETTIVD); _lettivd = pconti.get_char(PCN_LETTIVD);
_numrivd_int = pconti.get_int (PCN_NUMRIVD); _numrivd_int = pconti.get_int (PCN_NUMRIVD);
_numrivd = itor(_numrivd_int); _numrivd = itor(_numrivd_int);
_numivd = pconti.get_int (PCN_NUMIVD); _numivd = pconti.get(PCN_NUMIVD);
} }
void TMastrini_application::ricerca_gruppo() void TMastrini_application::ricerca_gruppo()
@ -3628,16 +3628,16 @@ void TMastrini_application::ricerca_gruppo()
ricerca_classe_IV (FALSE); //Allora la cerco a livello di conto ricerca_classe_IV (FALSE); //Allora la cerco a livello di conto
descriz = descrizione_classe(_sezivd,_lettivd,_numrivd_int,_numivd); descriz = descrizione_classe(_sezivd,_lettivd,_numrivd_int,_numivd);
if (_numivd != 0) //Ora devo stampare la descrizione del livello della if (_numivd.not_empty()) //Ora devo stampare la descrizione del livello della
{ //classe immediatamente precedente a quello appena { //classe immediatamente precedente a quello appena
if (_numrivd != "") //stampato if (_numrivd.not_empty()) //stampato
descriz2 = descrizione_classe(_sezivd,_lettivd,_numrivd_int,0); descriz2 = descrizione_classe(_sezivd,_lettivd,_numrivd_int,"");
else else
descriz2 = descrizione_classe(_sezivd,_lettivd,0,0); descriz2 = descrizione_classe(_sezivd,_lettivd,0,"");
} }
else else
if (_numrivd != "") if (_numrivd.not_empty())
descriz2 = descrizione_classe(_sezivd,_lettivd,0,0); descriz2 = descrizione_classe(_sezivd,_lettivd,0,"");
else else
descriz2 = ""; descriz2 = "";
@ -3650,9 +3650,9 @@ void TMastrini_application::ricerca_gruppo()
else else
set_header (4, "@0g%s@12g%c", TR("Classe"), _lettivd); set_header (4, "@0g%s@12g%c", TR("Classe"), _lettivd);
set_header (4, "@14g%-8s",(const char*) _numrivd); set_header (4, "@14g%-8s",(const char*) _numrivd);
if (_numivd != 0) if (_numivd.not_empty())
set_header (4, "@23g%d", _numivd); set_header (4, "@23g%-4s", (const char *) _numivd);
if (descriz2 != "") if (descriz2.not_empty())
{ {
set_header (4,"@27g%-50s",(const char*) descriz2); set_header (4,"@27g%-50s",(const char*) descriz2);
set_header (4,"@80g%-50s",(const char*) descriz); set_header (4,"@80g%-50s",(const char*) descriz);
@ -3703,16 +3703,16 @@ int TMastrini_application::ricerca_gruppo(int start)
ricerca_classe_IV (FALSE); //Allora la cerco a livello di conto ricerca_classe_IV (FALSE); //Allora la cerco a livello di conto
descriz = descrizione_classe(_sezivd,_lettivd,_numrivd_int,_numivd); descriz = descrizione_classe(_sezivd,_lettivd,_numrivd_int,_numivd);
if (_numivd != 0) //Ora devo stampare la descrizione del livello della if (_numivd.not_empty()) //Ora devo stampare la descrizione del livello della
{ //classe immediatamente precedente a quello appena { //classe immediatamente precedente a quello appena
if (_numrivd != "") //stampato if (_numrivd.not_empty()) //stampato
descriz2 = descrizione_classe(_sezivd,_lettivd,_numrivd_int,0); descriz2 = descrizione_classe(_sezivd,_lettivd,_numrivd_int,"");
else else
descriz2 = descrizione_classe(_sezivd,_lettivd,0,0); descriz2 = descrizione_classe(_sezivd,_lettivd,0,"");
} }
else else
if (_numrivd != "") if (_numrivd.not_empty())
descriz2 = descrizione_classe(_sezivd,_lettivd,0,0); descriz2 = descrizione_classe(_sezivd,_lettivd,0,"");
else else
descriz2 = ""; descriz2 = "";
@ -3725,8 +3725,8 @@ int TMastrini_application::ricerca_gruppo(int start)
else else
set_row(r, "@0g%s@12g%c", TR("Classe"), _lettivd); set_row(r, "@0g%s@12g%c", TR("Classe"), _lettivd);
set_row(r, "@14g%-8s",(const char*) _numrivd); set_row(r, "@14g%-8s",(const char*) _numrivd);
if (_numivd != 0) if (_numivd.not_empty())
set_row(r, "@23g%d", _numivd); set_row(r, "@23g%-4s", (const char *) _numivd);
if (descriz2 != "") if (descriz2 != "")
{ {
set_row(r,"@27g%-50s",(const char*) descriz2); set_row(r,"@27g%-50s",(const char*) descriz2);
@ -3781,7 +3781,7 @@ int TMastrini_application::ricerca_gruppo(int start)
return r; return r;
} }
const char* TMastrini_application::descrizione_classe(char sezione, char lettera, int numr, int numero) const char* TMastrini_application::descrizione_classe(char sezione, char lettera, int numr, const char * numero)
{ {
TString16 key; TString16 key;
@ -3793,9 +3793,9 @@ const char* TMastrini_application::descrizione_classe(char sezione, char lettera
else else
{ {
if (numr != 0) if (numr != 0)
key.format("%c%c%04d%02d",sezione, lettera, numr,numero); key.format("%c%c%04d%-4s",sezione, lettera, numr,numero);
else else
key.format("%c%c %02d",sezione,lettera,numero); key.format("%c%c %-4s",sezione,lettera,numero);
} }
return cache().get("%IVD", key, "S0"); return cache().get("%IVD", key, "S0");

2
cg/cg3400.cpp
View File

@ -1816,9 +1816,9 @@ bool TStampa_giornale::set_print(int)
if (_stampa_definitiva) if (_stampa_definitiva)
{ {
TEsercizi_contabili esc; TEsercizi_contabili esc;
_ae_solare = _data_a.year();
_ae = esc.date2esc(_data_a); _ae = esc.date2esc(_data_a);
_data_da = esc[_ae].inizio(); _data_da = esc[_ae].inizio();
_ae_solare = _data_da.year(); // qui modificato
// Controlla che non siano rimasti movimenti ancora da stampare dell'es.prec. // Controlla che non siano rimasti movimenti ancora da stampare dell'es.prec.
if (_stampa_stesso_registro) if (_stampa_stesso_registro)

306
cg/cg5800a.frm
View File

@ -183,447 +183,347 @@ END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 23 " Non assegnati Op.Imponibili " PROMPT 33 23 "@bOp. Imponibili"
END
STRINGA -1
BEGIN
PROMPT 73 23 "Imposte"
END
STRINGA -1
BEGIN
PROMPT 1 25 "Non assegnati"
END END
VALUTA FFR_REGIMP(00) 18 VALUTA FFR_REGIMP(00) 18
BEGIN
PROMPT 29 23 ""
END
STRINGA -1
BEGIN
PROMPT 54 23 "Imposte"
END
VALUTA FFR_REGIVA(00) 18
BEGIN
PROMPT 62 23 ""
END
STRINGA -1
BEGIN
PROMPT 1 24 " VT2 Abruzzo Op.Imponibili "
END
VALUTA FFR_REGIMP(01) 18
BEGIN
PROMPT 29 24 ""
END
STRINGA -1
BEGIN
PROMPT 54 24 "Imposte"
END
VALUTA FFR_REGIVA(01) 18
BEGIN
PROMPT 51 24 ""
END
STRINGA -1
BEGIN
PROMPT 1 25 "VT3 Basilicata Op.Imponibili "
END
VALUTA FFR_REGIMP(02) 18
BEGIN BEGIN
PROMPT 29 25 "" PROMPT 29 25 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(00) 18
BEGIN
PROMPT 54 25 "Imposte"
END
VALUTA FFR_REGIVA(02) 18
BEGIN BEGIN
PROMPT 62 25 "" PROMPT 62 25 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 26 " VT4 Bolzano Op.Imponibili " PROMPT 1 26 "VT2 Abruzzo"
END END
VALUTA FFR_REGIMP(03) 18 VALUTA FFR_REGIMP(01) 18
BEGIN BEGIN
PROMPT 29 26 "" PROMPT 29 26 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(01) 18
BEGIN BEGIN
PROMPT 54 26 "Imposte" PROMPT 51 26 ""
END
VALUTA FFR_REGIVA(03) 18
BEGIN
PROMPT 62 26 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 27 " VT5 Calabria Op.Imponibili " PROMPT 1 27 "VT3 Basilicata"
END END
VALUTA FFR_REGIMP(04) 18 VALUTA FFR_REGIMP(02) 18
BEGIN BEGIN
PROMPT 29 27 "" PROMPT 29 27 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(02) 18
BEGIN
PROMPT 54 27 "Imposte"
END
VALUTA FFR_REGIVA(04) 18
BEGIN BEGIN
PROMPT 62 27 "" PROMPT 62 27 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 28 " VT6 Campania Op.Imponibili " PROMPT 1 28 "VT4 Bolzano"
END END
VALUTA FFR_REGIMP(05) 18 VALUTA FFR_REGIMP(03) 18
BEGIN BEGIN
PROMPT 29 28 "" PROMPT 29 28 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(03) 18
BEGIN
PROMPT 54 28 "Imposte"
END
VALUTA FFR_REGIVA(05) 18
BEGIN BEGIN
PROMPT 62 28 "" PROMPT 62 28 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 29 "VT7 Emilia Rom.Op.Imponibili " PROMPT 1 29 "VT5 Calabria"
END END
VALUTA FFR_REGIMP(06) 18 VALUTA FFR_REGIMP(04) 18
BEGIN BEGIN
PROMPT 29 29 "" PROMPT 29 29 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(04) 18
BEGIN
PROMPT 54 29 "Imposte"
END
VALUTA FFR_REGIVA(06) 18
BEGIN BEGIN
PROMPT 62 29 "" PROMPT 62 29 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 30 " VT8 Friuli Op.Imponibili " PROMPT 1 30 "VT6 Campania"
END END
VALUTA FFR_REGIMP(07) 18 VALUTA FFR_REGIMP(05) 18
BEGIN BEGIN
PROMPT 29 30 "" PROMPT 29 30 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(05) 18
BEGIN
PROMPT 54 30 "Imposte"
END
VALUTA FFR_REGIVA(07) 18
BEGIN BEGIN
PROMPT 62 30 "" PROMPT 62 30 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 31 " VT9 Lazio Op.Imponibili " PROMPT 1 31 "VT7 Emilia Rom."
END END
VALUTA FFR_REGIMP(08) 18 VALUTA FFR_REGIMP(06) 18
BEGIN BEGIN
PROMPT 29 31 "" PROMPT 29 31 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(06) 18
BEGIN
PROMPT 54 31 "Imposte"
END
VALUTA FFR_REGIVA(08) 18
BEGIN BEGIN
PROMPT 62 31 "" PROMPT 62 31 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 32 " VT10 Liguria Op.Imponibili " PROMPT 1 32 "VT8 Friuli"
END END
VALUTA FFR_REGIMP(09) 18 VALUTA FFR_REGIMP(07) 18
BEGIN BEGIN
PROMPT 29 32 "" PROMPT 29 32 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(07) 18
BEGIN
PROMPT 54 32 "Imposte"
END
VALUTA FFR_REGIVA(09) 18
BEGIN BEGIN
PROMPT 62 32 "" PROMPT 62 32 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 33 "VT11 Lombardia Op.Imponibili " PROMPT 1 33 "VT9 Lazio"
END END
VALUTA FFR_REGIMP(10) 18 VALUTA FFR_REGIMP(08) 18
BEGIN BEGIN
PROMPT 29 33 "" PROMPT 29 33 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(08) 18
BEGIN
PROMPT 54 33 "Imposte"
END
VALUTA FFR_REGIVA(10) 18
BEGIN BEGIN
PROMPT 62 33 "" PROMPT 62 33 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 34 " VT12 Marche Op.Imponibili " PROMPT 1 34 "VT10 Liguria"
END END
VALUTA FFR_REGIMP(11) 18 VALUTA FFR_REGIMP(09) 18
BEGIN BEGIN
PROMPT 1 34 "" PROMPT 29 34 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(09) 18
BEGIN
PROMPT 54 34 "Imposte"
END
VALUTA FFR_REGIVA(11) 18
BEGIN BEGIN
PROMPT 62 34 "" PROMPT 62 34 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 35 " VT13 Molise Op.Imponibili " PROMPT 1 35 "VT11 Lombardia"
END END
VALUTA FFR_REGIMP(12) 18 VALUTA FFR_REGIMP(10) 18
BEGIN BEGIN
PROMPT 29 35 "" PROMPT 29 35 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(10) 18
BEGIN
PROMPT 54 35 "Imposte"
END
VALUTA FFR_REGIVA(12) 18
BEGIN BEGIN
PROMPT 62 35 "" PROMPT 62 35 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 36 " VT14 Piemonte Op.Imponibili " PROMPT 1 36 "VT12 Marche"
END END
VALUTA FFR_REGIMP(13) 18 VALUTA FFR_REGIMP(11) 18
BEGIN BEGIN
PROMPT 1 36 "" PROMPT 1 36 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(11) 18
BEGIN
PROMPT 54 36 "Imposte"
END
VALUTA FFR_REGIVA(13) 18
BEGIN BEGIN
PROMPT 62 36 "" PROMPT 62 36 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 37 " VT15 Puglia Op.Imponibili " PROMPT 1 37 "VT13 Molise"
END END
VALUTA FFR_REGIMP(14) 18 VALUTA FFR_REGIMP(12) 18
BEGIN BEGIN
PROMPT 29 37 "" PROMPT 29 37 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(12) 18
BEGIN
PROMPT 54 37 "Imposte"
END
VALUTA FFR_REGIVA(14) 18
BEGIN BEGIN
PROMPT 62 37 "" PROMPT 62 37 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 38 " VT16 Sardegna Op.Imponibili " PROMPT 1 38 "VT14 Piemonte"
END END
VALUTA FFR_REGIMP(15) 18 VALUTA FFR_REGIMP(13) 18
BEGIN BEGIN
PROMPT 29 38 "" PROMPT 1 38 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(13) 18
BEGIN
PROMPT 54 38 "Imposte"
END
VALUTA FFR_REGIVA(15) 18
BEGIN BEGIN
PROMPT 62 38 "" PROMPT 62 38 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 39 " VT17 Sicilia Op.Imponibili " PROMPT 1 39 "VT15 Puglia"
END END
VALUTA FFR_REGIMP(16) 18 VALUTA FFR_REGIMP(14) 18
BEGIN BEGIN
PROMPT 29 39 "" PROMPT 29 39 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(14) 18
BEGIN
PROMPT 54 39 "Imposte"
END
VALUTA FFR_REGIVA(16) 18
BEGIN BEGIN
PROMPT 62 39 "" PROMPT 62 39 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 40 " VT18 Toscana Op.Imponibili " PROMPT 1 40 "VT16 Sardegna"
END END
VALUTA FFR_REGIMP(17) 18 VALUTA FFR_REGIMP(15) 18
BEGIN BEGIN
PROMPT 29 40 "" PROMPT 29 40 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(15) 18
BEGIN
PROMPT 54 40 "Imposte"
END
VALUTA FFR_REGIVA(17) 18
BEGIN BEGIN
PROMPT 62 40 "" PROMPT 62 40 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 41 " VT19 Trento Op.Imponibili " PROMPT 1 41 "VT17 Sicilia"
END END
VALUTA FFR_REGIMP(18) 18 VALUTA FFR_REGIMP(16) 18
BEGIN BEGIN
PROMPT 29 41 "" PROMPT 29 41 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(16) 18
BEGIN
PROMPT 54 41 "Imposte"
END
VALUTA FFR_REGIVA(18) 18
BEGIN BEGIN
PROMPT 62 41 "" PROMPT 62 41 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 42 " VT20 Umbria Op.Imponibili " PROMPT 1 42 "VT18 Toscana"
END END
VALUTA FFR_REGIMP(19) 18 VALUTA FFR_REGIMP(17) 18
BEGIN BEGIN
PROMPT 29 42 "" PROMPT 29 42 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(17) 18
BEGIN
PROMPT 54 42 "Imposte"
END
VALUTA FFR_REGIVA(19) 18
BEGIN BEGIN
PROMPT 62 42 "" PROMPT 62 42 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 43 "VT21 Valle d'Aosta op.impon. " PROMPT 1 43 "VT19 Trento"
END END
VALUTA FFR_REGIMP(20) 18 VALUTA FFR_REGIMP(18) 18
BEGIN BEGIN
PROMPT 29 43 "" PROMPT 29 43 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(18) 18
BEGIN
PROMPT 54 43 "Imposte"
END
VALUTA FFR_REGIVA(20) 18
BEGIN BEGIN
PROMPT 62 43 "" PROMPT 62 43 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 1 44 " VT22 Veneto Op.Imponibili " PROMPT 1 44 "VT20 Umbria"
END END
VALUTA FFR_REGIMP(21) 18 VALUTA FFR_REGIMP(19) 18
BEGIN BEGIN
PROMPT 29 44 "" PROMPT 29 44 ""
END END
STRINGA -1 VALUTA FFR_REGIVA(19) 18
BEGIN
PROMPT 54 44 "Imposte"
END
VALUTA FFR_REGIVA(21) 18
BEGIN BEGIN
PROMPT 62 44 "" PROMPT 62 44 ""
END END
STRINGA -1 STRINGA -1
BEGIN BEGIN
PROMPT 2 46 "______________________________________________________________________________" PROMPT 1 45 "VT21 Valle d'Aosta"
END
VALUTA FFR_REGIMP(20) 18
BEGIN
PROMPT 29 45 ""
END
VALUTA FFR_REGIVA(20) 18
BEGIN
PROMPT 62 45 ""
END
STRINGA -1
BEGIN
PROMPT 1 46 "VT22 Veneto"
END
VALUTA FFR_REGIMP(21) 18
BEGIN
PROMPT 29 46 ""
END
VALUTA FFR_REGIVA(21) 18
BEGIN
PROMPT 62 46 ""
END
STRINGA -1
BEGIN
PROMPT 2 48 "______________________________________________________________________________"
END END
END END

2
cg/cg5800b.uml
View File

@ -429,7 +429,7 @@ END
CURRENCY FM_REGIMP(20) 18 CURRENCY FM_REGIMP(20) 18
BEGIN BEGIN
PROMPT 1 18 "VT21 Valle d'Aosta op.impon. " PROMPT 1 18 "VT21 Valle d'Aosta "
FLAGS "D" FLAGS "D"
END END

3
cg/cg5800ra.rep
View File

@ -94,7 +94,8 @@
<prescript description="F3.102 PRESCRIPT">MESSAGE ADD,F2.202</prescript> <prescript description="F3.102 PRESCRIPT">MESSAGE ADD,F2.202</prescript>
</field> </field>
</section> </section>
<sql>USE RMOVIVA SE (23.TIPO=="C")&#26;&#26;(23.ANNOIVA=#ANNO)&#26;&#26;(20.ALLEG=="6")&#26;&#26;(202@.S1=="") BY 23.ANNOIVA 13.CODREG 23.TIPO 23.CODCF NUMREG <sql>USE RMOVIVA SE (23.TIPO=="C")&#26;&#26;(23.ANNOIVA=#ANNO)&#26;&#26;(20.ALLEG=="6")&#26;&#26;(202@.S1=="")
BY 23.ANNOIVA 13.CODREG 23.TIPO 23.CODCF NUMREG
JOIN MOV INTO NUMREG==NUMREG JOIN MOV INTO NUMREG==NUMREG
JOIN CLIFO TO MOV INTO TIPOCF==TIPO CODCF==CODCF JOIN CLIFO TO MOV INTO TIPOCF==TIPO CODCF==CODCF
JOIN COMUNI TO CLIFO INTO STATO==STATOCF COM==COMCF JOIN COMUNI TO CLIFO INTO STATO==STATOCF COM==COMCF

163
cg/cg7200.cpp
View File

@ -16,9 +16,13 @@
#include <mov.h> #include <mov.h>
#include <rmov.h> #include <rmov.h>
#include <rmoviva.h> #include <rmoviva.h>
#include <pagsca.h>
#include <partite.h>
#define ALIAS_PCON1 100 #define ALIAS_PCON1 100
#define ALIAS_PCON2 200 #define ALIAS_PCON2 200
#define ALIAS_ABPCON1 300
#define ALIAS_ABPCON2 400
class TInvioP_file: public TFile_text class TInvioP_file: public TFile_text
{ {
@ -73,19 +77,25 @@ class TInvioP : public TSkeleton_application
TCursor* _cur; TCursor* _cur;
TInvioP_mask* _msk; TInvioP_mask* _msk;
TInvioP_file* _trasfile; TInvioP_file* _trasfile;
TInvioP_file* _trasfilepag;
TDate _dataini, _datafin; TDate _dataini, _datafin;
long _nregcosto, _nregpag;
real _importo;
protected: protected:
virtual bool create(void); virtual bool create(void);
virtual bool destroy(void); virtual bool destroy(void);
virtual void main_loop() ; virtual void main_loop() ;
void invio_proforma(); void invio_proforma();
bool i_proforma_movimenti(); bool i_proforma_movimenti(const bool pagamenti);
bool i_proforma_righe(); bool i_proforma_righe();
bool i_proforma_pagamenti(const TCursor& cur);
bool i_proforma_clifor(char tipocf = 'C'); bool i_proforma_clifor(char tipocf = 'C');
bool i_proforma_conti(); bool i_proforma_conti();
bool i_proforma_pagamenti();
public: public:
const real get_importo() {return _importo;};
const long get_nregcosto() {return _nregcosto;};
const long get_nregpag() {return _nregpag;};
TInvioP() {}; TInvioP() {};
virtual ~TInvioP() {}; virtual ~TInvioP() {};
}; };
@ -117,15 +127,46 @@ void TInvioP_file::validate(TCursor& cur,TRecord_text &rec, TToken_string &s, TS
valore << str; valore << str;
valore.trim(); valore.trim();
} }
else if (code == "_CODCBL")
{
valore = str;
int i = valore.find("$");
valore = valore.left(i);
}
else if (code == "_RAGSOC")
{
valore = str;
valore = valore.strip_d_spaces();
}
else if (code == "_FLAG")
{
const char chiusa = str[0];
valore = (chiusa=='X') ? "S" : "A";
}
else if (code == "_NREGCOSTO")
{
valore = app().get_nregcosto();
}
else if (code == "_NREGPAG")
{
valore = app().get_nregpag();
}
else if (code == "_IMPORTO")
{
valore = app().get_importo().string();
}
else NFCHECK("Macro non definita: %s", (const char *)code); else NFCHECK("Macro non definita: %s", (const char *)code);
str = valore; str = valore;
} }
bool TInvioP::create() bool TInvioP::create()
{ {
open_files(LF_CAUSALI, LF_CLIFO, LF_PCON, LF_MOV, LF_RMOV, LF_RMOVIVA, 0); open_files(LF_CAUSALI, LF_CLIFO, LF_PCON, LF_MOV, LF_RMOV, LF_RMOVIVA, LF_ABPCON, LF_PARTITE, 0);
_msk = new TInvioP_mask(); _msk = new TInvioP_mask();
_trasfile = NULL; _trasfile = NULL;
_trasfilepag = NULL;
return TSkeleton_application::create(); return TSkeleton_application::create();
} }
@ -133,6 +174,8 @@ bool TInvioP::destroy()
{ {
if (_trasfile) if (_trasfile)
delete _trasfile; delete _trasfile;
if (_trasfilepag)
delete _trasfilepag;
delete _msk; delete _msk;
return TSkeleton_application::destroy(); return TSkeleton_application::destroy();
@ -161,7 +204,7 @@ void TInvioP::invio_proforma()
{ {
if (_msk->get_bool(F_MOVIMENTI)) if (_msk->get_bool(F_MOVIMENTI))
{ {
i_proforma_movimenti(); i_proforma_movimenti(_msk->get_bool(F_PAGAMENTI));
i_proforma_righe(); i_proforma_righe();
} }
if (_msk->get_bool(F_CLIENTI)) if (_msk->get_bool(F_CLIENTI))
@ -177,7 +220,7 @@ bool TInvioP::i_proforma_conti()
TFilename configname = "proforma.ini"; TFilename configname = "proforma.ini";
TConfig configfile(configname); TConfig configfile(configname);
TFilename filename = _msk->get(F_DESTINAZIONE); TFilename filename = _msk->get(F_DESTINAZIONE);
filename.add("PIANOCON.TXT"); filename.add("pianocon.txt");
if (fexist(filename)) if (fexist(filename))
remove(filename); remove(filename);
_trasfile = new TInvioP_file(filename, configname); _trasfile = new TInvioP_file(filename, configname);
@ -204,17 +247,27 @@ bool TInvioP::i_proforma_conti()
return TRUE; return TRUE;
} }
bool TInvioP::i_proforma_movimenti() bool TInvioP::i_proforma_movimenti(const bool pagamenti)
{ {
TFilename configname = "proforma.ini"; TFilename configname = "proforma.ini";
TConfig configfile(configname); TConfig configfile(configname);
TFilename filename = _msk->get(F_DESTINAZIONE); TFilename filename = _msk->get(F_DESTINAZIONE);
filename.add("REGISTRA.TXT"); filename.add("registra.txt");
if (fexist(filename)) if (fexist(filename))
remove(filename); remove(filename);
_trasfile = new TInvioP_file(filename, configname); _trasfile = new TInvioP_file(filename, configname);
_trasfile->open(filename,'w'); _trasfile->open(filename,'w');
_trasfile->force_record_separator(); _trasfile->force_record_separator();
if (pagamenti)
{
TFilename filenamepag = _msk->get(F_DESTINAZIONE);
filenamepag.add("pagament.txt");
if (fexist(filenamepag))
remove(filenamepag);
_trasfilepag = new TInvioP_file(filenamepag, configname);
_trasfilepag->open(filenamepag,'w');
_trasfilepag->force_record_separator();
}
TRectype da(LF_MOV); TRectype da(LF_MOV);
TRectype a(LF_MOV); TRectype a(LF_MOV);
da.put(MOV_DATAREG, _dataini); da.put(MOV_DATAREG, _dataini);
@ -234,11 +287,19 @@ bool TInvioP::i_proforma_movimenti()
rec.set_type("T"); rec.set_type("T");
_trasfile->autoload(rec, cur); _trasfile->autoload(rec, cur);
_trasfile->write(rec); _trasfile->write(rec);
if (pagamenti)
i_proforma_pagamenti(cur);
} }
} }
_trasfile->close(); _trasfile->close();
delete _trasfile; delete _trasfile;
_trasfile = NULL; _trasfile = NULL;
if (pagamenti)
{
_trasfilepag->close();
delete _trasfilepag;
_trasfilepag = NULL;
}
return TRUE; return TRUE;
} }
@ -247,7 +308,7 @@ bool TInvioP::i_proforma_righe()
TFilename configname = "proforma.ini"; TFilename configname = "proforma.ini";
TConfig configfile(configname); TConfig configfile(configname);
TFilename filename = _msk->get(F_DESTINAZIONE); TFilename filename = _msk->get(F_DESTINAZIONE);
filename.add("RIGHE.TXT"); filename.add("righe.txt");
if (fexist(filename)) if (fexist(filename))
remove(filename); remove(filename);
_trasfile = new TInvioP_file(filename, configname); _trasfile = new TInvioP_file(filename, configname);
@ -262,14 +323,9 @@ bool TInvioP::i_proforma_righe()
rel.add(LF_RMOV, "NUMREG==NUMREG", 1); rel.add(LF_RMOV, "NUMREG==NUMREG", 1);
rel.add(LF_PCON, "GRUPPO==GRUPPO|CONTO==CONTO|SOTTOCONTO==SOTTOCONTO", 1, LF_RMOV, ALIAS_PCON1); rel.add(LF_PCON, "GRUPPO==GRUPPO|CONTO==CONTO|SOTTOCONTO==SOTTOCONTO", 1, LF_RMOV, ALIAS_PCON1);
rel.add(LF_PCON, "GRUPPO==GRUPPO|CONTO==CONTO|SOTTOCONTO==SOTTOCONTO", 1, LF_RMOVIVA, ALIAS_PCON2); rel.add(LF_PCON, "GRUPPO==GRUPPO|CONTO==CONTO|SOTTOCONTO==SOTTOCONTO", 1, LF_RMOVIVA, ALIAS_PCON2);
rel.add(LF_ABPCON, "CODCBL==CODCBL", 1, -ALIAS_PCON1, ALIAS_ABPCON1);
bool add(int logicnum, const char* relexprs, int key = 1, int linkto = 0, int alias = 0, bool allow_lock = FALSE); rel.add(LF_ABPCON, "CODCBL==CODCBL", 1, -ALIAS_PCON2, ALIAS_ABPCON2);
//rel.add("REG", "CODTAB[1,4]==ANNOIVA|CODTAB[5,7]==REG", 1);
//TString filtro = "(23->PROTIVA != \"\") && ";
//filtro << "(REG->I0 == 1) || (REG->I0 == 2)";
TCursor cur(&rel, "", 2, &da, &a); TCursor cur(&rel, "", 2, &da, &a);
//cur.setfilter(filtro, TRUE);
const long cur_items = cur.items(); const long cur_items = cur.items();
if (cur_items != 0) if (cur_items != 0)
{ {
@ -314,15 +370,88 @@ bool TInvioP::i_proforma_righe()
return TRUE; return TRUE;
} }
bool TInvioP::i_proforma_pagamenti(const TCursor& cur)
{
const char tipomov = cur.curr().get(MOV_TIPOMOV)[0];
if (tipomov == '3' || tipomov == '2' || tipomov == '6')
{
TRelation relpart(LF_PARTITE);
TRectype da(LF_PARTITE);
da.put(PART_NREG, cur.curr().get(MOV_NUMREG));
TCursor curpart(&relpart, "", 2, &da, &da);
const long curpart_items = curpart.items();
if (curpart_items != 0)
{
curpart.freeze();
TRectype& curpart_rec = curpart.curr();
for (curpart = 0; curpart.pos() < curpart_items; ++(curpart))
{
TRelation relpag(LF_PAGSCA);
TRectype da(LF_PAGSCA);
da.put(PAGSCA_TIPOC, curpart_rec.get(PART_TIPOCF));
da.put(PAGSCA_GRUPPO, curpart_rec.get(PART_GRUPPO));
da.put(PAGSCA_CONTO, curpart_rec.get(PART_CONTO));
da.put(PAGSCA_SOTTOCONTO, curpart_rec.get(PART_SOTTOCONTO));
da.put(PAGSCA_ANNO, curpart_rec.get(PART_ANNO));
da.put(PAGSCA_NUMPART, curpart_rec.get(PART_NUMPART));
const int nrigapart = curpart_rec.get_int(PART_NRIGA);
TString80 filtro;
filtro.format("NRIGP == %d", nrigapart);
TCursor curpag(&relpart, filtro, 1, &da, &da);
const long curpag_items = curpag.items();
if (curpag_items != 0)
{
TAssoc_array pagame;
pagame.destroy();
curpag.freeze();
TRectype& curpag_rec = curpag.curr();
for (curpag = 0; curpag.pos() < curpag_items; ++(curpag))
{
TString80 indice = curpag_rec.get(PAGSCA_ANNO);
indice << '|' << curpag_rec.get(PAGSCA_NUMPART);
indice << '|' << curpag_rec.get(PAGSCA_NRIGA);
real importo = ZERO;
bool is_key = pagame.is_key(indice);
real& somma = is_key ? (real&) pagame[indice] : importo;
somma += curpag_rec.get_real(PAGSCA_IMPORTO);
if (!is_key)
pagame.add(indice, somma);
}
// scrivo i record risultanti
real* cp;
for (cp = (real*) pagame.first_item(); cp != NULL; cp = (real*) pagame.succ_item())
{
TToken_string keypart;
keypart << curpart_rec.get(PART_TIPOCF);
keypart << curpart_rec.get(PART_GRUPPO);
keypart << curpart_rec.get(PART_CONTO);
keypart << curpart_rec.get(PART_SOTTOCONTO);
keypart << pagame.get_hashobj()->key();
const TRectype& partita = cache().get(LF_PARTITE, keypart);
_nregpag = cur.curr().get_long(MOV_NUMREG);
_nregcosto = partita.get_long(PART_NREG);
_importo = *cp;
TRecord_text recpag;
recpag.set_type("G");
_trasfilepag->autoload(recpag, curpag);
_trasfilepag->write(recpag);
}
}
}
}
}
return TRUE;
}
bool TInvioP::i_proforma_clifor(char tipocf) bool TInvioP::i_proforma_clifor(char tipocf)
{ {
TFilename configname = "proforma.ini"; TFilename configname = "proforma.ini";
TConfig configfile(configname); TConfig configfile(configname);
TFilename filename = _msk->get(F_DESTINAZIONE); TFilename filename = _msk->get(F_DESTINAZIONE);
if (tipocf == 'C') if (tipocf == 'C')
filename.add("CLIENTI.TXT"); filename.add("clienti.txt");
else else
filename.add("FORNIT.TXT"); filename.add("fornit.txt");
if (fexist(filename)) if (fexist(filename))
remove(filename); remove(filename);
_trasfile = new TInvioP_file(filename, configname); _trasfile = new TInvioP_file(filename, configname);

2
cg/cgp4.cpp
View File

@ -10,6 +10,8 @@ int main(int argc,char** argv)
{ {
case 0 : case 0 :
default: cgp4100(argc,argv) ; break; // Importa stipendi in prima nota (OMASA) default: cgp4100(argc,argv) ; break; // Importa stipendi in prima nota (OMASA)
case 1 :
default: cgp4200(argc,argv) ; break; // Importazione clienti (GSA/CODFIDI)
} }
exit(0); exit(0);
return 0; return 0;

2
cg/f19.dir
View File

@ -1,3 +1,3 @@
19 19
0 0
$pcon|798|798|144|7|Piano dei conti|NCON|| $pcon|||147|0|Piano dei conti|NCON||

4
cg/f19.trr
View File

@ -16,11 +16,11 @@ SOSPESO|8|1|0|Conto sospeso
SEZIVD|1|1|0|Sezione IV direttiva CEE SEZIVD|1|1|0|Sezione IV direttiva CEE
LETTIVD|1|1|0|Lettera IV direttiva CEE LETTIVD|1|1|0|Lettera IV direttiva CEE
NUMRIVD|1|8|0|Numero romano IV direttiva CEE NUMRIVD|1|8|0|Numero romano IV direttiva CEE
NUMIVD|2|2|0|Numero IV Direttiva CEE NUMIVD|1|4|0|Numero IV Direttiva CEE
SEZIVDOPP|1|1|0|Sezione di sezione opposta IV direttiva CEE SEZIVDOPP|1|1|0|Sezione di sezione opposta IV direttiva CEE
LETTIVDOPP|1|1|0|Lettera di sezione opposta IV direttiva CEE LETTIVDOPP|1|1|0|Lettera di sezione opposta IV direttiva CEE
NUMRIVDOPP|1|8|0|Numero romano di sezione opposta IV direttiva CEE NUMRIVDOPP|1|8|0|Numero romano di sezione opposta IV direttiva CEE
NUMIVDOPP|2|2|0|Numero di sezione opposta IV direttiva CEE NUMIVDOPP|1|4|0|Numero di sezione opposta IV direttiva CEE
RICSER|2|1|0|Ricavi per servizi RICSER|2|1|0|Ricavi per servizi
IVACOMP|1|4|0|Codice IVA di compensazione per regimi agricoli IVACOMP|1|4|0|Codice IVA di compensazione per regimi agricoli
CMSNEEDED|8|1|0|Codice cdc/commessa obbligatorio in prima nota CMSNEEDED|8|1|0|Codice cdc/commessa obbligatorio in prima nota

39
cg/proforma.ini
View File

@ -222,7 +222,8 @@ NAME(14) = VOCE DI SPESA
TYPE(14) = STRINGA TYPE(14) = STRINGA
POSITION(14) = 145 POSITION(14) = 145
LENGTH(14) = 10 LENGTH(14) = 10
FIELD(14) = 100@->CODCBL MESSAGE(14) = _CODCBL
FIELD(14) = 300@->DESCRIZ
[RECORD I] [RECORD I]
@ -303,7 +304,8 @@ NAME(14) = VOCE DI SPESA
TYPE(14) = STRINGA TYPE(14) = STRINGA
POSITION(14) = 145 POSITION(14) = 145
LENGTH(14) = 10 LENGTH(14) = 10
FIELD(14) = 200@->CODCBL MESSAGE(14) = _CODCBL
FIELD(14) = 400@->DESCRIZ
[RECORD C] [RECORD C]
@ -317,7 +319,8 @@ NAME(1) = RAGIONE SOCIALE
TYPE(1) = STRINGA TYPE(1) = STRINGA
POSITION(1) = 11 POSITION(1) = 11
LENGTH(1) = 40 LENGTH(1) = 40
FIELD(1) = 20->RAGSOC[1,40] MESSAGE(1) = _RAGSOC
FIELD(1) = 20->RAGSOC
NAME(2) = PARTITA IVA NAME(2) = PARTITA IVA
TYPE(2) = STRINGA TYPE(2) = STRINGA
@ -388,6 +391,36 @@ POSITION(3) = 15
LENGTH(3) = 80 LENGTH(3) = 80
FIELD(3)=19->DESCR FIELD(3)=19->DESCR
[RECORD G]
NAME(0) = ID REGISTRAZIONE PAGAMENTO
TYPE(0) = NUMERO
POSITION(0) = 0
LENGTH(0) = 10
MESSAGE(0) = _NREGPAG
NAME(1) = ID REGISTRAZIONE COSTO
TYPE(1) = NUMERO
POSITION(1) = 10
LENGTH(1) = 10
MESSAGE(1) = _NREGCOSTO
NAME(2) = IMPORTO
TYPE(2) = IMPORTO
POSITION(2) = 20
MESSAGE(2) = _IMPORTOPAG
NAME(3) = FLAG ACCONTO/SALDO
TYPE(3) = STRINGA
POSITION(3) = 34
LENGTH(3) = 1
MESSAGE(3) = _FLAG
NAME(4) = VALUTA
TYPE(4) = STRINGA
POSITION(4) = 35
LENGTH(4) = 1
MESSAGE(4)=_FISSO,!1
[OPZIONI] [OPZIONI]
PERCORSO = C:\TEMP\ PERCORSO = C:\TEMP\

68
cm/cm0100.cpp
View File

@ -10,6 +10,7 @@
#include "cm0100a.h" #include "cm0100a.h"
#include "cm0100.h" #include "cm0100.h"
#include "mov.h"
#include "rmov.h" #include "rmov.h"
#include "pconti.h" #include "pconti.h"
@ -19,9 +20,12 @@
class TForm_contixcdc : public TForm class TForm_contixcdc : public TForm
{ {
static TForm_contixcdc* _cur_form;
static void conti_header_handler(TPrinter& p);
public: public:
virtual bool validate(TForm_item &cf, TToken_string &s); virtual bool validate(TForm_item &cf, TToken_string &s);
void set_testata() { set_header(1, false); set_header(1, true); } void set_testata();
void set_pedata() { set_footer(1, false); set_footer(1, true); } void set_pedata() { set_footer(1, false); set_footer(1, true); }
TPrint_section& get_section(char s, pagetype pos); TPrint_section& get_section(char s, pagetype pos);
@ -29,6 +33,34 @@ public:
virtual ~TForm_contixcdc(); virtual ~TForm_contixcdc();
}; };
TForm_contixcdc* TForm_contixcdc::_cur_form = NULL;
void TForm_contixcdc::conti_header_handler(TPrinter& p)
{
TForm_contixcdc& f = *_cur_form;
if (f.firstpage_is_lastpage())
{
f.set_background(1, TRUE);
f.set_header(1, TRUE);
f.set_footer(0, FALSE);
}
else
{
const word page = f.page(p);
f.set_background(page, TRUE);
f.set_header(1, TRUE);
f.set_footer(page, FALSE);
}
}
void TForm_contixcdc::set_testata()
{
set_header(1, false); set_header(1, true);
_cur_form = this;
printer().setheaderhandler(conti_header_handler); // Setta handlers
}
TPrint_section& TForm_contixcdc::get_section(char s, pagetype pos) TPrint_section& TForm_contixcdc::get_section(char s, pagetype pos)
{ {
if (!exist(s, pos)) if (!exist(s, pos))
@ -135,6 +167,13 @@ bool TContixcdc_mask::on_field_event(TOperable_field& o, TField_event e, long jo
return error_box(TR("La data iniziale non può essere precedente alla data inizio esercizio %s"), (const char*) datainies.string()); return error_box(TR("La data iniziale non può essere precedente alla data inizio esercizio %s"), (const char*) datainies.string());
} }
} }
if (e == fe_close)
{
const int annoes = get_int(F_ANNO);
const TDate dataini = get(F_DATAINI);
if (annoes == 0 && !dataini.ok())
return error_box(TR("Data iniziale obbligatoria se anno esercizio non specificato"));
}
break; break;
case F_DATAFIN: case F_DATAFIN:
if (e == fe_modify || fe_close) if (e == fe_modify || fe_close)
@ -147,6 +186,13 @@ bool TContixcdc_mask::on_field_event(TOperable_field& o, TField_event e, long jo
return error_box(FR("La data finale non può essere successiva alla data fine esercizio %s"), (const char*) datafines.string()); return error_box(FR("La data finale non può essere successiva alla data fine esercizio %s"), (const char*) datafines.string());
} }
} }
if (e == fe_close)
{
const int annoes = get_int(F_ANNO);
const TDate datafin = get(F_DATAFIN);
if (annoes == 0 && !datafin.ok())
return error_box(TR("Data finale obbligatoria se anno esercizio non specificato"));
}
break; break;
default: break; default: break;
} }
@ -232,7 +278,7 @@ bool TContixCdc::destroy()
void TContixCdc::print_sottoc() void TContixCdc::print_sottoc()
{ {
if (!_t_sottoc._tot_periodo.is_zero()) if (!_t_sottoc._tot_periodo.is_zero() || !_t_sottoc._tot_progprec.is_zero())
{ {
if (_headercms) if (_headercms)
{ {
@ -361,6 +407,7 @@ void TContixCdc::print_special_section(char type, pagetype pos)
void TContixCdc::print_body(pagetype pos) void TContixCdc::print_body(pagetype pos)
{ {
print_special_section('B', pos); print_special_section('B', pos);
_form->set_testata();
} }
void TContixCdc::set_field(pagetype pos, int id, const real& val) void TContixCdc::set_field(pagetype pos, int id, const real& val)
@ -433,6 +480,9 @@ void TContixCdc::main_loop()
TString80 acdc = _mask->get(F_ACDC); // cdc/commessa finale TString80 acdc = _mask->get(F_ACDC); // cdc/commessa finale
TString80 afsc = _mask->get(F_AFSC); // fase finale TString80 afsc = _mask->get(F_AFSC); // fase finale
TRelation relrmov(LF_RMOV); TRelation relrmov(LF_RMOV);
if (_codes > 0)
relrmov.add(LF_MOV, "NUMREG==NUMREG"); //aggiunge le testate per avere la datacomp
TString filtro = ""; TString filtro = "";
if (_codes > 0) if (_codes > 0)
filtro.format("ANNOES==%d", _codes); filtro.format("ANNOES==%d", _codes);
@ -515,7 +565,7 @@ void TContixCdc::main_loop()
_currsottoc = rmovrec.get_long(RMV_SOTTOCONTO); _currsottoc = rmovrec.get_long(RMV_SOTTOCONTO);
_currgruppo = rmovrec.get_int(RMV_GRUPPO); _currgruppo = rmovrec.get_int(RMV_GRUPPO);
_currconto = rmovrec.get_int(RMV_CONTO); _currconto = rmovrec.get_int(RMV_CONTO);
TDate datareg = rmovrec.get_date(RMV_DATAREG);
const TImporto importo(rmovrec.get_char(RMV_SEZIONE), rmovrec.get_real(RMV_IMPORTO)); const TImporto importo(rmovrec.get_char(RMV_SEZIONE), rmovrec.get_real(RMV_IMPORTO));
if ((_oldcms != _currcms) || (_oldfsc != _currfsc) || (_oldgruppo != _currgruppo) || (_oldconto != _currconto) || (_oldsottoc != _currsottoc)) if ((_oldcms != _currcms) || (_oldfsc != _currfsc) || (_oldgruppo != _currgruppo) || (_oldconto != _currconto) || (_oldsottoc != _currsottoc))
{ {
@ -532,8 +582,16 @@ void TContixCdc::main_loop()
} }
} }
} }
aggiorna_totali(importo, datareg);
} TDate data;
if (_codes > 0)
data = relrmov.curr(LF_MOV).get_date(MOV_DATACOMP);
else
data = rmovrec.get_date(RMV_DATAREG);
aggiorna_totali(importo, data);
} //fine for
if (num > 0) if (num > 0)
{ {
print_sottoc(); print_sottoc();

6
cm/cm0100a.frm
View File

@ -88,6 +88,12 @@ BEGIN
PROMPT 40 6 "a fase: " PROMPT 40 6 "a fase: "
END END
STRINGA -1
BEGIN
KEY "Intestazione stampa"
PROMPT 1 7 "____________________________________________________________________________________________________________________________________"
END
END // section header first END // section header first
// intestazione comessa // intestazione comessa

65
cm/cm0200.cpp
View File

@ -17,12 +17,15 @@
class TForm_schedacdc : public TForm class TForm_schedacdc : public TForm
{ {
static TForm_schedacdc* _cur_form;
static void conti_header_handler(TPrinter& p);
public: public:
virtual bool validate(TForm_item &cf, TToken_string &s); virtual bool validate(TForm_item &cf, TToken_string &s);
void set_testata() {set_header(1,TRUE);} void set_testata();
TPrint_section& get_body() {return section('B', odd_page);} TPrint_section& get_body() {return section('B', odd_page);}
TPrint_section& get_section(char s, pagetype pos) {return section(s, pos);} TPrint_section& get_section(char s, pagetype pos) {return section(s, pos);}
TForm_schedacdc(); TForm_schedacdc();
virtual ~TForm_schedacdc(); virtual ~TForm_schedacdc();
}; };
@ -35,6 +38,35 @@ TForm_schedacdc::~TForm_schedacdc() //distruttore
{ {
} }
//pazzesco (ma forse unico) modo di stampare i numeri pagina progressivi senza poter usare la
//print() standard dei TForm; e' stata reimplementata la header_handler() come conti_header_handler()
TForm_schedacdc* TForm_schedacdc::_cur_form = NULL;
void TForm_schedacdc::conti_header_handler(TPrinter& p)
{
TForm_schedacdc& f = *_cur_form;
if (f.firstpage_is_lastpage())
{
f.set_background(1, TRUE);
f.set_header(1, TRUE);
f.set_footer(0, FALSE);
}
else
{
const word page = f.page(p);
f.set_background(page, TRUE);
f.set_header(1, TRUE);
f.set_footer(page, FALSE);
}
}
void TForm_schedacdc::set_testata()
{
set_header(1, false); set_header(1, true);
_cur_form = this;
printer().setheaderhandler(conti_header_handler); // Setta handlers
}
bool TForm_schedacdc::validate(TForm_item &cf, TToken_string &s) bool TForm_schedacdc::validate(TForm_item &cf, TToken_string &s)
{ {
const TString code(s.get(0)); // prende il primo parametro, il codice del messaggio const TString code(s.get(0)); // prende il primo parametro, il codice del messaggio
@ -119,6 +151,13 @@ bool TSchedacdc_mask::on_field_event(TOperable_field& o, TField_event e, long jo
return error_box(FR("La data iniziale non può essere precedente alla data inizio esercizio %s"), (const char*) datainies.string()); return error_box(FR("La data iniziale non può essere precedente alla data inizio esercizio %s"), (const char*) datainies.string());
} }
} }
if (e == fe_close)
{
const int annoes = get_int(F_ANNO);
const TDate dataini = get(F_DATAINI);
if (annoes == 0 && !dataini.ok())
return error_box(TR("Data iniziale obbligatoria se anno esercizio non specificato"));
}
break; break;
case F_DATAFIN: case F_DATAFIN:
if (e == fe_modify || fe_close) if (e == fe_modify || fe_close)
@ -134,6 +173,13 @@ bool TSchedacdc_mask::on_field_event(TOperable_field& o, TField_event e, long jo
return error_box(TR("La data iniziale non può essere successiva alla data finale")); return error_box(TR("La data iniziale non può essere successiva alla data finale"));
} }
} }
if (e == fe_close)
{
const int annoes = get_int(F_ANNO);
const TDate datafin = get(F_DATAFIN);
if (annoes == 0 && !datafin.ok())
return error_box(TR("Data finale obbligatoria se anno esercizio non specificato"));
}
break; break;
default: break; default: break;
} }
@ -556,6 +602,7 @@ void TSchedacdc::main_loop()
} }
else else
ordin.insert("CODCMS|FASCMS|"); ordin.insert("CODCMS|FASCMS|");
TSorted_cursor sortcur (&relrmov, ordin, filtro, 2, &darec, &arec); TSorted_cursor sortcur (&relrmov, ordin, filtro, 2, &darec, &arec);
sortcur.setregion(darec,arec); sortcur.setregion(darec,arec);
sortcur.setfilter(filtro,TRUE); sortcur.setfilter(filtro,TRUE);
@ -575,6 +622,7 @@ void TSchedacdc::main_loop()
_headercms = TRUE; _headercms = TRUE;
_headerfsc = (ctrlfsc) ? TRUE : FALSE; _headerfsc = (ctrlfsc) ? TRUE : FALSE;
_headersottoc = TRUE; _headersottoc = TRUE;
for (sortcur=0; sortcur.pos()<num; ++sortcur) //scansione su tutte le righe di movimento for (sortcur=0; sortcur.pos()<num; ++sortcur) //scansione su tutte le righe di movimento
{ {
const TRectype rmovrec = sortcur.curr(); const TRectype rmovrec = sortcur.curr();
@ -583,7 +631,7 @@ void TSchedacdc::main_loop()
_currsottoc = rmovrec.get_long(RMV_SOTTOCONTO); _currsottoc = rmovrec.get_long(RMV_SOTTOCONTO);
_currgruppo = rmovrec.get_int(RMV_GRUPPO); _currgruppo = rmovrec.get_int(RMV_GRUPPO);
_currconto = rmovrec.get_int(RMV_CONTO); _currconto = rmovrec.get_int(RMV_CONTO);
TDate datareg = rmovrec.get_date(RMV_DATAREG);
TImporto importo(rmovrec.get_char(RMV_SEZIONE), rmovrec.get_real(RMV_IMPORTO)); TImporto importo(rmovrec.get_char(RMV_SEZIONE), rmovrec.get_real(RMV_IMPORTO));
if ((_oldcms != _currcms) || (_oldfsc != _currfsc) || (_oldgruppo != _currgruppo) || (_oldconto != _currconto) || (_oldsottoc != _currsottoc)) if ((_oldcms != _currcms) || (_oldfsc != _currfsc) || (_oldgruppo != _currgruppo) || (_oldconto != _currconto) || (_oldsottoc != _currsottoc))
{ {
@ -602,11 +650,18 @@ void TSchedacdc::main_loop()
print_footer_cms(); print_footer_cms();
} }
} }
aggiorna_totali(importo, datareg);
bool da_stampare = !_dataini.ok() || datareg >= _dataini; TDate data;
if (_codes > 0)
data = relrmov.curr(LF_MOV).get_date(MOV_DATACOMP);
else
data = rmovrec.get_date(RMV_DATAREG);
aggiorna_totali(importo, data);
bool da_stampare = !_dataini.ok() || data >= _dataini;
if (da_stampare) if (da_stampare)
da_stampare = !_datafin.ok() || datareg <= _datafin; da_stampare = !_datafin.ok() || data <= _datafin;
if ( da_stampare) if ( da_stampare)
print_movimento(sortcur); print_movimento(sortcur);
} }

10
cm/cm0200a.frm
View File

@ -8,7 +8,7 @@ BEGIN
GRID "" GRID ""
END END
SECTION HEADER FIRST 6 SECTION HEADER FIRST 7
STRINGA 1 5 STRINGA 1 5
BEGIN BEGIN
@ -87,6 +87,12 @@ BEGIN
PROMPT 40 6 "a fase: " PROMPT 40 6 "a fase: "
END END
STRINGA -1
BEGIN
KEY "Intestazione stampa"
PROMPT 1 7 "____________________________________________________________________________________________________________________________________"
END
END // section header first END // section header first
// intestazione commessa // intestazione commessa
@ -123,7 +129,7 @@ END
END // section header last END // section header last
// intestazione vera e proprioa della stampa (a parte perché va stampata o dopo la commessa e dopo la fase) // intestazione vera e propria della stampa (a parte perché va stampata o dopo la commessa e dopo la fase)
SECTION HEADER EVEN 4 SECTION HEADER EVEN 4
STRINGA -1 STRINGA -1

19
db/db1100.cpp
View File

@ -328,11 +328,11 @@ inline TEsplosione_distinta_app& app() { return (TEsplosione_distinta_app&)main_
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
// Callback & funzione per valorizzazione nodi // Callback & funzione per valorizzazione nodi
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
static real valorizza_nodo(TDistinta_tree & node, _CallBackStruct & c) static real valorizza_nodo(TDistinta_tree & node, _CallBackStruct & c)
{ {
TAssoc_array* valori = c._a; TAssoc_array* valori = c._a;
TToken_string path; TToken_string path;
node.curr_id(path); node.curr_id(path);
real * valore = (real *) valori->objptr(path); real * valore = (real *) valori->objptr(path);
@ -345,13 +345,12 @@ static real valorizza_nodo(TDistinta_tree & node, _CallBackStruct & c)
TCodice_articolo codart; TCodice_articolo codart;
TString16 liv; TString16 liv;
TCodice_um um; TCodice_um um;
real qta = node.curr_qta(); const TString& annoes = pp->_anno_es;
TString& annoes = pp->_anno_es; const TString& catven = pp->_catven;
TString& catven = pp->_catven;
TString16 codmag; TString16 codmag;
TString& codlist = pp->_codlist; TString& codlist = pp->_codlist;
const bool dettagliata = pp->_advanced_val; const bool dettagliata = pp->_advanced_val;
bool valorizzato = FALSE; bool valorizzato = false;
const char tipo = node.curr_type(); const char tipo = node.curr_type();
real valore_un; real valore_un;
@ -368,16 +367,14 @@ static real valorizza_nodo(TDistinta_tree & node, _CallBackStruct & c)
if (dettagliata && tipo == 'A') if (dettagliata && tipo == 'A')
{ {
TArticolo_giacenza & art = TExplode_distinta_form::cache_articoli().art(codart); TArticolo_giacenza & art = TExplode_distinta_form::cache_articoli().art(codart);
const int art_tipo = art.get_int(ANAMAG_VALDIST); const valtype art_tipo = (valtype)art.get_int(ANAMAG_VALDIST);
if (art_tipo > 0) if (art_tipo > no_val)
{ {
const TDate inizio_val = art.get_date(ANAMAG_DATAVDIST); const TDate inizio_val = art.get_date(ANAMAG_DATAVDIST);
if (pp->_obs_date >= inizio_val) if (pp->_obs_date >= inizio_val)
{ {
valorizzato = TRUE; switch (art_tipo)
switch ((valtype) art_tipo)
{ {
case last_cost: valore_un = art.ultimo_costo(annoes); break; case last_cost: valore_un = art.ultimo_costo(annoes); break;
case last2cost: valore_un = art.media_costi(annoes); break; case last2cost: valore_un = art.media_costi(annoes); break;
@ -393,6 +390,7 @@ static real valorizza_nodo(TDistinta_tree & node, _CallBackStruct & c)
} }
valore_un = art.convert_to_um(valore_un, um); valore_un = art.convert_to_um(valore_un, um);
valorizzato = true;
} }
} }
} }
@ -450,6 +448,7 @@ static real valorizza_nodo(TDistinta_tree & node, _CallBackStruct & c)
} }
} }
valori->add(path, valore_un); valori->add(path, valore_un);
const real qta = node.last_qta(); // NON node.curr_qta();
const real valore_totale = valore_un * qta; const real valore_totale = valore_un * qta;
return valore_totale; return valore_totale;

2
ef/ef0300.cpp
View File

@ -397,6 +397,8 @@ bool TVariazione_distinte::user_create()
_msk = new TMask("ef0300a"); _msk = new TMask("ef0300a");
_m2 = new TMask("ef0300c"); _m2 = new TMask("ef0300c");
_rel = new TRelation(LF_EFFETTI); _rel = new TRelation(LF_EFFETTI);
if (_rel->last() == NOERR)
_msk->set(F_TIPODIST, _rel->curr().get("TIPODIST"));
_distinta = new TDistinta; _distinta = new TDistinta;
set_search_field(F_NUMBER);//setto il campo di ricerca della distinta set_search_field(F_NUMBER);//setto il campo di ricerca della distinta

1
ef/ef0300a.uml
View File

@ -30,6 +30,7 @@ BEGIN
MESSAGE RESET,F_TIPOCF|DISABLE,F_TIPOCF MESSAGE RESET,F_TIPOCF|DISABLE,F_TIPOCF
ITEM "S|Allo sconto" ITEM "S|Allo sconto"
MESSAGE RESET,F_TIPOCF|DISABLE,F_TIPOCF MESSAGE RESET,F_TIPOCF|DISABLE,F_TIPOCF
FLAGS "P"
END END
LIST F_NUMBERRIGA 12 LIST F_NUMBERRIGA 12

37
include/alex.cpp
View File

@ -21,7 +21,7 @@ enum AVM_opcode
avm_nop, avm_nop,
avm_add, avm_and, avm_add, avm_and,
avm_begin, avm_begin,
avm_call_word, avm_cold, avm_cr, avm_call_word, avm_ceil, avm_cold, avm_cr,
avm_cmp_eq, avm_cmp_gt, avm_cmp_gteq, avm_cmp_lt, avm_cmp_lteq, avm_cmp_noteq, avm_cmp_eq, avm_cmp_gt, avm_cmp_gteq, avm_cmp_lt, avm_cmp_lteq, avm_cmp_noteq,
avm_cmp_emptyeq, avm_cmp_nulleq, avm_cmp_zeroeq, avm_cmp_emptyeq, avm_cmp_nulleq, avm_cmp_zeroeq,
avm_div, avm_divide, avm_do, avm_dot, avm_drop, avm_dup, avm_div, avm_divide, avm_do, avm_dot, avm_drop, avm_dup,
@ -34,10 +34,10 @@ enum AVM_opcode
avm_negate, avm_null, avm_negate, avm_null,
avm_or, avm_over, avm_or, avm_over,
avm_perform, avm_pick, avm_plus_loop, avm_plus_store, avm_push, avm_perform, avm_pick, avm_plus_loop, avm_plus_store, avm_push,
avm_repeat, avm_rdrop, avm_rpeek, avm_rpush, avm_roll, avm_rot, avm_repeat, avm_rdrop, avm_rpeek, avm_rpush, avm_roll, avm_rot, avm_round,
avm_strlen, avm_strmid, avm_strtok_fetch, avm_strtok_add, avm_strlen, avm_strmid, avm_strtok_fetch, avm_strtok_add,
avm_store, avm_sp, avm_sub, avm_swap, avm_store, avm_sp, avm_sub, avm_swap,
avm_then, avm_then, avm_trunc,
avm_until, avm_usrword, avm_until, avm_usrword,
avm_variable, avm_variable,
avm_warm, avm_while, avm_warm, avm_while,
@ -49,7 +49,7 @@ const char* AVM_TOKENS[avm_zzz+1] =
"$NOP$", "$NOP$",
"+", "AND", "+", "AND",
"BEGIN", "BEGIN",
"$CALL_WORD$", "COLD", "CR", "$CALL_WORD$", "CEIL", "COLD", "CR",
"=", ">", ">=", "<", "<=", "<>", "=", ">", ">=", "<", "<=", "<>",
"EMPTY=", "NULL=", "0=", "EMPTY=", "NULL=", "0=",
"DIV", "/", "DO", ".", "DROP", "DUP", "DIV", "/", "DO", ".", "DROP", "DUP",
@ -62,10 +62,10 @@ const char* AVM_TOKENS[avm_zzz+1] =
"NEGATE", "NULL", "NEGATE", "NULL",
"OR", "OVER", "OR", "OVER",
"PERFORM", "PICK", "+LOOP", "+!", "$PUSH$", "PERFORM", "PICK", "+LOOP", "+!", "$PUSH$",
"REPEAT", "R>", "R@", ">R", "ROLL", "ROT", "REPEAT", "R>", "R@", ">R", "ROLL", "ROT", "ROUND",
"STRLEN", "STRMID", "STRTOK@", "STRTOK+", "STRLEN", "STRMID", "STRTOK@", "STRTOK+",
"!", "SP", "-", "SWAP", "!", "SP", "-", "SWAP",
"THEN", "THEN", "TRUNC",
"UNTIL", "$USR$", "UNTIL", "$USR$",
"VARIABLE", "VARIABLE",
"WARM", "WHILE" "WARM", "WHILE"
@ -781,6 +781,14 @@ void TAVM::execute(const TAVM_op& op)
break; break;
case avm_begin: break; case avm_begin: break;
case avm_call_word: do_call(op.var().as_string()); break; case avm_call_word: do_call(op.var().as_string()); break;
case avm_ceil:
{
const long dec = _stack.pop().as_int();
TVariant& v0 = (TVariant&)_stack.peek();
real k = v0.as_real(); k.ceil(dec);
v0 = k;
}
break;
case avm_cold: do_restart(true); _bc = NULL; break; case avm_cold: do_restart(true); _bc = NULL; break;
case avm_cr: _stack.push("\n"); break; case avm_cr: _stack.push("\n"); break;
case avm_cmp_eq : _stack.push(compare_tos_nos() == 0); break; case avm_cmp_eq : _stack.push(compare_tos_nos() == 0); break;
@ -935,6 +943,14 @@ void TAVM::execute(const TAVM_op& op)
case avm_rpush: _rstack.push(_stack.pop()); break; case avm_rpush: _rstack.push(_stack.pop()); break;
case avm_roll: _stack.roll(_stack.pop().as_int()); break; case avm_roll: _stack.roll(_stack.pop().as_int()); break;
case avm_rot: _stack.roll(2); break; case avm_rot: _stack.roll(2); break;
case avm_round:
{
const long dec = _stack.pop().as_int();
TVariant& v0 = (TVariant&)_stack.peek();
real k = v0.as_real(); k.round(dec);
v0 = k;
}
break;
case avm_store: do_store(_stack.pop().as_string()); break; case avm_store: do_store(_stack.pop().as_string()); break;
case avm_strlen: _stack.push(_stack.peek().as_string().len()); break; case avm_strlen: _stack.push(_stack.peek().as_string().len()); break;
case avm_strmid: case avm_strmid:
@ -971,6 +987,15 @@ void TAVM::execute(const TAVM_op& op)
break; break;
case avm_swap: _stack.roll(1); break; case avm_swap: _stack.roll(1); break;
case avm_then: break; case avm_then: break;
case avm_trunc:
{
const long dec = _stack.pop().as_int();
TVariant& v0 = (TVariant&)_stack.peek();
real k = v0.as_real(); k.trunc(dec);
v0 = k;
}
break;
case avm_until: case avm_until:
if (_stack.pop().is_zero()) if (_stack.pop().is_zero())
_ip = op.var().as_int(); _ip = op.var().as_int();

2
include/colors.h
View File

@ -32,7 +32,9 @@ extern COLOR REQUIRED_BACK_COLOR;
extern bool CAMPI_SCAVATI; extern bool CAMPI_SCAVATI;
extern bool ADVANCED_GRAPHICS; extern bool ADVANCED_GRAPHICS;
extern bool AUTOSELECT; extern bool AUTOSELECT;
extern bool AUTOZOOM;
extern bool SMALL_ICONS; extern bool SMALL_ICONS;
extern bool AUTOEND;
const COLOR COLOR_DKCYAN = MAKE_COLOR(0,128,128); const COLOR COLOR_DKCYAN = MAKE_COLOR(0,128,128);
const COLOR COLOR_DKYELLOW = MAKE_COLOR(128,128, 0); const COLOR COLOR_DKYELLOW = MAKE_COLOR(128,128, 0);

183
include/controls.cpp
View File

@ -34,12 +34,14 @@ COLOR FOCUS_COLOR = NORMAL_COLOR;
COLOR FOCUS_BACK_COLOR = COLOR_YELLOW; COLOR FOCUS_BACK_COLOR = COLOR_YELLOW;
COLOR REQUIRED_BACK_COLOR = MAKE_COLOR(255,255,156); COLOR REQUIRED_BACK_COLOR = MAKE_COLOR(255,255,156);
bool CAMPI_SCAVATI = TRUE; bool CAMPI_SCAVATI = true;
bool AUTOSELECT = FALSE; bool AUTOSELECT = false;
bool ADVANCED_GRAPHICS = TRUE; bool ADVANCED_GRAPHICS = true;
bool SMALL_ICONS=FALSE; bool AUTOZOOM = false;
bool SMALL_ICONS=false;
bool AUTOEND = false;
HIDDEN bool _button_blocked = FALSE; HIDDEN bool _button_blocked = false;
HIDDEN int _last_mouse_button = 0; HIDDEN int _last_mouse_button = 0;
HIDDEN TDropDownList* _cur_ddl = NULL; HIDDEN TDropDownList* _cur_ddl = NULL;
@ -103,9 +105,9 @@ bool TPicture_array::add(short id)
{ {
if (SMALL_ICONS) if (SMALL_ICONS)
{ {
ignore_xvt_errors(TRUE); ignore_xvt_errors(true);
i = new TImage(10000+id); i = new TImage(10000+id);
ignore_xvt_errors(FALSE); ignore_xvt_errors(false);
if (!i->ok()) if (!i->ok())
i->load(id); i->load(id);
} }
@ -231,7 +233,7 @@ XVT_FNTID xvt_load_default_font()
} }
X_FU_MULTIPLE = Y_FU_MULTIPLE = 0; X_FU_MULTIPLE = Y_FU_MULTIPLE = 0;
XVT_FNTID font = xvt_default_font(FALSE); XVT_FNTID font = xvt_default_font(false);
xi_set_font_id(font); xi_set_font_id(font);
xi_init_sysvals(); // Ricalcola i FU units xi_init_sysvals(); // Ricalcola i FU units
@ -273,6 +275,7 @@ void customize_colors()
TOOL_BACK_COLOR = colors.get_color("ToolBack", NULL, -1, MASK_DARK_COLOR); TOOL_BACK_COLOR = colors.get_color("ToolBack", NULL, -1, MASK_DARK_COLOR);
CAMPI_SCAVATI = colors.get_bool("Campi3D", NULL, -1, CAMPI_SCAVATI); CAMPI_SCAVATI = colors.get_bool("Campi3D", NULL, -1, CAMPI_SCAVATI);
AUTOSELECT = colors.get_bool("AutoSelect", NULL, -1, AUTOSELECT); AUTOSELECT = colors.get_bool("AutoSelect", NULL, -1, AUTOSELECT);
AUTOZOOM = colors.get_bool("AutoZoom", NULL, -1, AUTOZOOM);
ADVANCED_GRAPHICS = colors.get_bool("AdvancedGraphics", NULL, -1, ADVANCED_GRAPHICS); ADVANCED_GRAPHICS = colors.get_bool("AdvancedGraphics", NULL, -1, ADVANCED_GRAPHICS);
SMALL_ICONS = colors.get_bool("SmallIcons", NULL, -1, SMALL_ICONS); SMALL_ICONS = colors.get_bool("SmallIcons", NULL, -1, SMALL_ICONS);
const int SPEECH_MODE = colors.get_int("SpeechMode", NULL, -1, 0); const int SPEECH_MODE = colors.get_int("SpeechMode", NULL, -1, 0);
@ -302,12 +305,12 @@ void init_controls()
{ {
xi_set_font_id(xvt_load_default_font()); xi_set_font_id(xvt_load_default_font());
xi_set_pref(XI_PREF_NATIVE_CTRLS, FALSE); xi_set_pref(XI_PREF_NATIVE_CTRLS, false);
xi_set_pref(XI_PREF_3D_LOOK, TRUE); xi_set_pref(XI_PREF_3D_LOOK, true);
xi_set_pref(XI_PREF_CARET_WIDTH, 2); xi_set_pref(XI_PREF_CARET_WIDTH, 2);
#ifdef XI_R4 #ifdef XI_R4
xi_set_pref(XI_PREF_COMBO_ICON, ICO_COMBO); xi_set_pref(XI_PREF_COMBO_ICON, ICO_COMBO);
xi_set_pref(XI_PREF_OPTIMIZE_CELL_REQUESTS, TRUE); xi_set_pref(XI_PREF_OPTIMIZE_CELL_REQUESTS, true);
#else #else
xi_set_pref(XI_PREF_COMBO_ICON, COMBO_ICON); xi_set_pref(XI_PREF_COMBO_ICON, COMBO_ICON);
#endif #endif
@ -399,7 +402,7 @@ HIDDEN void init_fu_multiple(XI_OBJ* itf)
HIDDEN XI_BITMAP* get_background_bitmap() HIDDEN XI_BITMAP* get_background_bitmap()
{ {
static bool checked = FALSE; static bool checked = false;
static XI_BITMAP* bmp = NULL; static XI_BITMAP* bmp = NULL;
if (ADVANCED_GRAPHICS) if (ADVANCED_GRAPHICS)
@ -410,7 +413,7 @@ HIDDEN XI_BITMAP* get_background_bitmap()
TFilename back = ini.get("Tile"); TFilename back = ini.get("Tile");
if (back.custom_path()) if (back.custom_path())
bmp = xi_bitmap_create(back.get_buffer(), XI_BITMAP_TILE); bmp = xi_bitmap_create(back.get_buffer(), XI_BITMAP_TILE);
checked = TRUE; checked = true;
} }
return bmp; return bmp;
} }
@ -466,12 +469,12 @@ WINDOW create_interface(WINDOW parent, short x, short y, short dx, short dy,
XI_OBJ_DEF* def = xi_create_itf_def(ITF_CID, xi_event_handler, (XinRect *) &r, (char*)caption, (long)msk); XI_OBJ_DEF* def = xi_create_itf_def(ITF_CID, xi_event_handler, (XinRect *) &r, (char*)caption, (long)msk);
CHECK(def, "Can't define an interface"); CHECK(def, "Can't define an interface");
def->v.itf->automatic_back_color = FALSE; def->v.itf->automatic_back_color = false;
def->v.itf->back_color = MASK_BACK_COLOR; def->v.itf->back_color = MASK_BACK_COLOR;
def->v.itf->font_id = xvt_default_font(FALSE); def->v.itf->font_id = xvt_default_font(false);
def->v.itf->tab_on_enter = TRUE; def->v.itf->tab_on_enter = true;
def->v.itf->win = (XinWindow)win; def->v.itf->win = (XinWindow)win;
def->v.itf->edit_menu = TRUE; // Update edit menu items def->v.itf->edit_menu = true; // Update edit menu items
def->v.itf->menu_win = (XinWindow)TASK_WIN; // Window that owns the menu def->v.itf->menu_win = (XinWindow)TASK_WIN; // Window that owns the menu
XI_BITMAP* bmpback = get_background_bitmap(); XI_BITMAP* bmpback = get_background_bitmap();
@ -538,9 +541,9 @@ void attach_interface(WINDOW win, COLOR back)
XI_OBJ_DEF* def = xi_create_itf_def(ITF_CID, xi_event_handler, (XinRect *) &rc, caption, (long)parent); XI_OBJ_DEF* def = xi_create_itf_def(ITF_CID, xi_event_handler, (XinRect *) &rc, caption, (long)parent);
CHECK(def, "Can't define an interface"); CHECK(def, "Can't define an interface");
def->v.itf->automatic_back_color = FALSE; def->v.itf->automatic_back_color = false;
def->v.itf->back_color = back; def->v.itf->back_color = back;
def->v.itf->tab_on_enter = TRUE; def->v.itf->tab_on_enter = true;
def->v.itf->win = (XinWindow)win; def->v.itf->win = (XinWindow)win;
XI_OBJ* itf = xi_create(NULL, def); XI_OBJ* itf = xi_create(NULL, def);
@ -552,7 +555,7 @@ void attach_interface(WINDOW win, COLOR back)
HIDDEN void xi_event_handler(XI_OBJ* itf, XI_EVENT* xiev) HIDDEN void xi_event_handler(XI_OBJ* itf, XI_EVENT* xiev)
{ {
static bool notify_xvt = TRUE; static bool notify_xvt = true;
TControl* ctl = NULL; TControl* ctl = NULL;
@ -618,10 +621,10 @@ HIDDEN void xi_event_handler(XI_OBJ* itf, XI_EVENT* xiev)
if (w != NULL && w->win() != NULL_WIN) if (w != NULL && w->win() != NULL_WIN)
w->handler(w->win(), &xiev->v.xvte); w->handler(w->win(), &xiev->v.xvte);
if (xiev->v.xvte.type == E_MOUSE_UP) if (xiev->v.xvte.type == E_MOUSE_UP)
_button_blocked = FALSE; _button_blocked = false;
} }
else else
notify_xvt = TRUE; notify_xvt = true;
break; break;
case a_post: case a_post:
{ {
@ -647,10 +650,10 @@ HIDDEN void xi_event_handler(XI_OBJ* itf, XI_EVENT* xiev)
const bool ok = ctl->event_handler(itf, xiev); const bool ok = ctl->event_handler(itf, xiev);
if (!ok) if (!ok)
{ {
xiev->refused = TRUE; xiev->refused = true;
if (xiev->type == XIE_CHAR_FIELD || xiev->type == XIE_CHAR_CELL || if (xiev->type == XIE_CHAR_FIELD || xiev->type == XIE_CHAR_CELL ||
xiev->type == XIE_XVT_EVENT) xiev->type == XIE_XVT_EVENT)
notify_xvt = FALSE; notify_xvt = false;
} }
} }
} }
@ -777,16 +780,16 @@ void TControl::update_tab_cid()
{ {
const bool is_cont = is_container(_obj); const bool is_cont = is_container(_obj);
XI_OBJ *first = find_operable(_obj->itf, TRUE, !is_cont); XI_OBJ *first = find_operable(_obj->itf, true, !is_cont);
set_tab_cid(_obj, first->cid); set_tab_cid(_obj, first->cid);
XI_OBJ *last = find_operable(_obj->itf, FALSE, !is_cont); XI_OBJ *last = find_operable(_obj->itf, false, !is_cont);
set_tab_cid(last, _obj->cid); set_tab_cid(last, _obj->cid);
if (is_cont) if (is_cont)
{ {
XI_OBJ* fi = find_operable(_obj->itf, TRUE, TRUE); XI_OBJ* fi = find_operable(_obj->itf, true, true);
XI_OBJ* la = find_operable(_obj->itf, FALSE, TRUE); XI_OBJ* la = find_operable(_obj->itf, false, true);
int num; int num;
XI_OBJ** child = xi_get_member_list(_obj, &num); XI_OBJ** child = xi_get_member_list(_obj, &num);
set_tab_cid(child[num-1], fi->cid); set_tab_cid(child[num-1], fi->cid);
@ -794,8 +797,8 @@ void TControl::update_tab_cid()
} else } else
if (_obj->parent != _obj->itf) if (_obj->parent != _obj->itf)
{ {
XI_OBJ* fi = find_operable(_obj->itf, TRUE, FALSE); XI_OBJ* fi = find_operable(_obj->itf, true, false);
XI_OBJ* la = find_operable(_obj->itf, FALSE, FALSE); XI_OBJ* la = find_operable(_obj->itf, false, false);
set_tab_cid(_obj->parent, fi->cid); set_tab_cid(_obj->parent, fi->cid);
set_tab_cid(la, _obj->parent->cid); set_tab_cid(la, _obj->parent->cid);
} }
@ -896,7 +899,7 @@ RCT& TControl::get_rect(RCT& r) const
void TControl::set_rect(const RCT& r) void TControl::set_rect(const RCT& r)
{ {
xi_set_rect(_obj, (XinRect*)&r, FALSE); xi_set_rect(_obj, (XinRect*)&r, false);
} }
unsigned long TControl::flags2attr(const char* flags) const unsigned long TControl::flags2attr(const char* flags) const
@ -919,7 +922,7 @@ unsigned long TControl::flags2attr(const char* flags) const
const char* TControl::parse_caption(const char* cap, bool& bold, COLOR& color) const const char* TControl::parse_caption(const char* cap, bool& bold, COLOR& color) const
{ {
bold = FALSE; bold = false;
color = NORMAL_COLOR; color = NORMAL_COLOR;
const char* t; const char* t;
@ -931,7 +934,7 @@ const char* TControl::parse_caption(const char* cap, bool& bold, COLOR& color) c
const char code = toupper(*(t+1)); const char code = toupper(*(t+1));
if (code == 'B') if (code == 'B')
{ {
bold = TRUE; bold = true;
t++; t++;
} }
else else
@ -980,7 +983,7 @@ void TControl::set_focus() const
bool TControl::notify_key(KEY k) bool TControl::notify_key(KEY k)
{ {
bool ok = TRUE; bool ok = true;
if (_fld == NULL) if (_fld == NULL)
{ {
@ -1007,7 +1010,7 @@ bool TControl::is_edit_key(KEY k) const
bool TControl::event_handler(XI_OBJ* itf, XI_EVENT* xiev) bool TControl::event_handler(XI_OBJ* itf, XI_EVENT* xiev)
{ {
bool ok = TRUE; bool ok = true;
return ok; return ok;
} }
@ -1046,8 +1049,8 @@ void TControl::change_attrib(unsigned long mask, bool on, XI_OBJ* obj)
// @mfunc Mostra/Nasconde il controllo // @mfunc Mostra/Nasconde il controllo
void TControl::show( void TControl::show(
bool on) // @parm Operazione da svolgere sul controllo: bool on) // @parm Operazione da svolgere sul controllo:
// @flag TRUE | Il controllo viene mostrato // @flag true | Il controllo viene mostrato
// @flag FALSE | Il controllo viene nascosto // @flag false | Il controllo viene nascosto
{ {
change_attrib(XI_ATR_VISIBLE, on); change_attrib(XI_ATR_VISIBLE, on);
} }
@ -1057,8 +1060,8 @@ void TControl::show(
// @mfunc Abilita/disabilita il controllo // @mfunc Abilita/disabilita il controllo
void TControl::enable( void TControl::enable(
bool on) // @parm Operazione da svolgere sul controllo: bool on) // @parm Operazione da svolgere sul controllo:
// @flag TRUE | Il controllo viene abilitato // @flag true | Il controllo viene abilitato
// @flag FALSE | Il controllo viene disabilitato // @flag false | Il controllo viene disabilitato
{ {
change_attrib(XI_ATR_ENABLED, on); change_attrib(XI_ATR_ENABLED, on);
} }
@ -1121,7 +1124,7 @@ TText_control::TText_control(WINDOW win, short cid,
CHECKS(def, "Can't create the definition of TText_control:", text); CHECKS(def, "Can't create the definition of TText_control:", text);
def->v.text->fore_color = color; def->v.text->fore_color = color;
if (bold) if (bold)
def->v.text->font_id = xvt_default_font(TRUE); def->v.text->font_id = xvt_default_font(true);
_obj = xi_create(get_interface(win), def); _obj = xi_create(get_interface(win), def);
CHECKS(_obj, "Can't create TText_control ", text); CHECKS(_obj, "Can't create TText_control ", text);
@ -1186,8 +1189,8 @@ TGroupbox_control::TGroupbox_control(WINDOW win, short cid,
const bool erre = strchr(flags, 'R') != NULL; const bool erre = strchr(flags, 'R') != NULL;
if (erre) if (erre)
{ {
def->v.rect->well = TRUE; // Mette in rilievo il rettangolo def->v.rect->well = true; // Mette in rilievo il rettangolo
change_attrib(XI_ATR_RJUST, FALSE, _obj); // Toglie l'erroneo allineamento a destra del titolo change_attrib(XI_ATR_RJUST, false, _obj); // Toglie l'erroneo allineamento a destra del titolo
} }
_rct = xi_create(get_interface(win), def); _rct = xi_create(get_interface(win), def);
CHECKD(_rct, "Can't create Groupbox_control ", cid); CHECKD(_rct, "Can't create Groupbox_control ", cid);
@ -1216,7 +1219,7 @@ RCT& TGroupbox_control::get_rect(RCT& r) const
// TField // TField
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
static bool in_create = FALSE; static bool in_create = false;
TField_control::TField_control(WINDOW win, short cid, TField_control::TField_control(WINDOW win, short cid,
short left, short top, short width, short maxlen, short left, short top, short width, short maxlen,
@ -1230,7 +1233,7 @@ void TField_control::create(WINDOW win, short cid,
short left, short top, short width, short height, short maxlen, short left, short top, short width, short height, short maxlen,
const char* flags, const char* text, bool button) const char* flags, const char* text, bool button)
{ {
in_create = TRUE; in_create = true;
const short fcid = cid > 0 ? cid + 2000 : cid - 2000; const short fcid = cid > 0 ? cid + 2000 : cid - 2000;
XI_OBJ_DEF* frm_def = xi_add_form_def(NULL, fcid, fcid); XI_OBJ_DEF* frm_def = xi_add_form_def(NULL, fcid, fcid);
@ -1242,6 +1245,8 @@ void TField_control::create(WINDOW win, short cid,
unsigned long attrib = flags2attr(flags) | XI_ATR_EDITMENU; unsigned long attrib = flags2attr(flags) | XI_ATR_EDITMENU;
if (AUTOSELECT) if (AUTOSELECT)
attrib |= XI_ATR_AUTOSELECT; attrib |= XI_ATR_AUTOSELECT;
if (AUTOEND)
attrib |= XI_AGA_ATR_AUTOEND;
if (!CAMPI_SCAVATI) if (!CAMPI_SCAVATI)
attrib |= XI_ATR_BORDER; attrib |= XI_ATR_BORDER;
if (maxlen > width) if (maxlen > width)
@ -1262,10 +1267,10 @@ void TField_control::create(WINDOW win, short cid,
if (height == 1) if (height == 1)
{ {
f->auto_tab = TRUE; f->auto_tab = true;
if (button) if (button)
{ {
f->button = TRUE; f->button = true;
f->pixel_button_distance = 1; f->pixel_button_distance = 1;
} }
} }
@ -1275,8 +1280,8 @@ void TField_control::create(WINDOW win, short cid,
f->xi_rct.bottom = rct.bottom; f->xi_rct.bottom = rct.bottom;
f->xi_rct.right = rct.right; f->xi_rct.right = rct.right;
f->xi_rct.left = rct.left; f->xi_rct.left = rct.left;
f->cr_ok = TRUE; f->cr_ok = true;
f->var_len_text = TRUE; f->var_len_text = true;
} }
XI_OBJ* itf = get_interface(win); XI_OBJ* itf = get_interface(win);
@ -1301,7 +1306,7 @@ void TField_control::create(WINDOW win, short cid,
xi_dequeue(); xi_dequeue();
xi_tree_free(frm_def); xi_tree_free(frm_def);
in_create = FALSE; in_create = false;
} }
void TField_control::show_button(bool on) void TField_control::show_button(bool on)
@ -1328,9 +1333,9 @@ void TField_control::set_read_only(bool on)
bool TField_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev) bool TField_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev)
{ {
if (in_create) if (in_create)
return FALSE; return false;
bool ok = TRUE; bool ok = true;
switch(xiev->type) switch(xiev->type)
{ {
@ -1349,7 +1354,7 @@ bool TField_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev)
if (k == K_PREV || k == K_NEXT || k > K_CTRL) if (k == K_PREV || k == K_NEXT || k > K_CTRL)
{ {
k = K_TAB; k = K_TAB;
xiev->refused = TRUE; xiev->refused = true;
} }
if (k == K_TAB || is_edit_key(k) || (k > K_F1 && k < K_F12)) if (k == K_TAB || is_edit_key(k) || (k > K_F1 && k < K_F12))
ok = notify_key(k); ok = notify_key(k);
@ -1386,7 +1391,7 @@ TMultiline_control::TMultiline_control(WINDOW win, short cid,
short width, short height, short maxlen, short width, short height, short maxlen,
const char* flags, const char* text) const char* flags, const char* text)
{ {
create(win, cid, left, top, width, height, maxlen, flags, text, FALSE); create(win, cid, left, top, width, height, maxlen, flags, text, false);
} }
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
@ -1482,7 +1487,7 @@ void TButton_control::check(bool on)
bool TButton_control::checked() const bool TButton_control::checked() const
{ {
return xi_is_checked(_obj) ? TRUE : FALSE; return xi_is_checked(_obj) ? true : false;
} }
bool TButton_control::toggle() bool TButton_control::toggle()
@ -1494,14 +1499,14 @@ bool TButton_control::toggle()
bool TButton_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev) bool TButton_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev)
{ {
bool ok = TRUE; bool ok = true;
if (xiev->type == XIE_BUTTON) if (xiev->type == XIE_BUTTON)
{ {
if (_last_mouse_button == 0) if (_last_mouse_button == 0)
{ {
if (id() != DLG_CANCEL && id() != DLG_QUIT) if (id() != DLG_CANCEL && id() != DLG_QUIT)
ok = xi_move_focus(_obj) ? TRUE : FALSE; ok = xi_move_focus(_obj) ? true : false;
if (ok) if (ok)
{ {
@ -1561,7 +1566,7 @@ void TPushbutton_control::set_caption(const char* c)
TControl::set_caption(cap); TControl::set_caption(cap);
set_central_icon(0); set_central_icon(0);
set_bmp(0, 0); set_bmp(0, 0);
_obj->v.btn->drawable = FALSE; _obj->v.btn->drawable = false;
_obj->v.btn->fore_color = color; _obj->v.btn->fore_color = color;
} }
} }
@ -1571,7 +1576,7 @@ void TPushbutton_control::set_central_icon(unsigned int hicon)
xi_set_icon(_obj, hicon, hicon); xi_set_icon(_obj, hicon, hicon);
_obj->v.btn->icon_x = (_obj->v.btn->rct.right - _obj->v.btn->rct.left - 32) / 2 - 5; _obj->v.btn->icon_x = (_obj->v.btn->rct.right - _obj->v.btn->rct.left - 32) / 2 - 5;
_obj->v.btn->icon_y = (_obj->v.btn->rct.bottom - _obj->v.btn->rct.top - 32) / 2 - 5; _obj->v.btn->icon_y = (_obj->v.btn->rct.bottom - _obj->v.btn->rct.top - 32) / 2 - 5;
_obj->v.btn->drawable = FALSE; _obj->v.btn->drawable = false;
} }
void TPushbutton_control::set_bmp(short bmp_up, short bmp_dn) void TPushbutton_control::set_bmp(short bmp_up, short bmp_dn)
@ -1792,7 +1797,7 @@ void TRadiobutton_control::check_button(byte c)
XI_OBJ** child = xi_get_member_list(_obj, &children); XI_OBJ** child = xi_get_member_list(_obj, &children);
CHECKD(c < children, "This radio is rather old, it doesn't have button ", c); CHECKD(c < children, "This radio is rather old, it doesn't have button ", c);
if (!xi_is_checked(child[c])) if (!xi_is_checked(child[c]))
xi_check(child[c], TRUE); xi_check(child[c], true);
} }
void TRadiobutton_control::show_button(byte c, bool on) void TRadiobutton_control::show_button(byte c, bool on)
@ -1805,7 +1810,7 @@ void TRadiobutton_control::show_button(byte c, bool on)
bool TRadiobutton_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev) bool TRadiobutton_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev)
{ {
bool ok = TRUE; bool ok = true;
if (xiev->type == XIE_BUTTON) if (xiev->type == XIE_BUTTON)
{ {
XI_OBJ* obj = xiev->v.xi_obj; // Elemento del gruppo di radio buttons da premere XI_OBJ* obj = xiev->v.xi_obj; // Elemento del gruppo di radio buttons da premere
@ -1813,12 +1818,12 @@ bool TRadiobutton_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev)
{ {
if (!xi_is_checked(obj)) // Se non e' gia' premuto ... if (!xi_is_checked(obj)) // Se non e' gia' premuto ...
{ {
xi_check(obj, TRUE); // ... allora premilo e ... xi_check(obj, true); // ... allora premilo e ...
ok = notify_key(K_SPACE); // ... avverti il mask_field proprietario ok = notify_key(K_SPACE); // ... avverti il mask_field proprietario
} }
} }
else else
ok = FALSE; ok = false;
} }
else else
ok = TButton_control::event_handler(itf, xiev); ok = TButton_control::event_handler(itf, xiev);
@ -1882,7 +1887,7 @@ TTagbutton_control::TTagbutton_control(WINDOW win, short cid,
bool TTagbutton_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev) bool TTagbutton_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev)
{ {
bool ok = TRUE; bool ok = true;
if (xiev->type == XIE_BUTTON) if (xiev->type == XIE_BUTTON)
{ {
XI_OBJ* obj = xiev->v.xi_obj; // Elemento del gruppo di radio buttons da premere XI_OBJ* obj = xiev->v.xi_obj; // Elemento del gruppo di radio buttons da premere
@ -1973,7 +1978,7 @@ void TDropDownList::ddl_str_eh(XI_OBJ* itf, XI_EVENT* xiev)
xiev->v.rec_request.data_rec = n; xiev->v.rec_request.data_rec = n;
} }
else else
xiev->refused = TRUE; xiev->refused = true;
break; break;
case XIE_GET_LAST: case XIE_GET_LAST:
xiev->v.rec_request.data_rec = ddl->items() - 1; xiev->v.rec_request.data_rec = ddl->items() - 1;
@ -1986,7 +1991,7 @@ void TDropDownList::ddl_str_eh(XI_OBJ* itf, XI_EVENT* xiev)
if (n >= 0 && n < ddl->items()) if (n >= 0 && n < ddl->items())
xiev->v.rec_request.data_rec = n; xiev->v.rec_request.data_rec = n;
else else
xiev->refused = TRUE; xiev->refused = true;
} }
break; break;
case XIE_CELL_REQUEST: case XIE_CELL_REQUEST:
@ -2049,9 +2054,9 @@ void TDropDownList::close()
{ {
if (_open) if (_open)
{ {
_open = FALSE; _open = false;
if (_xi_lst != NULL) if (_xi_lst != NULL)
xvt_vobj_set_visible((WINDOW)xi_get_window(_xi_lst->itf), FALSE); xvt_vobj_set_visible((WINDOW)xi_get_window(_xi_lst->itf), false);
_cur_ddl = NULL; _cur_ddl = NULL;
} }
} }
@ -2085,10 +2090,10 @@ bool TDropDownList::select(int i, bool force)
if (force && _open) if (force && _open)
xi_scroll_rec(_xi_lst, i, FOCUS_COLOR, XI_ATR_ENABLED | XI_ATR_SELECTED, 0); xi_scroll_rec(_xi_lst, i, FOCUS_COLOR, XI_ATR_ENABLED | XI_ATR_SELECTED, 0);
return TRUE; return true;
} }
return FALSE; return false;
} }
bool TDropDownList::select_by_initial(char c) bool TDropDownList::select_by_initial(char c)
@ -2096,7 +2101,7 @@ bool TDropDownList::select_by_initial(char c)
const int tot = _values.items(); const int tot = _values.items();
int i = _selected; int i = _selected;
c = toupper(c); c = toupper(c);
while(TRUE) while(true)
{ {
i++; i++;
if (i >= tot) if (i >= tot)
@ -2108,7 +2113,7 @@ bool TDropDownList::select_by_initial(char c)
break; break;
} }
bool ok = FALSE; bool ok = false;
if (i != selected()) if (i != selected())
{ {
if (is_open()) if (is_open())
@ -2139,7 +2144,7 @@ bool TDropDownList::select_by_ofs(int i)
i += _selected; i += _selected;
if (i >= 0 && i < _values.items()) if (i >= 0 && i < _values.items())
return select(i); return select(i);
return FALSE; return false;
} }
void TDropDownList::set_values(const char* c, const char* v) void TDropDownList::set_values(const char* c, const char* v)
@ -2173,7 +2178,7 @@ void TDropDownList::create()
XI_OBJ_DEF* itfdef = xi_create_itf_def(ITF_CID+1, (XI_EVENT_HANDLER)ddl_str_eh, NULL, "", XI_OBJ_DEF* itfdef = xi_create_itf_def(ITF_CID+1, (XI_EVENT_HANDLER)ddl_str_eh, NULL, "",
(long)this); (long)this);
itfdef->v.itf->automatic_back_color = TRUE; itfdef->v.itf->automatic_back_color = true;
const int hei = items() <= 1 ? 2*XI_FU_MULTIPLE + 1 : (min(8,items()) * XI_FU_MULTIPLE) + 1; const int hei = items() <= 1 ? 2*XI_FU_MULTIPLE + 1 : (min(8,items()) * XI_FU_MULTIPLE) + 1;
XI_OBJ_DEF* lstdef = xi_add_list_def(itfdef, _obj->cid+1000, 0, 0, hei, XI_OBJ_DEF* lstdef = xi_add_list_def(itfdef, _obj->cid+1000, 0, 0, hei,
@ -2184,13 +2189,13 @@ void TDropDownList::create()
XI_LIST_DEF* ld = lstdef->v.list; XI_LIST_DEF* ld = lstdef->v.list;
ld->active_back_color = FOCUS_BACK_COLOR; ld->active_back_color = FOCUS_BACK_COLOR;
ld->scroll_bar = items() > 8; ld->scroll_bar = items() > 8;
ld->no_heading = TRUE; ld->no_heading = true;
ld->no_horz_lines = TRUE; ld->no_horz_lines = true;
ld->no_vert_lines = TRUE; ld->no_vert_lines = true;
ld->resize_with_window = TRUE; ld->resize_with_window = true;
ld->single_select = TRUE; ld->single_select = true;
#ifdef LINUX #ifdef LINUX
ld->scroll_on_thumb_track = TRUE; ld->scroll_on_thumb_track = true;
#endif #endif
// compute size in pixel of field (with button enclosed) // compute size in pixel of field (with button enclosed)
@ -2269,18 +2274,18 @@ void TDropDownList::open()
return; return;
if (_xi_lst != NULL) if (_xi_lst != NULL)
xvt_vobj_set_visible((WINDOW)xi_get_window(_xi_lst->itf), TRUE); xvt_vobj_set_visible((WINDOW)xi_get_window(_xi_lst->itf), true);
else else
create(); create();
_open = TRUE; _open = true;
xi_cell_request(_xi_lst); xi_cell_request(_xi_lst);
WINDOW win = (WINDOW)xi_get_window(_xi_lst->itf); WINDOW win = (WINDOW)xi_get_window(_xi_lst->itf);
xvt_scr_set_focus_vobj(win); xvt_scr_set_focus_vobj(win);
xvt_vobj_raise(win); xvt_vobj_raise(win);
select(_selected, TRUE); select(_selected, true);
xi_dequeue(); xi_dequeue();
_cur_ddl = this; _cur_ddl = this;
@ -2290,7 +2295,7 @@ void TDropDownList::open()
bool TListbox_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev) bool TListbox_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev)
{ {
bool ok = TRUE; bool ok = true;
switch (xiev->type) switch (xiev->type)
{ {
case XIE_DBL_FIELD: case XIE_DBL_FIELD:
@ -2316,7 +2321,7 @@ bool TListbox_control::event_handler(XI_OBJ* itf, XI_EVENT* xiev)
_ddl->select_by_ofs(-1); _ddl->select_by_ofs(-1);
else if (k == K_F2 || k == K_F11 || k == K_F12) else if (k == K_F2 || k == K_F11 || k == K_F12)
notify_key(k); notify_key(k);
xiev->refused = TRUE; xiev->refused = true;
} }
break; break;
case XIE_CHG_FIELD: case XIE_CHG_FIELD:
@ -2346,7 +2351,7 @@ void TDropDownList::on_mouse_down(const PNT& pt)
TDropDownList::TDropDownList(XI_OBJ* o, const char* codes, const char* values) TDropDownList::TDropDownList(XI_OBJ* o, const char* codes, const char* values)
: _obj(o), _xi_lst(NULL), _codes(codes), : _obj(o), _xi_lst(NULL), _codes(codes),
_values(values), _selected(0), _open(FALSE) _values(values), _selected(0), _open(false)
{ {
if (o->type == XIT_CELL) if (o->type == XIT_CELL)
{ {
@ -2370,9 +2375,9 @@ void TListbox_control::set_values(const char* cod, const char* val)
{ {
_ddl->set_values(cod, val); _ddl->set_values(cod, val);
if (selected() >= items()) if (selected() >= items())
_ddl->select(0, TRUE); _ddl->select(0, true);
else else
_ddl->select(selected(), TRUE); _ddl->select(selected(), true);
} }
int TListbox_control::items() const int TListbox_control::items() const
@ -2405,9 +2410,9 @@ TListbox_control::TListbox_control(WINDOW win, short cid,
const char* flags, const char* text, const char* flags, const char* text,
const char* codes, const char* values) const char* codes, const char* values)
{ {
create(win, cid, left, top, width , 1, width, flags, text, TRUE); create(win, cid, left, top, width , 1, width, flags, text, true);
_ddl = new TDropDownList(_obj, codes, values); _ddl = new TDropDownList(_obj, codes, values);
_ddl->select(0, TRUE); _ddl->select(0, true);
} }
TListbox_control::~TListbox_control() TListbox_control::~TListbox_control()

7
include/dongle.cpp
View File

@ -442,15 +442,16 @@ bool TDongle::eutron_login(bool test_all_keys)
bool TDongle::network_login(bool test_all_keys) bool TDongle::network_login(bool test_all_keys)
{ {
const char* appname = main_app().name();
if (network() && ok()) if (network() && ok())
rpc_UserLogout(); rpc_UserLogout(appname);
TConfig ini(CONFIG_INSTALL, "Server"); TConfig ini(CONFIG_INSTALL, "Server");
const char* server = ini.get("Dongle"); const char* server = ini.get("Dongle");
// const char* guest = "******"; // const char* guest = "******";
// const TString16 appname = main_app().name(); // const TString16 appname = main_app().name();
// const char* utente = (!main_app().is_running() && appname == "ba0100") ? guest : (const char *) user(); // const char* utente = (!main_app().is_running() && appname == "ba0100") ? guest : (const char *) user();
const char* appname = main_app().name();
const char* utente = user(); const char* utente = user();
const bool ok = rpc_UserLogin(server, utente, "******", appname); const bool ok = rpc_UserLogin(server, utente, "******", appname);
@ -560,7 +561,7 @@ bool TDongle::logout()
xvt_dongle_sl_logout(); xvt_dongle_sl_logout();
break; break;
case _dongle_network: case _dongle_network:
rpc_UserLogout(); rpc_UserLogout(main_app().name());
break; break;
default: default:
break; break;

14
include/execp.cpp
View File

@ -38,6 +38,15 @@ long TExternal_app::run(
if (!our_app) if (!our_app)
utente = FALSE; utente = FALSE;
} }
if (*comm_name.ext() == '\0')
comm_name.ext("exe");
if (comm_name.custom_path() && p > 0)
{
path = comm_name;
path << _path.mid(p);
}
if (utente) if (utente)
path << " /u" << user(); path << " /u" << user();
@ -45,13 +54,16 @@ long TExternal_app::run(
DIRECTORY oldir; DIRECTORY oldir;
xvt_fsys_get_dir(&oldir); xvt_fsys_get_dir(&oldir);
if (!utente) // cambio directory se eseguo un programma estero
{
const TFilename dir(comm_name.path()); const TFilename dir(comm_name.path());
if (dir.not_empty()) if (dir.not_empty() && dir.find("custom") < 0)
{ {
DIRECTORY d; DIRECTORY d;
if (xvt_fsys_convert_str_to_dir((char*)(const char*)dir, &d)) if (xvt_fsys_convert_str_to_dir((char*)(const char*)dir, &d))
xvt_fsys_set_dir(&d); xvt_fsys_set_dir(&d);
} }
}
if (!async) if (!async)
{ {

10
include/isam.cpp
View File

@ -3340,6 +3340,16 @@ void TRectype::put_str(const char* fieldname, const char* val)
setempty(FALSE); setempty(FALSE);
} }
void TRectype::add(const char* fieldname, const real& val)
{
if (!val.is_zero())
{
real k = get_real(fieldname);
k += val;
put(fieldname, k);
}
}
void TRectype::zero(const char* fieldname) void TRectype::zero(const char* fieldname)
{ {
if (*_tab && strcmp(fieldname , "COD") == 0) if (*_tab && strcmp(fieldname , "COD") == 0)

18
include/isam.h
View File

@ -206,6 +206,8 @@ public:
void put(const char* fieldname, long double val) void put(const char* fieldname, long double val)
{ put(fieldname, real(val)); } { put(fieldname, real(val)); }
#endif #endif
// @cmember Incrementa il contenuto del campo <p fieldname> in formato reale
void add(const char* fieldname, const real& val);
// @cmember Vuota il campo puntato da <p fieldname> // @cmember Vuota il campo puntato da <p fieldname>
virtual void zero(const char * fieldname); virtual void zero(const char * fieldname);
@ -762,7 +764,7 @@ class TRecfield : public TObject
// @access:(INTERNAL) Private Member // @access:(INTERNAL) Private Member
{ {
// @cmember:(INTERNAL) Nome del campo // @cmember:(INTERNAL) Nome del campo
char _name[30]; char _name[32];
// @cmember:(INTERNAL) Puntatore a inizio record // @cmember:(INTERNAL) Puntatore a inizio record
TRectype* _rec; TRectype* _rec;
// @cmember:(INTERNAL) Puntatore a inizio campo // @cmember:(INTERNAL) Puntatore a inizio campo
@ -815,19 +817,17 @@ public:
TRecnotype ptr() const; TRecnotype ptr() const;
// @cmember Ritorna un puntatore all'inizio del campo nel record. Dovrebbe essere protected! // @cmember Ritorna un puntatore all'inizio del campo nel record. Dovrebbe essere protected!
const char* pos() const const char* pos() const { return (const char*) _p;}
{ return (const char*) _p;} // @cmember Ritorna il nome del campo
const char* name() const { return _name; }
// @cmember Ritorna la lunghezza del campo // @cmember Ritorna la lunghezza del campo
int len() const int len() const { return (int) _len;}
{ return (int) _len;}
// @cmember Ritorna il numero di decimali del campo // @cmember Ritorna il numero di decimali del campo
int dec() const { return (int) _dec;} int dec() const { return (int) _dec;}
TFieldtypes type() const
// @cmember Ritorna il tipo del campo // @cmember Ritorna il tipo del campo
{ return _type;} TFieldtypes type() const { return _type;}
// @cmember Ritorna il puntatore a inizio record // @cmember Ritorna il puntatore a inizio record
TRectype& record() const TRectype& record() const { return *_rec;}
{ return *_rec;}
// @cmember Costruttore // @cmember Costruttore
TRecfield(TRectype& rec, const char* name, int from = 0, int to = -1); TRecfield(TRectype& rec, const char* name, int from = 0, int to = -1);

4
include/isamrpc.cpp
View File

@ -302,12 +302,12 @@ bool rpc_UserLogin(const char* server, const char* user,
return _connection != 0; return _connection != 0;
} }
bool rpc_UserLogout() bool rpc_UserLogout(const char* appname)
{ {
if (_connection) if (_connection)
{ {
const int session = xvt_sys_get_session_id(); const int session = xvt_sys_get_session_id();
_rpc_call.format("UserLogout(%s, %d)", (const char*)user(), session); _rpc_call.format("UserLogout(%s, %d, %s)", (const char*)user(), session, appname);
rpc_Call(_rpc_call); rpc_Call(_rpc_call);
_client->RemoveConnection(_connection); _client->RemoveConnection(_connection);
_connection = 0; _connection = 0;

2
include/isamrpc.h
View File

@ -19,7 +19,7 @@ unsigned rpc_DongleYear();
bool rpc_UserLogin(const char* server, const char* user, bool rpc_UserLogin(const char* server, const char* user,
const char* password, const char* application); const char* password, const char* application);
bool rpc_UserLogout(); bool rpc_UserLogout(const char* appname);
bool rpc_Start(); bool rpc_Start();
bool rpc_Stop(); bool rpc_Stop();

59
include/maskfld.cpp
View File

@ -1,6 +1,7 @@
#define XI_INTERNAL #define XI_INTERNAL
#include <xinclude.h> #include <xinclude.h>
#include <automask.h>
#include <colors.h> #include <colors.h>
#include <controls.h> #include <controls.h>
#include <diction.h> #include <diction.h>
@ -4836,8 +4837,38 @@ void TZoom_field::create(WINDOW parent)
TEdit_field::create(parent); TEdit_field::create(parent);
} }
class TZoom_mask : public TAutomask
{
protected:
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
public:
TZoom_mask(const char * prompt);
virtual ~TZoom_mask() {}
};
bool TZoom_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
{
return true;
}
TZoom_mask::TZoom_mask(const char * prompt) : TAutomask("Zoom", 1, 72, 18)
{
const bool select = AUTOSELECT;
AUTOSELECT = false;
AUTOEND = true;
add_memo(101, 0, prompt, 1, 0, -1, -3);
add_button(DLG_OK, 0, "", -12, -1, 10, 2);
add_button(DLG_CANCEL, 0, "", -22, -1, 10, 2);
AUTOEND = false;
AUTOSELECT = select;
set_handlers();
}
bool TZoom_field::on_key( KEY key ) bool TZoom_field::on_key( KEY key )
{ {
static KEY __k = '\0';
switch (key) switch (key)
{ {
case K_TAB: case K_TAB:
@ -4850,11 +4881,15 @@ bool TZoom_field::on_key( KEY key )
case K_F8: case K_F8:
{ {
get_window_data(); get_window_data();
TMask m("Zoom", 1, 72, 18); TZoom_mask m(prompt());
m.add_memo(101, 0, prompt(), 1, 0, -1, -3);
m.add_button(DLG_OK, 0, "", -12, -1, 10, 2); if (__k)
m.add_button(DLG_CANCEL, 0, "", -22, -1, 10, 2); {
_str << (const char) __k;
__k = '\0';
}
m.set(101, _str); m.set(101, _str);
if (m.run() == K_ENTER) if (m.run() == K_ENTER)
{ {
_str = m.get(101); _str = m.get(101);
@ -4864,6 +4899,22 @@ bool TZoom_field::on_key( KEY key )
} }
break; break;
default: default:
if (AUTOZOOM && isalnum(key))
{
get_window_data();
if (_str.len() >= size())
{
__k = key;
if (mask().is_running())
on_key(K_F8);
else
{
TSheet_field * s = mask().get_sheet();
if (s != NULL)
dispatch_e_char(s->mask().win(), K_F8);
}
}
}
break; break;
} }
return TEdit_field::on_key(key); return TEdit_field::on_key(key);

2
include/modaut.h
View File

@ -17,7 +17,7 @@
#define SCAUT 13 #define SCAUT 13
#define SRAUT 14 #define SRAUT 14
#define CMAUT 15 #define CMAUT 15
#define M73AUT 16 #define LIAUT 16
#define ATAUT 17 #define ATAUT 17
#define INAUT 18 #define INAUT 18
#define POAUT 19 #define POAUT 19

15
include/msksheet.cpp
View File

@ -1626,6 +1626,8 @@ bool TSpreadsheet::event_handler(XI_OBJ* itf, XI_EVENT *xiev)
owner().mask().notify_focus_field(owner().dlg()); owner().mask().notify_focus_field(owner().dlg());
refused = TRUE; refused = TRUE;
} }
else
refused = true;
break; break;
case K_CTRL + 'A': case K_CTRL + 'A':
{ {
@ -1702,10 +1704,19 @@ bool TSpreadsheet::event_handler(XI_OBJ* itf, XI_EVENT *xiev)
{ {
refused = TRUE; refused = TRUE;
} else } else
if (is_edit_key(k) && !_edit_field->on_key(k)) if (is_edit_key(k))
{ {
refused = TRUE; if (AUTOZOOM)
{
if ((_edit_field->class_id() == CLASS_ZOOM_FIELD))
copy_cell2field();
}
if (!_edit_field->on_key(k))
{
refused = true;
beep(); beep();
}
} else } else
if (_edit_field->is_kind_of(CLASS_LIST_FIELD)) if (_edit_field->is_kind_of(CLASS_LIST_FIELD))
{ {

6
include/printer.cpp
View File

@ -885,7 +885,8 @@ const char* TPrintrow::row_codified() const
int last_color = -1; int last_color = -1;
int k = 0, i = 0, len = 0; int k = 0, i = 0, len = 0;
char* tmp = get_tmp_string(256).get_buffer(); const int kmax = 1024;
char* tmp = get_tmp_string(kmax).get_buffer();
// Calcolo lunghezza stringa // Calcolo lunghezza stringa
for (i = _row.size()-1; i >= 0; i--) for (i = _row.size()-1; i >= 0; i--)
@ -939,6 +940,7 @@ const char* TPrintrow::row_codified() const
tmp[k++] = '@'; // Escape for @ tmp[k++] = '@'; // Escape for @
tmp[k++] = _row[i]; tmp[k++] = _row[i];
} }
CHECKD(k < kmax, "Internal buffer overflow ", k);
tmp[k] = '\0'; tmp[k] = '\0';
if (_images) if (_images)
@ -1482,7 +1484,7 @@ bool TPrinter::printrow(
_printertype == exportprinter) ? _printertype == exportprinter) ?
rowtoprint->row_codified () : rowtoprint->row_codified () :
rowtoprint->row ())); rowtoprint->row ()));
rw.rtrim (); rw.rtrim();
int lun = rw.len (); int lun = rw.len ();
int idx; int idx;

61
include/recset.cpp
View File

@ -426,7 +426,9 @@ const TVariant& TRecordset::get_var(const char* name) const
{ {
// Se mi accorgo che posso e voglio accedere ad un campo del recordset padre // Se mi accorgo che posso e voglio accedere ad un campo del recordset padre
if (_parentset != NULL && strncmp(name, "#PARENT.", 8) == 0) if (_parentset != NULL && strncmp(name, "#PARENT.", 8) == 0)
{
return _parentset->get(name+8); // Attenzione! E' giusto usare get() e non get_var() return _parentset->get(name+8); // Attenzione! E' giusto usare get() e non get_var()
}
const TVariant* var = (const TVariant*)_var.objptr(name); const TVariant* var = (const TVariant*)_var.objptr(name);
return var != NULL ? *var : NULL_VARIANT; return var != NULL ? *var : NULL_VARIANT;
@ -477,7 +479,7 @@ void TRecordset::find_and_reset_vars()
if (is_var_separator(sql[diesis-1])) // Controllo che ci sia un separatore prima del # if (is_var_separator(sql[diesis-1])) // Controllo che ci sia un separatore prima del #
{ {
int i = diesis+1; int i = diesis+1;
for ( ; sql[i] && (isalnum(sql[i]) || sql[i] == '_' || sql[i] == '.'); i++); for ( ; sql[i] && (isalnum(sql[i]) || sql[i] == '_' || sql[i] == '.' || sql[i] == '#'); i++);
if (i > diesis+1) if (i > diesis+1)
{ {
const TString& name = sql.sub(diesis, i); const TString& name = sql.sub(diesis, i);
@ -490,6 +492,10 @@ void TRecordset::find_and_reset_vars()
void TRecordset::parsed_text(TString& sql) const void TRecordset::parsed_text(TString& sql) const
{ {
sql = query_text(); sql = query_text();
const bool is_isam = sql.starts_with("US");
const bool is_sql = !is_isam;
const char* apici = is_isam ? "\"" : "'";
const bool vars = ((TSQL_recordset*)this)->ask_variables(false); const bool vars = ((TSQL_recordset*)this)->ask_variables(false);
if (vars) // Se ci sono variabili faccio le sostituzioni if (vars) // Se ci sono variabili faccio le sostituzioni
{ {
@ -509,16 +515,19 @@ void TRecordset::parsed_text(TString& sql) const
else else
{ {
s = var.as_string(); s = var.as_string();
if (is_sql) // Raddoppia gli apici in SQL
{
for (int i = 0; s[i]; i++) for (int i = 0; s[i]; i++)
{ {
if (s[i] == '\'') if (s[i] == '\'')
s.insert("'", i++); s.insert("'", i++);
} }
} }
if ((var.is_string() && s[0] != '\'') || var.is_null()) }
if ((var.is_string() && s[0] != *apici && sql.right(1) != apici) || var.is_null())
{ {
s.insert("'"); s.insert(apici);
s << '\''; s << apici;
} }
sql << s << after; sql << s << after;
} }
@ -1224,11 +1233,13 @@ class TCursor_parser
protected: protected:
const TString& pop(); const TString& pop();
const TString& line();
void push(); void push();
void add_column_info(const char* table, const TRectype& rec); void add_column_info(const char* table, const TRectype& rec);
void parse_sortexpr(TToken_string& se); void parse_sortexpr(TToken_string& se);
void parse_filter(TToken_string& filter); void parse_filter(TToken_string& filter);
void parse_select(TToken_string& filter);
void parse_region(TRectype& rec); void parse_region(TRectype& rec);
void parse_join_param(TRelation* rel, const TString& j, int to); void parse_join_param(TRelation* rel, const TString& j, int to);
void parse_join(); void parse_join();
@ -1267,6 +1278,15 @@ const TString& TCursor_parser::pop()
return _token; return _token;
} }
const TString& TCursor_parser::line()
{
if (_pushed.not_empty())
return pop();
char* buff = _token.get_buffer(256);
_instr.getline(buff, _token.size());
return _token;
}
void TCursor_parser::push() void TCursor_parser::push()
{ {
CHECK(_pushed.empty(), "Repushing?"); CHECK(_pushed.empty(), "Repushing?");
@ -1299,6 +1319,26 @@ void TCursor_parser::parse_sortexpr(TToken_string& se)
se.strip_d_spaces(); se.strip_d_spaces();
se.replace(' ', sep); se.replace(' ', sep);
se.separator(sep); se.separator(sep);
// Trasforma i nomi dei files in numeri se necessario
if (se.find('.') > 0)
{
TToken_string fld(16, '.');
TString16 name;
for (int i = 0; se.get(i, fld); i++)
{
if (!isdigit(fld[0]) && fld.find('.') > 0)
{
fld.get(0, name);
const int num = ::table2logic(name);
if (num != 0)
{
fld.add(num, 0);
se.add(fld, i);
}
}
}
}
} }
void TCursor_parser::parse_filter(TToken_string& filter) void TCursor_parser::parse_filter(TToken_string& filter)
@ -1312,10 +1352,17 @@ void TCursor_parser::parse_filter(TToken_string& filter)
push(); push();
} }
void TCursor_parser::parse_select(TToken_string& filter)
{
filter = line();
filter.trim();
}
void TCursor_parser::parse_region(TRectype& rec) void TCursor_parser::parse_region(TRectype& rec)
{ {
TString16 field; TString16 field;
TString value; TString80 value;
while (true) while (true)
{ {
const TString& ass = pop(); const TString& ass = pop();
@ -1416,7 +1463,7 @@ void TCursor_parser::parse_sortedjoin()
pop(); pop();
if (tok.starts_with("FI") || tok.starts_with("SE")) if (tok.starts_with("FI") || tok.starts_with("SE"))
{ {
parse_filter(filter); parse_select(filter);
} }
else else
push(); push();
@ -1526,7 +1573,7 @@ TCursor_parser::TCursor_parser(istream& instr, TArray& col)
TToken_string filter; TToken_string filter;
if (tok.starts_with("FI") || tok.starts_with("SE")) if (tok.starts_with("FI") || tok.starts_with("SE"))
parse_filter(filter); parse_select(filter);
else else
push(); push();

29
include/report.cpp
View File

@ -1102,9 +1102,8 @@ const TRectangle& TReport_field::get_draw_rect() const
TRectangle& rct = ((TReport_field*)this)->_draw_rct; TRectangle& rct = ((TReport_field*)this)->_draw_rct;
if (dynamic_height()) if (dynamic_height())
{ {
TParagraph_string str(formatted_text(), rct.width()/100); TParagraph_string str(formatted_text(), rct.width()/100-1); // Sto un po' scarso
str.rtrim(); int h = str.items() * 100;
int h = str.items() * 110; h -= h%100; // Sto un po' abbondante
if (h <= 0) if (h <= 0)
h = 100; h = 100;
if (h > _rct.height()) if (h > _rct.height())
@ -1418,11 +1417,13 @@ const TString& TReport_field::formatted_text() const
tmp << _picture << ' ' << _var.as_string(); tmp << _picture << ' ' << _var.as_string();
return tmp; return tmp;
} }
if (dynamic_height() && _var.as_string().find(char(0xB6)) >= 0) if (dynamic_height())
{ {
TString& tmp = get_tmp_string(); TString& tmp = get_tmp_string();
tmp = _var.as_string(); tmp = _var.as_string();
tmp.strip_d_spaces();
tmp.replace(char(0xB6), '\n'); tmp.replace(char(0xB6), '\n');
tmp.rtrim();
return tmp; return tmp;
} }
return _var.as_string(); return _var.as_string();
@ -2222,6 +2223,7 @@ bool TReport::execute_prescript()
} }
} }
if (bAsk) if (bAsk)
{ {
// Script dei poverissimi: chiede le eventuali variabili // Script dei poverissimi: chiede le eventuali variabili
@ -2537,6 +2539,17 @@ void TReport::mask2report(const TMask & m)
} }
} }
KEY TReport::run_form(TMask& m)
{
report2mask(m);
KEY key = m.run();
if (key != K_QUIT && key != K_ESC)
mask2report(m); // Rendi visibili tutte le variabili utente al report
return key;
}
KEY TReport::run_form(const TString& maskname) KEY TReport::run_form(const TString& maskname)
{ {
TFilename fname = maskname; fname.ext("msk"); TFilename fname = maskname; fname.ext("msk");
@ -2544,12 +2557,9 @@ KEY TReport::run_form(const TString& maskname)
if (fname.custom_path()) if (fname.custom_path())
{ {
TMask m(maskname); TMask m(maskname);
key = run_form(m);
report2mask(m);
key = m.run();
if (key != K_QUIT && key != K_ESC)
mask2report(m); // Rendi visibili tutte le variabili utente al report
} }
return key; return key;
} }
@ -2950,4 +2960,3 @@ TReport::~TReport()
{ {
destroy(); destroy();
} }

7
include/report.h
View File

@ -455,7 +455,9 @@ protected:
virtual bool execute_usr_word(unsigned int opcode, TVariant_stack& stack); virtual bool execute_usr_word(unsigned int opcode, TVariant_stack& stack);
virtual bool get_usr_val(const TString& name, TVariant& var) const; virtual bool get_usr_val(const TString& name, TVariant& var) const;
virtual bool set_usr_val(const TString& name, const TVariant& var); virtual bool set_usr_val(const TString& name, const TVariant& var);
KEY run_form(const TString& msk);
virtual KEY run_form(TMask& msk);
virtual KEY run_form(const TString& msk);
bool do_message(const TVariant& var, FLDMSG_FUNC msg, void* jolly); bool do_message(const TVariant& var, FLDMSG_FUNC msg, void* jolly);
@ -528,6 +530,8 @@ public:
// Used by TReport_printer // Used by TReport_printer
void set_page(word r, word p) { _rep_page = r; _book_page = p; } void set_page(word r, word p) { _rep_page = r; _book_page = p; }
word page() const { return _rep_page; }
virtual word last_printed_page() const { return 0; }
void set_curr_field(TReport_field* fld) { _curr_field = fld; } void set_curr_field(TReport_field* fld) { _curr_field = fld; }
TReport_field* curr_field() const { return _curr_field; } TReport_field* curr_field() const { return _curr_field; }
@ -539,6 +543,7 @@ public:
void mask2report(const TMask & m); void mask2report(const TMask & m);
void destroy(); void destroy();
TReport(); TReport();
virtual ~TReport(); virtual ~TReport();
}; };

4
include/reprint.cpp
View File

@ -1337,7 +1337,7 @@ bool TBook::init()
bool ok = true; bool ok = true;
if (_pvr < 96 || _phr < 96) // Risoluzione di Acrobat Writer if (_pvr < 96 || _phr < 96) // Risoluzione di Acrobat Writer
{ {
ok = yesno_box(TR("Stampante obsoleta o non adeguatamente configurata:\n" ok = yesno_box(FR("Stampante obsoleta o non adeguatamente configurata:\n"
"Risoluzione %ldx%ld. Continuare ugualmente?"), _phr, _pvr); "Risoluzione %ldx%ld. Continuare ugualmente?"), _phr, _pvr);
} }
return ok; return ok;
@ -1751,7 +1751,7 @@ bool TReport_book::add(TReport& rep, bool progind)
const int max_body = _report->find_max_level('B'); const int max_body = _report->find_max_level('B');
int last_body_height = 0; int last_body_height = 0;
_rep_page = 0; // Azzera numero di pagina relativo _rep_page = rep.last_printed_page(); // Azzera numero di pagina relativo
_is_last_page = false; _is_last_page = false;
bool ok = rex->move_to(0); bool ok = rex->move_to(0);

46
include/sheet.cpp
View File

@ -800,10 +800,7 @@ bool TSheet_control::event_handler(XI_OBJ* itf, XI_EVENT *xiev)
xiev->v.cell_request.back_color = FOCUS_BACK_COLOR; xiev->v.cell_request.back_color = FOCUS_BACK_COLOR;
} }
else else
{ _sheet->get_cell_colors(rec, col, xiev->v.cell_request.color, xiev->v.cell_request.back_color);
xiev->v.cell_request.color = 0;
xiev->v.cell_request.back_color = 0;
}
} }
} }
else else
@ -1045,6 +1042,12 @@ void TSheet::add_button(
butt.set_exit_key(key); butt.set_exit_key(key);
} }
bool TSheet::get_cell_colors(int row, int col, COLOR& fore, COLOR& back) const
{
fore = back = 0; // Default colors
return false; // Not assigned
}
void TSheet::repos_buttons() const void TSheet::repos_buttons() const
{ {
if (_sheet == NULL) if (_sheet == NULL)
@ -1337,6 +1340,27 @@ long TArray_sheet::insert(const TToken_string& s, long n)
// TCursor_sheet // TCursor_sheet
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
bool TCursor_sheet::in_key(const TFieldref& fr) const
{
const int logic = _cursor->file().num();
if (fr.file() != 0 && fr.file() != logic)
return false;
const RecDes& rd = prefix().get_recdes(logic);
const int key = _cursor->key();
const KeyDes& kd = rd.Ky[key-1];
for (int i = 0; i < kd.NkFields; i++)
{
const int n = kd.FieldSeq[i] % MaxFields;
if (strcmp(rd.Fd[n].Name, fr.name()) == 0)
return true;
}
return false;
}
TCursor_sheet::TCursor_sheet(TCursor* cursor, const char* fields, TCursor_sheet::TCursor_sheet(TCursor* cursor, const char* fields,
const char* title, const char* head, const char* title, const char* head,
byte buttons, short sht_y, WINDOW parent) byte buttons, short sht_y, WINDOW parent)
@ -1362,6 +1386,8 @@ TCursor_sheet::TCursor_sheet(TCursor* cursor, const char* fields,
if (c == ' ') if (c == ' ')
sheet().align_column(campo, TRUE); sheet().align_column(campo, TRUE);
} }
_key_cols.set(campo, in_key(fr));
} }
} }
} }
@ -1396,6 +1422,18 @@ void TCursor_sheet::get_row(long row, TToken_string& l)
} }
} }
bool TCursor_sheet::get_cell_colors(int row, int col, COLOR& fore, COLOR& back) const
{
if (_key_cols[col])
{
fore = 0;
back = REQUIRED_BACK_COLOR;
return true;
}
return TSheet::get_cell_colors(row, col, fore, back);
}
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// TBrowse_sheet // TBrowse_sheet
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////

6
include/sheet.h
View File

@ -40,6 +40,7 @@ protected:
// @cmember Permette di riposizionare i bottoni all'interno della pagina // @cmember Permette di riposizionare i bottoni all'interno della pagina
virtual void repos_buttons() const; virtual void repos_buttons() const;
virtual bool get_cell_colors(int row, int col, COLOR& fore, COLOR& back) const;
void post_select(long rec); void post_select(long rec);
@ -173,6 +174,8 @@ class TCursor_sheet : public TSheet
// @cmember:(INTERNAL) Cursore da cui prelevare i dati // @cmember:(INTERNAL) Cursore da cui prelevare i dati
TCursor* _cursor; TCursor* _cursor;
TBit_array _key_cols; // Colonne colorate;
// @access Protected Member // @access Protected Member
protected: // TSheet protected: // TSheet
@ -183,6 +186,9 @@ protected: // TSheet
// @cmember Ritorna la riga n // @cmember Ritorna la riga n
virtual void get_row(long n, TToken_string& row); virtual void get_row(long n, TToken_string& row);
bool in_key(const TFieldref& fr) const;
virtual bool get_cell_colors(int row, int col, COLOR& fore, COLOR& back) const;
// @access Public Member // @access Public Member
public: // TSheet public: // TSheet

2
mr/f152.dir
View File

@ -1,3 +1,3 @@
152 152
0 0
$rilprod|1|1|116|0|Rilevazione produzione||| $rilprod|0|0|127|0|Rilevazione produzione|||

19
mr/f152.trr
View File

@ -1,7 +1,7 @@
152 152
20 19
CODART|1|20|0|Codice articolo CODART|1|20|0|Codice articolo
DATAPROD|5|8|0|Data di inizio produzione DATA|5|8|0|Data di scadenza
PROG|2|3|0|Progressivo del giorno PROG|2|3|0|Progressivo del giorno
CODNUM|1|4|0|Codice numerazione ordine di produzione CODNUM|1|4|0|Codice numerazione ordine di produzione
ANNO|2|4|0|Anno ordine di produzione ANNO|2|4|0|Anno ordine di produzione
@ -9,11 +9,10 @@ PROVV|1|1|0|Tipo numerazione <P>rovvisorio <D>efinitivo ordine di produzione
NDOC|3|7|0|Numero documento ordine di produzione NDOC|3|7|0|Numero documento ordine di produzione
IMPIANTO|1|5|0|Codice impianto IMPIANTO|1|5|0|Codice impianto
LINEA|1|5|0|Codice linea LINEA|1|5|0|Codice linea
OPERATORE|1|16|0|Codice Operatore
NRIGA|2|3|0|Numero riga ordine di produzione NRIGA|2|3|0|Numero riga ordine di produzione
ORAPROD|1|6|0|Ora di inizio produzione QTA|4|15|5|Quantità prodotta totale
DATAFINE|5|8|0|Data fine produzione SCARTO|4|15|4|Scarto di produzione totale
ORAFINE|1|6|0|Ora fine produzione
QTA|4|15|5|Quantità prodotta
CHIUSO|8|1|0|Lotto chiuso CHIUSO|8|1|0|Lotto chiuso
CODNUMP|1|4|0|Codice numerazione bolla di produzione CODNUMP|1|4|0|Codice numerazione bolla di produzione
ANNOP|2|4|0|Anno bolla di produzione ANNOP|2|4|0|Anno bolla di produzione
@ -21,9 +20,9 @@ PROVVP|1|1|0|Tipo numerazione <P>rovvisorio <D>efinitivo bolla di produzione
NDOCP|3|7|0|Numero documento bolla di produzione NDOCP|3|7|0|Numero documento bolla di produzione
NRIGAP|2|3|0|Numero riga bolla di produzione NRIGAP|2|3|0|Numero riga bolla di produzione
6 6
CODART+DATAPROD+PROG| CODART+DATA+PROG|
IMPIANTO+LINEA+CODART+DATAPROD|X IMPIANTO+LINEA+CODART+DATA|X
DATAPROD+IMPIANTO+LINEA+CODART|X DATA+IMPIANTO+LINEA+CODART|X
PROVV+ANNO+CODNUM+NDOC+NRIGA|X PROVV+ANNO+CODNUM+NDOC+NRIGA|X
PROVVP+ANNOP+CODNUMP+NDOCP+NRIGAP|X PROVVP+ANNOP+CODNUMP+NDOCP+NRIGAP|X
CODNUM+ANNO+PROVV+NDOC+CODART+DATAPROD|X CODNUM+ANNO+PROVV+NDOC+CODART+DATA|X

3
mr/f153.dir Executable file
View File

@ -0,0 +1,3 @@
153
0
$rrilprod|0|0|93|0|Righe rilevazione produzione|||

14
mr/f153.trr Executable file
View File

@ -0,0 +1,14 @@
153
10
CODART|1|20|0|Codice articolo
DATA|5|8|0|Data consegna
PROG|2|3|0|Progressivo
NRIGA|2|3|0|Numero di riga
DATAINI|5|8|0|Data inizio produzione
ORAINI|1|6|0|Ora di inizio produzione
DATAFINE|5|8|0|Data fine produzione
ORAFINE|1|6|0|Ora fine produzione
QTA|4|15|5|Quantità prodotta
SCARTO|4|15|4|Scarto di produzione
1
CODART+DATA+PROG+NRIGA|

774
mr/mr0500.cpp
View File

@ -1,12 +1,100 @@
#include <automask.h> #include <automask.h>
#include <defmask.h>
#include <filetext.h>
#include <printer.h>
#include <progind.h>
#include <relapp.h> #include <relapp.h>
#include <modaut.h>
#include <utility.h> #include <utility.h>
#include <viswin.h>
#include "../ve/velib.h"
#include "mr0500a.h" #include "mr0500a.h"
#include "mr0500b.h"
#include "mr0500c.h"
#include "mrplib.h"
///////////////////////////////////////////////////////////
// TElabora_mask
///////////////////////////////////////////////////////////
class TElabora_mask : public TAutomask
{
protected:
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
public:
TElabora_mask() : TAutomask("mr0500c") { }
};
bool TElabora_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
{
return true;
}
///////////////////////////////////////////////////////////
// TLoadfile_mask
///////////////////////////////////////////////////////////
class TLoadfile_mask : public TAutomask
{
protected:
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
public:
TLoadfile_mask() : TAutomask("mr0500b") { }
};
bool TLoadfile_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
{
switch (o.dlg()) //eventi, tipo pressione dei tasti
{
case F_FILE:
if(e==fe_button) //se e (che é l'evento) = pressione del bottone 'cerca' (fe button)
{
DIRECTORY dir;
FILE_SPEC fs;
TFilename fname=o.get(); //se il nome del file non esiste -> gli assegna automaticamente il nome
if(fname == "") //articoli.dat
fname = "articoli";
xvt_fsys_get_dir(&dir); //funzioni di xvt (grafica); utilizzate per creare la finestra di ricerca del
xvt_fsys_get_dir(&fs.dir); //file di tipo .dat (é una finestra tipo gestione risorse Windows)
strcpy(fs.type, "dat");
strcpy(fs.name, fname);
strcpy(fs.creator, "ELD");
const bool good = xvt_dm_post_file_open(&fs, "Selezionare il file ...") == FL_OK;
xvt_fsys_set_dir(&dir);
if (good)
{
xvt_fsys_convert_dir_to_str(&fs.dir, fname.get_buffer(), fname.size()); //converte il nome della directory in una
fname.add(fs.name); //stringa aggiungendo il path del file
o.set(fname); //mostra il campo sul video (la funzione set)
}
}
if(e==fe_init && o.get().empty())
o.set("prod.dat");
if(e==fe_close) //se e = alla pressione del bottone 'chiudi' (fe_close) controlla che il campo sia stato
{ //riempito correttamente nella maschera
TFilename n = o.get();
return n.exist();
}
break;
default:
break;
}
return true;
}
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// TRilprod_mask // TRilprod_mask
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
typedef enum TTipo_rec { _no_type = 0, _start = 1, _end = 2, _rett = 3};
class TRilprod_mask : public TAutomask class TRilprod_mask : public TAutomask
{ {
@ -15,12 +103,23 @@ protected:
virtual bool on_key(KEY key); virtual bool on_key(KEY key);
public: public:
TRilprod_mask() : TAutomask("mr0500a") { } void load_prod_file(const char * nomefile, bool savefile, bool only_errors);
void display_error(TViswin & v, const char * msg, TTracciato_record & t, TRecord_text & r);
void print_record(TViswin & v, TTipo_rec t , TProduzione & r);
TRilprod_mask();
virtual ~TRilprod_mask() {}
}; };
TRilprod_mask::TRilprod_mask() : TAutomask("mr0500a")
{
enable(F_DATALOG, main_app().has_module(POAUT, CHK_DONGLE));
sfield(F_TEMPI).set_append(false);
}
bool TRilprod_mask::on_key(KEY key) bool TRilprod_mask::on_key(KEY key)
{ {
//shift+f12 per abilitare il riquadro della bolla di protezione //shift+f12 per abilitare il riquadro della bolla di produzione
if (key == K_SHIFT + K_F12) if (key == K_SHIFT + K_F12)
{ {
enable(-GR_BOLPROD); enable(-GR_BOLPROD);
@ -34,34 +133,505 @@ bool TRilprod_mask::on_field_event(TOperable_field& o, TField_event e, long joll
bool ok = true; bool ok = true;
switch (o.dlg()) switch (o.dlg())
{ {
case F_ORAINI : case F_TEMPI:
case F_MININI : if (e == se_notify_add || e == se_notify_del)
case F_SECINI : {
case F_ORAFIN : TSheet_field & sh = (TSheet_field &)o;
case F_MINFIN : TMask_field & q = field(F_QTA);
case F_SECFIN : TMask_field & s = field(F_SCARTO);
const int items = sh.items();
const bool enable = items == 0;
if (enable)
{
q.enable(); q.reset();
s.enable(); s.reset();
}
else
{
q.disable();
s.disable();
}
}
else
if (e == se_leave)
{
TSheet_field & sh = (TSheet_field &)o;
TMask_field & q = field(F_QTA);
TMask_field & s = field(F_SCARTO);
const int items = sh.items();
if (items > 0)
{
real qta;
real scarto;
for (int i = 0; i < items; i++)
{
TToken_string & r = sh.row(i);
qta += (real)r.get(sh.cid2index(FR_QTA));
scarto += (real)r.get(sh.cid2index(FR_SCARTO));
}
q.set(qta.string());
s.set(scarto.string());
}
}
break;
case FR_ORAINI :
case FR_MININI :
case FR_SECINI :
case FR_ORAFIN :
case FR_MINFIN :
case FR_SECFIN :
if (e == fe_modify || e == fe_close) if (e == fe_modify || e == fe_close)
{ {
//i campi ore/min/sec vanno zero filled //i campi ore/min/sec vanno zero filled
TString8 stringa; TString8 stringa;
if (o.get().not_empty())
{
int numero = atoi(o.get()); int numero = atoi(o.get());
stringa.format("%02d", numero); stringa.format("%02d", numero);
o.set(stringa); o.set(stringa);
} }
break;
case F_DATAFIN :
if (e == fe_close)
{
if (o.get().not_empty() && get_real(F_QTA) <= 0.0)
return error_box(FR("La quantita' deve essere >0 avendo\n indicato una data di fine produzione"));
} }
break; break;
case H_PROG :
if (e == fe_modify && key_valid(1))
stop_run(K_AUTO_ENTER);
break;
case DLG_ELABORA :
if (e == fe_button)
{
TElabora_mask m;
if (m.run() == K_ENTER)
{
TConsuntivazione_produzione c(m.get(F_CODICE_EL));
TLista_documenti docs;
TDate d(m.get(F_DATA_EL));
if (c.elabora(docs, docs, d, true))
docs[0].rewrite();
}
}
break;
case F_DATALOG :
if (e == fe_button)
{
TLoadfile_mask m;
if (m.run() == K_ENTER)
load_prod_file(m.get(F_FILE), m.get_bool(F_SAVE), m.get_bool(F_ONLY_ERRORS));
}
default: default:
break; break;
} }
return ok; return ok;
} }
void TRilprod_mask::display_error(TViswin & v, const char * msg, TTracciato_record & t, TRecord_text & r)
{
TString riga;
const int nfields = t.tracciati_campo().items();
v.add_line("");
v.add_line(format(FR("Errore : %s"), msg));
TString l;
for (int f = 0; f < nfields; f++)
{
const TTracciato_campo & c = t.get(f);
const TString & name = c.name();
TString val(r.get(f));
TString s;
val.trim();
s.format(" %s = %s", (const char *) name, (const char *) val);
if (l.len() + s.len() > 80)
{
v.add_line(l);
l.cut(0);
}
l << s;
}
if (l.not_empty())
v.add_line(l);
}
void TRilprod_mask::print_record(TViswin & v, TTipo_rec t , TProduzione & r)
{
TString riga;
const int nfields = r.rec_des()->NFields;
v.add_line("");
if (t == _start)
v.add_line(TR("Record elaborato - inizio produzione"));
else
if (t == _end)
v.add_line(TR("Record elaborato - fine produzione"));
else
if (t == _rett)
v.add_line(TR("Record elaborato - rettifica"));
TString l;
for (int i = 0; i < nfields; i++)
{
const TString & name = r.fieldname(i);
const TString & val = r.get(name);
TString s;
s.format(" %s = %s", (const char *) name, (const char *) val);
if (l.len() + s.len() > 80)
{
v.add_line(l);
l.cut(0);
}
l << s;
}
if (l.not_empty())
v.add_line(l);
}
void TRilprod_mask::load_prod_file(const char * nomefile, bool savefile, bool only_errors)
{
TViswin vwin(NULL, TR("Importazione produzione"), FALSE, TRUE, TRUE);
TFile_text prod(nomefile,"mr0500a.ini"); //crea un oggetto articoli di tipo TFile_text
TRecord_text rec; //crea un record vuoto con nome articolocor
TTracciato_record & trec = *(prod.t_rec(""));
const int nfields = trec.tracciati_campo().items();
int type_field = 0;
int ord_field = 0;
int cod_field = 0;
TDate filedate;
TProduzione prd;
TLocalisamfile rigaord(LF_RIGHEDOC);
TString val;
TString codart;
TLocalisamfile fp(LF_RILPROD);
TRectype cmp(fp.curr());
const long max = fsize(nomefile);
TProgind p(max, format(FR("Importazione produzione : file %s"), nomefile));
for (int f = 0; f < nfields; f++)
{
const TTracciato_campo & c = trec.get(f);
const TString name = c.name();
if (name == "TIPO")
type_field = f;
else
if (name == "ORDINE")
ord_field = f;
else
if (name == "CODART")
cod_field = f;
}
vwin.open_modal();
prod.open(); //applico il metodo open che apre il file in lettura (contenuta in TFile_text)
while(prod.ok_r()) //ok_r é una funzione che indica la fine del file
{
if(prod.read(rec) == NOERR)
{
const TTipo_rec tipo = (TTipo_rec) atoi(rec.get(type_field));
p.setstatus(prod.read_file()->tellg());
if (tipo == _no_type)
{
display_error(vwin, TR("Tipo record non valido - record scartato"), trec, rec);
continue;
}
const TString ordval(rec.get(ord_field));
if (ordval.blank())
{
display_error(vwin, TR("Record vuoto - record scartato"), trec, rec);
continue;
}
if (ordval.find('.') < 0)
{
display_error(vwin, TR("Riga ordine errata - record scartato"), trec, rec);
continue;
}
TToken_string ord(ordval, '.'); ord.trim();
const TString codnum(ord.get(0));
const int anno = ord.get_int();
const int ndoc = ord.get_long();
const int nriga = ord.get_int();
TDate d;
TString h;
real qta;
real scarto;
rigaord.zero();
rigaord.put("CODNUM", codnum);
rigaord.put("ANNO", anno);
rigaord.put("PROVV", "D");
rigaord.put("NDOC", ndoc);
rigaord.put("NRIGA", nriga);
codart.cut(0);
TDate datao(TODAY);
if (rigaord.read(_isequal) != NOERR)
display_error(vwin, TR("Riga ordine inesistente"), trec, rec);
else
{
codart = rigaord.get("CODART");
TToken_string key;
key.add("D");
key.add(anno);
key.add(codnum);
key.add(ndoc);
const TRectype & doc = cache().get(LF_DOC, key);
datao = doc.get_date("DATADOC");
}
TString codart_new(rec.get(cod_field)); codart_new.trim();
const int err = prd.read_ordp(codnum, anno, 'D', ndoc, nriga);
TDate datarec;
bool nuovo = (err != NOERR);
if (!nuovo)
{
fp.setkey(4);
cmp.zero();
cmp.put("CODNUM", codnum);
cmp.put("ANNO", anno);
cmp.put("PROVV", "D");
cmp.put("NDOC", ndoc);
cmp.put("NRIGA", nriga);
fp.curr() = cmp;
if (codart_new.not_empty())
{
nuovo = true;
for (int err = fp.read(); (err == NOERR) && (fp.curr() == cmp); err = fp.next())
{
if (codart_new == fp.get("CODART"))
{
nuovo = false;
datarec = fp.get_date("DATA");
break;
}
}
}
else
{
TRecnotype r = -1L;
for (int err = fp.read(); (err == NOERR) && (fp.curr() == cmp); err = fp.next())
{
const TRecnotype pos = fp.recno();
if (r < pos)
r = pos;
}
if (r >= 0L)
{
fp.readat(r);
codart_new = fp.curr().get("CODART");
datarec = fp.get_date("DATA");
}
}
}
if (codart_new.empty())
{
display_error(vwin, TR("Articolo nullo - record scartato"), trec, rec);
continue;
}
else
{
const TRectype & anamag = cache().get(LF_ANAMAG, codart_new);
if (anamag.empty())
{
display_error(vwin, TR("Articolo inesistente - record scartato"), trec, rec);
continue;
}
}
if (nuovo)
{
prd.zero();
prd.put("CODNUM", codnum);
prd.put("ANNO", anno);
prd.put("PROVV", "D");
prd.put("NDOC", ndoc);
prd.put("NRIGA", nriga);
prd.put("DATA", datao);
}
else
prd.read_art(codart_new, datarec, 0);
for (int f = 0; f < nfields; f++)
{
const TTracciato_campo & c = trec.get(f);
const TString name = c.name();
val = rec.get(f);
val.trim();
if (!val.empty() || tipo == _rett)
{
if (name == "TIPO" || name == "ORDINE")
continue;
else
if (name == "DATA")
{
if (val.len() == 8)
val.insert("20", 6);
d = val;
}
else
if (name == "ORA")
{
h = val.left(2);
h << val.mid(3, 2) << val.right(2);
}
else
if (name == "QTA")
qta = (real) val;
else
if (name == "SCARTO")
scarto = (real) val;
else
prd.put(name, val);
}
}
if (prd.get("IMPIANTO").empty())
{
const TString16 linea(prd.get("LINEA"));
if (linea.not_empty())
{
const TLinea_prod lp(linea);
const TString16 imp(lp.codimp());
if (imp.not_empty())
prd.put("IMPIANTO", imp);
}
}
if (!only_errors)
print_record(vwin, tipo, prd);
if (tipo == _start)
{
const int rows = prd.body().rows();
bool found = false;
bool seq_err = false;
for (int i = 1; !found && i <= rows; i++)
{
const TRectype & row = prd.body()[i];
found = d == row.get_date("DATAINI") && h == row.get("ORAINI");
if (row.get("DATAFINE").empty())
seq_err = true;
}
if (seq_err)
display_error(vwin, TR("Inizio senza fine precedente"), trec, rec);
if (!found)
{
TRectype & row = prd.body().row(rows + 1, true);
row.put("DATAINI", d);
row.put("ORAINI", h);
}
if (nuovo)
prd.write();
else
prd.rewrite();
}
else
if (tipo == _end)
{
const int rows = prd.body().rows();
bool found = false;
for (int i = rows; i > 0; i--)
{
const TRectype & row = prd.body()[i];
found = (d == row.get_date("DATAFINE") && h == row.get("ORAFINE")) ||
row.get("DATAFINE").empty();
if (found)
break;
}
if (!found)
{
TRectype & row = prd.body().row(rows + 1, true);
i = rows + 1;
display_error(vwin, TR("Fine senza inizio"), trec, rec);
}
TRectype & row = prd.body()[i];
row.put("DATAFINE", d);
row.put("ORAFINE", h);
real diff = qta - row.get_real("QTA");
real tot = prd.get_real("QTA") + diff;
row.put("QTA", qta);
prd.put("QTA", tot);
diff = scarto - row.get_real("SCARTO");
tot = prd.get_real("SCARTO") + diff;
row.put("SCARTO", scarto);
prd.put("SCARTO", tot);
prd.rewrite();
}
else
{
const int rows = prd.body().rows();
for (int i = 1; i <= rows; i++)
{
TRectype & row = prd.body()[i];
if (i < rows)
{
row.zero("QTA");
row.zero("SCARTO");
}
else
{
row.put("QTA", qta);
row.put("SCARTO", scarto);
}
}
prd.put("QTA", qta);
prd.put("SCARTO", scarto);
prd.rewrite();
}
}
}
prod.close();
if (savefile)
{
TFilename dest(nomefile);
dest = dest.path();
TString filemask(dest);
TString_array arr;
int cnt = 0;
filemask << "pr" << filedate.month() << filedate.day() << "*.dat";
list_files(filemask, arr);
const int items = arr.items();
if (items > 0)
{
arr.sort();
cnt = atoi(arr.row(items - 1).right(5));
}
cnt++;
dest << "pr" << filedate.month() << filedate.day() << cnt; dest.ext("dat");
if (fcopy(nomefile, dest))
remove_file(nomefile);
}
vwin.close_print();
vwin.close_modal();
KEY k = vwin.run();
if (k == K_CTRL+'S') // Ho premuto Stampa
printer().print_txt(vwin.text());
}
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// TRilprod_app // TRilprod_app
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
@ -71,6 +641,11 @@ class TRilprod_app : public TRelation_application
TRelation* _rel; TRelation* _rel;
TRilprod_mask* _msk; TRilprod_mask* _msk;
virtual int read( TMask& m );
virtual int write( const TMask& m );
virtual int rewrite( const TMask& m );
virtual bool remove();
protected: protected:
virtual TMask* get_mask(int) { return _msk; } virtual TMask* get_mask(int) { return _msk; }
virtual TRelation* get_relation() const { return _rel; } virtual TRelation* get_relation() const { return _rel; }
@ -85,6 +660,8 @@ protected:
void TRilprod_app::init_insert_mode(TMask& m) void TRilprod_app::init_insert_mode(TMask& m)
{ {
m.disable(-GR_BOLPROD); m.disable(-GR_BOLPROD);
m.field(F_QTA).enable();
m.field(F_SCARTO).enable();
} }
void TRilprod_app::init_modify_mode(TMask& m) void TRilprod_app::init_modify_mode(TMask& m)
@ -112,28 +689,173 @@ bool TRilprod_app::get_next_key(TToken_string& key)
{ {
TMask& m = curr_mask( ); TMask& m = curr_mask( );
if (m.get(F_CODART).empty() || m.get(F_DATAPROD).empty()) if (m.get(F_CODART).empty() || m.get(F_DATA).empty())
return false; return false;
TLocalisamfile rilprod(LF_RILPROD); TProduzione p;
rilprod.put("CODART", m.get(F_CODART));
rilprod.put("DATAPROD", m.get(F_DATAPROD));
TRectype cmp_rec(rilprod.curr()); // record campione int n = 0;
rilprod.put( "PROG", 999 ); TLocalisamfile ril(LF_RILPROD);
if (rilprod.read(_isgreat) == NOERR) TRectype& curr = ril.curr();
rilprod.prev();
else
rilprod.last();
const int num = ((rilprod.curr() == cmp_rec) ? rilprod.get_int("PROG") : 0) + 1; curr.put("CODART", m.get(F_CODART));
curr.put("DATA", m.get_date(F_DATA));
curr.put("PROG", 999);
key.format("%d|%d", F_PROG, num); const int err = ril.read(_isgreat);
if (err != _isemptyfile)
{
if (err == NOERR)
ril.prev();
if (curr.get("CODART") == m.get(F_CODART) &&
curr.get("DATA") == m.get_date(F_DATA))
n = curr.get_int("PROG");
}
n++;
key.format("%d|%d", F_PROG, n);
return true; return true;
} }
int TRilprod_app::read( TMask& m )
{
TProduzione p;
int err = TRelation_application::read(m);
if (err != NOERR)
return err;
p.TMultiple_rectype::read(_rel->curr());
const int rows = p.body().rows();
TSheet_field & sh = m.sfield(F_TEMPI);
sh.reset();
for (int i = 0 ; i < rows; i++)
{
TToken_string & r = sh.row(i);
const TRectype & row = p.body()[i + 1];
r.add(row.get("DATAINI"));
const TString & oraini = row.get("ORAINI");
r.add(oraini.left(2));
r.add(oraini.mid(2, 2));
r.add(oraini.right(2));
r.add(row.get("DATAFINE"));
const TString & orafin = row.get("ORAFINE");
r.add(orafin.left(2));
r.add(orafin.mid(2, 2));
r.add(orafin.right(2));
r.add(row.get("QTA"));
r.add(row.get("SCARTO"));
}
const bool on = m.sfield(F_TEMPI).items() == 0;
m.field(F_QTA).enable(on);
m.field(F_SCARTO).enable(on);
return NOERR;
}
int TRilprod_app::write( const TMask& m )
{
TProduzione p;
TSheet_field & sh = m.sfield(F_TEMPI);
const int rows = sh.items();
p.zero();
m.autosave(*_rel);
p.head() = _rel->curr();
for (int i = 0 ; i < rows; i++)
{
TToken_string & r = sh.row(i);
TRectype & row = p.body().row(i + 1, true);
row.put("DATAINI", r.get(0));
TString8 ora(r.get());
TString8 w(r.get());
if (w.blank())
w = "00";
ora << w;
w = r.get();
if (w.blank())
w = "00";
ora << w;
row.put("ORAINI", ora);
row.put("DATAFINE", r.get());
ora = r.get();
w = r.get();
if (w.blank())
w = "00";
ora << w;
w = r.get();
if (w.blank())
w = "00";
ora << w;
row.put("ORAFINE", ora);
row.put("QTA", r.get());
row.put("SCARTO", r.get());
}
const int err = p.write();
_rel->curr() = p.head();
_rel->read();
return err;
}
int TRilprod_app::rewrite( const TMask& m )
{
TProduzione p;
TSheet_field & sh = m.sfield(F_TEMPI);
const int rows = sh.items();
m.autosave(*_rel);
p.TMultiple_rectype::read(_rel->curr());
p.head() = _rel->curr();
p.destroy_rows();
for (int i = 0 ; i < rows; i++)
{
TToken_string & r = sh.row(i);
TRectype & row = p.body().row(i + 1, true);
row.put("DATAINI", r.get(0));
TString16 ora(r.get());
TString8 w(r.get());
if (w.blank())
w = "00";
ora << w;
w = r.get();
if (w.blank())
w = "00";
ora << w;
row.put("ORAINI", ora);
row.put("DATAFINE", r.get());
ora = r.get();
w = r.get();
if (w.blank())
w = "00";
ora << w;
w = r.get();
if (w.blank())
w = "00";
ora << w;
row.put("ORAFINE", ora);
row.put("QTA", r.get());
row.put("SCARTO", r.get());
}
return p.rewrite();
}
bool TRilprod_app::remove()
{
TProduzione p;
_msk->autosave(*_rel);
p.TMultiple_rectype::read(_rel->curr());
return p.remove() == NOERR;
}
int mr0500(int argc, char* argv[]) int mr0500(int argc, char* argv[])
{ {
TRilprod_app app; TRilprod_app app;

74
mr/mr0500a.h
View File

@ -1,39 +1,47 @@
//campi maschera mr0500a.uml //campi maschera mr0500a.uml
#define F_CODART 101 #define F_CODART 201
#define F_DATAPROD 102 #define F_DATA 202
#define F_PROG 103 #define F_PROG 203
#define F_IMPIANTO 104 #define F_IMPIANTO 204
#define F_LINEA 105 #define F_LINEA 205
#define F_CODNUM 106 #define F_CODNUM 206
#define F_ANNO 107 #define F_ANNO 207
#define F_PROVV 108 #define F_PROVV 208
#define F_NDOC 109 #define F_NDOC 209
#define F_NRIGA 110 #define F_NRIGA 210
#define F_QTA 113 #define F_QTA 213
#define F_CHIUSO 114 #define F_CHIUSO 214
#define F_CODNUMP 115 #define F_CODNUMP 215
#define F_ANNOP 116 #define F_ANNOP 216
#define F_PROVVP 117 #define F_PROVVP 217
#define F_NDOCP 118 #define F_NDOCP 218
#define F_NRIGAP 119 #define F_NRIGAP 219
#define F_DESCRCOD 120 #define F_DESCRCOD 220
#define F_DESCRIMP 121 #define F_DESCRIMP 221
#define F_DESCRLIN 122 #define F_DESCRLIN 222
#define F_DESCRNUM 123 #define F_DESCRNUM 223
#define F_DESCRNUMP 124 #define F_DESCRNUMP 224
#define F_SCARTO 225
#define F_DATAINI 130 #define F_BOTTONE 240
#define F_ORAINI 131 #define F_DATALOG 241
#define F_MININI 132 #define GR_BOLPROD 242
#define F_SECINI 133 #define F_OPERATORE 243
#define F_DATAFIN 134 #define F_COGNOME 244
#define F_ORAFIN 135 #define F_NOME 245
#define F_MINFIN 136 #define F_TEMPI 246
#define F_SECFIN 137 #define H_PROG 247
#define F_BOTTONE 140 #define FR_DATAINI 101
#define F_DATALOG 141 #define FR_ORAINI 102
#define GR_BOLPROD 142 #define FR_MININI 103
#define FR_SECINI 104
#define FR_DATAFIN 105
#define FR_ORAFIN 106
#define FR_MINFIN 107
#define FR_SECFIN 108
#define FR_QTA 109
#define FR_SCARTO 110

31
mr/mr0500a.ini Executable file
View File

@ -0,0 +1,31 @@
[MAIN]
DECSEP =
FIELDSEP = |
RECORDSEP =
RECORDSIZE =
SKIPLINES = 0
TYPEFIELD = -1
TYPELEN = 0
TYPEPOS = -1
[RECORD]
LENGTH(0) = 1
LENGTH(1) = 20
LENGTH(2) = 20
LENGTH(3) = 5
LENGTH(4) = 8
LENGTH(5) = 8
LENGTH(6) = 15
LENGTH(7) = 1
LENGTH(8) = 5
LENGTH(9) = 15
NAME(0) = TIPO
NAME(1) = ORDINE
NAME(2) = CODART
NAME(3) = LINEA
NAME(4) = DATA
NAME(5) = ORA
NAME(6) = QTA
NAME(7) = CHIUSO
NAME(8) = OPERATORE
NAME(9) = SCARTO

411
mr/mr0500a.uml
View File

@ -1,6 +1,22 @@
#include "mr0500a.h" #include "mr0500a.h"
TOOLBAR "" 0 -2 0 2 TOOLBAR "" 0 -4 0 4
BUTTON 99 10 2
BEGIN
PROMPT -13 -3 "~Aperti"
MESSAGE K_F9,H_PROG
END
BUTTON DLG_ELABORA 10 2
BEGIN
PROMPT -23 -3 "E~labora"
END
BUTTON F_DATALOG 10 2
BEGIN
PROMPT -33 -3 ""
PICTURE 20001
END
#include <toolbar.h> #include <toolbar.h>
ENDPAGE ENDPAGE
@ -24,6 +40,7 @@ BEGIN
FLAGS "U" FLAGS "U"
KEY 1 KEY 1
FIELD CODART FIELD CODART
MESSAGE COPY,11@
END END
STRING F_DESCRCOD 50 STRING F_DESCRCOD 50
@ -37,33 +54,65 @@ BEGIN
COPY OUTPUT F_CODART COPY OUTPUT F_CODART
CHECKTYPE NORMAL CHECKTYPE NORMAL
KEY 1 KEY 1
MESSAGE COPY,12@
END END
DATE F_DATAPROD DATE F_DATA
BEGIN BEGIN
PROMPT 2 3 "Data produzione " PROMPT 2 3 "Data ordine "
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
KEY 1 KEY 1
FIELD DATAPROD FIELD DATA
MESSAGE COPY,F_DATAINI MESSAGE COPY,13@
END END
NUMBER F_PROG 3 NUMBER F_PROG 3
BEGIN BEGIN
PROMPT 42 3 "Progressivo del giorno " PROMPT 42 3 "Progressivo del giorno "
USE LF_RILPROD USE LF_RILPROD KEY 6
JOIN LF_ANAMAG INTO CODART==CODART
FLAGS "U" FLAGS "U"
INPUT CODART F_CODART SELECT INPUT PROVV F_PROVV
INPUT DATAPROD F_DATAPROD INPUT ANNO F_ANNO
INPUT PROG F_PROG INPUT CODNUM F_CODNUM
INPUT NDOC F_NDOC
INPUT NRIGA F_NRIGA
DISPLAY "Ordine@10" NDOC
DISPLAY "Riga@7" NRIGA
DISPLAY "Codice articolo@20" CODART DISPLAY "Codice articolo@20" CODART
DISPLAY "Data prod." DATAPROD DISPLAY "Descrizione@50" LF_ANAMAG->DESCR
DISPLAY "Data ordine" DATA
DISPLAY "Prog." PROG DISPLAY "Prog." PROG
OUTPUT F_DATAPROD DATAPROD OUTPUT F_CODART CODART
OUTPUT F_DATA DATA
OUTPUT F_PROG PROG OUTPUT F_PROG PROG
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
KEY 1 KEY 1
FIELD PROG FIELD PROG
MESSAGE COPY,14@
END
NUMBER H_PROG 3
BEGIN
PROMPT 42 3 ""
USE LF_RILPROD KEY 6 SELECT QTA==0
JOIN LF_ANAMAG INTO CODART==CODART
FLAGS "UHG"
INPUT PROVV F_PROVV
INPUT ANNO F_ANNO
INPUT CODNUM F_CODNUM
INPUT NDOC F_NDOC
INPUT NRIGA F_NRIGA
DISPLAY "Ordine@10" NDOC
DISPLAY "Riga@7" NRIGA
DISPLAY "Codice articolo@20" CODART
DISPLAY "Descrizione@50" LF_ANAMAG->DESCR
DISPLAY "Data ordine" DATA
DISPLAY "Prog." PROG
OUTPUT F_CODART CODART
OUTPUT F_DATA DATA
OUTPUT F_PROG PROG
CHECKTYPE NORMAL
END END
STRING F_IMPIANTO 5 STRING F_IMPIANTO 5
@ -114,14 +163,49 @@ BEGIN
CHECKTYPE NORMAL CHECKTYPE NORMAL
END END
STRING F_OPERATORE 16
BEGIN
PROMPT 1 7 "Operatore "
USE DIP
INPUT CODTAB F_OPERATORE
DISPLAY "Codice" CODTAB
DISPLAY "Cognome@40" S0[1,40]
DISPLAY "Nome@30" S0[41,70]
OUTPUT F_OPERATORE CODTAB
OUTPUT F_COGNOME S0[1,40]
OUTPUT F_NOME S0[41,70]
CHECKTYPE NORMAL
FIELD OPERATORE
END
STRING F_COGNOME 40 25
BEGIN
PROMPT 30 7 ""
USE DIP KEY 2
INPUT S0[1,40] F_COGNOME
INPUT S0[41,70] F_NOME
DISPLAY "Cognome@40" S0[1,40]
DISPLAY "Nome@30" S0[41,70]
DISPLAY "Codice" CODTAB
COPY OUTPUT F_OPERATORE
CHECKTYPE SEARCH
END
STRING F_NOME 30 18
BEGIN
PROMPT 59 7 ""
COPY ALL F_COGNOME
CHECKTYPE SEARCH
END
GROUPBOX DLG_NULL 78 4 GROUPBOX DLG_NULL 78 4
BEGIN BEGIN
PROMPT 1 7 "@bOrdine di produzione" PROMPT 1 8 "@bOrdine"
END END
STRING F_CODNUM 4 STRING F_CODNUM 4
BEGIN BEGIN
PROMPT 2 8 "Numerazione " PROMPT 2 9 "Numerazione "
USE %NUM USE %NUM
INPUT CODTAB F_CODNUM INPUT CODTAB F_CODNUM
DISPLAY "Codice" CODTAB DISPLAY "Codice" CODTAB
@ -135,7 +219,7 @@ END
STRING F_DESCRNUM 50 STRING F_DESCRNUM 50
BEGIN BEGIN
PROMPT 24 8 "" PROMPT 24 9 ""
USE %NUM KEY 2 USE %NUM KEY 2
INPUT S0 F_DESCRNUM INPUT S0 F_DESCRNUM
DISPLAY "Descrizione@50" S0 DISPLAY "Descrizione@50" S0
@ -145,7 +229,7 @@ END
NUMBER F_ANNO 4 NUMBER F_ANNO 4
BEGIN BEGIN
PROMPT 2 9 "Anno " PROMPT 2 10 "Anno "
FLAGS "U" FLAGS "U"
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
FIELD ANNO FIELD ANNO
@ -153,7 +237,7 @@ END
LISTBOX F_PROVV 11 LISTBOX F_PROVV 11
BEGIN BEGIN
PROMPT 24 9 "" PROMPT 24 10 ""
ITEM "D|Definitivo " ITEM "D|Definitivo "
ITEM "P|Provvisorio" ITEM "P|Provvisorio"
FIELD PROVV FIELD PROVV
@ -161,134 +245,56 @@ END
NUMBER F_NDOC 7 NUMBER F_NDOC 7
BEGIN BEGIN
PROMPT 43 9 "Numero " PROMPT 43 10 "Numero "
USE LF_DOC USE LF_RIGHEDOC SELECT CODART==#F_CODART
INPUT PROVV F_PROVV SELECT INPUT PROVV F_PROVV SELECT
INPUT ANNO F_ANNO SELECT INPUT ANNO F_ANNO SELECT
INPUT CODNUM F_CODNUM SELECT INPUT CODNUM F_CODNUM SELECT
INPUT NDOC F_NDOC INPUT NDOC F_NDOC
DISPLAY "Num." CODNUM INPUT NRIGA F_NRIGA
DISPLAY "Anno" ANNO DISPLAY "N.Doc.@7" NDOC
DISPLAY "Provv" PROVV DISPLAY "Riga" NRIGA
DISPLAY "Tipo" TIPODOC DISPLAY "Descrizione@50" DESCR
DISPLAY "N.Doc. " NDOC DISPLAY "Articolo@20" CODARTMAG
DISPLAY "Stato@R" STATO
DISPLAY "Data\ndocumento" DATADOC
OUTPUT F_NDOC NDOC OUTPUT F_NDOC NDOC
OUTPUT F_PROVV PROVV OUTPUT F_NRIGA NRIGA
CHECKTYPE NORMAL
FIELD NDOC FIELD NDOC
END END
NUMBER F_NRIGA 3 NUMBER F_NRIGA 3
BEGIN BEGIN
PROMPT 66 9 "Riga " PROMPT 66 10 "Riga "
USE LF_RIGHEDOC COPY ALL F_NDOC
INPUT PROVV F_PROVV SELECT CHECKTYPE SEARCH
INPUT ANNO F_ANNO SELECT
INPUT CODNUM F_CODNUM SELECT
INPUT NDOC F_NDOC SELECT
INPUT NRIGA F_NRIGA
DISPLAY "Riga" NRIGA
DISPLAY "Descrizione@50" DESCR
OUTPUT F_NRIGA NRIGA
CHECKTYPE NORMAL
FIELD NRIGA FIELD NRIGA
END END
GROUPBOX DLG_NULL 38 3
BEGIN
PROMPT 1 11 "@bInizio produzione"
END
DATA F_DATAINI
BEGIN
PROMPT 2 12 "Data "
CHECKTYPE REQUIRED
FLAGS "D"
END
STRING F_ORAINI 2
BEGIN
PROMPT 22 12 "Ora "
FLAGS "U"
NUM_EXPR #F_ORAINI<24
FIELD ORAPROD[1,2]
END
STRING F_MININI 2
BEGIN
PROMPT 29 12 ":"
NUM_EXPR #F_MININI<60
FIELD ORAPROD[3,4]
END
STRING F_SECINI 2
BEGIN
PROMPT 33 12 ":"
NUM_EXPR #F_SECINI<60
FIELD ORAPROD[5,6]
END
GROUPBOX DLG_NULL 38 3
BEGIN
PROMPT 41 11 "@bFine produzione"
END
DATA F_DATAFIN
BEGIN
PROMPT 42 12 "Data "
FIELD DATAFINE
END
STRING F_ORAFIN 2
BEGIN
PROMPT 62 12 "Ora "
NUM_EXPR #F_ORAFIN<24
FIELD ORAFINE[1,2]
END
STRING F_MINFIN 2
BEGIN
PROMPT 69 12 ":"
NUM_EXPR #F_MINFIN<60
FIELD ORAFINE[3,4]
END
STRING F_SECFIN 2
BEGIN
PROMPT 73 12 ":"
NUM_EXPR #F_SECFIN<60
FIELD ORAFINE[5,6]
END
NUMBER F_QTA 15 5 NUMBER F_QTA 15 5
BEGIN BEGIN
PROMPT 1 14 "Quantita' prodotta " PROMPT 1 13 "Quantita' prodotta "
FIELD QTA FIELD QTA
END END
BOOLEAN F_CHIUSO BOOLEAN F_CHIUSO
BEGIN BEGIN
PROMPT 42 14 "Lotto chiuso" PROMPT 38 13 "Lotto chiuso"
FIELD CHIUSO FIELD CHIUSO
END END
NUMBER F_SCARTO 15 5
BUTTON F_DATALOG 10 2
BEGIN BEGIN
PROMPT 67 14 "" PROMPT 1 14 "Scarto di produz. "
PICTURE 20001 FIELD SCARTO
END END
GROUPBOX DLG_NULL 78 4 GROUPBOX DLG_NULL 78 4
BEGIN BEGIN
PROMPT 1 16 "@bBolla di produzione" PROMPT 1 15 "@bBolla di produzione"
END END
STRING F_CODNUMP 4 STRING F_CODNUMP 4
BEGIN BEGIN
PROMPT 2 17 "Numerazione " PROMPT 2 16 "Numerazione "
USE %NUM USE %NUM
INPUT CODTAB F_CODNUMP INPUT CODTAB F_CODNUMP
DISPLAY "Codice" CODTAB DISPLAY "Codice" CODTAB
@ -303,7 +309,7 @@ END
STRING F_DESCRNUMP 50 STRING F_DESCRNUMP 50
BEGIN BEGIN
PROMPT 24 17 "" PROMPT 24 16 ""
USE %NUM KEY 2 USE %NUM KEY 2
INPUT S0 F_DESCRNUMP INPUT S0 F_DESCRNUMP
DISPLAY "Descrizione@50" S0 DISPLAY "Descrizione@50" S0
@ -315,7 +321,7 @@ END
NUMBER F_ANNOP 4 NUMBER F_ANNOP 4
BEGIN BEGIN
PROMPT 2 18 "Anno " PROMPT 2 17 "Anno "
FLAGS "UD" FLAGS "UD"
FIELD ANNOP FIELD ANNOP
GROUP GR_BOLPROD GROUP GR_BOLPROD
@ -323,7 +329,7 @@ END
LISTBOX F_PROVVP 11 LISTBOX F_PROVVP 11
BEGIN BEGIN
PROMPT 24 18 "" PROMPT 24 17 ""
ITEM "D|Definitivo " ITEM "D|Definitivo "
ITEM "P|Provvisorio" ITEM "P|Provvisorio"
FLAGS "D" FLAGS "D"
@ -333,30 +339,15 @@ END
NUMBER F_NDOCP 7 NUMBER F_NDOCP 7
BEGIN BEGIN
PROMPT 43 18 "Numero " PROMPT 43 17 "Numero "
USE LF_DOC
INPUT PROVV F_PROVVP SELECT
INPUT ANNO F_ANNOP SELECT
INPUT CODNUM F_CODNUMP SELECT
INPUT NDOC F_NDOCP
DISPLAY "Num." CODNUM
DISPLAY "Anno" ANNO
DISPLAY "Provv" PROVV
DISPLAY "Tipo" TIPODOC
DISPLAY "N.Doc. " NDOC
DISPLAY "Data\ndocumento" DATADOC
OUTPUT F_NDOCP NDOC
OUTPUT F_PROVVP PROVV
CHECKTYPE NORMAL
FLAGS "D" FLAGS "D"
FIELD NDOCP FIELD NDOCP
GROUP GR_BOLPROD
END END
NUMBER F_NRIGAP 3 NUMBER F_NRIGAP 3
BEGIN BEGIN
PROMPT 66 18 "Riga " PROMPT 66 17 "Riga "
USE LF_RIGHEDOC USE LF_RIGHEDOC SELECT CODART==#F_CODART
INPUT PROVV F_PROVVP SELECT INPUT PROVV F_PROVVP SELECT
INPUT ANNO F_ANNOP SELECT INPUT ANNO F_ANNOP SELECT
INPUT CODNUM F_CODNUMP SELECT INPUT CODNUM F_CODNUMP SELECT
@ -364,6 +355,7 @@ BEGIN
INPUT NRIGA F_NRIGAP INPUT NRIGA F_NRIGAP
DISPLAY "Riga" NRIGA DISPLAY "Riga" NRIGA
DISPLAY "Descrizione@50" DESCR DISPLAY "Descrizione@50" DESCR
OUTPUT F_NDOCP NDOC
OUTPUT F_NRIGAP NRIGA OUTPUT F_NRIGAP NRIGA
CHECKTYPE NORMAL CHECKTYPE NORMAL
FLAGS "D" FLAGS "D"
@ -371,6 +363,159 @@ BEGIN
GROUP GR_BOLPROD GROUP GR_BOLPROD
END END
ENDPAGE
PAGE "Tempi" -1 -1 72 6
GROUPBOX DLG_NULL 78 5
BEGIN
PROMPT 1 0 ""
END
STRING DLG_NULL 20
BEGIN
PROMPT 2 1 "Articolo "
FLAGS "UD"
GROUP 11
END
STRING DLG_NULL 50
BEGIN
PROMPT 2 2 "Descrizione "
FLAGS "UD"
GROUP 12
END
DATE DLG_NULL
BEGIN
PROMPT 2 3 "Data consegna "
FLAGS "D"
GROUP 13
END
NUMBER DLG_NULL 3
BEGIN
PROMPT 42 3 "Progressivo del giorno "
FLAGS "UD"
GROUP 14
END
SPREADSHEET F_TEMPI 78
BEGIN
PROMPT 1 5 "Tempi"
ITEM "Data inizio"
ITEM "Ora"
ITEM "Minuto"
ITEM "Secondo"
ITEM "Data fine@10"
ITEM "Ora"
ITEM "Minuto"
ITEM "Secondo"
ITEM "Quantità prodotta"
ITEM "Scarto@15"
END
ENDPAGE ENDPAGE
ENDMASK ENDMASK
PAGE "Tempi" -1 -1 80 11
GROUPBOX DLG_NULL 38 3
BEGIN
PROMPT 1 2 "@bInizio produzione"
END
DATA FR_DATAINI
BEGIN
PROMPT 2 3 "Data "
CHECKTYPE REQUIRED
END
STRING FR_ORAINI 2
BEGIN
PROMPT 22 3 "Ora "
FLAGS "U"
NUM_EXPR #F_ORAINI<24
FIELD ORAPROD[1,2]
END
STRING FR_MININI 2
BEGIN
PROMPT 29 3 ":"
NUM_EXPR #F_MININI<60
FIELD ORAPROD[3,4]
END
STRING FR_SECINI 2
BEGIN
PROMPT 33 3 ":"
NUM_EXPR #F_SECINI<60
FIELD ORAPROD[5,6]
END
GROUPBOX DLG_NULL 38 3
BEGIN
PROMPT 41 2 "@bFine produzione"
END
DATA FR_DATAFIN
BEGIN
PROMPT 42 3 "Data "
FIELD DATAFINE
END
STRING FR_ORAFIN 2
BEGIN
PROMPT 62 3 "Ora "
NUM_EXPR #F_ORAFIN<24
FIELD ORAFINE[1,2]
END
STRING FR_MINFIN 2
BEGIN
PROMPT 69 3 ":"
NUM_EXPR #F_MINFIN<60
FIELD ORAFINE[3,4]
END
STRING FR_SECFIN 2
BEGIN
PROMPT 73 3 ":"
NUM_EXPR #F_SECFIN<60
FIELD ORAFINE[5,6]
END
NUMBER FR_QTA 15 5
BEGIN
PROMPT 1 5 "Quantita' prodotta "
FIELD QTA
END
NUMBER FR_SCARTO 15 5
BEGIN
PROMPT 1 7 "Scarto di produz. "
FIELD SCARTO
END
BUTTON DLG_OK 10 2
BEGIN
PROMPT -13 -1 ""
END
BUTTON DLG_CANCEL 10 2
BEGIN
PROMPT -23 -1 ""
END
BUTTON DLG_DELREC 10 2
BEGIN
PROMPT -33 -1 "Elimina"
MESSAGE EXIT,K_DEL
END
ENDPAGE
ENDMASK

5
mr/mr0500b.h Executable file
View File

@ -0,0 +1,5 @@
#define F_FILE 101
#define F_PROFILO 102
#define F_SAVE 103
#define F_ONLY_ERRORS 104

41
mr/mr0500b.uml Executable file
View File

@ -0,0 +1,41 @@
#include "mr0500b.h"
PAGE "Lettura terminale portatile" -1 -1 80 8
STRING F_FILE 128 40
BEGIN
PROMPT 1 2 "File "
FLAGS "B"
CHECKTYPE REQUIRED
END
BOOLEAN F_SAVE
BEGIN
PROMPT 1 4 "Archivia il file sorgente"
END
BOOLEAN F_ONLY_ERRORS
BEGIN
PROMPT 40 4 "Visualizza solo gli errori"
END
STRING F_PROFILO 70 50
BEGIN
PROMPT 1 -3 "Profilo "
PSELECT
END
BUTTON DLG_OK 10 2
BEGIN
PROMPT -12 -1 ""
END
BUTTON DLG_CANCEL 10 2
BEGIN
PROMPT -22 -1 ""
END
ENDPAGE
ENDMASK

4
mr/mr0500c.h Executable file
View File

@ -0,0 +1,4 @@
#define F_CODICE_EL 101
#define F_DATA_EL 102
#define F_DESC_EL 103

49
mr/mr0500c.uml Executable file
View File

@ -0,0 +1,49 @@
#include "mr0500c.h"
PAGE "Elaborazione produzione" -1 -1 80 8
STRING F_CODICE_EL 8
BEGIN
PROMPT 2 1 "Codice elaborazione"
FLAG "U"
USE %ELD SELECT I0 == 6
INPUT CODTAB F_CODICE_EL
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@55" S0
OUTPUT F_CODICE_EL CODTAB
OUTPUT F_DESC_EL S0
CHECKTYPE REQUIRED
WARNING "E' necessario specificare il codice elaborazione"
END
STRING F_DESC_EL 50 30
BEGIN
PROMPT 35 1 ""
USE %ELD KEY 2 SELECT I0 == 6
INPUT S0 F_DESC_EL
DISPLAY "Descrizione@55" S0
DISPLAY "Codice" CODTAB
COPY OUTPUT F_CODICE_EL
END
DATE F_DATA_EL
BEGIN
PROMPT 2 3 "Data elaborazione "
CHECKTYPE REQUIRED
WARNING "La data di inizio intervallo e' obbligatoria"
END
BUTTON DLG_OK 10 2
BEGIN
PROMPT -12 -1 ""
END
BUTTON DLG_CANCEL 10 2
BEGIN
PROMPT -22 -1 ""
END
ENDPAGE
ENDMASK

279
mr/mr1100.cpp
View File

@ -2,6 +2,7 @@
#include <applicat.h> #include <applicat.h>
#include <form.h> #include <form.h>
#include <relation.h> #include <relation.h>
#include <reprint.h>
#include <printer.h> #include <printer.h>
#include <progind.h> #include <progind.h>
@ -76,7 +77,7 @@ public:
_TCapacitaLinea::_TCapacitaLinea() _TCapacitaLinea::_TCapacitaLinea()
{ {
for (int i = 0; i<LAST_BUCKET-1; i++) for (int i = 0; i < LAST_BUCKET-1; i++)
{ {
_cap_min.add(new real); _cap_min.add(new real);
_cap_max.add(new real); _cap_max.add(new real);
@ -130,7 +131,9 @@ TMRP_rep_record& TMRP_rep_record_array::operator[](int b)
class TMRP_rep_line : public TSortable class TMRP_rep_line : public TSortable
{ {
TCodice_articolo _codart; TCodice_articolo _codart;
TString16 _giac, _imp, _lin, _um; TString16 _giac;
TString8 _imp, _lin;
TString4 _um;
TMRP_rep_record_array _bucket; TMRP_rep_record_array _bucket;
@ -272,7 +275,6 @@ TMRP_rep_line* TMRP_rep_lines::find(const TCodice_articolo& codart,
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// MRP report generator mask // MRP report generator mask
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
class TRepgen_mask : public TCalendar_mask class TRepgen_mask : public TCalendar_mask
{ {
protected: protected:
@ -284,6 +286,10 @@ protected:
public: public:
int round_date(TDate& date, bool up) const; int round_date(TDate& date, bool up) const;
int get_bucket_size() const { return get_int(F_BUCKET) * get_int(F_DAYXBUCK);}
const TDate start_date() const { return get_date(F_DADATA);}
const TDate end_date() const { return get_date(F_ADATA);}
int last_bucket() { TDate d(end_date()); return round_date(d, true);}
bool elabora() const; bool elabora() const;
TRepgen_mask(); TRepgen_mask();
virtual ~TRepgen_mask() { } virtual ~TRepgen_mask() { }
@ -317,23 +323,47 @@ bool TRepgen_mask::test_tipodoc_num(const TSheet_field &sheet_num ,const TShee
int TRepgen_mask::round_date(TDate& date, bool up) const int TRepgen_mask::round_date(TDate& date, bool up) const
{ {
// Dimensione del bucket in giorni // Dimensione del bucket in giorni
int bucket_size = get_int(F_BUCKET) * 7; const int bucket_size = get_bucket_size();
if (bucket_size < 7) bucket_size = 7;
// Riporta la data al primo lunedi prima dell'inizio TDate inizio(start_date());
TDate inizio = get(F_DADATA); int bucket;
if (bucket_size == 31) // mese solare
{
if (up)
{
date.set_end_month();
int wday = date.wday();
wday = (7-wday) % 7;
if (wday<0)
date += wday;
}
else
date.set_day(1);
bucket = (date.year()-inizio.year())*12 + date.month() - inizio.month();
if (bucket < 0)
bucket = 0;
}
else
{
if (bucket_size > 1) // non vado a giorni
{
const int wday = inizio.wday(); const int wday = inizio.wday();
if (wday > 1) inizio -= wday-1; if (wday > 1) inizio -= wday-1;
}
// Calcola il bucket di appartenenza // Calcola il bucket di appartenenza
const int days = int(date - inizio); const int days = int(date - inizio);
const int bucket = days / bucket_size;
bucket = days / bucket_size;
if (bucket < 0)
bucket = 0;
else
if (bucket > LAST_BUCKET)
bucket = LAST_BUCKET;
if (up) // Arrotonda alla fine del bucket if (up) // Arrotonda alla fine del bucket
date = inizio + long((bucket+1) * bucket_size - 1); date = inizio + long((bucket+1 )* bucket_size - 1 /*- get_int(F_LASTWRKDAY)*/);
else // Arrotonda all'inizio del bucket else // Arrotonda all'inizio del bucket
date = inizio + long(bucket * bucket_size); date = inizio + long(bucket * bucket_size);
}
return bucket; return bucket;
} }
@ -353,8 +383,8 @@ void TRepgen_mask::calcola_capacita(TAssoc_array& capacita) const
return; return;
const bool carico_uomo = get_bool(F_MANLOAD); const bool carico_uomo = get_bool(F_MANLOAD);
const TDate df(get_date(F_DADATA)); const TDate df(start_date());
const TDate dt(get_date(F_ADATA)); const TDate dt(end_date());
TDate wd1,wd2; TDate wd1,wd2;
TString16 codimp; TString16 codimp;
@ -377,6 +407,7 @@ void TRepgen_mask::calcola_capacita(TAssoc_array& capacita) const
{ {
wd2 = wd1; wd2 = wd1;
const int bucket = round_date(wd2, FALSE); // da 0 a 10 al massimo const int bucket = round_date(wd2, FALSE); // da 0 a 10 al massimo
if (bucket > 10) if (bucket > 10)
break; // Fine break; // Fine
real & v1 = (real&) cap_min[bucket]; real & v1 = (real&) cap_min[bucket];
@ -394,14 +425,15 @@ bool TRepgen_mask::elabora() const
const TRectype& riga = cur.curr(); const TRectype& riga = cur.curr();
TRectype filter_fr(riga), filter_to(riga); TRectype filter_fr(riga), filter_to(riga);
const TDate date_fr = get(F_DADATA); const TDate date_fr(start_date());
const int year_fr = date_fr.year(); const int year_fr = date_fr.year();
TDate date_to = get(F_ADATA); TDate date_to(end_date());
const int year_to = date_to.year(); const int year_to = date_to.year();
const int bucket_size = get_int(F_BUCKET) * 7; const int bucket_size = get_bucket_size();
const TExplosion_grouping raggr = (TExplosion_grouping)get_int(F_RAGGRUM); const TExplosion_grouping raggr = (TExplosion_grouping)get_int(F_RAGGRUM);
const tipo_valore ts = (tipo_valore) get_int(F_VAL2PRINT); const tipo_valore ts = (tipo_valore) get_int(F_VAL2PRINT);
const bool carico_uomo = get_bool(F_MANLOAD); const bool carico_uomo = get_bool(F_MANLOAD);
const int last_bucket = round_date(date_to,TRUE)+1; const int last_bucket = round_date(date_to,TRUE)+1;
TString16 ws; TString16 ws;
@ -440,10 +472,6 @@ bool TRepgen_mask::elabora() const
pi.addstatus(1); pi.addstatus(1);
const TCodice_articolo art = riga.get(RDOC_CODARTMAG); const TCodice_articolo art = riga.get(RDOC_CODARTMAG);
if (art.not_empty()) if (art.not_empty())
{
TDate datacons = riga.get(RDOC_DATACONS);
// Seleziona tutte le righe! Altrimenti LAST_BUCKET non viene mai settato
//if (datacons <= date_to)
{ {
real qta; real qta;
if (!riga.get_bool(RDOC_RIGAEVASA)) if (!riga.get_bool(RDOC_RIGAEVASA))
@ -458,16 +486,14 @@ bool TRepgen_mask::elabora() const
const TString16 imp = riga.get(RDOC_IMPIANTO); const TString16 imp = riga.get(RDOC_IMPIANTO);
const TString16 lin = riga.get(RDOC_LINEA); const TString16 lin = riga.get(RDOC_LINEA);
const TCodice_um um = riga.get(RDOC_UMQTA); const TCodice_um um = riga.get(RDOC_UMQTA);
TQuantita q(art, um, qta); TQuantita q(art, um, qta);
int bucket = 0; TDate datacons = riga.get(RDOC_DATACONS);
if (datacons >= date_fr) int bucket = round_date(datacons, FALSE);
{ if (bucket < 0)
bucket = round_date(datacons, FALSE) + 1; bucket = 0;
if (bucket > last_bucket) if (bucket > last_bucket)
bucket = LAST_BUCKET; bucket = last_bucket;
}
// Calcoli per carico // Calcoli per carico
if (ts == carico) if (ts == carico)
@ -509,12 +535,8 @@ bool TRepgen_mask::elabora() const
TMRP_rep_line& rep = *articles.find(art, liv, imp, lin, q.um(), TRUE); TMRP_rep_line& rep = *articles.find(art, liv, imp, lin, q.um(), TRUE);
switch (raggr) switch (raggr)
{ {
case RAGGR_EXP_UMBASE: case RAGGR_EXP_UMBASE: q.convert2umbase(); break;
q.convert2umbase(); case RAGGR_EXP_UMDIST: q.convert2umdist(); break;
break;
case RAGGR_EXP_UMDIST:
q.convert2umdist();
break;
default: break; default: break;
} }
rep.qta(bucket) += q.val(); rep.qta(bucket) += q.val();
@ -522,7 +544,6 @@ bool TRepgen_mask::elabora() const
} }
} }
} }
}
cur.freeze(FALSE); cur.freeze(FALSE);
} }
@ -533,34 +554,59 @@ bool TRepgen_mask::elabora() const
TProgind pi(total, TR("Generazione file"), FALSE, TRUE); TProgind pi(total, TR("Generazione file"), FALSE, TRUE);
TMask_field& fld = field(F_FILENAME); TMask_field& fld = field(F_FILENAME);
TFilename filename = fld.get();
TLocalisamfile* rep = NULL;
if (fld.empty())
{
TSystemisamfile mrprep(LF_MRPREP);
mrprep.zap();
rep = new TLocalisamfile(LF_MRPREP);
}
else
{
TFilename filename = fld.get();
if (filename.empty()) if (filename.empty())
filename.temp("mrprep"); filename.temp("mrprep");
fld.set(filename); fld.set(filename);
filename.insert("%"); filename.insert("%");
rep = new TIsamtempfile(LF_MRPREP, filename);
TIsamtempfile rep(LF_MRPREP, filename); }
// Scrive la testata (Record tipo "H"); // Scrive la testata (Record tipo "H");
rep.put("TIPO","H"); rep->put("TIPO","H");
rep.put("CODART", date_fr.string()); rep->put("CODART", date_fr.string());
rep.put("LIVELLO", get(F_ADATA)); rep->put("LIVELLO", get(F_ADATA));
rep.put("IMPIANTO", bucket_size); rep->put("IMPIANTO", bucket_size);
rep.put("LINEA", ts == quantita ? "Q" : "C"); rep->put("LINEA", ts == quantita ? "Q" : "C");
rep.write();
// Scrive le date nelle quantita' dei buckets
TDate fd = date_fr;
--fd;
rep->put("QTAFIRST", fd.string(ANSI));
++fd;
for (int b = 1; b <= last_bucket; b++)
{
TString8 fldname; fldname.format("QTA%d", b);
rep->put(fldname, fd.string(ANSI));
fd += bucket_size;
}
rep->put("QTALAST", fd.string(ANSI));
rep->write();
for (long i = 0; i < total; i++) for (long i = 0; i < total; i++)
{ {
pi.addstatus(1); pi.addstatus(1);
articles[i].fill(rep.curr(), ts == carico ? &capacita : NULL); articles[i].fill(rep->curr(), ts == carico ? &capacita : NULL);
int err = rep.write(); int err = rep->write();
if (err != NOERR) if (err != NOERR)
rep.rewrite(); rep->rewrite();
} }
return rep.good(); delete rep;
return true;
} }
bool TRepgen_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) bool TRepgen_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
@ -568,18 +614,18 @@ bool TRepgen_mask::on_field_event(TOperable_field& o, TField_event e, long jolly
switch(o.dlg()) switch(o.dlg())
{ {
case F_DADATA: case F_DADATA:
if (e == fe_modify) if (e == fe_modify || e == fe_close)
round_field(o, FALSE); round_field(o, false);
break; break;
case F_ADATA: case F_ADATA:
if (e == fe_modify) if (e == fe_modify || e == fe_close)
round_field(o, TRUE); round_field(o, true);
break; break;
case F_BUCKET: case F_BUCKET:
if (e == fe_modify) if (e == fe_modify)
{ {
round_field(field(F_DADATA), FALSE); round_field(field(F_DADATA), false);
round_field(field(F_ADATA), TRUE); round_field(field(F_ADATA), true);
} }
break; break;
case F_NUMERAZIONI: case F_NUMERAZIONI:
@ -757,8 +803,11 @@ public:
bool TMRP_repgen::create() bool TMRP_repgen::create()
{ {
open_files(LF_MRPREP, LF_RIGHEDOC, LF_ANAMAG, LF_TAB, 0);
TConfig ini(CONFIG_DITTA, "mr");
_m = new TRepgen_mask; _m = new TRepgen_mask;
open_files(LF_MRPREP, 0);
_codgiac = new TCodgiac_livelli; _codgiac = new TCodgiac_livelli;
if (!_codgiac->enabled()) if (!_codgiac->enabled())
_m->hide(F_LIVDET); _m->hide(F_LIVDET);
@ -776,64 +825,73 @@ bool TMRP_repgen::destroy()
void TMRP_repgen::set_buckets_description() void TMRP_repgen::set_buckets_description()
{ {
TString descr; TString descr;
TDate fd = _m->get_date(F_DADATA); TRepgen_mask & mask = *_m;
TDate td = _m->get_date(F_ADATA); TDate fd(mask.start_date());
TConfig ini(CONFIG_DITTA, "mr"); TConfig ini(CONFIG_DITTA, "mr");
const bool week_complete = ini.get_bool("WEEKCOMPLETE"); const bool week_complete = ini.get_bool("WEEKCOMPLETE");
const int bucket_size = _m->get_bucket_size();
int bucket_size = _m->get_int(F_BUCKET) * 7;
if (bucket_size < 7) bucket_size = 7;
int weekd, yeard; int weekd, yeard;
const short first_id = 3; const short first_id = 3;
const short last_id = 15; const short last_id = 15;
int last_bucket = mask.last_bucket();
if (last_bucket >= LAST_BUCKET)
last_bucket = LAST_BUCKET - 1;
--fd; --fd;
descr.format(FR("\nAl %s"), (const char*)fd); descr.cut(0);
if (bucket_size != 1)
descr << "\n";
descr << TR("Al") << " " << fd.string();
if (bucket_size == 7) if (bucket_size == 7)
{ {
fd.get_week_year(weekd, yeard, week_complete); fd.get_week_year(weekd, yeard, week_complete);
descr << TR("\nSett. ") << weekd << ' ' << yeard; descr << "\n" << TR("Sett.") << " " << weekd << ' ' << yeard;
} }
_form->find_field('B', odd_page, first_id).set_col_head(descr); TForm_item & ff = _form->find_field('B', odd_page, first_id);
TDate wd; ff.set_col_head(descr);
for (;fd <= td;) for (short i = 1; i <= (short) last_bucket; i++)
{ {
++fd; ++fd;
descr.format(FR("Dal %s\nAl "), (const char*)fd); descr.cut(0);
if (bucket_size != 1)
descr << FR("Dal"); fd.string();
descr << " " << fd.string() << " ";
if (bucket_size != 1)
{
fd += bucket_size-1; fd += bucket_size-1;
wd = fd; descr << "\n" << FR("Al") << " " << fd.string();
descr << (const char*)fd;
const short id = first_id+_m->round_date(wd,FALSE)+1;
if (id >= last_id)
break;
if (bucket_size == 7) if (bucket_size == 7)
{ {
wd.get_week_year(weekd, yeard, week_complete); fd.get_week_year(weekd, yeard, week_complete);
descr << TR("\nSett. ") << weekd << ' ' << yeard; descr << "\n" << TR("Sett.") << " " << weekd << ' ' << yeard;
} }
_form->find_field('B', odd_page, id).set_col_head(descr);
} }
descr.format(FR("Dal %s"), (const char*)wd); TForm_item & fi = _form->find_field('B', odd_page, first_id + i);
fi.set_col_head(descr);
}
++fd;
descr.cut(0);
descr << FR("Dal ") << fd.string();
if (bucket_size == 7) if (bucket_size == 7)
{ {
wd.get_week_year(weekd, yeard, week_complete); fd.get_week_year(weekd, yeard, week_complete);
descr << TR("\n\nSett. ") << weekd << ' ' << yeard; descr << TR("\n\nSett. ") << weekd << ' ' << yeard;
} }
_form->find_field('B', odd_page, last_id).set_col_head(descr); TForm_item & lf = _form->find_field('B', odd_page, last_id);
lf.set_col_head(descr);
} }
void TMRP_repgen::set_buckets() void TMRP_repgen::set_buckets()
{ {
TString tmp; TString tmp;
TDate last_date = _m->get_date(F_ADATA);
// Calcola l'ultimo bucket visibile: // Calcola l'ultimo bucket visibile:
// Il bucket iniziale e quello finale dovrebbero essere sempre visibili // Il bucket iniziale e quello finale dovrebbero essere sempre visibili
const short last_bucket = _m->round_date(last_date,TRUE)+1; const short last_bucket = _m->last_bucket();
// Disabilita le colonne in base al numero di buckets da visualizzare // Disabilita le colonne in base al numero di buckets da visualizzare
if (last_bucket < LAST_BUCKET - 1)
{
const short first_id = 4; // Bucket 1 const short first_id = 4; // Bucket 1
const short last_id = 14; // Bucket 11 const short last_id = 14; // Bucket 11
@ -843,6 +901,7 @@ void TMRP_repgen::set_buckets()
// Nella stampa scheduling linee, non esiste un totale per linea/impianto ma per articolo/liv giacenza // Nella stampa scheduling linee, non esiste un totale per linea/impianto ma per articolo/liv giacenza
for (id = first_id+last_bucket+100; id <= (last_id+100); id++) for (id = first_id+last_bucket+100; id <= (last_id+100); id++)
_form->find_field('B',odd_page,id).disable(); _form->find_field('B',odd_page,id).disable();
}
set_buckets_description(); set_buckets_description();
@ -881,12 +940,16 @@ void TMRP_repgen::set_buckets()
if (tl && _m->get_bool(F_CAPACITA)) // Abilitato il calcolo capacita/carico linea? if (tl && _m->get_bool(F_CAPACITA)) // Abilitato il calcolo capacita/carico linea?
{ {
_form->find_field('B', odd_page, 238).show(); _form->find_field('B', odd_page, 238).show();
const short lid = 240 + (last_bucket >= LAST_BUCKET ? 11 : last_bucket); short lid = 240 + last_bucket;
if (lid > 250)
lid = 250;
for (short id = 240; id<lid; id++) for (short id = 240; id<lid; id++)
_form->find_field('B', odd_page, id).show(); _form->find_field('B', odd_page, id).show();
} }
if (tl && _tipo_val == quantita) // Stampa scheduling, disabilita totali per linea/impianto) if (tl)
{
if (_tipo_val == quantita) // Stampa scheduling, disabilita totali per linea/impianto)
{ {
// Abilita i campi per l'unita di misura sui totali per livello giac. e articolo // Abilita i campi per l'unita di misura sui totali per livello giac. e articolo
_form->find_field('B', odd_page, 2).show(); _form->find_field('B', odd_page, 2).show();
@ -898,8 +961,9 @@ void TMRP_repgen::set_buckets()
for (id = 101; id <= 115; id++) for (id = 101; id <= 115; id++)
_form->find_field('B', odd_page, id).hide(); // Riga totale impianto _form->find_field('B', odd_page, id).hide(); // Riga totale impianto
} }
}
if (!tl && _tipo_val == carico) // Stampa carico per articoli else
if (_tipo_val == carico) // Stampa carico per articoli
{ {
// Nasconde la colonna delle unita' di misura. // Nasconde la colonna delle unita' di misura.
// Il calcolo capacita' non ha senso e quindi viene omesso in // Il calcolo capacita' non ha senso e quindi viene omesso in
@ -984,27 +1048,41 @@ void TMRP_repgen::set_form()
void TMRP_repgen::main_loop() void TMRP_repgen::main_loop()
{ {
while (_m->run() != K_QUIT) KEY k;
while ((k = _m->run()) != K_QUIT)
{ {
const bool use_file = _m->get_bool(F_USAFILE); const bool use_file = _m->get_bool(F_USAFILE);
if (use_file || _m->elabora()) if (use_file || _m->elabora())
{
if (k == K_ENTER)
{
TFilename report_name(_m->get(F_REPORT));
if (report_name.empty())
{ {
_tipo_ord = (tipo_ordinamento) _m->get_int(F_ORDINAMENTO); _tipo_ord = (tipo_ordinamento) _m->get_int(F_ORDINAMENTO);
_tipo_val = (tipo_valore) _m->get_int(F_VAL2PRINT); _tipo_val = (tipo_valore) _m->get_int(F_VAL2PRINT);
_livello = _m->get_int(F_LIVDET); _livello = _m->get_int(F_LIVDET);
TFilename fname(_m->get(F_FILENAME)); // Presente 24 ore su 24
fname.insert("%"); // e questo dove lo mettiamo?
const bool delfile = !_m->get_bool(F_GENREPORT) && !use_file; const bool delfile = !_m->get_bool(F_GENREPORT) && !use_file;
if (delfile) if (delfile)
{
_m->reset(F_FILENAME); _m->reset(F_FILENAME);
}
// Utilizza questo file per la stampa del form // Utilizza questo file per la stampa del form
TIsamtempfile * report = new TIsamtempfile(LF_MRPREP,fname, FALSE, delfile);
TRelation* rel;
_dettaglio = (tipo_dettaglio) _m->get_int(_tipo_ord == articolo ? F_DETTAGLIO1 : F_DETTAGLIO2); _dettaglio = (tipo_dettaglio) _m->get_int(_tipo_ord == articolo ? F_DETTAGLIO1 : F_DETTAGLIO2);
_form = new TMRP_form(_tipo_ord == articolo ? "mr1100a" : "mr1100b", _codgiac, _livello); _form = new TMRP_form(_tipo_ord == articolo ? "mr1100a" : "mr1100b", _codgiac, _livello);
rel = _form->relation(); TRelation* rel = _form->relation();
if (!delfile)
{
TFilename fname(_m->get(F_FILENAME)); // Presente 24 ore su 24
fname.insert("%"); // e questo dove lo mettiamo?
TIsamtempfile * report = new TIsamtempfile(LF_MRPREP,fname, FALSE, delfile);
rel->replace(report); rel->replace(report);
}
set_form(); set_form();
const int hh = 7; const int hh = 7;
@ -1024,6 +1102,21 @@ void TMRP_repgen::main_loop()
// report non va cancellato, poiche' ne viene fatta la sostituzione nella relazione del form // report non va cancellato, poiche' ne viene fatta la sostituzione nella relazione del form
// quindi la delete viene gia' fatta alla distruzione di _form // quindi la delete viene gia' fatta alla distruzione di _form
delete _form; delete _form;
_form = NULL;
}
else
{
TReport_book book;
TReport rep;
if (rep.load(report_name))
{
book.add(rep);
if (book.pages() > 0)
book.print_or_preview();
}
}
}
} }
} }
} }

4
mr/mr1100a.frm
View File

@ -2,7 +2,7 @@
// ed il carico articoli nel tempo ( non richiesta ma messa per completezza ) // ed il carico articoli nel tempo ( non richiesta ma messa per completezza )
USE LF_MRPREPORT USE LF_MRPREPORT KEY 2
JOIN LF_ANAMAG INTO CODART==CODART JOIN LF_ANAMAG INTO CODART==CODART
JOIN IMP ALIAS 201 INTO CODTAB==IMPIANTO JOIN IMP ALIAS 201 INTO CODTAB==IMPIANTO
JOIN LNP ALIAS 202 INTO CODTAB==LINEA JOIN LNP ALIAS 202 INTO CODTAB==LINEA
@ -51,7 +51,7 @@ END //HEADER
SECTION BODY ODD 3 COLUMNWISE SECTION BODY ODD 3 COLUMNWISE
STRING 1 50 STRING 1 50 2
BEGIN BEGIN
SPECIAL STRINGA INTESTAZIONE "Articolo" "Articolo" SPECIAL STRINGA INTESTAZIONE "Articolo" "Articolo"
SPECIAL NUMERO OFFSET "0" "Offset iniziale campo" SPECIAL NUMERO OFFSET "0" "Offset iniziale campo"

3
mr/mr1100a.h
View File

@ -26,6 +26,7 @@
#define F_MANLOAD 224 #define F_MANLOAD 224
#define F_CAPACITA 225 #define F_CAPACITA 225
#define F_USAFILE 226 #define F_USAFILE 226
#define F_DAYXBUCK 227
#define F_YEAR 301 #define F_YEAR 301
#define F_IMPIANTO 302 #define F_IMPIANTO 302
#define F_LINEA 303 #define F_LINEA 303
@ -36,5 +37,7 @@
#define F_DASTATO 103 #define F_DASTATO 103
#define F_ASTATO 104 #define F_ASTATO 104
#define F_REPORT 305
#endif #endif

36
mr/mr1100a.uml
View File

@ -54,23 +54,27 @@ LIST F_BUCKETS 1 15
BEGIN BEGIN
PROMPT 2 4 "Bucket temporale " PROMPT 2 4 "Bucket temporale "
ITEM "1|1 Settimana" ITEM "1|1 Settimana"
MESSAGE DISABLE,F_BUCKET|COPY,F_BUCKET MESSAGE SHOW,F_BUCKET|DISABLE,F_BUCKET|COPY,F_BUCKET|"7",F_DAYXBUCK
ITEM "2|2 Settimane" ITEM "2|2 Settimane"
MESSAGE DISABLE,F_BUCKET|COPY,F_BUCKET MESSAGE SHOW,F_BUCKET|DISABLE,F_BUCKET|COPY,F_BUCKET|"7",F_DAYXBUCK
ITEM "4|1 Mese" ITEM "4|1 Mese"
MESSAGE DISABLE,F_BUCKET|COPY,F_BUCKET MESSAGE SHOW,F_BUCKET|DISABLE,F_BUCKET|COPY,F_BUCKET|"7",F_DAYXBUCK
ITEM "8|2 Mese" ITEM "8|2 Mese"
MESSAGE DISABLE,F_BUCKET|COPY,F_BUCKET MESSAGE SHOW,F_BUCKET|DISABLE,F_BUCKET|COPY,F_BUCKET|"7",F_DAYXBUCK
ITEM "13|3 Mesi" ITEM "13|3 Mesi"
MESSAGE DISABLE,F_BUCKET|COPY,F_BUCKET MESSAGE SHOW,F_BUCKET|DISABLE,F_BUCKET|COPY,F_BUCKET|"7",F_DAYXBUCK
ITEM "17|4 Mesi" ITEM "17|4 Mesi"
MESSAGE DISABLE,F_BUCKET|COPY,F_BUCKET MESSAGE SHOW,F_BUCKET|DISABLE,F_BUCKET|COPY,F_BUCKET|"7",F_DAYXBUCK
ITEM "26|6 Mesi" ITEM "26|6 Mesi"
MESSAGE DISABLE,F_BUCKET|COPY,F_BUCKET MESSAGE SHOW,F_BUCKET|DISABLE,F_BUCKET|COPY,F_BUCKET|"7",F_DAYXBUCK
ITEM "52|1 Anno" ITEM "52|1 Anno"
MESSAGE DISABLE,F_BUCKET|COPY,F_BUCKET MESSAGE SHOW,F_BUCKET|DISABLE,F_BUCKET|COPY,F_BUCKET|"7",F_DAYXBUCK
ITEM " |Personalizzato" ITEM " |Personalizzato"
MESSAGE ENABLE,F_BUCKET MESSAGE ENABLE,F_BUCKET|"7",F_DAYXBUCK
ITEM "G|1 Giorno"
MESSAGE HIDE,F_BUCKET|"1",F_BUCKET|"1",F_DAYXBUCK
ITEM "M|Mese solare"
MESSAGE HIDE,F_BUCKET|"31",F_BUCKET|"1",F_DAYXBUCK
END END
NUMBER F_BUCKET 2 NUMBER F_BUCKET 2
@ -80,6 +84,14 @@ BEGIN
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
END END
LIST F_DAYXBUCK 1 9
BEGIN
PROMPT 65 4 ""
ITEM "7|settimane"
ITEM "1|giorni"
FLAGS "D"
END
LIST F_RAGGRUM 1 53 LIST F_RAGGRUM 1 53
BEGIN BEGIN
PROMPT 2 5 "Raggruppa " PROMPT 2 5 "Raggruppa "
@ -258,6 +270,12 @@ BEGIN
GROUP 6 7 GROUP 6 7
END END
STRING F_REPORT 70 50
BEGIN
PROMPT 1 19 "Report "
RSELECT "mr1100"
GROUP 1
END
ENDPAGE ENDPAGE
PAGE "Selezione" -1 -1 78 20 PAGE "Selezione" -1 -1 78 20

20
mr/mr1100b.frm
View File

@ -2,7 +2,7 @@
// e la stampa scheduling del bucket suddiviso per linee // e la stampa scheduling del bucket suddiviso per linee
USE 132 KEY 2 USE LF_MRPREPORT KEY 1
JOIN LF_ANAMAG INTO CODART==CODART JOIN LF_ANAMAG INTO CODART==CODART
JOIN IMP ALIAS 201 INTO CODTAB==IMPIANTO JOIN IMP ALIAS 201 INTO CODTAB==IMPIANTO
JOIN LNP ALIAS 202 INTO CODTAB==LINEA JOIN LNP ALIAS 202 INTO CODTAB==LINEA
@ -51,7 +51,7 @@ END //HEADER
SECTION BODY ODD 3 COLUMNWISE SECTION BODY ODD 3 COLUMNWISE
STRING 1 50 STRING 1 50 2
BEGIN BEGIN
SPECIAL STRINGA INTESTAZIONE "Impianto" "Impianto" SPECIAL STRINGA INTESTAZIONE "Impianto" "Impianto"
SPECIAL NUMERO OFFSET "0" "Offset iniziale campo" SPECIAL NUMERO OFFSET "0" "Offset iniziale campo"
@ -61,7 +61,7 @@ BEGIN
MESSAGE _STREXPR,IMPIANTO+ " "+201@->S0|RESET,1@ MESSAGE _STREXPR,IMPIANTO+ " "+201@->S0|RESET,1@
END END
STRING 2 4 STRING 2 2
BEGIN BEGIN
SPECIAL STRINGA INTESTAZIONE "UM" "UM" SPECIAL STRINGA INTESTAZIONE "UM" "UM"
SPECIAL NUMERO OFFSET "0" "Offset iniziale campo" SPECIAL NUMERO OFFSET "0" "Offset iniziale campo"
@ -198,7 +198,7 @@ SECTION IMPIANTI 2 0 4 FILE 132 GROUP IMPIANTO
SECTION LINEE 2 0 3 FILE 132 GROUP LINEA SECTION LINEE 2 0 3 FILE 132 GROUP LINEA
FLAGS "H" FLAGS "H"
STRINGA 300 50 STRINGA 300 50 2
BEGIN BEGIN
PROMPT 1 1 " Articolo " PROMPT 1 1 " Articolo "
MESSAGE _STREXPR,CODART+ " "+LF_ANAMAG->DESCR|RESET,3@ MESSAGE _STREXPR,CODART+ " "+LF_ANAMAG->DESCR|RESET,3@
@ -221,7 +221,7 @@ SECTION IMPIANTI 2 0 4 FILE 132 GROUP IMPIANTO
PROMPT 1 1 "" PROMPT 1 1 ""
END END
STRINGA 502 4 STRINGA 502 2
BEGIN BEGIN
KEY "UM" KEY "UM"
PROMPT 2 1 "" PROMPT 2 1 ""
@ -519,7 +519,7 @@ SECTION IMPIANTI 2 0 4 FILE 132 GROUP IMPIANTO
PROMPT 1 2 " Totale livello giacenza " PROMPT 1 2 " Totale livello giacenza "
END END
STRINGA 402 4 STRINGA 402 2
BEGIN BEGIN
KEY "UM" KEY "UM"
PROMPT 2 2 "" PROMPT 2 2 ""
@ -638,7 +638,7 @@ SECTION IMPIANTI 2 0 4 FILE 132 GROUP IMPIANTO
PROMPT 1 2 " Totale articolo " PROMPT 1 2 " Totale articolo "
END END
STRINGA 302 4 STRINGA 302 2
BEGIN BEGIN
KEY "UM" KEY "UM"
PROMPT 2 2 "" PROMPT 2 2 ""
@ -757,7 +757,7 @@ SECTION IMPIANTI 2 0 4 FILE 132 GROUP IMPIANTO
PROMPT 1 2 " Totale linea " PROMPT 1 2 " Totale linea "
END END
STRINGA 202 4 STRINGA 202 2
BEGIN BEGIN
KEY "UM" KEY "UM"
PROMPT 2 2 "" PROMPT 2 2 ""
@ -1051,7 +1051,7 @@ SECTION IMPIANTI 2 0 4 FILE 132 GROUP IMPIANTO
PROMPT 1 3 " Carico linea" PROMPT 1 3 " Carico linea"
END END
STRINGA 239 10 STRINGA 239 8
BEGIN BEGIN
KEY "UM" KEY "UM"
FLAGS "H" FLAGS "H"
@ -1166,7 +1166,7 @@ BEGIN
PROMPT 1 2 "Totale impianto" PROMPT 1 2 "Totale impianto"
END END
STRING 102 4 STRING 102 2
BEGIN BEGIN
SPECIAL STRINGA FINCATURA "XX" "Fincatura sinistra e destra" SPECIAL STRINGA FINCATURA "XX" "Fincatura sinistra e destra"
KEY "UM" KEY "UM"

200
mr/mr2100.cpp
View File

@ -311,10 +311,11 @@ const TMRP_time& TMRP_line::lead_time(int i, TMRP_time& t, bool anticipate) cons
if (anticipate) if (anticipate)
{ {
if (!cache().get(LF_DIST, articolo()).empty()) const TRectype& dist = cache().get(LF_DIST, articolo());
if (!dist.empty())
{ {
int days = cache().get(LF_DIST, articolo()).get_int("LEADTIME"); const int days = dist.get_int("LEADTIME");
long hours = cache().get(LF_DIST, articolo()).get_long("LEADHOURS"); const long hours = dist.get_long("LEADHOURS");
t.sub_time(days, hours); t.sub_time(days, hours);
} }
else else
@ -498,7 +499,7 @@ public:
TRiga_ordine& operator=(TToken_string& r); TRiga_ordine& operator=(TToken_string& r);
TRiga_ordine& operator+=(TRiga_ordine& r); TRiga_ordine& operator+=(TRiga_ordine& r);
TRiga_ordine() : TToken_string(128) { } // TRiga_ordine() : TToken_string(128) { CHECK(0, "Miiii"): }
TRiga_ordine(const TDate& datadoc, const TDate& datacons, long forn, TRiga_ordine(const TDate& datadoc, const TDate& datacons, long forn,
const TMRP_line& line, int bucket, const real & price); const TMRP_line& line, int bucket, const real & price);
virtual ~TRiga_ordine() { } virtual ~TRiga_ordine() { }
@ -917,6 +918,7 @@ protected:
bool ask_save(); bool ask_save();
void save_orders(TAssoc_array& docs); void save_orders(TAssoc_array& docs);
long compute_production_time(const TMRP_line& line, const real& qta) const;
public: public:
virtual bool menu(MENU_TAG mt); virtual bool menu(MENU_TAG mt);
@ -1287,7 +1289,8 @@ int TMatResMask::add_order_line(long forn, const TMRP_line& line, int bucket)
r->add(pl_orders->get_ref(nref).datacons().string() , F_DATACONS - FIRST_FIELD); r->add(pl_orders->get_ref(nref).datacons().string() , F_DATACONS - FIRST_FIELD);
r->add(pl_orders->get_ref(nref).datadoc().string(), F_DATADOC - FIRST_FIELD); r->add(pl_orders->get_ref(nref).datadoc().string(), F_DATADOC - FIRST_FIELD);
q = ZERO; q = ZERO;
} else }
else
r->add(" " , F_QUANTITA - FIRST_FIELD); r->add(" " , F_QUANTITA - FIRST_FIELD);
} }
else else
@ -1763,6 +1766,11 @@ int TRisalita_mask::add_internal_ref(const TMRP_internalref &iref)
r.add(docref->numrig() , F_DOCNRIGA - FIRST_FIELD); r.add(docref->numrig() , F_DOCNRIGA - FIRST_FIELD);
r.add(qtaplan.string() , F_QUANTITA - FIRST_FIELD); r.add(qtaplan.string() , F_QUANTITA - FIRST_FIELD);
um = docref->um(); um = docref->um();
const TRectype& rdoc = docref->get_rdoc();
r.add(rdoc.get(RDOC_DAANNO), F_DAANNO - FIRST_FIELD);
r.add(rdoc.get(RDOC_DACODNUM), F_DACODNUM - FIRST_FIELD);
r.add(rdoc.get(RDOC_DANDOC), F_DANUMDOC - FIRST_FIELD);
} }
else else
{ {
@ -1927,6 +1935,10 @@ bool TMatResPlanning::load_gross_requirements()
// Scandisce tutte le numerazioni considerando solo quelle // Scandisce tutte le numerazioni considerando solo quelle
// contenenti i tipi documento specificati nella maschera // contenenti i tipi documento specificati nella maschera
// Inizializza la cache delle lavorazioni
_artinfo.init(m.get_bool(F_KEEP_IMP));
for (int err = cod.first(num); err == NOERR; err = cod.next(num)) for (int err = cod.first(num); err == NOERR; err = cod.next(num))
{ {
pi.addstatus(1); pi.addstatus(1);
@ -1985,9 +1997,9 @@ bool TMatResPlanning::load_gross_requirements()
{ {
const TCodice_articolo art = riga.get(RDOC_CODARTMAG); const TCodice_articolo art = riga.get(RDOC_CODARTMAG);
const TString16 liv = riga.get(RDOC_LIVELLO); const TString16 liv = riga.get(RDOC_LIVELLO);
const TString8 mag = nomag ? EMPTY_STRING : riga.get(RDOC_CODMAG).left(nodep ? 3 : 5); TString8 mag = nomag ? EMPTY_STRING : riga.get(RDOC_CODMAG).left(nodep ? 3 : 5);
const TString8 imp = noimp ? EMPTY_STRING : riga.get(RDOC_IMPIANTO); TString8 imp = noimp ? EMPTY_STRING : riga.get(RDOC_IMPIANTO);
const TString8 lin = nolin ? EMPTY_STRING : riga.get(RDOC_LINEA); TString8 lin = nolin ? EMPTY_STRING : riga.get(RDOC_LINEA);
const TCodice_um um = riga.get(RDOC_UMQTA); const TCodice_um um = riga.get(RDOC_UMQTA);
// GUY was Here, but it's Koki fault! // GUY was Here, but it's Koki fault!
@ -1997,11 +2009,14 @@ bool TMatResPlanning::load_gross_requirements()
TQuantita q(art, um, qta); TQuantita q(art, um, qta);
q.convert2umbase(); q.convert2umbase();
q.currency2umbase(prz); q.currency2umbase(prz);
TMRP_line* line = _articles.find(art, liv, mag, "", imp, lin, codcli);
if (lin.empty())
_artinfo.art2magimpline(art, mag, imp, lin);
TMRP_line* line = _articles.find(art, liv, mag, EMPTY_STRING, imp, lin, codcli);
if (line == NULL) if (line == NULL)
{ {
// nuova linea // nuova linea
line = _articles.find(art, liv, mag, "", imp, lin, codcli, true); line = _articles.find(art, liv, mag, EMPTY_STRING, imp, lin, codcli, true);
line->set_description(riga.get(RDOC_DESCR)); line->set_description(riga.get(RDOC_DESCR));
line->set_final_product(); line->set_final_product();
} }
@ -2011,7 +2026,13 @@ bool TMatResPlanning::load_gross_requirements()
TMRP_docref * docref = new TMRP_docref(doc.get_int(DOC_ANNO), codnum, docnum, TMRP_docref * docref = new TMRP_docref(doc.get_int(DOC_ANNO), codnum, docnum,
numriga, um, qta, prz.get_num()); numriga, um, qta, prz.get_num());
const TMRP_time t(datacons, 0, imp, lin); TMRP_time t(datacons, 0, imp, lin);
if (m.get_int(F_LDTIME_MODE) != 0)
{
t.add_time(0, -1); // Toglie un'ora: sposta datacons a fine turno
t.add_time(0, +1); // Riaggiunge un'ora nel giorno stesso
}
line->add_gross_req(t, q.val(), docref); line->add_gross_req(t, q.val(), docref);
if (master) if (master)
line->add_net_req(t, q.val()); line->add_net_req(t, q.val());
@ -2034,12 +2055,13 @@ bool TMatResPlanning::explode_articles()
const TMatResMask& m = *_mask; const TMatResMask& m = *_mask;
TDistinta_tree distinta; // albero distinta TDistinta_tree distinta; // albero distinta
TArray boom; // array per i figli TArray boom; // array per i figli
int level = 1; int level = 0;
int maxlevel = m.get_int(F_MAXLEVEL);
bool finiti = TRUE; bool finiti = TRUE;
TProgind* pi = NULL; TProgind* pi = NULL;
// Inizializza la cache delle lavorazioni // Inizializza la cache delle lavorazioni
_artinfo.init(m.get_bool(F_KEEP_IMP)); // _artinfo.init(m.get_bool(F_KEEP_IMP)); ??
// Scandisce gli articoli inseriti dal gross requirements ed // Scandisce gli articoli inseriti dal gross requirements ed
// accoda tutti gli articoli risultanti dalla loro esplosione // accoda tutti gli articoli risultanti dalla loro esplosione
@ -2053,8 +2075,10 @@ bool TMatResPlanning::explode_articles()
} }
if (pi == NULL) if (pi == NULL)
{ {
if (maxlevel > 0 && level >= maxlevel)
return _articles.items() > 0;
TString80 msg; TString80 msg;
msg.format(FR("Esplosione articoli (livello %d)"), level++); msg.format(FR("Esplosione articoli (livello %d)"), ++level);
pi = new TProgind(_articles.items()-a, msg, TRUE, TRUE); pi = new TProgind(_articles.items()-a, msg, TRUE, TRUE);
} }
pi->addstatus(1); pi->addstatus(1);
@ -2139,6 +2163,8 @@ bool TMatResPlanning::load_planned_orders()
const int year_fr = date_fr.year() - (m.get_bool(F_DOC_YEAR_PREC) ? 1 : 0); const int year_fr = date_fr.year() - (m.get_bool(F_DOC_YEAR_PREC) ? 1 : 0);
const int year_to = date_to.year(); const int year_to = date_to.year();
const bool load_evasi = m.get_bool(F_LOAD_EVASI);
TTable num("%NUM"); TTable num("%NUM");
TCodice_numerazione cod; TCodice_numerazione cod;
@ -2181,7 +2207,7 @@ bool TMatResPlanning::load_planned_orders()
// quelli con uno stato nel range corretto // quelli con uno stato nel range corretto
for (cur = 0; cur.pos() < items; ++cur) for (cur = 0; cur.pos() < items; ++cur)
{ {
const bool evaso = curr.get_bool(DOC_DOCEVASO); const bool evaso = !load_evasi && curr.get_bool(DOC_DOCEVASO);
if (evaso) if (evaso)
continue; continue;
@ -2212,7 +2238,7 @@ bool TMatResPlanning::load_planned_orders()
if (riga.is_articolo()) if (riga.is_articolo())
{ {
const real qta = riga.qtaresidua(); const real qta = load_evasi ? riga.quantita() : riga.qtaresidua();
if (qta > ZERO) if (qta > ZERO)
{ {
const TCodice_articolo art = riga.get(RDOC_CODARTMAG); const TCodice_articolo art = riga.get(RDOC_CODARTMAG);
@ -2224,10 +2250,10 @@ bool TMatResPlanning::load_planned_orders()
// GUY was Here, but it's Koki fault! // GUY was Here, but it's Koki fault!
const long codcli = is_production_article(art) ? doc.get_long(DOC_CODCF) : 0; const long codcli = is_production_article(art) ? doc.get_long(DOC_CODCF) : 0;
TMRP_line* line = _articles.find(art, liv, mag, "", imp, lin, codcli); TMRP_line* line = _articles.find(art, liv, mag, EMPTY_STRING, imp, lin, codcli);
if (line == NULL) if (line == NULL)
{ {
line = _articles.find(art, liv, mag, "", imp, lin, codcli, TRUE); line = _articles.find(art, liv, mag, EMPTY_STRING, imp, lin, codcli, TRUE);
line->set_description(riga.get(RDOC_DESCR)); line->set_description(riga.get(RDOC_DESCR));
} }
TPrice prz(riga.prezzo(TRUE,TRUE)); TPrice prz(riga.prezzo(TRUE,TRUE));
@ -2266,7 +2292,7 @@ bool TMatResPlanning::preprocess_cycle()
// costruisce gli sched rec degli elementi dai DOCS ordini fornitore emessi // costruisce gli sched rec degli elementi dai DOCS ordini fornitore emessi
ok |= load_planned_orders(); ok |= load_planned_orders();
if (ok) if (ok)
// esplode l'array mediante la DIBA // esplode l'array mediante la Distinta Base
return explode_articles(); return explode_articles();
/* /*
@ -2277,7 +2303,38 @@ bool TMatResPlanning::preprocess_cycle()
// costruisce gli sched rec degli elementi dai DOCS ordini fornitore emessi // costruisce gli sched rec degli elementi dai DOCS ordini fornitore emessi
return load_planned_orders(m); return load_planned_orders(m);
*/ */
return FALSE; return false;
}
long TMatResPlanning::compute_production_time(const TMRP_line& line, const real& qta) const
{
real tot;
if (line.codlin().not_empty())
{
TDistinta_tree tree;
tree.set_global("_MAGDEP", line.codmagdep());
tree.set_global("_LINEA", line.codlin());
tree.set_global("_IMPIANTO", line.codimp());
tree.set_root(line.articolo(), "", qta, line.livgiac());
TArray lav_array;
for (TRiga_esplosione* llav = tree.first_labor(lav_array, RAGGR_EXP_UMBASE); llav;
llav = tree.next_labor(lav_array))
{
TLavorazione* lavorazione = tree.find_labor(llav);
const int linea = lavorazione->find_linea(line.codlin());
if (linea >= 0)
{
const real prod_linea = lavorazione->produttiv_linea(linea);
real ore = (llav->val() * lavorazione->um_temporale().converti_in_ore()) / prod_linea;
// if (carico_uomo) ore *= lavorazione->numpers_linea(linea);
tot += ore;
}
}
tot.ceil();
}
return tot.integer();
} }
/////////// finished: 99% /////////// finished: 99%
@ -2333,16 +2390,33 @@ bool TMatResPlanning::gross2net_logic(TMRP_line &curr_article, int bucket, bool
// trasforma i fabbisogni totali nel fabbisogno lordo dei figli // trasforma i fabbisogni totali nel fabbisogno lordo dei figli
net_req += curr_article.sched_receipts(bucket); net_req += curr_article.sched_receipts(bucket);
// net_req += curr_article.planned_orders(bucket);//planned orders are not added here, but in build orders phase // net_req += curr_article.planned_orders(bucket);//planned orders are not added here, but in build orders phase
if (net_req > ZERO && n_figli) if (net_req > ZERO && n_figli > 0)
{ {
TMRP_time lead_time, xlead_time; TMRP_time lead_time;
curr_article.lead_time(bucket, lead_time, use_leadtime); curr_article.lead_time(bucket, lead_time, use_leadtime);
const int ldtime_mode = m.get_int(F_LDTIME_MODE);
if (ldtime_mode == 1 || ldtime_mode == 2)
{
const long xtrahours = compute_production_time(curr_article, net_req);
if (xtrahours > 0)
{
if (ldtime_mode == 1)
lead_time.sub_time(0, xtrahours);
else
{
TMRP_time prod_time = curr_article.time(bucket);
prod_time.sub_time(0, xtrahours);
if (prod_time < lead_time)
lead_time = prod_time;
}
}
}
const int xtradays = m.get_int(F_XTRA_LDTIME); const int xtradays = m.get_int(F_XTRA_LDTIME);
if (xtradays) if (xtradays)
{ lead_time.sub_time(xtradays);
xlead_time = lead_time;
xlead_time.sub_time(xtradays);
}
for (int o = 0; o < n_figli; o++) for (int o = 0; o < n_figli; o++)
{ {
TMRP_line& article_son = curr_article.son(o); TMRP_line& article_son = curr_article.son(o);
@ -2351,14 +2425,11 @@ bool TMatResPlanning::gross2net_logic(TMRP_line &curr_article, int bucket, bool
if (tmpreal > ZERO) if (tmpreal > ZERO)
{ {
TMRP_internalref * iref = new TMRP_internalref( &curr_article, bucket, tmpreal); TMRP_internalref * iref = new TMRP_internalref( &curr_article, bucket, tmpreal);
if (xtradays && curr_article.sons())
article_son.add_gross_req(xlead_time, tmpreal, iref);
else
article_son.add_gross_req(lead_time, tmpreal, iref); article_son.add_gross_req(lead_time, tmpreal, iref);
} }
} }
} }
return TRUE; return true;
} }
/////////// finished: 99% /////////// finished: 99%
@ -2367,7 +2438,7 @@ bool TMatResPlanning::net_requirement_cycle()
{ {
const TMatResMask& m = *_mask; const TMatResMask& m = *_mask;
bool ok = TRUE; bool ok = true;
// ordina gli articoli // ordina gli articoli
const long total = _articles.sort(); const long total = _articles.sort();
@ -2385,7 +2456,7 @@ bool TMatResPlanning::net_requirement_cycle()
{ {
real curgiac; real curgiac;
curr_article.set_on_hand(0, curr_article.giacenza_attuale(curgiac, m.get_date(F_DADATA))); curr_article.set_on_hand(0, curr_article.giacenza_attuale(curgiac, m.get_date(F_DADATA)));
bool sc_used = FALSE; bool sc_used = false;
for (int bucket = 0; ok && bucket <= last; bucket = curr_article.next_bucket(bucket)) for (int bucket = 0; ok && bucket <= last; bucket = curr_article.next_bucket(bucket))
{ {
@ -2682,9 +2753,15 @@ TMRP_line* TMatResPlanning::find_risalita_line(TToken_string &row)
{ {
line = _articles.find(art, liv, mag, magc, imp, EMPTY_STRING, codcf); // Riprovo senza linea line = _articles.find(art, liv, mag, magc, imp, EMPTY_STRING, codcf); // Riprovo senza linea
if (line == NULL) if (line == NULL)
{
line = _articles.find(art, liv, mag, magc, EMPTY_STRING, lin, codcf); // Riprovo senza impianto
if (line == NULL)
{
line = _articles.find(art, liv, mag, magc, imp, EMPTY_STRING, 0L); // Riprovo senza nulla line = _articles.find(art, liv, mag, magc, imp, EMPTY_STRING, 0L); // Riprovo senza nulla
} }
} }
}
}
return line; return line;
} }
@ -2734,7 +2811,7 @@ bool TMatResPlanning::print_risalita(const TMRP_line & line, const TDate &date,
plan += line.planned_orders(b); plan += line.planned_orders(b);
sched += line.sched_receipts(b); sched += line.sched_receipts(b);
TMRP_internalrefs *irefs = line.record(b).internal_refs(); TMRP_internalrefs *irefs = line.record(b).internal_refs();
if (irefs) if (irefs != NULL)
{ {
int ir = 0; int ir = 0;
while (ir < irefs->items()) while (ir < irefs->items())
@ -2926,13 +3003,26 @@ void TMatResPlanning::save_orders(TAssoc_array& docs)
if (doc.get_long(DOC_NDOC)) if (doc.get_long(DOC_NDOC))
{ {
// riscrittura; elimina righe con qta zero // riscrittura; elimina righe con qta zero
if (!m.get_bool(F_ALL_ORDERSCHANGES)) // if (!m.get_bool(F_ALL_ORDERSCHANGES))
for (int numriga = doc.physical_rows(); numriga >0 ; numriga--) int nrows = doc.physical_rows();
for (int numriga = nrows; numriga >0 ; numriga--)
{ {
if (doc[numriga].get_real(RDOC_QTA).is_zero()) if (doc[numriga].get_real(RDOC_QTA).is_zero())
doc.destroy_row(numriga, TRUE); doc.destroy_row(numriga, TRUE);
} }
nrows = doc.physical_rows();
if (nrows > 0)
err = doc.rewrite(); err = doc.rewrite();
else
{
TDocumento d;
if (d.read(doc, _isequal, _testandlock) == NOERR)
d.remove();
}
} }
else else
// generazione // generazione
@ -2989,12 +3079,15 @@ const TRectype* TMatResPlanning::irefs2rdoc(const TMRP_internalrefs& irefs) cons
{ {
const TMRP_docref& docref = *refs->get_ref_ptr(j); const TMRP_docref& docref = *refs->get_ref_ptr(j);
if (docref.numrig() > 0) if (docref.numrig() > 0)
{
rdoc = &docref.get_rdoc(); rdoc = &docref.get_rdoc();
break;
}
} }
} }
} }
// Quin comincia la magia, perche' differente dalla risalita standard // Qui comincia la magia, perche' differente dalla risalita standard
if (rdoc == NULL) if (rdoc == NULL)
{ {
const TMRP_internalrefs* inter = rec.internal_refs(); const TMRP_internalrefs* inter = rec.internal_refs();
@ -3142,7 +3235,7 @@ bool TMatResPlanning::emit_orders()
rdoc.put(RDOC_CODART, riga.get(sf.cid2index(F_ARTICOLO))); rdoc.put(RDOC_CODART, riga.get(sf.cid2index(F_ARTICOLO)));
TString80 str; TString80 str;
for (int l= livelli_giacenza().last_level(); l>=1; l--) for (int l= livelli_giacenza().last_level(); l>0; l--)
livelli_giacenza().pack_grpcode(str, riga.get(sf.cid2index(F_LIV1+l-1)), l); livelli_giacenza().pack_grpcode(str, riga.get(sf.cid2index(F_LIV1+l-1)), l);
rdoc.put(RDOC_LIVELLO,str); rdoc.put(RDOC_LIVELLO,str);
@ -3175,7 +3268,7 @@ bool TMatResPlanning::emit_orders()
riga.add("X",sf.cid2index(F_OK)); riga.add("X",sf.cid2index(F_OK));
// Cerca di impostare la riga di provenienza dell'ordine // Cerca di impostare la riga di provenienza dell'ordine
if (rdoc.get(RDOC_DAPROVV).blank()) // Se e' una riga nuova... if (rdoc.get(RDOC_DAPROVV).blank()) // Se e' una riga nuova ...
{ {
TMRP_line* line = find_risalita_line(riga); // ... cerco la riga di risalita TMRP_line* line = find_risalita_line(riga); // ... cerco la riga di risalita
if (line != NULL) if (line != NULL)
@ -3184,9 +3277,14 @@ bool TMatResPlanning::emit_orders()
rdoc.put(RDOC_QTAGG5, depth); // Per ora memorizziamo in QTAGG5, scelto a caso rdoc.put(RDOC_QTAGG5, depth); // Per ora memorizziamo in QTAGG5, scelto a caso
// Cerco la riga di risalita // Cerco la riga di risalita
for (int bucket = line->last_bucket(); bucket >= 0; bucket--)
{
const TRectype* dardoc = NULL; const TRectype* dardoc = NULL;
int bucket;
const int last_bucket = line->last_bucket();
for (bucket = last_bucket; bucket >= 0; bucket--)
{
if (datacon >= line->record(bucket).time().date())
{
TMRP_internalrefs *irefs = line->record(bucket).internal_refs(); TMRP_internalrefs *irefs = line->record(bucket).internal_refs();
if (irefs != NULL && irefs->items() > 0) if (irefs != NULL && irefs->items() > 0)
dardoc = irefs2rdoc(*irefs); dardoc = irefs2rdoc(*irefs);
@ -3197,14 +3295,32 @@ bool TMatResPlanning::emit_orders()
{ {
const TMRP_docref& docref = *gr_refs->get_ref_ptr(0); const TMRP_docref& docref = *gr_refs->get_ref_ptr(0);
dardoc = &docref.get_rdoc(); dardoc = &docref.get_rdoc();
break;
}
}
else
break;
} }
} }
if (dardoc != NULL) if (dardoc != NULL)
{ {
rdoc.set_original_rdoc_key(*dardoc); // Imposto DAPROVV, DAANNO, DACODNUM, DANDOC, DAIDRIGA int depth = m.get_int(F_RIFERIMENTO_MRP);
break; if (depth == 0 && dardoc->get(RDOC_DACODNUM).not_empty())
depth = 1;
rdoc.set_original_rdoc_key(*dardoc, depth); // Imposto DAPROVV, DAANNO, DACODNUM, DANDOC, DAIDRIGA
}
else
{
TString80 msg; msg.format(FR("Riferimento non trovato: riga %d"), r+1);
xvt_statbar_set(msg);
beep();
} }
} }
else
{
TString80 msg; msg.format(FR("Linea risalita non trovata: riga %d"), r+1);
xvt_statbar_set(msg);
beep();
} }
} }
} }

3
mr/mr2100.h
View File

@ -1,6 +1,9 @@
#ifndef __MR2100_H #ifndef __MR2100_H
#define __MR2100_H #define __MR2100_H
#include "mrplib.h"
#include "../ve/velib.h"
void print_header(TPrinter& pr); void print_header(TPrinter& pr);
void print_footer(TPrinter& pr); void print_footer(TPrinter& pr);

10
mr/mr2100a.h
View File

@ -50,10 +50,14 @@
#define F_DAYXBUCK 244 #define F_DAYXBUCK 244
#define F_XTRA_LDTIME 245 #define F_XTRA_LDTIME 245
#define F_XTRA_PLTIME 246 #define F_XTRA_PLTIME 246
#define F_LDTIME_MODE 247
#define F_ALL_ORDERSCHANGES 250 #define F_ALL_ORDERSCHANGES 250
#define F_DISABLESAVE 251 #define F_DISABLESAVE 251
#define F_ALL_MRPLINES 252 #define F_ALL_MRPLINES 252
#define F_DOC_YEAR_PREC 253 #define F_DOC_YEAR_PREC 253
#define F_MAXLEVEL 254
#define F_RIFERIMENTO_MRP 255
#define F_LOAD_EVASI 256
// campi senza default sul profilo // campi senza default sul profilo
#define F_YEAR 301 #define F_YEAR 301
@ -102,8 +106,10 @@
#define F_DOCCODNUM 120 // 2 #define F_DOCCODNUM 120 // 2
#define F_DOCNUM 121 // 3 #define F_DOCNUM 121 // 3
#define F_DOCNRIGA 122 // 4 #define F_DOCNRIGA 122 // 4
#define F_DAANNO 123 // lasciare questi 3 campi in sequenza
#define F_OK 123 #define F_DACODNUM 124 //
#define F_DANUMDOC 125 //
#define F_OK 126
#define F_RAGSOC 154 #define F_RAGSOC 154
#define F_DESCMAG 160 #define F_DESCMAG 160

39
mr/mr2100a.uml
View File

@ -184,14 +184,14 @@ BEGIN
PROMPT 1 10 "@bOrdini produzione/fornitori" PROMPT 1 10 "@bOrdini produzione/fornitori"
END END
SPREADSHEET F_NUM_ORF 8 SPREADSHEET F_NUM_ORF 8 9
BEGIN BEGIN
GROUP G_PREPROCESS GROUP G_PREPROCESS
PROMPT 1 11 "" PROMPT 1 11 ""
ITEM "Codice" ITEM "Codice"
END END
SPREADSHEET F_TIPI_ORF 62 SPREADSHEET F_TIPI_ORF 62 9
BEGIN BEGIN
GROUP G_PREPROCESS GROUP G_PREPROCESS
PROMPT 16 11 "" PROMPT 16 11 ""
@ -202,6 +202,11 @@ BEGIN
ITEM "Stato def." ITEM "Stato def."
END END
BOOLEAN F_LOAD_EVASI
BEGIN
PROMPT 2 20 "Non considerare l'evasione ordini"
END
ENDPAGE ENDPAGE
PAGE "Genera" -1 -1 78 20 PAGE "Genera" -1 -1 78 20
@ -382,6 +387,13 @@ BEGIN
GROUP G_PREPROCESS GROUP G_PREPROCESS
END END
LIST F_RIFERIMENTO_MRP 1 20
BEGIN
PROMPT 2 11 "Riferimento sulle righe "
ITEM "0|Documento originale"
ITEM "1|Documento padre"
END
BOOLEAN F_KEEP_IMP BOOLEAN F_KEEP_IMP
@ -410,31 +422,44 @@ BEGIN
FLAGS "U" FLAGS "U"
END END
LIST F_LDTIME_MODE 1 50
BEGIN
PROMPT 2 18 "Calcolo lead time "
ITEM "0|Normale"
ITEM "1|Sommare al lead time il tempo di produzione"
ITEM "2|Massimo tra lead time e tempo di produzione"
END
NUMBER F_MAXLEVEL 3
BEGIN
PROMPT 2 19 "Max.livello di esplosione "
FLAGS "U"
END
NUMBER F_XTRA_LDTIME 2 NUMBER F_XTRA_LDTIME 2
BEGIN BEGIN
GROUP G_PREPROCESS GROUP G_PREPROCESS
PROMPT 2 18 "Anticipa le consegne di " PROMPT 2 20 "Anticipa le consegne di "
FLAGS "U" FLAGS "U"
END END
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
GROUP G_PREPROCESS GROUP G_PREPROCESS
PROMPT 31 18 "giorni lavorativi" PROMPT 32 20 "giorni lavorativi"
FLAGS "U"
END END
NUMBER F_XTRA_PLTIME 2 NUMBER F_XTRA_PLTIME 2
BEGIN BEGIN
GROUP G_PREPROCESS GROUP G_PREPROCESS
PROMPT 2 19 "Anticipa le emissioni di " PROMPT 2 21 "Anticipa le emissioni di "
FLAGS "U" FLAGS "U"
END END
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
GROUP G_PREPROCESS GROUP G_PREPROCESS
PROMPT 31 19 "giorni lavorativi" PROMPT 32 21 "giorni lavorativi"
FLAGS "U" FLAGS "U"
END END

19
mr/mr2100b.uml
View File

@ -160,6 +160,9 @@ BEGIN
ITEM "Cod.Num." ITEM "Cod.Num."
ITEM "Num.Doc." ITEM "Num.Doc."
ITEM "Num.Riga." ITEM "Num.Riga."
ITEM "Da Anno"
ITEM "Da Cod.Num."
ITEM "Da Num.Doc."
END END
BUTTON DLG_CANCEL 10 2 BUTTON DLG_CANCEL 10 2
@ -432,6 +435,22 @@ BEGIN
FLAGS "H" FLAGS "H"
END END
STRING F_DAANNO 4
BEGIN
PROMPT 1 14 "Da Anno "
END
STRING F_DACODNUM 4
BEGIN
PROMPT 19 14 "Documento "
END
NUMBER F_DANUMDOC 9
BEGIN
PROMPT 35 14 "N. "
END
BUTTON DLG_OK 10 2 BUTTON DLG_OK 10 2
BEGIN BEGIN

457
mr/mr2200.cpp
View File

File diff suppressed because it is too large Load Diff

4
mr/mr2200.h
View File

@ -2,11 +2,7 @@
#define __MR2200_H #define __MR2200_H
#include <applicat.h> #include <applicat.h>
#include <colmask.h>
#include "mrplib.h" #include "mrplib.h"
#include "../mg/mglib.h"
#include "../ve/velib.h"
#include "../ve/veconf.h"
#include "mr2100.h" #include "mr2100.h"
#include "mr2201.h" #include "mr2201.h"

9
mr/mr2200a.h
View File

@ -55,11 +55,11 @@
#define F_USENONSTDLIN_MSP 230 #define F_USENONSTDLIN_MSP 230
#define F_USEEXTRAHRS_MSP 231 #define F_USEEXTRAHRS_MSP 231
#define F_HUMANCHECK_MSP 232 #define F_HUMANCHECK_MSP 232
//#define F_??? 233 #define F_NOANTICIPI_MSP 233
//#define F_??? 234 #define F_RIFERIMENTO_MSP 234
//#define F_??? 235 //#define F_??? 235
#define F_RECALC_TYPE 236 #define F_RECALC_TYPE 236
//#define F_??? 237 #define F_PRIORITY 237
#define F_LOTSIZING 238 #define F_LOTSIZING 238
#define F_ANTICIPOMAX 239 #define F_ANTICIPOMAX 239
#define F_ANTICIPOMIN 240 #define F_ANTICIPOMIN 240
@ -93,6 +93,9 @@
#define F_FRSGM 264 #define F_FRSGM 264
#define F_TOGRM 265 #define F_TOGRM 265
#define F_TOSGM 266 #define F_TOSGM 266
#define F_IMP 267
#define F_IGNORE_PREC 268
// filtri di salvataggio // filtri di salvataggio
#define F_SAVE_OPT 260 #define F_SAVE_OPT 260

56
mr/mr2200a.uml
View File

@ -304,6 +304,18 @@ BEGIN
CHECKTYPE NORMAL CHECKTYPE NORMAL
END END
STRING F_IMP 5
BEGIN
PROMPT 2 19 "Impianto "
FLAG "UZ"
USE IMP
INPUT CODTAB F_IMP
DISPLAY "Codice@5" CODTAB
DISPLAY "Descrizione@60" S0
OUTPUT F_IMP CODTAB
CHECKTYPE NORMAL
END
ENDPAGE ENDPAGE
PAGE "Elabora" -1 -1 80 19 PAGE "Elabora" -1 -1 80 19
@ -463,18 +475,23 @@ BEGIN
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
END END
BOOLEAN F_IGNORE_PREC
BEGIN
PROMPT 2 18 "Ignora le pianificazioni precedenti alla data iniziale"
END
ENDPAGE ENDPAGE
PAGE "Genera" -1 -1 78 20 PAGE "Genera" -1 -1 78 20
GROUPBOX DLG_NULL 78 7
GROUPBOX DLG_NULL 78 8
BEGIN BEGIN
PROMPT 1 1 "@b Ricalcolo" PROMPT 1 0 "@b Ricalcolo"
END END
LIST F_RECALC_TYPE 35 LIST F_RECALC_TYPE 35
BEGIN BEGIN
PROMPT 2 2 "Logica propositiva " PROMPT 2 1 "Logica propositiva "
#ifndef _IS_ACQ #ifndef _IS_ACQ
ITEM "1|FirstFit " ITEM "1|FirstFit "
MESSAGE ENABLE,G_FINITE@ MESSAGE ENABLE,G_FINITE@
@ -511,6 +528,11 @@ BEGIN
MESSAGE COPY,F_RECALC_TYPE2 MESSAGE COPY,F_RECALC_TYPE2
END END
STRING F_PRIORITY 60
BEGIN
PROMPT 2 2 "Priorita' "
END
BOOL F_LOTSIZING BOOL F_LOTSIZING
BEGIN BEGIN
PROMPT 2 3 "Ridimensiona in base ai lotti" PROMPT 2 3 "Ridimensiona in base ai lotti"
@ -598,41 +620,53 @@ BEGIN
PROMPT 42 10 "Abilita turni straordinari" PROMPT 42 10 "Abilita turni straordinari"
END END
GROUPBOX DLG_NULL 78 18 BOOL F_NOANTICIPI_MSP
BEGIN BEGIN
PROMPT 1 11 "@b Registrazione" PROMPT 2 11 "Non anticipare gli articoli con distinta"
END
LIST F_RIFERIMENTO_MSP 1 20
BEGIN
PROMPT 32 11 "Riferimento sulle righe "
ITEM "0|Documento originale"
ITEM "1|Documento padre"
END
GROUPBOX DLG_NULL 78
BEGIN
PROMPT 1 12 "@b Registrazione"
END END
BOOLEAN F_NUMBERBYWEEK BOOLEAN F_NUMBERBYWEEK
BEGIN BEGIN
PROMPT 2 12 "Numera gli ordini per settimana" PROMPT 2 13 "Numera gli ordini per settimana"
GROUP G_PREPROCESS GROUP G_PREPROCESS
MESSAGE TRUE "X",F_DIVIDEBYDATE MESSAGE TRUE "X",F_DIVIDEBYDATE
END END
BOOLEAN F_NUMBERBYCLI BOOLEAN F_NUMBERBYCLI
BEGIN BEGIN
PROMPT 40 12 "Numera gli ordini per cliente" PROMPT 40 13 "Numera gli ordini per cliente"
GROUP G_PREPROCESS GROUP G_PREPROCESS
END END
BOOLEAN F_DIVIDEBYART BOOLEAN F_DIVIDEBYART
BEGIN BEGIN
PROMPT 2 13 "Suddividi gli ordini per articolo" PROMPT 2 14 "Suddividi gli ordini per articolo"
GROUP G_PREPROCESS GROUP G_PREPROCESS
END END
BOOLEAN F_DIVIDEBYDATE BOOLEAN F_DIVIDEBYDATE
BEGIN BEGIN
PROMPT 40 13 "Suddividi gli ordini per scadenza" PROMPT 40 14 "Suddividi gli ordini per scadenza"
GROUP G_PREPROCESS GROUP G_PREPROCESS
END END
SPREADSHEET F_SAVE_OPT 70 -1 SPREADSHEET F_SAVE_OPT 70 -1
BEGIN BEGIN
PROMPT 2 14 "" PROMPT 2 15 ""
ITEM " " ITEM " "
ITEM "Num.@6" ITEM "Num.@6"
ITEM "Tipo@6" ITEM "Tipo@6"

55
mr/mr2201.cpp
View File

@ -1,7 +1,9 @@
#include <execp.h> #include <execp.h>
#include "mrplib.h" #include <printer.h>
#include <progind.h>
#include <utility.h>
#include "../mg/mglib.h" #include "../mg/mglib.h"
#include "../ve/velib.h"
#include "../ve/veconf.h" #include "../ve/veconf.h"
#include "mr2100.h" #include "mr2100.h"
@ -14,8 +16,8 @@ static TDistinta_tree *_dist_tree=NULL;
TDistinta_tree &dist_tree() TDistinta_tree &dist_tree()
{ {
if (!_dist_tree) if (_dist_tree == NULL)
_dist_tree=new TDistinta_tree(); _dist_tree = new TDistinta_tree();
return *_dist_tree; return *_dist_tree;
} }
@ -23,7 +25,7 @@ TDistinta_tree &dist_tree()
// triga ordine // triga ordine
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
TMSP_form::TMSP_form (TIsamtempfile * report) :TForm("mr2200a") TMSP_form::TMSP_form (TIsamtempfile * report) : TForm("mr2200a")
{ {
TRelation* rel = relation(); TRelation* rel = relation();
rel->replace(report); rel->replace(report);
@ -791,6 +793,9 @@ void TMSP_constraint::fill_sheet_row(TToken_string& row, const TMask & m, bool c
row.add(format("%ld", codclifor()),F_CLIENTE-FIRST_FIELD); row.add(format("%ld", codclifor()),F_CLIENTE-FIRST_FIELD);
row.add(articolo(),F_ARTICOLO-FIRST_FIELD); row.add(articolo(),F_ARTICOLO-FIRST_FIELD);
if (_priority != 0)
row.add(_priority, F_PRIORITA-FIRST_FIELD);
else
row.add(" ",F_PRIORITA-FIRST_FIELD); row.add(" ",F_PRIORITA-FIRST_FIELD);
const TString& liv = livgiac(); const TString& liv = livgiac();
@ -856,11 +861,13 @@ const char *TMSP_constraint::um()
key.add("1"); key.add("1");
return cache().get(LF_UMART,key).get("UM"); return cache().get(LF_UMART,key).get("UM");
} }
void TMSP_constraint::add_rigaref(int buck, TString& codnum, int annodoc, long ndoc, int nrig, const char * um, const real & qta, const real &prz)
TMRP_docref* TMSP_constraint::add_rigaref(int buck, TString& codnum, int annodoc, long ndoc, int nrig, const char * um, const real & qta, const real &prz)
{ {
TMSP_record& b = _bucket_qta[buck]; TMSP_record& b = _bucket_qta[buck];
TMRP_docref *rdr= new TMRP_docref(annodoc, codnum, ndoc, nrig, um, qta,prz); TMRP_docref *rdr= new TMRP_docref(annodoc, codnum, ndoc, nrig, um, qta,prz);
b.add_rigaref(rdr); b.add_rigaref(rdr);
return rdr;
} }
void TMSP_constraint::add_rigaref(int buck, TMRP_docref *rdr) void TMSP_constraint::add_rigaref(int buck, TMRP_docref *rdr)
@ -877,13 +884,13 @@ void TMSP_constraint::remove_rigaref(int buck)
int TMSP_constraint::find_distinta_master(const TMSP_constraint & constr, TString & master,TString & livmaster,TString & um, real & expr, TString & imp,TString & lin,TString & magdep, int fromindex) int TMSP_constraint::find_distinta_master(const TMSP_constraint & constr, TString & master,TString & livmaster,TString & um, real & expr, TString & imp,TString & lin,TString & magdep, int fromindex)
{ {
TArray sons;
dist_tree().set_global("_LIVELLO",constr.livgiac()); dist_tree().set_global("_LIVELLO",constr.livgiac());
dist_tree().set_global("_IMPIANTO",constr.codimp()); dist_tree().set_global("_IMPIANTO",constr.codimp());
dist_tree().set_global("_LINEA",constr.codlin()); dist_tree().set_global("_LINEA",constr.codlin());
dist_tree().set_global("_MAGDEP",constr.codmagdep()); dist_tree().set_global("_MAGDEP",constr.codmagdep());
if (dist_tree().set_root(constr.articolo())) if (dist_tree().set_root(constr.articolo()))
{ {
TArray sons;
dist_tree().explode(sons, FALSE, RAGGR_EXP_NONE, 1, "AV"); dist_tree().explode(sons, FALSE, RAGGR_EXP_NONE, 1, "AV");
TRiga_esplosione* riga; TRiga_esplosione* riga;
while (riga=(TRiga_esplosione* )sons.objptr(fromindex)) while (riga=(TRiga_esplosione* )sons.objptr(fromindex))
@ -899,7 +906,7 @@ int TMSP_constraint::find_distinta_master(const TMSP_constraint & constr, TStrin
fromindex=sons.succ(fromindex); fromindex=sons.succ(fromindex);
} }
} }
master=""; master.cut(0);
return -1; return -1;
} }
@ -1076,14 +1083,14 @@ TMSP_constraint::TMSP_constraint(long cliente,
const TString& mag, const TString& mag,
const TString& magc) const TString& magc)
: _codclifor(cliente), _codart(codart), _livgiac(giac), : _codclifor(cliente), _codart(codart), _livgiac(giac),
_codimp(imp), _codlin(lin), _codmag(mag), _codmag_coll(magc),_on_sheet(FALSE),_check_master(FALSE), _upperlines(NULL), _lines2(NULL) _codimp(imp), _codlin(lin), _codmag(mag), _codmag_coll(magc),_on_sheet(FALSE),_check_master(FALSE), _upperlines(NULL), _lines2(NULL), _priority(0)
{ } { }
TMSP_constraint::TMSP_constraint(const TMSP_constraint & line) TMSP_constraint::TMSP_constraint(const TMSP_constraint & line)
: _codclifor(line.codclifor()), _codart(line.articolo()), _livgiac(line.livgiac()), : _codclifor(line.codclifor()), _codart(line.articolo()), _livgiac(line.livgiac()),
_codimp(line.codimp()), _codlin(line.codlin()), _codmag(line.codmagdep()), _codmag_coll(line.codmagdep_coll()), _codimp(line.codimp()), _codlin(line.codlin()), _codmag(line.codmagdep()), _codmag_coll(line.codmagdep_coll()),
_descr(line.description()), _on_sheet(FALSE), _check_master(FALSE), _upperlines(NULL), _lines2(NULL) _descr(line.description()), _on_sheet(FALSE), _check_master(FALSE), _upperlines(NULL), _lines2(NULL), _priority(0)
{ {
} }
@ -1472,7 +1479,7 @@ bool TLista_dettagli::bucket_handler(TMask_field & f, KEY key)
return TRUE; return TRUE;
} }
void TLista_dettagli::init(const char * title, TDate fromdate, int bucketsize) void TLista_dettagli::init(const char * title, const TDate& fromdate, int bucketsize)
{ {
_curr_bucket = -1; _curr_bucket = -1;
_from = fromdate; _from = fromdate;
@ -1484,7 +1491,7 @@ void TLista_dettagli::init(const char * title, TDate fromdate, int bucketsize)
add_string(FIRST_FIELD+3,0,TR("Settimana "),49,0,15,"D"); add_string(FIRST_FIELD+3,0,TR("Settimana "),49,0,15,"D");
} }
TLista_dettagli::TLista_dettagli(const char * title, TDate fromdate, int bucketsize, const char * head) : TLista_dettagli::TLista_dettagli(const char * title, const TDate& fromdate, int bucketsize, const char * head) :
TSheet(-1, 5, 80, 15, title, head,0,2) TSheet(-1, 5, 80, 15, title, head,0,2)
{ {
init(title, fromdate, bucketsize); init(title, fromdate, bucketsize);
@ -1493,26 +1500,21 @@ TLista_dettagli::TLista_dettagli(const char * title, TDate fromdate, int buckets
void TLista_docref::get_row(long r, TToken_string& row) void TLista_docref::get_row(long r, TToken_string& row)
{ {
row = ""; row.cut(0);
if (r < _line->rigarefs(curr_bucket())) if (r < _line->rigarefs(curr_bucket()))
{ {
TMRP_docref * rdr=_line->rigaref(curr_bucket(),(int)r); TMRP_docref * rdr=_line->rigaref(curr_bucket(),(int)r);
if (rdr) if (rdr)
{ {
TLocalisamfile & rdoc = _r->lfile(LF_RIGHEDOC); const TRectype& doc = rdr->get_doc();
TLocalisamfile & doc = _r->lfile(LF_DOC); const TRectype& rdoc = rdr->get_rdoc();
rdoc.put(RDOC_PROVV,"D");
rdoc.put(RDOC_ANNO,rdr->annodoc());
rdoc.put(RDOC_CODNUM,rdr->codnumdoc());
rdoc.put(RDOC_NDOC,rdr->numdoc());
rdoc.put(RDOC_NRIGA,rdr->numrig());
_r->read();
row.add(" "); row.add(" ");
row.add(rdr->annodoc()); row.add(rdr->annodoc());
row.add(rdr->codnumdoc()); row.add(rdr->codnumdoc());
row.add(rdr->numdoc()); row.add(rdr->numdoc());
row.add(rdr->numrig()); row.add(rdr->numrig());
TDate dc(rdoc.get_date(RDOC_DATACONS)); const TDate dc(rdoc.get(RDOC_DATACONS));
row.add(dc.ok() ? dc : doc.get_date(RDOC_DATACONS)); row.add(dc.ok() ? dc : doc.get_date(RDOC_DATACONS));
row.add(rdoc.get(RDOC_UMQTA)); row.add(rdoc.get(RDOC_UMQTA));
real q(rdoc.get_real(RDOC_QTA)); real q(rdoc.get_real(RDOC_QTA));
@ -1521,6 +1523,9 @@ void TLista_docref::get_row(long r, TToken_string& row)
row.add(q.string("#######@,@@@")); row.add(q.string("#######@,@@@"));
//const char statodef=cache().get("%TIP",doc.get(DOC_TIPODOC)).get("S2")[1]; //const char statodef=cache().get("%TIP",doc.get(DOC_TIPODOC)).get("S2")[1];
row.add(doc.get(DOC_STATO)); row.add(doc.get(DOC_STATO));
row.add(rdoc.get(RDOC_DAANNO));
row.add(rdoc.get(RDOC_DACODNUM));
row.add(rdoc.get(RDOC_DANDOC));
enable_row(r); enable_row(r);
} }
} }
@ -1569,9 +1574,9 @@ long TLista_docref::get_items(int b) const
} }
TLista_docref::TLista_docref(TMSP_constraint * l, const char * title, TDate fromdate, int bucketsize) : TLista_docref::TLista_docref(TMSP_constraint * l, const char * title, TDate fromdate, int bucketsize)
TLista_dettagli(title, fromdate, bucketsize, : TLista_dettagli(title, fromdate, bucketsize,
"@1|Anno|CodNum|Numero|Riga|Consegna@10|UM|Q.ta totale@12|Q.ta residua@12|Stato"), "@1|Anno|CodNum|Numero|Riga|Consegna@10|UM|Q.ta totale@12|Q.ta residua@12|Stato|Da Anno|Da CodNum|Da NDoc"),
_line (l) _line (l)
{ {
_r= new TRelation(LF_RIGHEDOC); _r= new TRelation(LF_RIGHEDOC);

28
mr/mr2201.h
View File

@ -1,13 +1,9 @@
#ifndef __MR2201_H #ifndef __MR2201_H
#define __MR2201_H #define __MR2201_H
#include <colors.h>
#include <defmask.h> #ifndef __SHEET_H
#include <progind.h>
#include <tabutil.h>
#include <xvtility.h>
#include <utility.h>
#include <printer.h>
#include <sheet.h> #include <sheet.h>
#endif
// funzioni di ricerca distinta master // funzioni di ricerca distinta master
bool distinta_master(const char *code, bool is_son=FALSE); bool distinta_master(const char *code, bool is_son=FALSE);
@ -186,13 +182,14 @@ class TMSP_constraint : public TSortable
long _codclifor; // cliente o fornitore long _codclifor; // cliente o fornitore
TCodice_articolo _codart; // articolo TCodice_articolo _codart; // articolo
TString16 _livgiac; // livelli di giacenza TString16 _livgiac; // livelli di giacenza
TString8 _codmag; // magazzino /deposito TString8 _codmag; // magazzino/deposito
TString8 _codmag_coll; // magazzino /deposito collegato TString8 _codmag_coll; // magazzino/deposito collegato
TString8 _codimp, _codlin; // codice impianto e linea TString8 _codimp, _codlin; // codici impianto e linea
TString _descr; // descrizione TString _descr; // descrizione
long _priority;
bool _on_sheet; // gia' sullo sheet bool _on_sheet; // gia' sullo sheet
bool _check_master; // anrticolo non master, controllare se esistono Master bool _check_master; // articolo non master, controllare se esistono Master
TArray *_lines2; // codici master per articoli NON master TArray *_lines2; // codici master per articoli NON master
TMSP_constraints *_upperlines; // vincoli dei codici di livello 1 per articoli master TMSP_constraints *_upperlines; // vincoli dei codici di livello 1 per articoli master
@ -224,7 +221,7 @@ public:
TMRP_docref * next_rigaref(int buck); TMRP_docref * next_rigaref(int buck);
int rigarefs(int buck); int rigarefs(int buck);
TMRP_docref* rigaref(int buck, int n); TMRP_docref* rigaref(int buck, int n);
void add_rigaref(int buck, TString& codnum, int annodoc, long ndoc, int nrig, const char * um, const real & qta, const real &prz); TMRP_docref* add_rigaref(int buck, TString& codnum, int annodoc, long ndoc, int nrig, const char * um, const real & qta, const real &prz);
void add_rigaref(int buck, TMRP_docref *rdr); void add_rigaref(int buck, TMRP_docref *rdr);
void remove_rigaref(int buck); void remove_rigaref(int buck);
// master sched. a due livelli: // master sched. a due livelli:
@ -253,6 +250,9 @@ public:
virtual real& qta(int b) { return _bucket_qta[b]._qta; } virtual real& qta(int b) { return _bucket_qta[b]._qta; }
virtual real& price(int b) { return _bucket_qta[b]._price; } virtual real& price(int b) { return _bucket_qta[b]._price; }
virtual long priority() const { return _priority; }
virtual void priority(long p) { _priority = p; }
virtual void fill_sheet_row(TToken_string& row, const TMask & m, bool codes_only=FALSE) ; virtual void fill_sheet_row(TToken_string& row, const TMask & m, bool codes_only=FALSE) ;
bool is_on_sheet() const { return _on_sheet; } bool is_on_sheet() const { return _on_sheet; }
@ -441,8 +441,8 @@ public:
bool reset_bucket_field(); bool reset_bucket_field();
int curr_bucket() const {return _curr_bucket;} int curr_bucket() const {return _curr_bucket;}
void set_bucket(int b); void set_bucket(int b);
void init(const char * title, TDate fromdate, int bucketsize); void init(const char * title, const TDate& fromdate, int bucketsize);
TLista_dettagli(const char * title, TDate fromdate, int bucketsize, const char * head); TLista_dettagli(const char * title, const TDate& fromdate, int bucketsize, const char * head);
~TLista_dettagli() {} ~TLista_dettagli() {}
}; };

4
mr/mr2202.cpp
View File

@ -1,3 +1,7 @@
#include <printer.h>
#include <progind.h>
#include <utility.h>
#include "mr2200.h" #include "mr2200.h"
#include "mr2200a.h" #include "mr2200a.h"
#include "mr2200b.h" #include "mr2200b.h"

240
mr/mrplib.cpp
View File

@ -18,14 +18,17 @@ TAssoc_array TMRP_time::_frate_indovino;
TMRP_calendar& TMRP_time::get_calendar(const char* codimp,const char* codlin) TMRP_calendar& TMRP_time::get_calendar(const char* codimp,const char* codlin)
{ {
TToken_string k; TToken_string k;
k.add(codimp); k = codimp; k.add(codlin);
k.add(codlin);
TMRP_calendar* cal = (TMRP_calendar*)_frate_indovino.objptr(k); TMRP_calendar* cal = (TMRP_calendar*)_frate_indovino.objptr(k);
if (cal == NULL) if (cal == NULL)
{ {
if (_frate_indovino.items() > 16) if (_frate_indovino.items() > 64) // troppi calendari fanno male alla salute...
_frate_indovino.destroy(); // troppi calendari fanno male alla salute... {
// _frate_indovino.destroy(); // Esagerato: cancella tutto
const THash_object* rnd = _frate_indovino.random_hash_object();
if (rnd != NULL)
_frate_indovino.remove(rnd->key()); // Cancella uno a caso
}
cal = new TMRP_calendar(codlin, codimp); cal = new TMRP_calendar(codlin, codimp);
_frate_indovino.add(k, cal); _frate_indovino.add(k, cal);
} }
@ -50,7 +53,7 @@ int TMRP_time::compare(const TSortable& s) const
TMRP_time& TMRP_time::add_time(int days, long hours,bool macchina) TMRP_time& TMRP_time::add_time(int days, long hours,bool macchina)
{ {
TMRP_calendar& cal = calendario(); const TMRP_calendar& cal = calendario();
if (days != 0) if (days != 0)
{ {
cal.next_working_day(_date, days); cal.next_working_day(_date, days);
@ -73,7 +76,7 @@ TMRP_time& TMRP_time::add_time(int days, long hours,bool macchina)
{ {
cal.prev_working_day(_date); cal.prev_working_day(_date);
hours += _hour; hours += _hour;
_hour = (macchina ? cal.add_oremacchina(junk, _date) : cal.add_oreuomo(junk,_date)); _hour = macchina ? cal.add_oremacchina(junk, _date) : cal.add_oreuomo(junk,_date);
} }
} }
else else
@ -153,7 +156,7 @@ long TMRP_array::sort()
TProgind* pi = NULL; TProgind* pi = NULL;
if (last >= 16) if (last >= 16)
pi = new TProgind(last, TR("Ordinamento"), FALSE, TRUE); pi = new TProgind(last, TR("Ordinamento"), false, true);
else else
begin_wait(); begin_wait();
@ -161,10 +164,10 @@ long TMRP_array::sort()
{ {
if (pi) pi->addstatus(1); if (pi) pi->addstatus(1);
TSortable* best = &find_obj(i); TSortable* best = &find_obj(i);
bool swapped = TRUE; bool swapped = true;
while (swapped) while (swapped)
{ {
swapped = FALSE; swapped = false;
for (long j = i+1; j <= last; j++) for (long j = i+1; j <= last; j++)
{ {
TSortable& other = find_obj(j); TSortable& other = find_obj(j);
@ -172,9 +175,9 @@ long TMRP_array::sort()
{ {
// swap(i, j); // swap(i, j);
// best = &other; // best = &other;
best = (TSortable*)_by_idx.remove(int(j), TRUE); best = (TSortable*)_by_idx.remove(int(j), true);
_by_idx.TArray::insert(best, int(i)); _by_idx.TArray::insert(best, int(i));
swapped = TRUE; swapped = true;
} }
} }
} }
@ -207,10 +210,10 @@ void TMRP_calendar::init_default()
// Inizializza i turni dei 5 giorni feriali a 1 // Inizializza i turni dei 5 giorni feriali a 1
// Inizializza i turni di sabato e domenica a 0 // Inizializza i turni di sabato e domenica a 0
// Inizializza i turni dei giorni festivi a 0 // Inizializza i turni dei giorni festivi a 0
_days = cfg.get(TR("Turni"), NULL, -1, "1111100011111000"); _days = cfg.get("Turni", NULL, -1, "1111100011111000");
// Inizializza la lista delle feste comandate tranne la Pasqua // Inizializza la lista delle feste comandate tranne la Pasqua
_holidays = cfg.get(TR("Feste"), NULL, -1, _holidays = cfg.get("Feste", NULL, -1,
"01-01|06-01|25-04|01-05|15-08|01-11|08-12|25-12|26-12"); "01-01|06-01|25-04|01-05|02-06|15-08|01-11|08-12|25-12|26-12");
TUnita_produttiva * up=NULL; TUnita_produttiva * up=NULL;
if (_codlin.not_empty()) if (_codlin.not_empty())
up=new TLinea_prod(_codlin); up=new TLinea_prod(_codlin);
@ -252,7 +255,7 @@ bool TMRP_calendar::is_holiday(const TDate& date) const
bool TMRP_calendar::is_red(const TDate& date) const bool TMRP_calendar::is_red(const TDate& date) const
{ {
if (date.wday() == 7) if (date.wday() == 7)
return TRUE; return true;
return is_holiday(date); return is_holiday(date);
} }
@ -353,19 +356,21 @@ int TMRP_calendar::remove_cal(const TString& code, char tipo) const
return NOERR; return NOERR;
} }
int TMRP_calendar::turni(const TDate& data, int& mini, int& maxi, bool as_is) int TMRP_calendar::turni(const TDate& data, int& mini, int& maxi, bool as_is) const
{ {
const int year = data.year(); const int year = data.year();
const int month = data.month(); const int month = data.month();
const int day = data.day(); const int day = data.day();
TString16 str; TString16 str;
TMRP_calendar& myself = (TMRP_calendar&)*this;
mini = maxi = -1; mini = maxi = -1;
if (_codlin.not_empty()) if (_codlin.not_empty())
{ {
str.format("%04d%02d", year, month); str.format("%04d%02d", year, month);
if (_exc_lin.objptr(str) == NULL) if (_exc_lin.objptr(str) == NULL)
read_cal(str, 'L'); myself.read_cal(str, 'L');
const TString& turn = (const TString&)_exc_lin[str]; const TString& turn = (const TString&)_exc_lin[str];
mini = turn[day-1] - '0'; mini = turn[day-1] - '0';
@ -378,7 +383,7 @@ int TMRP_calendar::turni(const TDate& data, int& mini, int& maxi, bool as_is)
{ {
str.format("%04d%02d", year, month); str.format("%04d%02d", year, month);
if (_exc_imp.objptr(str) == NULL) if (_exc_imp.objptr(str) == NULL)
read_cal(str, 'I'); myself.read_cal(str, 'I');
const TString& turn = (const TString&)_exc_imp[str]; const TString& turn = (const TString&)_exc_imp[str];
mini = turn[day-1] - '0'; mini = turn[day-1] - '0';
@ -389,7 +394,7 @@ int TMRP_calendar::turni(const TDate& data, int& mini, int& maxi, bool as_is)
} }
if (_days.empty()) if (_days.empty())
init_default(); myself.init_default();
// Controlla se e' festa // Controlla se e' festa
for (str = _holidays.get(0); str.not_empty(); str = _holidays.get()) for (str = _holidays.get(0); str.not_empty(); str = _holidays.get())
@ -498,7 +503,7 @@ int TMRP_calendar::set_turni(const TDate& data, int mini, int maxi)
return 0; return 0;
} }
int TMRP_calendar::add_oreuomo(real & var,const TDate& date, bool max) int TMRP_calendar::add_oreuomo(real & var,const TDate& date, bool max) const
{ {
long minuti = 0L; long minuti = 0L;
const int tm = max ? turni_max(date) : turni_min(date); const int tm = max ? turni_max(date) : turni_min(date);
@ -509,12 +514,12 @@ int TMRP_calendar::add_oreuomo(real & var,const TDate& date, bool max)
return ore; return ore;
} }
int TMRP_calendar::add_oreuomo_max(real & var,const TDate& date) int TMRP_calendar::add_oreuomo_max(real & var,const TDate& date) const
{ {
return add_oreuomo(var, date,TRUE); return add_oreuomo(var, date,true);
} }
int TMRP_calendar::add_oremacchina(real & var,const TDate& date, bool max) int TMRP_calendar::add_oremacchina(real & var,const TDate& date, bool max) const
{ {
const int tm = max ? turni_max(date) : turni_min(date); const int tm = max ? turni_max(date) : turni_min(date);
real minuti(ZERO); real minuti(ZERO);
@ -552,9 +557,9 @@ int TMRP_calendar::add_oremacchina(real & var,const TDate& date, bool max)
return int(minuti.integer()); return int(minuti.integer());
} }
int TMRP_calendar::add_oremacchina_max(real & var,const TDate& date) int TMRP_calendar::add_oremacchina_max(real & var,const TDate& date) const
{ {
return add_oremacchina(var, date,TRUE); return add_oremacchina(var, date, true);
} }
int TMRP_calendar::write() const int TMRP_calendar::write() const
@ -613,7 +618,7 @@ char TMRP_calendar::tipo() const
return 'S'; return 'S';
} }
TDate& TMRP_calendar::next_working_day(TDate& work, int gap) TDate& TMRP_calendar::next_working_day(TDate& work, int gap) const
{ {
const int delta = gap >= 0 ? +1 : -1; const int delta = gap >= 0 ? +1 : -1;
const int steps = gap >= 0 ? gap : -gap; const int steps = gap >= 0 ? gap : -gap;
@ -694,7 +699,9 @@ void TCalendar_win::handler(WINDOW win, EVENT* ep)
{ {
m.add_list(104, 0, TR("Turni minimi "), 1, 4, 8, "", "0|1|2|3|4|5|6|7|8", "Nessuno|1 turno|2 turni|3 turni|4 turni|5 turni|6 turni|7 turni|8 turni"); m.add_list(104, 0, TR("Turni minimi "), 1, 4, 8, "", "0|1|2|3|4|5|6|7|8", "Nessuno|1 turno|2 turni|3 turni|4 turni|5 turni|6 turni|7 turni|8 turni");
m.add_list(105, 0, TR("Turni massimi "), 1, 5, 8, "", "0|1|2|3|4|5|6|7|8", "Nessuno|1 turno|2 turni|3 turni|4 turni|5 turni|6 turni|7 turni|8 turni"); m.add_list(105, 0, TR("Turni massimi "), 1, 5, 8, "", "0|1|2|3|4|5|6|7|8", "Nessuno|1 turno|2 turni|3 turni|4 turni|5 turni|6 turni|7 turni|8 turni");
} else { }
else
{
m.add_list(104, 0, TR("Turni minimi "), 1, 4, 8, "", " |0|1|2|3|4|5|6|7|8", "Standard|Nessuno|1 turno|2 turni|3 turni|4 turni|5 turni|6 turni|7 turni|8 turni"); m.add_list(104, 0, TR("Turni minimi "), 1, 4, 8, "", " |0|1|2|3|4|5|6|7|8", "Standard|Nessuno|1 turno|2 turni|3 turni|4 turni|5 turni|6 turni|7 turni|8 turni");
m.add_list(105, 0, TR("Turni massimi "), 1, 5, 8, "", " |0|1|2|3|4|5|6|7|8", "Standard|Nessuno|1 turno|2 turni|3 turni|4 turni|5 turni|6 turni|7 turni|8 turni"); m.add_list(105, 0, TR("Turni massimi "), 1, 5, 8, "", " |0|1|2|3|4|5|6|7|8", "Standard|Nessuno|1 turno|2 turni|3 turni|4 turni|5 turni|6 turni|7 turni|8 turni");
} }
@ -709,7 +716,7 @@ void TCalendar_win::handler(WINDOW win, EVENT* ep)
m.set(102, itow(d.wday())); m.set(102, itow(d.wday()));
m.set(103, festa ? "X" : ""); m.set(103, festa ? "X" : "");
int mini, maxi; int mini, maxi;
_calendario->turni(d, mini, maxi, TRUE); _calendario->turni(d, mini, maxi, true);
m.set(104, mini); m.set(104, mini);
m.set(105, maxi); m.set(105, maxi);
_calendario->turni(d, mini, maxi, FALSE); _calendario->turni(d, mini, maxi, FALSE);
@ -764,7 +771,7 @@ void TCalendar_win::update()
bmp.draw(win(), x, y); bmp.draw(win(), x, y);
} }
_pixmap = TRUE; _pixmap = true;
TString16 str; TString16 str;
str << _anno; str << _anno;
@ -1057,12 +1064,12 @@ void TMRP_config::set_durata_turno(int i,int ore, int minuti)
void TMRP_config::set_inizio_turno(int i,int time) void TMRP_config::set_inizio_turno(int i,int time)
{ {
set("TINIZIO", time, "mr", TRUE, i); set("TINIZIO", time, "mr", true, i);
} }
void TMRP_config::set_durata_turno(int i,int time) void TMRP_config::set_durata_turno(int i,int time)
{ {
set("TDURATA", time, "mr", TRUE, i); set("TDURATA", time, "mr", true, i);
} }
//******** //********
@ -1352,7 +1359,7 @@ void find_price(const TString &tipocv, const TString &codcv, const TString &codc
{ {
static TCondizione_vendita *_condv =NULL; static TCondizione_vendita *_condv =NULL;
bool retry=TRUE; bool retry=true;
if (_condv == NULL) if (_condv == NULL)
_condv = new TCondizione_vendita(new TConfig (CONFIG_DITTA)); _condv = new TCondizione_vendita(new TConfig (CONFIG_DITTA));
@ -1380,4 +1387,171 @@ void find_price(const TString &tipocv, const TString &codcv, const TString &codc
} }
} }
void TProduzione::init()
{
add_file(LF_RRILPROD, "NRIGA");
}
TProduzione::TProduzione()
: TMultiple_rectype(LF_RILPROD)
{
init();
}
TProduzione::TProduzione(const TProduzione & d)
: TMultiple_rectype(LF_RILPROD)
{
init();
copy(d);
}
TProduzione::TProduzione(const char* codart, TDate datacons, int prog)
: TMultiple_rectype(LF_RILPROD)
{
init();
if (prog <= 0)
{
prog = 0;
set_key(*this, codart, datacons, prog);
}
else
read_art(codart, datacons, prog);
}
// Funzione statica utile a tutti gli utenti di LF_DOC e LF_RIGHEDOC
void TProduzione::set_key(TRectype& rec, const char* codart, TDate datacons, int prog)
{
CHECK(codart && *codart, "Codice articolo nullo");
CHECK(datacons.ok(), "Data di consegna non valida ");
rec.put("CODART", codart);
rec.put("DATA", datacons);
rec.put("PROG", prog);
}
bool TProduzione::renum()
{
TLocalisamfile f(LF_RILPROD);
TRectype& cmp = head();
int n = 0;
f.curr() = cmp;
f.put("PROG", 999);
const int err = f.read(_isgreat);
if (err != _isemptyfile)
{
if (err == NOERR)
f.prev();
if (f.get("CODART") == cmp.get("CODART") &&
f.get("DATA") == cmp.get_date("DATA"))
n = f.get_int("PROG");
}
cmp.put("PROG", n + 1);
return true;
}
int TProduzione::read_art(const char* codart, TDate datacons, int prog, word op, word lockop)
{
TLocalisamfile f(LF_RILPROD);
zero();
set_key(*this, codart, datacons, prog);
if (prog == 0)
{
TRectype& cmp = head();
f.curr() = cmp;
f.put("PROG", 999);
const int err = f.read(_isgreat);
if (err != _isemptyfile)
{
if (err == NOERR)
f.prev();
if (f.get("CODART") == cmp.get("CODART") &&
f.get("DATA") == cmp.get_date("DATA"))
cmp.put("PROG", f.get("PROG"));
else
return _iskeynotfound;
}
else
return _iskeynotfound;
}
return TMultiple_rectype::read(f, op, lockop);
}
int TProduzione::read_ordp(const char* codnum, int anno, char provv, long ndoc, int nriga, word op, word lockop)
{
TLocalisamfile f(LF_RILPROD);
f.setkey(4);
f.put("CODNUM", codnum);
f.put("ANNO", anno);
f.put("PROVV", "D");
f.put("NDOC", ndoc);
f.put("NRIGA", nriga);
int err = f.read();
head() = f.curr();
f.setkey(1);
if (err == NOERR)
err = TMultiple_rectype::read(f, op, lockop);
else
zero();
return err;
}
int TProduzione::read_bolp(const char* codnum, int anno, char provv, long ndoc, int nriga, word op, word lockop)
{
TLocalisamfile f(LF_RILPROD);
f.setkey(5);
f.put("CODNUM", codnum);
f.put("ANNO", anno);
f.put("PROVV", "D");
f.put("NDOC", ndoc);
f.put("NRIGA", nriga);
int err = f.read();
head() = f.curr();
f.setkey(1);
if (err == NOERR)
err = TMultiple_rectype::read(f, op, lockop);
else
zero();
return err;
}
void TProduzione::copy_data(TRectype& dst, const TRectype& src)
{
// Memorizza tutti i campi chiave
const TString codart = dst.get("CODART");
const TDate datacons = dst.get_date("DATA");
const int prog = dst.get_int("PROG");
const int nriga = dst.num() == LF_RRILPROD ? dst.get_int("NRIGA") : 0;
// Copia tutto il record
dst = src;
// Ripristina tutti i campi chiave
set_key(dst, codart, datacons, prog);
if (nriga > 0)
dst.put("NRIGA", nriga);
}
void TProduzione::copy_contents(const TProduzione& src)
{
copy_data(head(), src.head());
destroy_rows();
const int rows = src.rows();
for (int i = 1; i <= rows ; i++)
{
const TRectype & s = src.body()[i];
TRectype & r = new_row();
copy_data(r, s);
}
}

50
mr/mrplib.h
View File

@ -38,7 +38,7 @@ public:
long items() const { return _by_key.items(); } long items() const { return _by_key.items(); }
void destroy(); void destroy();
long sort(); long sort();
void add(TMRP_array &a, bool force=FALSE); void add(TMRP_array &a, bool force=false);
// I metodi add(), find() e operator[] devono essere dichiarati // I metodi add(), find() e operator[] devono essere dichiarati
// dalle classi derivate e ritornare i tipi giusti tramite cast // dalle classi derivate e ritornare i tipi giusti tramite cast
@ -64,7 +64,7 @@ class TMRP_calendar : public TObject
int _persturno[8]; int _persturno[8];
TAssoc_array _exc_imp, _exc_lin; TAssoc_array _exc_imp, _exc_lin;
TString16 _codimp, _codlin; TString8 _codimp, _codlin;
protected: protected:
void init_default(); void init_default();
@ -73,23 +73,23 @@ protected:
int remove_cal(const TString& code, char tipo) const; int remove_cal(const TString& code, char tipo) const;
public: public:
int turni(const TDate& date, int& mini, int& maxi, bool as_is = FALSE); int turni(const TDate& date, int& mini, int& maxi, bool as_is = false) const;
int turni_min(const TDate& date) int turni_min(const TDate& date) const
{ int mini, maxi; turni(date, mini, maxi); return mini; } { int mini, maxi; turni(date, mini, maxi); return mini; }
int turni_max(const TDate& date) int turni_max(const TDate& date) const
{ int mini, maxi; turni(date, mini, maxi); return maxi; } { int mini, maxi; turni(date, mini, maxi); return maxi; }
// ore minime e massime ad una certa data // ore minime e massime ad una certa data
int add_oremacchina(real & var,const TDate& date, bool max=FALSE); int add_oremacchina(real & var,const TDate& date, bool max=false) const;
int add_oremacchina_max(real & var,const TDate& date); int add_oremacchina_max(real & var,const TDate& date) const;
int add_oreuomo(real & var,const TDate& date, bool max=FALSE); int add_oreuomo(real & var,const TDate& date, bool max=false) const;
int add_oreuomo_max(real & var,const TDate& date); int add_oreuomo_max(real & var,const TDate& date) const;
TDate& next_working_day(TDate& from, int gap = 1); TDate& next_working_day(TDate& from, int gap = 1) const;
TDate& prev_working_day(TDate& from, int gap = 1) TDate& prev_working_day(TDate& from, int gap = 1) const
{ return next_working_day(from, -gap); } { return next_working_day(from, -gap); }
int set_turni(const TDate& date, int mini, int maxi); int set_turni(const TDate& date, int mini, int maxi);
@ -173,7 +173,6 @@ public:
void set(const TDate& d, int h, const char* imp, const char* lin); void set(const TDate& d, int h, const char* imp, const char* lin);
TMRP_time& operator=(const TMRP_time& t) { copy(t); return *this; } TMRP_time& operator=(const TMRP_time& t) { copy(t); return *this; }
TMRP_time(); TMRP_time();
TMRP_time(const TDate& d, int h, const char* imp, const char* lin); TMRP_time(const TDate& d, int h, const char* imp, const char* lin);
TMRP_time(const TMRP_time& t) { copy(t); } TMRP_time(const TMRP_time& t) { copy(t); }
@ -302,4 +301,31 @@ TLinea_prod* get_linea(const char * codice);
void find_price(const TString &tipocv, const TString &codcv, const TString &codcatven, void find_price(const TString &tipocv, const TString &codcv, const TString &codcatven,
const char * tipocf, long codcf, const char * codice, const real & qta, real & price); const char * tipocf, long codcf, const char * codice, const real & qta, real & price);
class TProduzione : public TMultiple_rectype
{
protected:
void init();
virtual TProduzione & copy(const TProduzione & d) { return (TProduzione &) TMultiple_rectype::operator=((TMultiple_rectype &)d);}
virtual TObject* dup() const { return new TProduzione(*this); }
virtual bool renum();
virtual bool key_complete() { return head().get_int("PROG") != 0; }
public:
virtual TProduzione & operator =(const TProduzione & d) {return copy(d);}
static void set_key(TRectype& rec, const char* codart, TDate datacons, int prog);
static void copy_data(TRectype & dst, const TRectype & src);
static void copy_row(TRectype & dst, const TRectype & src) { copy_data((TRectype&)dst, (const TRectype&)src);}
void copy_contents(const TProduzione & src);
int read_art(const char* codart, TDate datacons, int prog, word op = _isequal, word lockop = _nolock);
int read_ordp(const char* codnum, int anno, char provv, long ndoc, int nriga, word op = _isequal, word lockop = _nolock);
int read_bolp(const char* codnum, int anno, char provv, long ndoc, int nriga, word op = _isequal, word lockop = _nolock);
TProduzione();
TProduzione(const TProduzione & d);
TProduzione(const char* codart, TDate datacons, int prog = 0);
virtual ~TProduzione() {}
};
#endif #endif

6
projects/agalib.dsp
View File

@ -45,7 +45,7 @@ AgaLib=link.exe -lib
# ADD BASE AgaLib /nologo # ADD BASE AgaLib /nologo
# ADD AgaLib /nologo # ADD AgaLib /nologo
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /O2 /I "..\xvaga" /I "..\xi" /I "..\include" /I "..\gfm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "CB6" /YX /FD /c # ADD CPP /nologo /MT /W3 /O2 /I "..\xvaga" /I "..\xi" /I "..\include" /I "..\gfm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "CB6" /FR /YX /FD /c
# ADD BASE RSC /l 0x410 # ADD BASE RSC /l 0x410
# ADD RSC /l 0x410 # ADD RSC /l 0x410
BSC32=bscmake.exe BSC32=bscmake.exe
@ -539,6 +539,10 @@ SOURCE=..\include\sheet.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\smartcard.h
# End Source File
# Begin Source File
SOURCE=..\include\sort.h SOURCE=..\include\sort.h
# End Source File # End Source File
# Begin Source File # Begin Source File

1062
projects/cg0.dsp
View File

File diff suppressed because it is too large Load Diff

2
projects/cg3.dsp
View File

@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c # ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FR /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

27
projects/cg5.dsp
View File

@ -740,6 +740,33 @@ InputName=cg5800a
# Begin Source File # Begin Source File
SOURCE=..\cg\cg5800ra.rep SOURCE=..\cg\cg5800ra.rep
!IF "$(CFG)" == "cg5 - Win32 Release"
# Begin Custom Build - Copying rep $(InputPath)...
TargetDir=D:\Release\Campo22
InputPath=..\cg\cg5800ra.rep
InputName=cg5800ra
"$(TargetDir)\$(InputName).rep" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)
# End Custom Build
!ELSEIF "$(CFG)" == "cg5 - Win32 Debug"
# Begin Custom Build - Copying rep $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
InputPath=..\cg\cg5800ra.rep
InputName=cg5800ra
"$(TargetDir)\$(InputName).rep" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)
# End Custom Build
!ENDIF
# End Source File # End Source File
# End Group # End Group
# Begin Source File # Begin Source File

44
projects/li.dsw Executable file
View File

@ -0,0 +1,44 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "AgaLib"=.\AgaLib.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "li0"=.\li0.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name AgaLib
End Project Dependency
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

463
projects/li0.dsp Executable file
View File

@ -0,0 +1,463 @@
# Microsoft Developer Studio Project File - Name="li0" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=li0 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "li0.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "li0.mak" CFG="li0 - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "li0 - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "li0 - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "li0 - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\release"
# PROP Intermediate_Dir "..\release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x410 /d "NDEBUG"
# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/li0.exe"
# SUBTRACT LINK32 /map /debug /nodefaultlib
!ELSEIF "$(CFG)" == "li0 - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\debug"
# PROP Intermediate_Dir "..\debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x410 /d "_DEBUG"
# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\exed\li0.exe" /pdbtype:sept
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
# Begin Target
# Name "li0 - Win32 Release"
# Name "li0 - Win32 Debug"
# Begin Group "Sources"
# PROP Default_Filter "cpp"
# Begin Source File
SOURCE=..\li\li0.cpp
# End Source File
# Begin Source File
SOURCE=..\li\li0400.cpp
# End Source File
# Begin Source File
SOURCE=..\li\li0500.cpp
# End Source File
# Begin Source File
SOURCE=..\li\li0600.cpp
# End Source File
# End Group
# Begin Group "Masks"
# PROP Default_Filter "uml"
# Begin Source File
SOURCE=..\li\li0400a.uml
!IF "$(CFG)" == "li0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\li\li0400a.uml
InputName=li0400a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "li0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\li\li0400a.uml
InputName=li0400a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\li\li0500a.uml
!IF "$(CFG)" == "li0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\li\li0500a.uml
InputName=li0500a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "li0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\li\li0500a.uml
InputName=li0500a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\li\li0500b.uml
!IF "$(CFG)" == "li0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\li\li0500b.uml
InputName=li0500b
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "li0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\li\li0500b.uml
InputName=li0500b
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\li\li0600a.uml
!IF "$(CFG)" == "li0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\li\li0600a.uml
InputName=li0600a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "li0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\li\li0600a.uml
InputName=li0600a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\li\li0600b.uml
!IF "$(CFG)" == "li0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\li\li0600b.uml
InputName=li0600b
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "li0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\li\li0600b.uml
InputName=li0600b
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Headers"
# PROP Default_Filter "h"
# Begin Source File
SOURCE=..\li\letint.h
# End Source File
# Begin Source File
SOURCE=..\li\li0.h
# End Source File
# Begin Source File
SOURCE=..\li\li0400a.h
# End Source File
# Begin Source File
SOURCE=..\li\li0500a.h
# End Source File
# Begin Source File
SOURCE=..\li\li0500b.h
# End Source File
# Begin Source File
SOURCE=..\li\li0600a.h
# End Source File
# Begin Source File
SOURCE=..\li\li0600b.h
# End Source File
# End Group
# Begin Group "Trrs"
# PROP Default_Filter "trr"
# Begin Source File
SOURCE=..\li\f154.trr
!IF "$(CFG)" == "li0 - Win32 Release"
# Begin Custom Build - Copying trr $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\li\f154.trr
InputName=f154
"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr
# End Custom Build
!ELSEIF "$(CFG)" == "li0 - Win32 Debug"
# Begin Custom Build - Copying trr $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\li\f154.trr
InputName=f154
"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Dirs"
# PROP Default_Filter "dir"
# Begin Source File
SOURCE=..\li\f154.dir
!IF "$(CFG)" == "li0 - Win32 Release"
# Begin Custom Build - Copying dir $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\li\f154.dir
InputName=f154
"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir
# End Custom Build
!ELSEIF "$(CFG)" == "li0 - Win32 Debug"
# Begin Custom Build - Copying dir $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\li\f154.dir
InputName=f154
"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Reports"
# PROP Default_Filter "rep"
# Begin Source File
SOURCE=..\li\li0500a.rep
!IF "$(CFG)" == "li0 - Win32 Release"
# Begin Custom Build - Copying report $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\li\li0500a.rep
InputName=li0500a
"$(TargetDir)\$(InputName).rep" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\$(InputName).rep
# End Custom Build
!ELSEIF "$(CFG)" == "li0 - Win32 Debug"
# Begin Custom Build - Copying report $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\li\li0500a.rep
InputName=li0500a
"$(TargetDir)\$(InputName).rep" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\$(InputName).rep
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Ini"
# PROP Default_Filter "ini"
# Begin Source File
SOURCE=..\li\li0600a.ini
!IF "$(CFG)" == "li0 - Win32 Release"
# Begin Custom Build - Copying ini $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\li\li0600a.ini
InputName=li0600a
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ELSEIF "$(CFG)" == "li0 - Win32 Debug"
# Begin Custom Build - Copying ini $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\li\li0600a.ini
InputName=li0600a
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Source File
SOURCE=.\li0.rc
!IF "$(CFG)" == "li0 - Win32 Release"
# ADD BASE RSC /l 0x410
# ADD RSC /l 0x410
!ELSEIF "$(CFG)" == "li0 - Win32 Debug"
# ADD BASE RSC /l 0x410
# ADD RSC /l 0x410 /fo"..\Debug/li0.res"
!ENDIF
# End Source File
# End Target
# End Project

0
projects/scp0.rc → projects/li0.rc
View File

316
projects/mr0.dsp
View File

@ -96,10 +96,22 @@ LINK32=link.exe
# PROP Default_Filter "cpp" # PROP Default_Filter "cpp"
# Begin Source File # Begin Source File
SOURCE=..\cg\cg2103.cpp
# End Source File
# Begin Source File
SOURCE=..\cg\cglib01.cpp SOURCE=..\cg\cglib01.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\cg\cgpagame.cpp
# End Source File
# Begin Source File
SOURCE=..\ve\clifor.cpp
# End Source File
# Begin Source File
SOURCE=..\db\dblib.cpp SOURCE=..\db\dblib.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -134,6 +146,46 @@ SOURCE=..\mr\mr0500.cpp
SOURCE=..\mr\mrplib.cpp SOURCE=..\mr\mrplib.cpp
# End Source File # End Source File
# Begin Source File
SOURCE=..\pr\prlib01.cpp
# End Source File
# Begin Source File
SOURCE=..\ve\sconti.cpp
# End Source File
# Begin Source File
SOURCE=..\sv\svlib01.cpp
# End Source File
# Begin Source File
SOURCE=..\sv\svlib09.cpp
# End Source File
# Begin Source File
SOURCE=..\ve\velib01.cpp
# End Source File
# Begin Source File
SOURCE=..\ve\velib02.cpp
# End Source File
# Begin Source File
SOURCE=..\ve\velib03.cpp
# End Source File
# Begin Source File
SOURCE=..\ve\velib03a.cpp
# End Source File
# Begin Source File
SOURCE=..\ve\velib04.cpp
# End Source File
# Begin Source File
SOURCE=..\ve\velib04e.cpp
# End Source File
# End Group # End Group
# Begin Group "Masks" # Begin Group "Masks"
@ -202,6 +254,68 @@ InputName=mr0500a
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\mr\mr0500b.uml
!IF "$(CFG)" == "mr0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
InputPath=..\mr\mr0500b.uml
InputName=mr0500b
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "mr0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
InputPath=..\mr\mr0500b.uml
InputName=mr0500b
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\mr\mr0500c.uml
!IF "$(CFG)" == "mr0 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22
InputPath=..\mr\mr0500c.uml
InputName=mr0500c
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "mr0 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
InputPath=..\mr\mr0500c.uml
InputName=mr0500c
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\mr\mrtbfia.uml SOURCE=..\mr\mrtbfia.uml
!IF "$(CFG)" == "mr0 - Win32 Release" !IF "$(CFG)" == "mr0 - Win32 Release"
@ -311,6 +425,14 @@ SOURCE=..\mr\mr0500a.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\mr\mr0500b.h
# End Source File
# Begin Source File
SOURCE=..\mr\mr0500c.h
# End Source File
# Begin Source File
SOURCE=..\mr\mrplib.h SOURCE=..\mr\mrplib.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -324,6 +446,200 @@ SOURCE=..\mr\mrtbimp.h
# Begin Source File # Begin Source File
SOURCE=..\mr\mrtblnp.h SOURCE=..\mr\mrtblnp.h
# End Source File
# End Group
# Begin Group "Trr"
# PROP Default_Filter "trr"
# Begin Source File
SOURCE=..\mr\f132.trr
!IF "$(CFG)" == "mr0 - Win32 Release"
# Begin Custom Build - Copying trr $(InputPath)...
TargetDir=D:\Release\Campo22
InputPath=..\mr\f132.trr
InputName=f132
"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr
# End Custom Build
!ELSEIF "$(CFG)" == "mr0 - Win32 Debug"
# Begin Custom Build - Copying trr $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
InputPath=..\mr\f132.trr
InputName=f132
"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\mr\f152.trr
!IF "$(CFG)" == "mr0 - Win32 Release"
# Begin Custom Build - Copying trr $(InputPath)...
TargetDir=D:\Release\Campo22
InputPath=..\mr\f152.trr
InputName=f152
"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr
# End Custom Build
!ELSEIF "$(CFG)" == "mr0 - Win32 Debug"
# Begin Custom Build - Copying trr $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
InputPath=..\mr\f152.trr
InputName=f152
"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\mr\f153.trr
!IF "$(CFG)" == "mr0 - Win32 Release"
# Begin Custom Build - Copying trr $(InputPath)...
TargetDir=D:\Release\Campo22
InputPath=..\mr\f153.trr
InputName=f153
"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr
# End Custom Build
!ELSEIF "$(CFG)" == "mr0 - Win32 Debug"
# Begin Custom Build - Copying trr $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
InputPath=..\mr\f153.trr
InputName=f153
"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Dir"
# PROP Default_Filter "dir"
# Begin Source File
SOURCE=..\mr\f132.dir
!IF "$(CFG)" == "mr0 - Win32 Release"
# Begin Custom Build - Copying dir $(InputPath)...
TargetDir=D:\Release\Campo22
InputPath=..\mr\f132.dir
InputName=f132
"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir
# End Custom Build
!ELSEIF "$(CFG)" == "mr0 - Win32 Debug"
# Begin Custom Build - Copying dir $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
InputPath=..\mr\f132.dir
InputName=f132
"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\mr\f152.dir
!IF "$(CFG)" == "mr0 - Win32 Release"
# Begin Custom Build - Copying dir $(InputPath)...
TargetDir=D:\Release\Campo22
InputPath=..\mr\f152.dir
InputName=f152
"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir
# End Custom Build
!ELSEIF "$(CFG)" == "mr0 - Win32 Debug"
# Begin Custom Build - Copying dir $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
InputPath=..\mr\f152.dir
InputName=f152
"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\mr\f153.dir
!IF "$(CFG)" == "mr0 - Win32 Release"
# Begin Custom Build - Copying dir $(InputPath)...
TargetDir=D:\Release\Campo22
InputPath=..\mr\f153.dir
InputName=f153
"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir
# End Custom Build
!ELSEIF "$(CFG)" == "mr0 - Win32 Debug"
# Begin Custom Build - Copying dir $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed
InputPath=..\mr\f153.dir
InputName=f153
"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir
# End Custom Build
!ENDIF
# End Source File # End Source File
# End Group # End Group
# Begin Source File # Begin Source File

10
projects/mr1.dsp
View File

@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /D "__LONGDOUBLE__" /FR /FD /c # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /FR /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@ -217,6 +217,14 @@ InputName=mr1100a
# Begin Group "Headers" # Begin Group "Headers"
# PROP Default_Filter "h" # PROP Default_Filter "h"
# Begin Source File
SOURCE=..\mr\mr1.h
# End Source File
# Begin Source File
SOURCE=..\mr\mr1100a.h
# End Source File
# End Group # End Group
# Begin Group "Forms" # Begin Group "Forms"

69
projects/Scp0.dsp → projects/pd1890.dsp
View File

@ -1,24 +1,24 @@
# Microsoft Developer Studio Project File - Name="scp0" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="pd1890" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101 # TARGTYPE "Win32 (x86) Application" 0x0101
CFG=scp0 - Win32 Debug CFG=pd1890 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "Scp0.mak". !MESSAGE NMAKE /f "pd1890.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "Scp0.mak" CFG="scp0 - Win32 Debug" !MESSAGE NMAKE /f "pd1890.mak" CFG="pd1890 - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "scp0 - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "pd1890 - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "scp0 - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "pd1890 - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
@ -29,7 +29,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "scp0 - Win32 Release" !IF "$(CFG)" == "pd1890 - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
@ -54,10 +54,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo22/scp0.exe" # ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/pd1890.exe"
# SUBTRACT LINK32 /map /debug /nodefaultlib # SUBTRACT LINK32 /map /debug /nodefaultlib
!ELSEIF "$(CFG)" == "scp0 - Win32 Debug" !ELSEIF "$(CFG)" == "pd1890 - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
@ -82,15 +82,15 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\exed\scp0.exe" /pdbtype:sept # ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\exed\pd1890.exe" /pdbtype:sept
# SUBTRACT LINK32 /nodefaultlib # SUBTRACT LINK32 /nodefaultlib
!ENDIF !ENDIF
# Begin Target # Begin Target
# Name "scp0 - Win32 Release" # Name "pd1890 - Win32 Release"
# Name "scp0 - Win32 Debug" # Name "pd1890 - Win32 Debug"
# Begin Group "Sources" # Begin Group "Sources"
# PROP Default_Filter "cpp" # PROP Default_Filter "cpp"
@ -108,11 +108,11 @@ SOURCE=..\cg\cgsaldac.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\sc\scp0.cpp SOURCE=..\ps\pd1890.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\sc\scp0100.cpp SOURCE=..\ps\pd1890100.cpp
# End Source File # End Source File
# End Group # End Group
# Begin Group "Masks" # Begin Group "Masks"
@ -120,26 +120,26 @@ SOURCE=..\sc\scp0100.cpp
# PROP Default_Filter "uml" # PROP Default_Filter "uml"
# Begin Source File # Begin Source File
SOURCE=..\sc\scp0100a.uml SOURCE=..\ps\pd1890100a.uml
!IF "$(CFG)" == "scp0 - Win32 Release" !IF "$(CFG)" == "pd1890 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)... # Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo22 TargetDir=D:\Release\Campo21
InputPath=..\sc\scp0100a.uml InputPath=..\ps\pd1890100a.uml
InputName=scp0100a InputName=pd1890100a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build # End Custom Build
!ELSEIF "$(CFG)" == "scp0 - Win32 Debug" !ELSEIF "$(CFG)" == "pd1890 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)... # Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\R_02_02\exed TargetDir=\U\Luca\D_02_01\exed
InputPath=..\sc\scp0100a.uml InputPath=..\ps\pd1890100a.uml
InputName=scp0100a InputName=pd1890100a
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk msk32 $(InputPath) $(TargetDir)\$(InputName).msk
@ -153,10 +153,31 @@ InputName=scp0100a
# Begin Group "Headers" # Begin Group "Headers"
# PROP Default_Filter "h" # PROP Default_Filter "h"
# Begin Source File
SOURCE=..\ps\pd1890.h
# End Source File
# Begin Source File
SOURCE=..\ps\pd1890100.h
# End Source File
# End Group # End Group
# Begin Source File # Begin Source File
SOURCE=.\scp0.rc SOURCE=.\pd1890.rc
!IF "$(CFG)" == "pd1890 - Win32 Release"
# ADD BASE RSC /l 0x410
# ADD RSC /l 0x410
!ELSEIF "$(CFG)" == "pd1890 - Win32 Debug"
# ADD BASE RSC /l 0x410
# ADD RSC /l 0x410 /fo"..\Debug/pd1890.res"
!ENDIF
# End Source File # End Source File
# End Target # End Target
# End Project # End Project

4
projects/pd1890.rc Executable file
View File

@ -0,0 +1,4 @@
"9012" ICON DISCARDABLE "../exed/res/exe.ico"
rcinclude ../../wx240/include/wx/msw/wx.rc

179
projects/pd6030.dsp Executable file
View File

@ -0,0 +1,179 @@
# Microsoft Developer Studio Project File - Name="pd6030" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=pd6030 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "pd6030.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "pd6030.mak" CFG="pd6030 - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "pd6030 - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "pd6030 - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "pd6030 - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\release"
# PROP Intermediate_Dir "..\release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x410 /d "NDEBUG"
# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/pd6030.exe"
# SUBTRACT LINK32 /map /debug /nodefaultlib
!ELSEIF "$(CFG)" == "pd6030 - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\debug"
# PROP Intermediate_Dir "..\debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x410 /d "_DEBUG"
# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\exed\pd6030.exe" /pdbtype:sept
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
# Begin Target
# Name "pd6030 - Win32 Release"
# Name "pd6030 - Win32 Debug"
# Begin Group "Sources"
# PROP Default_Filter "cpp"
# Begin Source File
SOURCE=..\ps\pd6030.cpp
# End Source File
# Begin Source File
SOURCE=..\ps\pd6030100.cpp
# End Source File
# End Group
# Begin Group "Masks"
# PROP Default_Filter "uml"
# Begin Source File
SOURCE=..\ps\pd6030100.uml
!IF "$(CFG)" == "pd6030 - Win32 Release"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\ps\pd6030100.uml
InputName=pd6030100
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ELSEIF "$(CFG)" == "pd6030 - Win32 Debug"
# Begin Custom Build - Compiling mask $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ps\pd6030100.uml
InputName=pd6030100
"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
msk32 $(InputPath) $(TargetDir)\$(InputName).msk
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Headers"
# PROP Default_Filter "h"
# Begin Source File
SOURCE=..\ps\pd6030.h
# End Source File
# Begin Source File
SOURCE=..\ps\pd6030100.h
# End Source File
# End Group
# Begin Group "Reports"
# PROP Default_Filter "rep"
# Begin Source File
SOURCE=..\ps\pd6030100a.rep
# End Source File
# End Group
# Begin Source File
SOURCE=.\pd6030.rc
!IF "$(CFG)" == "pd6030 - Win32 Release"
# ADD BASE RSC /l 0x410
# ADD RSC /l 0x410
!ELSEIF "$(CFG)" == "pd6030 - Win32 Debug"
# ADD BASE RSC /l 0x410
# ADD RSC /l 0x410 /fo"..\Debug/pd6030.res"
!ENDIF
# End Source File
# End Target
# End Project

4
projects/pd6030.rc Executable file
View File

@ -0,0 +1,4 @@
"9012" ICON DISCARDABLE "../exed/res/exe.ico"
rcinclude ../../wx240/include/wx/msw/wx.rc

30
projects/ps.dsw
View File

@ -30,6 +30,36 @@ Package=<4>
############################################################################### ###############################################################################
Project: "pd1890"=.\pd1890.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name AgaLib
End Project Dependency
}}}
###############################################################################
Project: "pd6030"=.\pd6030.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name AgaLib
End Project Dependency
}}}
###############################################################################
Project: "ps"=.\ps.dsp - Package Owner=<4> Project: "ps"=.\ps.dsp - Package Owner=<4>
Package=<5> Package=<5>

97
projects/ve7.dsp
View File

@ -533,6 +533,103 @@ InputName=ve7300a
!ENDIF !ENDIF
# End Source File
# End Group
# Begin Group "Ini"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\ve\mainardi.ini
!IF "$(CFG)" == "ve7 - Win32 Release"
# Begin Custom Build - Copying ini $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\ve\mainardi.ini
InputName=mainardi
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ELSEIF "$(CFG)" == "ve7 - Win32 Debug"
# Begin Custom Build - Copying ini $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ve\mainardi.ini
InputName=mainardi
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\ve\ve7500m.ini
!IF "$(CFG)" == "ve7 - Win32 Release"
# Begin Custom Build - Copying ini $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\ve\ve7500m.ini
InputName=ve7500m
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ELSEIF "$(CFG)" == "ve7 - Win32 Debug"
# Begin Custom Build - Copying ini $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ve\ve7500m.ini
InputName=ve7500m
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\ve\ve7500p.ini
!IF "$(CFG)" == "ve7 - Win32 Release"
# Begin Custom Build - Copying ini $(InputPath)...
TargetDir=D:\Release\Campo21
InputPath=..\ve\ve7500p.ini
InputName=ve7500p
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ELSEIF "$(CFG)" == "ve7 - Win32 Debug"
# Begin Custom Build - Copying ini $(InputPath)...
TargetDir=\U\Luca\D_02_01\exed
InputPath=..\ve\ve7500p.ini
InputName=ve7500p
"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) $(TargetDir)\$(InputName).ini
# End Custom Build
!ENDIF
# End Source File # End Source File
# End Group # End Group
# Begin Source File # Begin Source File

Some files were not shown because too many files have changed in this diff Show More