Patch level :4.0 patch futura

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :"Mein stampf" a puon punto!


git-svn-id: svn://10.65.10.50/trunk@14472 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2006-11-13 16:09:58 +00:00
parent 2bf56b3d8b
commit 47a63a2510
3 changed files with 82 additions and 40 deletions

View File

@ -204,6 +204,7 @@ void TPrint_bilancio_cms_recordset::parse_bill(const TString& bill, TString& con
//lunghezza dell'eventuale prefisso di gruppo e conto
const int prefix_len = (prefix >= 0) ? pconana_info.total_len(prefix) : 0;
//quanto e' lungo il codice del conto da considerare? E' il livello - il prefisso
const int conto_end = pconana_info.total_len(_depth) - prefix_len;
//stringa con cio' che segue il prefisso ed e' richiesto
@ -439,7 +440,7 @@ const TVariant& TPrint_bilancio_cms_recordset::get(const char* column_name) cons
var.set(_tipostima == 'T' ? "T" : "C");
}
else
if (strcmp(column_name, "LEVEL") == 0)
if (strcmp(column_name, "DEPTH") == 0)
{
var.set(_depth);
}

View File

@ -13,26 +13,14 @@
<field x="165" type="Numero" align="right" width="3" pattern="1">
<source>#REPORT.PAGE</source>
</field>
<field border="2" x="1" y="1.5" type="Linea" width="169" height="0" pattern="1" />
<field x="70" y="1.75" type="Testo" width="57" pattern="1" text="Costi e ricavi di Commessa maturati nell'esercizio">
<font italic="1" face="Arial Narrow" size="8" />
</field>
<field x="130" y="1.75" type="Testo" width="23" pattern="1" text="Stima avanzamento " />
<field x="153" y="1.75" type="Array" width="10" pattern="1">
<source>TIPOSTIMA</source>
<list>
<li Value="TEMPO" Code="T" />
<li Value="COSTI" Code="C" />
</list>
</field>
<field x="74" y="2.75" type="Testo" align="right" width="8" pattern="1" text="Margine" />
<field x="72" y="3.5" type="Testo" align="right" width="12" pattern="1" text=" Contribuz. " />
<field x="53" y="3.75" type="Testo" align="center" width="6" pattern="1" text="% Av." />
<field border="1" x="1" y="4.75" type="Linea" width="169" height="0" pattern="1" />
<field x="59" y="2.5" type="Testo" valign="bottom" align="right" width="13" height="2" id="69" pattern="1" text="Testata" />
<field x="1" y="3.5" type="Testo" width="15" id="121" pattern="1" text="Commessa" />
<field x="80" y="1.25" type="Testo" align="center" width="13" pattern="1" text="Margine" />
<field x="54" y="2" type="Testo" align="center" width="6" pattern="1" text="% Av." />
<field x="80" y="2" type="Testo" align="center" width="13" pattern="1" text=" Contribuz. " />
<field border="1" x="1" y="3" type="Linea" width="169" height="0" pattern="1" />
<field x="59" y="1" type="Testo" valign="bottom" align="right" width="13" height="2" id="69" pattern="1" text="Testata" />
<field x="1" y="2" type="Testo" width="15" id="121" pattern="1" text="Commessa" />
</section>
<section type="Head" level="1" height="4">
<section type="Head" level="1">
<prescript description="H1 PRESCRIPT">MESSAGE RESET,F1.101
MESSAGE RESET,F1.102
MESSAGE RESET,F1.103
@ -44,7 +32,32 @@ MESSAGE RESET,F1.108</prescript>
<field border="1" radius="100" x="1" type="Testo" valign="center" align="center" shade_offset="25" width="167" height="2.5" text="BILANCIO DI COMMESSA PER ESERCIZIO">
<font face="Courier New" bold="1" size="16" />
</field>
<field border="2" x="1" y="3.5" type="Linea" width="169" height="0" pattern="1" />
<field x="10" y="3" type="Testo" width="35" pattern="1" text="Costi e ricavi di Commessa maturati nell'esercizio">
<font italic="1" face="Arial Narrow" size="9" />
</field>
<field x="50" y="3" type="Stringa" width="4" pattern="1">
<font face="Arial Narrow" bold="1" size="9" />
<source>ANNO</source>
</field>
<field x="67" y="3" type="Testo" width="15" pattern="1" text="Stima avanzamento ">
<font italic="1" face="Arial Narrow" size="9" />
</field>
<field x="83" y="3" type="Array" width="10" pattern="1">
<font face="Arial Narrow" bold="1" size="9" />
<source>TIPOSTIMA</source>
<list>
<li Value="TEMPO" Code="T" />
<li Value="COSTI" Code="C" />
</list>
</field>
<field x="104" y="3" type="Testo" width="25" pattern="1" text="Profondita' della struttura in esame">
<font italic="1" face="Arial Narrow" size="9" />
</field>
<field x="130" y="3" type="Stringa" width="1" pattern="1">
<font face="Arial Narrow" bold="1" size="9" />
<source>DEPTH</source>
</field>
<field border="2" x="1" y="4.5" type="Linea" width="169" height="0" pattern="1" />
</section>
<section type="Head" level="2" height="1.5" page_break="1">
<groupby>LEVEL &#3C; 2</groupby>
@ -155,8 +168,8 @@ THEN
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<field border="2" x="1" y="0.75" type="Linea" width="169" height="0" pattern="1" />
<field x="1" y="1.5" type="Testo" fg_color="#FFFFFF" bg_color="#000000" width="25" height="1.5" text="TOTALI GENERALI " />
<field x="58" y="1.5" type="Valuta" align="right" width="13" id="69" pattern="1" text="###.###.###,@@" />
<field x="71" y="1.5" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@" />
<field x="59" y="1.5" type="Valuta" align="right" width="13" id="69" pattern="1" text="###.###.###,@@" />
<field x="73" y="1.5" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@" />
</section>
<section type="Foot" level="2" height="2.5">
<font italic="1" face="Courier New" bold="1" size="8" />
@ -175,7 +188,7 @@ THEN
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<source>H2.102</source>
</field>
<field x="58" y="1" type="Valuta" align="right" width="13" id="69" pattern="1" text="###.###.###,@@">
<field x="59" y="1" type="Valuta" align="right" width="13" id="69" pattern="1" text="###.###.###,@@">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<postscript description="F2.69 POSTSCRIPT">MESSAGE ADD,F1.69</postscript>
</field>
@ -183,7 +196,7 @@ THEN
<field x="35" y="1" type="Numero" hidden="1" align="right" width="4" id="102" pattern="1">
<postscript description="F2.102 POSTSCRIPT">MESSAGE COPY,F2.101</postscript>
</field>
<field x="71" y="1" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@">
<field x="73" y="1" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<postscript description="F2.169 POSTSCRIPT">MESSAGE ADD,F1.169</postscript>
</field>
@ -200,11 +213,11 @@ THEN
<li Value="TOTALI Commesse avviate nell'esercizio selezionato" Code="3" />
</list>
</field>
<field x="58" y="0.5" type="Valuta" align="right" width="13" id="69" pattern="1" text="###.###.###,@@">
<field x="59" y="0.5" type="Valuta" align="right" width="13" id="69" pattern="1" text="###.###.###,@@">
<postscript description="F3.69 POSTSCRIPT">MESSAGE ADD,F2.69</postscript>
</field>
<field y="0.5" type="Numero" hidden="1" align="right" width="1" id="101" pattern="1" />
<field x="71" y="0.5" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@">
<field x="73" y="0.5" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@">
<postscript description="F3.169 POSTSCRIPT">MESSAGE ADD,F2.169</postscript>
</field>
</section>

