Patch level : 2.2 126

Files correlati     :  ci1.exe
Ricompilazione Demo : [ ]
Commento            :

Aggiunta selezione da stato a stato sulle stampe


git-svn-id: svn://10.65.10.50/trunk@13181 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2005-06-08 11:16:57 +00:00
parent fbf827607e
commit 269f8b4c9a
2 changed files with 41 additions and 3 deletions

View File

@ -163,6 +163,8 @@ bool TRiepiloghi_recordset::valid_record(const TRelation& rel) const
{
const TString4 codnum = doc.get(DOC_CODNUM);
const TString4 tipodoc = doc.get(DOC_TIPODOC);
const TString4 stato = doc.get(DOC_STATO);
bool found = false;
FOR_EACH_ARRAY_ROW(_tipidoc, i, row)
{
@ -170,8 +172,14 @@ bool TRiepiloghi_recordset::valid_record(const TRelation& rel) const
const TString4 td = row->get();
if ((cn.blank() || cn == codnum) && (td.blank() || td == tipodoc))
{
found = true;
break;
const TString4 si = row->get();
const TString4 sf = row->get();
if ((si.blank() || stato >= si) && (sf.blank() || stato <= sf))
{
found = true;
break;
}
}
}
if (!found)
@ -234,6 +242,8 @@ void TRiepiloghi_recordset::set_filter(const TRiepiloghi_mask& msk, int cms_row)
TToken_string str;
str.add(row->get(0), 0);
str.add(row->get(2), 1);
str.add(row->get(4), 2);
str.add(row->get(5), 3);
_tipidoc.add(str);
}

View File

@ -117,6 +117,8 @@ BEGIN
ITEM "Descrizione@50"
ITEM "Tipo"
ITEM "Descrizione@50"
ITEM "Da Stato"
ITEM "A Stato"
END
TEXT DLG_NULL
@ -145,7 +147,7 @@ ENDPAGE
ENDMASK
PAGE "Tipi" -1 -1 68 7
PAGE "Tipi" -1 -1 68 9
STRING 101 4
BEGIN
@ -157,6 +159,7 @@ BEGIN
OUTPUT 101 CODTAB
OUTPUT 102 S0
CHECKTYPE NORMAL
FLAG "U"
END
STRING 102 50
@ -180,6 +183,7 @@ BEGIN
OUTPUT 103 CODTAB
OUTPUT 104 S0
CHECKTYPE NORMAL
FLAG "U"
END
STRING 104 50
@ -193,6 +197,30 @@ BEGIN
CHECKTYPE NORMAL
END
STRING 105 1
BEGIN
PROMPT 1 5 "Da stato "
USE %STD
CHECKTYPE NORMAL
INPUT CODTAB 105
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@50" S0
OUTPUT 105 CODTAB
FLAG "U"
END
STRING 106 1
BEGIN
PROMPT 1 6 "A stato "
USE %STD
CHECKTYPE NORMAL
INPUT CODTAB 106
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@50" S0
OUTPUT 106 CODTAB
FLAG "U"
END
BUTTON DLG_OK 10 2
BEGIN
PROMPT -13 -1 ""