Errores #519: Poder establecer el topN en los informes estadísticos de resumen

Errores #279: Quitar el capítulo 'general' y resumen cuando sea un solo capitulo

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1036 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2011-02-23 11:54:21 +00:00
parent 3213bcd128
commit ddf8611bcf
12 changed files with 531 additions and 453 deletions

View File

@ -54,58 +54,58 @@
<DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\adortl.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\cxDataD11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\cxEditorsD11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\cxExportD11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\cxExtEditorsD11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\cxGridD11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\cxIntl6D11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\cxLibraryD11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\cxPageControlD11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\dbrtl.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\dclIndyCore.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\designide.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\dsnap.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\dxGDIPlusD11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\dxPSCoreD11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\dxThemeD11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\GUISDK_D11R.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\IndyCore.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\IndyProtocols.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\IndySystem.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\Jcl.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\JclVcl.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\JSDialog100.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\JvCmpD11R.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\JvCoreD11R.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\JvCtrlsD11R.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\JvDlgsD11R.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\JvMMD11R.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\JvNetD11R.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\JvPageCompsD11R.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\JvSystemD11R.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\pckMD5.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\pckUCDataConnector.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\pckUserControl_RT.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\PngComponentsD10.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\PNG_D10.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\rtl.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\TB2k_D10.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\tbx_d10.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\vcl.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\vclactnband.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\vcldb.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\vcljpg.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\VclSmp.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\vclx.dcp" />
<DCCReference Include="..\..\Resources\Logotipos Tecsitel\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxIntl6D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Indy_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
<DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form>
<DesignClass>TForm</DesignClass>

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -75,7 +75,7 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl
Left = 0
Top = 0
Width = 188
Height = 182
Height = 230
Align = alTop
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -85,9 +85,11 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl
ParentFont = False
TabOrder = 1
ReadOnly = False
ExplicitTop = 195
ExplicitWidth = 188
ExplicitHeight = 230
inherited TBXAlignmentPanel2: TTBXAlignmentPanel
Width = 182
ExplicitWidth = 182
inherited Label3: TLabel
Width = 172
end
@ -96,14 +98,17 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166
Width = 166
end
end
inherited TBXLabel2: TTBXLabel
Width = 188
ExplicitWidth = 188
end
inherited TBXAlignmentPanel3: TTBXAlignmentPanel
Width = 182
ExplicitWidth = 182
inherited lis: TLabel
Width = 172
end
@ -112,11 +117,13 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166
Width = 166
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 182
ExplicitWidth = 182
inherited Label1: TLabel
Width = 172
end
@ -125,13 +132,21 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166
Width = 166
end
end
inherited TBXAlignmentPanel4: TTBXAlignmentPanel
Width = 182
ExplicitWidth = 182
inherited Label2: TLabel
Width = 172
end
end
end
inline frViewFiltroClientes1: TfrViewFiltroClientes
Left = 0
Top = 182
Top = 230
Width = 188
Height = 195
Align = alTop
@ -144,17 +159,21 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl
TabOrder = 2
ReadOnly = False
ExplicitTop = 182
ExplicitWidth = 188
inherited TBXLabel2: TTBXLabel
Width = 188
ExplicitWidth = 188
end
inherited bElegirCliente: TBitBtn
Width = 119
ExplicitWidth = 119
end
inherited edtCliente: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 152
Width = 152
end
end

View File

@ -108,7 +108,7 @@ end;
function TfEditorInformeFacturasClienteReportGrafComp.GetNTop: Variant;
begin
Result := 5;
Result := frViewIntervaloComparativo1.stopN.Value;
end;
procedure TfEditorInformeFacturasClienteReportGrafComp.RefrescarInforme;

View File

