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

Patch level :10.0 224

Browse Source 
Files correlati     :ve2.exe ve2400.msk ve0200g.msk
Ricompilazione Demo : [ ]
Commento            :
0001134: Nell'anagrafica articoli se abbiamo impostato i campi user 1, 2, ecc.. vengono uno sovrapposto all'altro
Descrizione  Abbiamo impostato diversi campi user in Magazzino e Produzione -> Configurazione -> Articoli e Distinte. Poi quando si apre l'anagrafica articoli si vede correttamente la "pateletta" Utente 1, ma i campi risultano uno sovrapposto all'altro.


git-svn-id: svn://10.65.10.50/trunk@18169 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2009-02-02 10:30:10 +00:00
parent 7cf43e4623
commit daabfb0ba2
3 changed files with 67 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ve/ve0200g.uml
View File

@ -121,7 +121,7 @@ BEGIN
FIELD CHK_USER[1] FIELD CHK_USER[1]
END END
STRING F_PROMPT_USER1 20 STRING F_PROMPT_USER1 18
BEGIN BEGIN
PROMPT 2 3 "Prompt " PROMPT 2 3 "Prompt "
FIELD PROMPT_USER[1] FIELD PROMPT_USER[1]
@ -170,7 +170,7 @@ BEGIN
FIELD CHK_USER[2] FIELD CHK_USER[2]
END END
STRING F_PROMPT_USER2 20 STRING F_PROMPT_USER2 18
BEGIN BEGIN
PROMPT 2 6 "Prompt " PROMPT 2 6 "Prompt "
FIELD PROMPT_USER[2] FIELD PROMPT_USER[2]
@ -219,7 +219,7 @@ BEGIN
FIELD CHK_USER[3] FIELD CHK_USER[3]
END END
STRING F_PROMPT_USER3 20 STRING F_PROMPT_USER3 18
BEGIN BEGIN
PROMPT 2 9 "Prompt " PROMPT 2 9 "Prompt "
FIELD PROMPT_USER[3] FIELD PROMPT_USER[3]
@ -268,7 +268,7 @@ BEGIN
FIELD CHK_USER[4] FIELD CHK_USER[4]
END END
STRING F_PROMPT_USER4 20 STRING F_PROMPT_USER4 18
BEGIN BEGIN
PROMPT 2 12 "Prompt " PROMPT 2 12 "Prompt "
FIELD PROMPT_USER[4] FIELD PROMPT_USER[4]
@ -317,7 +317,7 @@ BEGIN
FIELD CHK_USER[5] FIELD CHK_USER[5]
END END
STRING F_PROMPT_USER5 20 STRING F_PROMPT_USER5 18
BEGIN BEGIN
PROMPT 2 15 "Prompt " PROMPT 2 15 "Prompt "
FIELD PROMPT_USER[5] FIELD PROMPT_USER[5]
@ -370,7 +370,7 @@ BEGIN
FIELD CHK_USER[6] FIELD CHK_USER[6]
END END
STRING F_PROMPT_USER6 20 STRING F_PROMPT_USER6 18
BEGIN BEGIN
PROMPT 2 3 "Prompt " PROMPT 2 3 "Prompt "
FIELD PROMPT_USER[6] FIELD PROMPT_USER[6]
@ -419,7 +419,7 @@ BEGIN
FIELD CHK_USER[7] FIELD CHK_USER[7]
END END
STRING F_PROMPT_USER7 20 STRING F_PROMPT_USER7 18
BEGIN BEGIN
PROMPT 2 6 "Prompt " PROMPT 2 6 "Prompt "
FIELD PROMPT_USER[7] FIELD PROMPT_USER[7]
@ -468,7 +468,7 @@ BEGIN
FIELD CHK_USER[8] FIELD CHK_USER[8]
END END
STRING F_PROMPT_USER8 20 STRING F_PROMPT_USER8 18
BEGIN BEGIN
PROMPT 2 9 "Prompt " PROMPT 2 9 "Prompt "
FIELD PROMPT_USER[8] FIELD PROMPT_USER[8]
@ -517,7 +517,7 @@ BEGIN
FIELD CHK_USER[9] FIELD CHK_USER[9]
END END
STRING F_PROMPT_USER9 20 STRING F_PROMPT_USER9 18
BEGIN BEGIN
PROMPT 2 12 "Prompt " PROMPT 2 12 "Prompt "
FIELD PROMPT_USER[9] FIELD PROMPT_USER[9]
@ -566,7 +566,7 @@ BEGIN
FIELD CHK_USER[10] FIELD CHK_USER[10]
END END
STRING F_PROMPT_USER10 20 STRING F_PROMPT_USER10 18
BEGIN BEGIN
PROMPT 2 15 "Prompt " PROMPT 2 15 "Prompt "
FIELD PROMPT_USER[10] FIELD PROMPT_USER[10]
@ -619,7 +619,7 @@ BEGIN
FIELD CHK_USER[11] FIELD CHK_USER[11]
END END
STRING F_PROMPT_USER11 20 STRING F_PROMPT_USER11 18
BEGIN BEGIN
PROMPT 2 3 "Prompt " PROMPT 2 3 "Prompt "
FIELD PROMPT_USER[11] FIELD PROMPT_USER[11]
@ -668,7 +668,7 @@ BEGIN
FIELD CHK_USER[12] FIELD CHK_USER[12]
END END
STRING F_PROMPT_USER12 20 STRING F_PROMPT_USER12 18
BEGIN BEGIN
PROMPT 2 6 "Prompt " PROMPT 2 6 "Prompt "
FIELD PROMPT_USER[12] FIELD PROMPT_USER[12]
@ -717,7 +717,7 @@ BEGIN
FIELD CHK_USER[13] FIELD CHK_USER[13]
END END
STRING F_PROMPT_USER13 20 STRING F_PROMPT_USER13 18
BEGIN BEGIN
PROMPT 2 9 "Prompt " PROMPT 2 9 "Prompt "
FIELD PROMPT_USER[13] FIELD PROMPT_USER[13]
@ -766,7 +766,7 @@ BEGIN
FIELD CHK_USER[14] FIELD CHK_USER[14]
END END
STRING F_PROMPT_USER14 20 STRING F_PROMPT_USER14 18
BEGIN BEGIN
PROMPT 2 12 "Prompt " PROMPT 2 12 "Prompt "
FIELD PROMPT_USER[14] FIELD PROMPT_USER[14]
@ -815,7 +815,7 @@ BEGIN
FIELD CHK_USER[15] FIELD CHK_USER[15]
END END
STRING F_PROMPT_USER15 20 STRING F_PROMPT_USER15 18
BEGIN BEGIN
PROMPT 2 15 "Prompt " PROMPT 2 15 "Prompt "
FIELD PROMPT_USER[15] FIELD PROMPT_USER[15]
@ -868,7 +868,7 @@ BEGIN
FIELD CHK_USER[16] FIELD CHK_USER[16]
END END
STRING F_PROMPT_USER16 20 STRING F_PROMPT_USER16 18
BEGIN BEGIN
PROMPT 2 3 "Prompt " PROMPT 2 3 "Prompt "
FIELD PROMPT_USER[16] FIELD PROMPT_USER[16]
@ -917,7 +917,7 @@ BEGIN
FIELD CHK_USER[17] FIELD CHK_USER[17]
END END
STRING F_PROMPT_USER17 20 STRING F_PROMPT_USER17 18
BEGIN BEGIN
PROMPT 2 6 "Prompt " PROMPT 2 6 "Prompt "
FIELD PROMPT_USER[17] FIELD PROMPT_USER[17]
@ -966,7 +966,7 @@ BEGIN
FIELD CHK_USER[18] FIELD CHK_USER[18]
END END
STRING F_PROMPT_USER18 20 STRING F_PROMPT_USER18 18
BEGIN BEGIN
PROMPT 2 9 "Prompt " PROMPT 2 9 "Prompt "
FIELD PROMPT_USER[18] FIELD PROMPT_USER[18]
@ -1015,7 +1015,7 @@ BEGIN
FIELD CHK_USER[19] FIELD CHK_USER[19]
END END
STRING F_PROMPT_USER19 20 STRING F_PROMPT_USER19 18
BEGIN BEGIN
PROMPT 2 12 "Prompt " PROMPT 2 12 "Prompt "
FIELD PROMPT_USER[19] FIELD PROMPT_USER[19]
@ -1064,7 +1064,7 @@ BEGIN
FIELD CHK_USER[20] FIELD CHK_USER[20]
END END
STRING F_PROMPT_USER20 20 STRING F_PROMPT_USER20 18
BEGIN BEGIN
PROMPT 2 15 "Prompt " PROMPT 2 15 "Prompt "
FIELD PROMPT_USER[20] FIELD PROMPT_USER[20]

