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

Patch level :10.0

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


git-svn-id: svn://10.65.10.50/trunk@20616 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2010-06-22 13:25:41 +00:00
parent 3ed307ec7d
commit d63de600f5
5 changed files with 47 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mg/mg4200.cpp
View File

@ -308,13 +308,6 @@ TStampainv_mask::TStampainv_mask()
show(F_DAUSR); show(F_AUSR);
}
if (!IsPeppeOk()) // Rimuovere quand'e' ora, non prima
{
hide(F_FORNITORE);
hide(F_DASTAGIONE);
hide(F_ASTAGIONE);
}
set_handler(F_TOLIVELLOART, handle_liv);
set_handler(F_TOLIVELLOGIAC, handle_liv);
set_handler(F_ORDINE, handle_ragg);

16
mr/mr0500.cpp
View File

@ -169,20 +169,20 @@ bool TRilprod_mask::on_field_event(TOperable_field& o, TField_event e, long joll
{
TToken_string & r = sh.row(i);
qta += (real)r.get(sh.cid2index(FR_QTA));
scarto += (real)r.get(sh.cid2index(FR_SCARTO));
qta += (real)r.get(sh.cid2index(FS_QTA));
scarto += (real)r.get(sh.cid2index(FS_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 :
case FS_ORAINI :
case FS_MININI :
case FS_SECINI :
case FS_ORAFIN :
case FS_MINFIN :
case FS_SECFIN :
if (e == fe_modify || e == fe_close)
{
//i campi ore/min/sec vanno zero filled

26
mr/mr0500a.h
View File

@ -36,16 +36,16 @@
#define F_TEMPI 246
#define H_PROG 247
#define FR_DATAINI 101
#define FR_ORAINI 102
#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
#define FR_OPERATORE 111
#define FR_COGNOME 112
#define FR_NOME 113
#define FS_DATAINI 101
#define FS_ORAINI 102
#define FS_MININI 103
#define FS_SECINI 104
#define FS_DATAFIN 105
#define FS_ORAFIN 106
#define FS_MINFIN 107
#define FS_SECFIN 108
#define FS_QTA 109
#define FS_SCARTO 110
#define FS_OPERATORE 111
#define FS_COGNOME 112
#define FS_NOME 113

42
mr/mr0500a.uml
View File

@ -441,13 +441,13 @@ BEGIN
PROMPT 1 2 "@bInizio produzione"
END
DATA FR_DATAINI
DATA FS_DATAINI
BEGIN
PROMPT 2 3 "Data "
CHECKTYPE REQUIRED
END
STRING FR_ORAINI 2
STRING FS_ORAINI 2
BEGIN
PROMPT 22 3 "Ora "
FLAGS "U"
@ -455,14 +455,14 @@ BEGIN
FIELD ORAPROD[1,2]
END
STRING FR_MININI 2
STRING FS_MININI 2
BEGIN
PROMPT 29 3 ":"
NUM_EXPR #F_MININI<60
FIELD ORAPROD[3,4]
END
STRING FR_SECINI 2
STRING FS_SECINI 2
BEGIN
PROMPT 33 3 ":"
NUM_EXPR #F_SECINI<60
@ -474,77 +474,77 @@ BEGIN
PROMPT 41 2 "@bFine produzione"
END
DATA FR_DATAFIN
DATA FS_DATAFIN
BEGIN
PROMPT 42 3 "Data "
FIELD DATAFINE
END
STRING FR_ORAFIN 2
STRING FS_ORAFIN 2
BEGIN
PROMPT 62 3 "Ora "
NUM_EXPR #F_ORAFIN<24
FIELD ORAFINE[1,2]
END
STRING FR_MINFIN 2
STRING FS_MINFIN 2
BEGIN
PROMPT 69 3 ":"
NUM_EXPR #F_MINFIN<60
FIELD ORAFINE[3,4]
END
STRING FR_SECFIN 2
STRING FS_SECFIN 2
BEGIN
PROMPT 73 3 ":"
NUM_EXPR #F_SECFIN<60
FIELD ORAFINE[5,6]
END
NUMBER FR_QTA 15 5
NUMBER FS_QTA 15 5
BEGIN
PROMPT 1 5 "Quantita' prodotta "
FIELD QTA
END
NUMBER FR_SCARTO 15 5
NUMBER FS_SCARTO 15 5
BEGIN
PROMPT 1 7 "Scarto di produz. "
FIELD SCARTO
END
STRING FR_OPERATORE 16
STRING FS_OPERATORE 16
BEGIN
PROMPT 1 9 "Operatore "
USE DIP
INPUT CODTAB FR_OPERATORE
INPUT CODTAB FS_OPERATORE
DISPLAY "Codice" CODTAB
DISPLAY "Cognome@40" S0[1,40]
DISPLAY "Nome@30" S0[41,70]
OUTPUT FR_OPERATORE CODTAB
OUTPUT FR_COGNOME S0[1,40]
OUTPUT FR_NOME S0[41,70]
OUTPUT FS_OPERATORE CODTAB
OUTPUT FS_COGNOME S0[1,40]
OUTPUT FS_NOME S0[41,70]
CHECKTYPE NORMAL
FIELD OPERATORE
END
STRING FR_COGNOME 40 25
STRING FS_COGNOME 40 25
BEGIN
PROMPT 30 9 ""
USE DIP KEY 2
INPUT S0[1,40] FR_COGNOME
INPUT S0[41,70] FR_NOME
INPUT S0[1,40] FS_COGNOME
INPUT S0[41,70] FS_NOME
DISPLAY "Cognome@40" S0[1,40]
DISPLAY "Nome@30" S0[41,70]
DISPLAY "Codice" CODTAB
COPY OUTPUT FR_OPERATORE
COPY OUTPUT FS_OPERATORE
CHECKTYPE SEARCH
END
STRING FR_NOME 30 18
STRING FS_NOME 30 18
BEGIN
PROMPT 59 9 ""
COPY ALL FR_COGNOME
COPY ALL FS_COGNOME
CHECKTYPE SEARCH
END

11
mr/mrplib.cpp
View File

@ -727,7 +727,7 @@ class TCalendar_win : public TField_window
bool _immediate_write;
protected:
virtual void handler(WINDOW win, EVENT* ep);
virtual long handler(WINDOW win, EVENT* ep);
virtual void update();
public:
@ -735,12 +735,11 @@ public:
void set_calendar(TMRP_calendar* cal, int year = 0);
TMRP_calendar* get_calendar() { return _calendario; }
TCalendar_win(int x, int y, int dx, int dy,
WINDOW parent, TWindowed_field* owner);
TCalendar_win(int x, int y, int dx, int dy, WINDOW parent, TWindowed_field* owner);
virtual ~TCalendar_win() { }
};
void TCalendar_win::handler(WINDOW win, EVENT* ep)
long TCalendar_win::handler(WINDOW win, EVENT* ep)
{
switch (ep->type)
{
@ -833,7 +832,7 @@ void TCalendar_win::handler(WINDOW win, EVENT* ep)
break;
}
TField_window::handler(win, ep);
return TField_window::handler(win, ep);
}
void TCalendar_win::update()
@ -969,7 +968,7 @@ void TCalendar_win::update()
str.format("%d", tmin);
stringat(x+2, y, str);
str.format(" %d", tmax);
stringat(x+2, y+BASEY, str);
stringat(x+2, y + CHARY, str);
if (j == this_month && i == this_day)
set_font(); // Rimette a posto il font