View File

@ -202,12 +202,31 @@ void TCRPA_report::offset_and_fill_columns(TReport_section& rep_sect, const TStr
new_field->set_pos(rep_field_rect.left() + rep_field_rect.width() * i, rep_field_rect.top());
new_field->set_id(rep_field.id() + i);
}
if (sect_type == 'H')
switch (sect_type)
{
case 'H':
new_field->set_picture(str_arr.row(i));
if (sect_type == 'B')
new_field->set_field(str_arr.row(i));
if (sect_type == 'F')
new_field->set_field("");
break;
case 'B':
{
new_field->set_field(str_arr.row(i));
TString ps = "MESSAGE ADD,F3.";
ps << new_field->id();
new_field->set_postscript(ps);
}
break;
case 'F':
if (rep_sect.level() > 1)
{
new_field->set_field("");
TString ps = "MESSAGE ADD,F";
ps << (rep_sect.level() - 1) << '.' << new_field->id();
new_field->set_postscript(ps);
}
break;
default:
break;
}
}
//sposta a destra gli ultimi campi non generati
@ -225,9 +244,7 @@ void TCRPA_report::offset_and_fill_columns(TReport_section& rep_sect, const TStr
bool TCRPA_report::generate_columns (TString_array& codici, TString_array& testate)
{
//sezioni del report da modificare
TReport_section& h0 = section('H', 0);
TReport_section& b1 = section('B', 1);
TReport_section& f3 = section('F', 3);
//controllo dell'esistenza dei campi modello da replicare e loro duplicazione e riempimento!
TReport_field* b1_69 = b1.find_field(69);
@ -235,15 +252,26 @@ bool TCRPA_report::generate_columns (TString_array& codici, TString_array& testa
return false;
offset_and_fill_columns(b1, codici);
//testata
TReport_section& h0 = section('H', 0);
TReport_field* h0_69 = h0.find_field(69);
if (h0_69 == NULL)
return warning_box(TR("Manca l'intestazione della colonna modello (H0.69)"));
offset_and_fill_columns(h0, testate);
warning_box(TR("Manca l'intestazione della colonna modello (H0.69)"));
else
offset_and_fill_columns(h0, testate);
TReport_field* f3_69 = f3.find_field(69);
if (f3_69 == NULL)
return warning_box(TR("Manca l'intestazione della colonna modello (F3.69)"));
offset_and_fill_columns(f3, codici);
//footers
for (int i = 3; i > 0; i--)
{
TReport_section& foot = section('F', i);
TReport_field* foot_69 = foot.find_field(69);
if (foot_69 == NULL)
warning_box(TR("Manca la colonna modello (F%d.69)"), i);
else
offset_and_fill_columns(foot, codici);
}
return true;
}