62
ve/ve2400.cpp
View File

@ -398,59 +398,65 @@ void TMask_anamag::create_user_fields()
_ean8_cin = c.get_bool("EAN8CIN"); _ean8_cin = c.get_bool("EAN8CIN");
_ean13_pref = c.get("EAN13"); _ean13_pref = c.get("EAN13");
bool disable_user_page = true;
TString80 prompt; TString80 prompt;
int page = PAGE_USER; int page = PAGE_USER;
int row = 4; int row = 4;
TBit_array pages; int col = 0;
int user_fields = 0;
//si suppone 20 campi user; sarebbe meglio definire una costante
for (int i = 1; i <= 20; i++) for (int i = 1; i <= 20; i++)
{ {
if (c.get_bool("CHK_USER", "ve", i)) if (c.get_bool("CHK_USER", "ve", i))
{ {
TEditable_field * f = NULL; TEditable_field * f = NULL;
prompt = c.get("PROMPT_USER", "ve", i); prompt = c.get("PROMPT_USER", "ve", i);
prompt.rpad(20); //se il prompt fosse più lungo di 18 caratteri...
prompt.rpad(18);
prompt.cut(18);
const char type = c.get_char("TYPE_USER", "ve", i); const char type = c.get_char("TYPE_USER", "ve", i);
if (type == 'S')
f = &add_string(F_USER1 + i - 1, page, prompt, 2, row, c.get_int("LEN_USER", "ve", i)); //visto che lo switch funziona con i char...
else switch (type)
if (type == 'N')
{ {
f = &add_number(F_USER1 + i - 1, page, prompt, 2, row, c.get_int("LEN_USER", "ve", i)); case 'S':
f = &add_string(F_USER1 + i - 1, page, prompt, col, row, c.get_int("LEN_USER", "ve", i));
break;
case 'N':
f = &add_number(F_USER1 + i - 1, page, prompt, col, row, c.get_int("LEN_USER", "ve", i));
((TReal_field *) f)->set_decimals(c.get_int("DEC_USER", "ve", i)); ((TReal_field *) f)->set_decimals(c.get_int("DEC_USER", "ve", i));
break;
case 'D':
f = &add_date(F_USER1 + i - 1, page, prompt, col, row);
break;
case 'I':
f = &add_currency(F_USER1 + i - 1, page, prompt, col, row, c.get_int("LEN_USER", "ve", i));
break;
case 'X':
f = &add_boolean(F_USER1 + i - 1, page, prompt, col, row);
break;
default:
break;
} }
else //se esiste il campo utente...
if (type == 'D')
f = &add_date(F_USER1 + i - 1, page, prompt, 2, row);
else
if (type == 'I')
f = &add_currency(F_USER1 + i - 1, page, prompt, 2, row, c.get_int("LEN_USER", "ve", i));
else
if (type == 'X')
f = &add_boolean(F_USER1 + i - 1, page, prompt, 2, row);
if (f != NULL) if (f != NULL)
{ {
TString8 u; u.format("USER%d", i); TString8 u; u.format("USER%d", i);
f->set_field(u); f->set_field(u);
} user_fields++;
pages.set(page); row ++;
if (row > 19) if (row > 19)
{ {
page++; col = 40;
row = 4; row = 4;
} }
} }
} } //if(c.get_bool...
} //for(int i...
if (!pages[PAGE_USER]) if (user_fields == 0)
_disabled_user_page = PAGE_USER; _disabled_user_page = PAGE_USER;
else
if (!pages[PAGE_USER + 1])
_disabled_user_page = PAGE_USER + 1;
else
_disabled_user_page = PAGE_USER + 2;
} }
// costruttore della maschera anagrafica di magazzino // costruttore della maschera anagrafica di magazzino

25
ve/ve2400.uml
View File

@ -1378,7 +1378,7 @@ END
ENDPAGE ENDPAGE
PAGE "Utente 1" 0 0 70 20 PAGE "Personalizzazioni" 0 0 80 20
GROUPBOX DLG_NULL 78 4 GROUPBOX DLG_NULL 78 4
BEGIN BEGIN
@ -1401,29 +1401,6 @@ END
ENDPAGE ENDPAGE
PAGE "Utente 2" 0 0 70 20
GROUPBOX DLG_NULL 78 3
BEGIN
PROMPT 0 0 "@bArticolo"
END
STRING DLG_NULL 20
BEGIN
FLAGS "D"
PROMPT 2 1 ""
GROUP G_CODART
END
STRING DLG_NULL 50
BEGIN
FLAGS "D"
PROMPT 25 1 ""
GROUP G_DESART
END
ENDPAGE
ENDMASK ENDMASK
#include "ve2400c.uml" #include "ve2400c.uml"