@ -75,7 +75,7 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
Left = 0
Top = 0
Width = 188
Height = 182
Height = 230
Align = alTop
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -85,9 +85,11 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
ParentFont = False
TabOrder = 1
ReadOnly = False
ExplicitTop = 195
ExplicitWidth = 188
ExplicitHeight = 230
inherited TBXAlignmentPanel2: TTBXAlignmentPanel
Width = 182
ExplicitWidth = 182
inherited Label3: TLabel
Width = 172
end
@ -96,14 +98,17 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166
Width = 166
end
end
inherited TBXLabel2: TTBXLabel
Width = 188
ExplicitWidth = 188
end
inherited TBXAlignmentPanel3: TTBXAlignmentPanel
Width = 182
ExplicitWidth = 182
inherited lis: TLabel
Width = 172
end
@ -112,11 +117,13 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166
Width = 166
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 182
ExplicitWidth = 182
inherited Label1: TLabel
Width = 172
end
@ -125,13 +132,21 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166
Width = 166
end
end
inherited TBXAlignmentPanel4: TTBXAlignmentPanel
Width = 182
ExplicitWidth = 182
inherited Label2: TLabel
Width = 172
end
end
end
inline frViewFiltroProveedores1: TfrViewFiltroProveedores
Left = 0
Top = 182
Top = 230
Width = 188
Height = 195
Align = alTop
@ -144,17 +159,21 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
TabOrder = 2
ReadOnly = False
ExplicitTop = 182
ExplicitWidth = 188
inherited TBXLabel2: TTBXLabel
Width = 188
ExplicitWidth = 188
end
inherited bElegirProveedor: TBitBtn
Width = 119
ExplicitWidth = 119
end
inherited edtProveedor: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 152
Width = 152
end
end

View File

@ -109,7 +109,7 @@ end;
function TfEditorInformeFacturasProveedorReportGrafComp.GetNTop: Variant;
begin
Result := 5;
Result := frViewIntervaloComparativo1.stopN.Value;
end;
procedure TfEditorInformeFacturasProveedorReportGrafComp.RefrescarInforme;

View File

@ -1,9 +1,9 @@
inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo
Width = 451
Height = 182
Height = 220
Align = alTop
ExplicitWidth = 451
ExplicitHeight = 182
ExplicitHeight = 220
object TBXAlignmentPanel2: TTBXAlignmentPanel
AlignWithMargins = True
Left = 3
@ -175,4 +175,34 @@ inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo
Width = 429
end
end
object TBXAlignmentPanel4: TTBXAlignmentPanel
AlignWithMargins = True
Left = 3
Top = 176
Width = 445
Height = 42
Margins.Left = 5
Margins.Top = 5
Margins.Right = 5
Align = alTop
AutoSize = True
TabOrder = 4
object Label2: TLabel
Left = 5
Top = 5
Width = 435
Height = 13
Align = alTop
Caption = 'Top N:'
Transparent = True
ExplicitWidth = 32
end
object stopN: TcxSpinEdit
Left = 3
Top = 21
TabOrder = 0
Value = 5
Width = 110
end
end
end

View File

@ -7,7 +7,7 @@ uses
Dialogs, cxGraphics, cxEdit, cxDropDownEdit, cxCalendar, StdCtrls,
cxControls, cxContainer, cxTextEdit, cxMaskEdit, TBXDkPanels,
cxEditRepositoryItems, dxLayoutControl, dxLayoutLookAndFeels, uViewBase,
Mask, JvExMask, JvToolEdit, TB2Dock, uViewParametrosInforme;
Mask, JvExMask, JvToolEdit, TB2Dock, uViewParametrosInforme, cxSpinEdit;
type
IViewPeriodoFechas = interface(IViewParametrosInforme)
@ -25,6 +25,9 @@ type
TBXAlignmentPanel1: TTBXAlignmentPanel;
Label1: TLabel;
cbAno2: TcxComboBox;
TBXAlignmentPanel4: TTBXAlignmentPanel;
Label2: TLabel;
stopN: TcxSpinEdit;
private
function GetIntervalo: Variant;

View File

@ -460,12 +460,14 @@ begin
shiftCells := False;
iContador := 2; // Empezar en la 2ª fila de celdas. La primera es la
// cabecera de la tabla.
Estilo := 'TituloCapitulo';
FWordApp.Application.Selection.Set_Style(Estilo);
FWordApp.InsertText('RESUMEN');
Tabla := FDocumento.Document.Tables.Item(FDocumento.Document.Tables.Count-1);
//Solo se sacará el resumen si hay más de un capitulo
if (FNumCapitulos > 1) then
begin
with Tabla do
begin
for iAux := 1 to FNumCapitulos do
@ -529,6 +531,10 @@ begin
AutoFitBehavior(wdAutoFitWindow);
end;
end
else
Tabla.Delete;
Result := True;
end;

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@ -36,6 +36,7 @@
<Borland.ProjectType />
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">8</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.8.8.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.8.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 19 de enero de 2011 18:10</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>