From 14cffb023d063f485ef7a810d0fe361c9c26110e Mon Sep 17 00:00:00 2001 From: david Date: Tue, 2 Jun 2009 11:06:34 +0000 Subject: [PATCH] General -> mostrar el reloj de arena cuando se prepara un informe para previsualizarlo. git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@947 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- .../uAlbaranesClienteReportController.pas | 91 +++++++++++-------- .../uAlbaranesProveedorReportController.pas | 33 ++++--- .../uEtiquetasContactosReportController.pas | 32 ++++--- .../uFichasEmpleadoReportController.pas | 31 ++++--- .../uFacturasClienteReportController.pas | 32 ++++--- .../uFacturasProveedorReportController.pas | 27 +++--- .../uPedidosProveedorReportController.pas | 37 ++++---- .../uPresupuestosClienteReportController.pas | 35 ++++--- .../uRecibosClienteReportController.pas | 32 ++++--- .../uRecibosProveedorReportController.pas | 28 +++--- .../uRemesasClienteReportController.pas | 29 +++--- .../uRemesasProveedorReportController.pas | 27 +++--- 12 files changed, 258 insertions(+), 176 deletions(-) diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas index 5c1615c2..89c75a4a 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas +++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteReportController.pas @@ -70,19 +70,25 @@ var AEditor : IEditorAlbaranesClientePreview; begin AEditor := NIL; - AStream := FDataModule.GetEtiquetas(AID, withRefCliente); + + ShowHourglassCursor; try - CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor); - if Assigned(AEditor) then - try - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; - end; + AStream := FDataModule.GetEtiquetas(AID, withRefCliente); + try + CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor); + if Assigned(AEditor) then + try + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + end; + finally + FreeAndNil(AStream); + AEditor := Nil; + end; finally - FreeAndNil(AStream); - AEditor := Nil; + HideHourglassCursor; end; end; @@ -92,19 +98,25 @@ var AEditor : IEditorAlbaranesClientePreview; begin AEditor := NIL; - AStream := FDataModule.GetEtiquetas(AID, withRefCliente); + + ShowHourglassCursor; try - CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor); - if Assigned(AEditor) then - try - AEditor.LoadFromStream(AStream); - AEditor.Print; - finally - AEditor.Release; - end; + AStream := FDataModule.GetEtiquetas(AID, withRefCliente); + try + CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor); + if Assigned(AEditor) then + try + AEditor.LoadFromStream(AStream); + AEditor.Print; + finally + AEditor.Release; + end; + finally + FreeAndNil(AStream); + AEditor := Nil; + end; finally - FreeAndNil(AStream); - AEditor := Nil; + HideHourglassCursor; end; end; @@ -162,24 +174,30 @@ var AEditor : IEditorAlbaranesClientePreview; begin AEditor := NIL; - AStream := FDataModule.GetRptAlbaranes(AListaID); + + ShowHourglassCursor; try - CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor); - if Assigned(AEditor) then - begin - try - AEditor.Controller := Self; - AEditor.ListaID := AListaID; - AEditor.Title := 'Albarán - ' + AppFactuGES.EmpresaActiva.NOMBRE; - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; + AStream := FDataModule.GetRptAlbaranes(AListaID); + try + CreateEditor('EditorAlbaranesClientePreview', IEditorAlbaranesClientePreview, AEditor); + if Assigned(AEditor) then + begin + try + AEditor.Controller := Self; + AEditor.ListaID := AListaID; + AEditor.Title := 'Albarán - ' + AppFactuGES.EmpresaActiva.NOMBRE; + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + end; end; + finally + FreeAndNil(AStream); + AEditor := Nil; end; finally - FreeAndNil(AStream); - AEditor := Nil; + HideHourglassCursor; end; end; @@ -189,6 +207,7 @@ var AEditor : IEditorAlbaranesClientePreview; begin AEditor := NIL; + ShowHourglassCursor; try AStream := FDataModule.GetRptAlbaranes(AListaID); diff --git a/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorReportController.pas b/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorReportController.pas index 0605b150..a59ffdd9 100644 --- a/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorReportController.pas +++ b/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorReportController.pas @@ -116,24 +116,29 @@ var begin AEditor := NIL; - AStream := FDataModule.GetReport(AListaID); + ShowHourglassCursor; try - CreateEditor('EditorAlbaranesProveedorPreview', IEditorAlbaranesProveedorPreview, AEditor); - if Assigned(AEditor) then - begin - try - AEditor.Controller := Self; - AEditor.ListaID := AListaID; - AEditor.Title := 'Albarán de proveedor - ' + AppFactuGES.EmpresaActiva.NOMBRE; - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; - AEditor := Nil; + AStream := FDataModule.GetReport(AListaID); + try + CreateEditor('EditorAlbaranesProveedorPreview', IEditorAlbaranesProveedorPreview, AEditor); + if Assigned(AEditor) then + begin + try + AEditor.Controller := Self; + AEditor.ListaID := AListaID; + AEditor.Title := 'Albarán de proveedor - ' + AppFactuGES.EmpresaActiva.NOMBRE; + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + AEditor := Nil; + end; end; + finally + FreeANDNil(AStream) end; finally - FreeANDNil(AStream) + HideHourglassCursor; end; end; diff --git a/Source/Modulos/Contactos/Controller/uEtiquetasContactosReportController.pas b/Source/Modulos/Contactos/Controller/uEtiquetasContactosReportController.pas index 0771b0a9..4b749b20 100644 --- a/Source/Modulos/Contactos/Controller/uEtiquetasContactosReportController.pas +++ b/Source/Modulos/Contactos/Controller/uEtiquetasContactosReportController.pas @@ -59,23 +59,28 @@ var begin AEditor := NIL; - AStream := FDataModule.GetReport(ListaID); + ShowHourglassCursor; try - CreateEditor('EditorEtiquetasContactosPreview', IEditorEtiquetasContactosPreview, AEditor); - if Assigned(AEditor) then - begin - try - AEditor.Controller := Self; - AEditor.ListaID := ListaID; - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; + AStream := FDataModule.GetReport(ListaID); + try + CreateEditor('EditorEtiquetasContactosPreview', IEditorEtiquetasContactosPreview, AEditor); + if Assigned(AEditor) then + begin + try + AEditor.Controller := Self; + AEditor.ListaID := ListaID; + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + end; end; + finally + FreeAndNil(AStream); + AEditor := Nil; end; finally - FreeAndNil(AStream); - AEditor := Nil; + HideHourglassCursor; end; end; @@ -85,6 +90,7 @@ var AEditor : IEditorEtiquetasContactosPreview; begin AEditor := NIL; + ShowHourglassCursor; try AStream := FDataModule.GetReport(ListaID); diff --git a/Source/Modulos/Contactos/Controller/uFichasEmpleadoReportController.pas b/Source/Modulos/Contactos/Controller/uFichasEmpleadoReportController.pas index 3298c705..a8963749 100644 --- a/Source/Modulos/Contactos/Controller/uFichasEmpleadoReportController.pas +++ b/Source/Modulos/Contactos/Controller/uFichasEmpleadoReportController.pas @@ -59,23 +59,28 @@ var begin AEditor := NIL; - AStream := FDataModule.GetReport(ListaID); + ShowHourglassCursor; try - CreateEditor('EditorFichasEmpleadoPreview', IEditorFichasEmpleadoPreview, AEditor); - if Assigned(AEditor) then - begin - try - AEditor.Controller := Self; - AEditor.ListaID := ListaID; - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; + AStream := FDataModule.GetReport(ListaID); + try + CreateEditor('EditorFichasEmpleadoPreview', IEditorFichasEmpleadoPreview, AEditor); + if Assigned(AEditor) then + begin + try + AEditor.Controller := Self; + AEditor.ListaID := ListaID; + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + end; end; + finally + FreeAndNil(AStream); + AEditor := Nil; end; finally - FreeAndNil(AStream); - AEditor := Nil; + HideHourglassCursor; end; end; diff --git a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteReportController.pas b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteReportController.pas index 409ad3ee..34e8ecc7 100644 --- a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteReportController.pas +++ b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteReportController.pas @@ -114,21 +114,26 @@ var begin AEditor := NIL; - AStream := FDataModule.GetRptFacturas(AListaID, VerSello, VerCopia); + ShowHourglassCursor; try - CreateEditor('EditorFacturasClientePreview', IEditorFacturasClientePreview, AEditor); - if Assigned(AEditor) then - try - AEditor.Controller := Self; - AEditor.ListaID := AListaID; - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; - end; + AStream := FDataModule.GetRptFacturas(AListaID, VerSello, VerCopia); + try + CreateEditor('EditorFacturasClientePreview', IEditorFacturasClientePreview, AEditor); + if Assigned(AEditor) then + try + AEditor.Controller := Self; + AEditor.ListaID := AListaID; + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + end; + finally + FreeAndNil(AStream); + AEditor := Nil; + end; finally - FreeAndNil(AStream); - AEditor := Nil; + HideHourglassCursor; end; end; @@ -138,6 +143,7 @@ var AEditor : IEditorFacturasClientePreview; begin AEditor := NIL; + ShowHourglassCursor; try AStream := FDataModule.GetRptFacturas(AListaID, VerSello, VerCopia); diff --git a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorReportController.pas b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorReportController.pas index b3b54f3a..69225391 100644 --- a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorReportController.pas +++ b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorReportController.pas @@ -60,19 +60,24 @@ var begin AEditor := NIL; - AStream := FDataModule.GetReport(AFacturaID); + ShowHourglassCursor; try - CreateEditor('EditorFacturasProveedorPreview', IEditorFacturasProveedorPreview, AEditor); - if Assigned(AEditor) then - try - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; - end; + AStream := FDataModule.GetReport(AFacturaID); + try + CreateEditor('EditorFacturasProveedorPreview', IEditorFacturasProveedorPreview, AEditor); + if Assigned(AEditor) then + try + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + end; + finally + FreeAndNil(AStream); + AEditor := Nil; + end; finally - FreeAndNil(AStream); - AEditor := Nil; + HideHourglassCursor; end; end; diff --git a/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorReportController.pas b/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorReportController.pas index aaf962c7..9719b5a1 100644 --- a/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorReportController.pas +++ b/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorReportController.pas @@ -126,26 +126,31 @@ var begin AEditor := NIL; - AStream := FDataModule.GetReport(AListaID, VerPrecios, VerRefProveedor); + ShowHourglassCursor; try - CreateEditor('EditorPedidosProveedorPreview', IEditorPedidosProveedorPreview, AEditor); - if Assigned(AEditor) then - begin - try - AEditor.Controller := Self; - AEditor.ListaID := AListaID; - AEditor.VerPrecios := VerPrecios; - AEditor.VerRefProveedor := VerRefProveedor; - AEditor.Title := 'Pedido a proveedor - ' + AppFactuGES.EmpresaActiva.NOMBRE; - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; - AEditor := Nil; + AStream := FDataModule.GetReport(AListaID, VerPrecios, VerRefProveedor); + try + CreateEditor('EditorPedidosProveedorPreview', IEditorPedidosProveedorPreview, AEditor); + if Assigned(AEditor) then + begin + try + AEditor.Controller := Self; + AEditor.ListaID := AListaID; + AEditor.VerPrecios := VerPrecios; + AEditor.VerRefProveedor := VerRefProveedor; + AEditor.Title := 'Pedido a proveedor - ' + AppFactuGES.EmpresaActiva.NOMBRE; + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + AEditor := Nil; + end; end; + finally + FreeANDNil(AStream) end; finally - FreeANDNil(AStream) + HideHourglassCursor; end; end; diff --git a/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteReportController.pas b/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteReportController.pas index 12157b91..9b6f8aa6 100644 --- a/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteReportController.pas +++ b/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteReportController.pas @@ -116,6 +116,7 @@ var begin Result := False; AFile := AFileName; + if EsCadenaVacia(AFile) and (not PreguntarFicheroWordExportar(AFile)) then Exit; @@ -140,24 +141,29 @@ var begin AEditor := NIL; - AStream := FDataModule.GetRptPresupuestos(AListaID); + ShowHourglassCursor; try - CreateEditor('EditorPresupuestosClientePreview', IEditorPresupuestosClientePreview, AEditor); - if Assigned(AEditor) then - begin - try - AEditor.Controller := Self; - AEditor.ListaID := AListaID; - AEditor.Title := 'Presupuesto - ' + AppFactuGES.EmpresaActiva.NOMBRE; - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; + AStream := FDataModule.GetRptPresupuestos(AListaID); + try + CreateEditor('EditorPresupuestosClientePreview', IEditorPresupuestosClientePreview, AEditor); + if Assigned(AEditor) then + begin + try + AEditor.Controller := Self; + AEditor.ListaID := AListaID; + AEditor.Title := 'Presupuesto - ' + AppFactuGES.EmpresaActiva.NOMBRE; + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + end; end; + finally + FreeAndNil(AStream); + AEditor := Nil; end; finally - FreeAndNil(AStream); - AEditor := Nil; + HideHourglassCursor; end; end; @@ -167,6 +173,7 @@ var AEditor : IEditorPresupuestosClientePreview; begin AEditor := NIL; + ShowHourglassCursor; try AStream := FDataModule.GetRptPresupuestos(AListaID); diff --git a/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteReportController.pas b/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteReportController.pas index 01e11251..224e74d6 100644 --- a/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteReportController.pas +++ b/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteReportController.pas @@ -60,23 +60,28 @@ var begin AEditor := NIL; - AStream := FDataModule.GetReport(ListaID); + ShowHourglassCursor; try - CreateEditor('EditorRecibosClientePreview', IEditorRecibosClientePreview, AEditor); - if Assigned(AEditor) then - begin - try - AEditor.Controller := Self; - AEditor.ListaID := ListaID; - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; + AStream := FDataModule.GetReport(ListaID); + try + CreateEditor('EditorRecibosClientePreview', IEditorRecibosClientePreview, AEditor); + if Assigned(AEditor) then + begin + try + AEditor.Controller := Self; + AEditor.ListaID := ListaID; + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + end; end; + finally + FreeAndNil(AStream); + AEditor := Nil; end; finally - FreeAndNil(AStream); - AEditor := Nil; + HideHourglassCursor; end; end; @@ -86,6 +91,7 @@ var AEditor : IEditorRecibosClientePreview; begin AEditor := NIL; + ShowHourglassCursor; try AStream := FDataModule.GetReport(ListaID); diff --git a/Source/Modulos/Recibos de proveedor/Controller/uRecibosProveedorReportController.pas b/Source/Modulos/Recibos de proveedor/Controller/uRecibosProveedorReportController.pas index 44f26f4c..a57cc225 100644 --- a/Source/Modulos/Recibos de proveedor/Controller/uRecibosProveedorReportController.pas +++ b/Source/Modulos/Recibos de proveedor/Controller/uRecibosProveedorReportController.pas @@ -59,19 +59,24 @@ var begin AEditor := NIL; - AStream := FDataModule.GetReport(ID); + ShowHourglassCursor; try - CreateEditor('EditorRecibosProveedorPreview', IEditorRecibosProveedorPreview, AEditor); - if Assigned(AEditor) then - try - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; - end; + AStream := FDataModule.GetReport(ID); + try + CreateEditor('EditorRecibosProveedorPreview', IEditorRecibosProveedorPreview, AEditor); + if Assigned(AEditor) then + try + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + end; + finally + FreeAndNil(AStream); + AEditor := Nil; + end; finally - FreeAndNil(AStream); - AEditor := Nil; + HideHourglassCursor; end; end; @@ -81,6 +86,7 @@ var AEditor : IEditorRecibosProveedorPreview; begin AEditor := NIL; + ShowHourglassCursor; try AStream := FDataModule.GetReport(ID); diff --git a/Source/Modulos/Remesas de cliente/Controller/uRemesasClienteReportController.pas b/Source/Modulos/Remesas de cliente/Controller/uRemesasClienteReportController.pas index 10a7f5a0..0d2c902b 100644 --- a/Source/Modulos/Remesas de cliente/Controller/uRemesasClienteReportController.pas +++ b/Source/Modulos/Remesas de cliente/Controller/uRemesasClienteReportController.pas @@ -58,19 +58,25 @@ var AEditor : IEditorRemesasClientePreview; begin AEditor := NIL; - AStream := FDataModule.GetReport(ID); + + ShowHourglassCursor; try - CreateEditor('EditorRemesasClientePreview', IEditorRemesasClientePreview, AEditor); - if Assigned(AEditor) then - try - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; - end; + AStream := FDataModule.GetReport(ID); + try + CreateEditor('EditorRemesasClientePreview', IEditorRemesasClientePreview, AEditor); + if Assigned(AEditor) then + try + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + end; + finally + FreeAndNil(AStream); + AEditor := Nil; + end; finally - FreeAndNil(AStream); - AEditor := Nil; + HideHourglassCursor; end; end; @@ -80,6 +86,7 @@ var AEditor : IEditorRemesasClientePreview; begin AEditor := NIL; + ShowHourglassCursor; try AStream := FDataModule.GetReport(ID); diff --git a/Source/Modulos/Remesas de proveedor/Controller/uRemesasProveedorReportController.pas b/Source/Modulos/Remesas de proveedor/Controller/uRemesasProveedorReportController.pas index b831708d..3aafe005 100644 --- a/Source/Modulos/Remesas de proveedor/Controller/uRemesasProveedorReportController.pas +++ b/Source/Modulos/Remesas de proveedor/Controller/uRemesasProveedorReportController.pas @@ -59,19 +59,24 @@ var begin AEditor := NIL; - AStream := FDataModule.GetReport(ID); + ShowHourglassCursor; try - CreateEditor('EditorRemesasProveedorPreview', IEditorRemesasProveedorPreview, AEditor); - if Assigned(AEditor) then - try - AEditor.LoadFromStream(AStream); - AEditor.Preview; - finally - AEditor.Release; - end; + AStream := FDataModule.GetReport(ID); + try + CreateEditor('EditorRemesasProveedorPreview', IEditorRemesasProveedorPreview, AEditor); + if Assigned(AEditor) then + try + AEditor.LoadFromStream(AStream); + AEditor.Preview; + finally + AEditor.Release; + end; + finally + FreeAndNil(AStream); + AEditor := Nil; + end; finally - FreeAndNil(AStream); - AEditor := Nil; + HideHourglassCursor; end; end;