From dc4e7c7c4ba1c765197bace31d369e07cfc89bd0 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 25 Mar 2008 18:34:28 +0000 Subject: [PATCH] =?UTF-8?q?Obra:=20=20-=20Activar=20la=20operaci=C3=B3n=20?= =?UTF-8?q?de=20duplicar=20una=20obra=20=20-=20A=C3=B1adir=20en=20el=20gri?= =?UTF-8?q?d=20la=20columna=20de=20subcontrata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@357 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- .../Obras/Controller/uObrasController.pas | 2 +- Source/Modulos/Obras/Views/uEditorObras.dfm | 41 ++++++++----- Source/Modulos/Obras/Views/uEditorObras.pas | 3 - Source/Modulos/Obras/Views/uViewObras.dfm | 58 +++++++++++++------ Source/Modulos/Obras/Views/uViewObras.pas | 3 +- 5 files changed, 69 insertions(+), 38 deletions(-) diff --git a/Source/Modulos/Obras/Controller/uObrasController.pas b/Source/Modulos/Obras/Controller/uObrasController.pas index 41d431ad..2f60da3d 100644 --- a/Source/Modulos/Obras/Controller/uObrasController.pas +++ b/Source/Modulos/Obras/Controller/uObrasController.pas @@ -161,7 +161,7 @@ begin try DuplicarRegistros(AObra.DataTable, Result.DataTable, mdrActual); - // Hay que dejar algunos campos como si fuera un Obra nuevo + // Hay que dejar algunos campos como si fuera una obra nuevo Result.Edit; with Result do begin diff --git a/Source/Modulos/Obras/Views/uEditorObras.dfm b/Source/Modulos/Obras/Views/uEditorObras.dfm index 32f59188..17df7202 100644 --- a/Source/Modulos/Obras/Views/uEditorObras.dfm +++ b/Source/Modulos/Obras/Views/uEditorObras.dfm @@ -2,12 +2,17 @@ inherited fEditorObras: TfEditorObras Left = 489 Top = 325 Caption = 'Lista de obras' - ExplicitHeight = 471 + ClientHeight = 503 + ClientWidth = 853 + ExplicitWidth = 861 + ExplicitHeight = 530 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader + Width = 853 Caption = 'Lista de obras' inherited Image1: TImage + Left = 826 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -30,6 +35,7 @@ inherited fEditorObras: TfEditorObras end end inherited TBXDock: TTBXDock + Width = 853 inherited tbxMain: TTBXToolbar ExplicitWidth = 474 end @@ -42,17 +48,24 @@ inherited fEditorObras: TfEditorObras Visible = False end end + inherited tbxMenu: TTBXToolbar + ExplicitWidth = 853 + end inherited TBXTMain2: TTBXToolbar Left = 275 DockPos = 275 ExplicitLeft = 275 end end + inherited StatusBar: TJvStatusBar + Top = 484 + Width = 853 + end inline frViewObras1: TfrViewObras [3] Left = 0 Top = 102 - Width = 543 - Height = 323 + Width = 853 + Height = 382 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -66,8 +79,8 @@ inherited fEditorObras: TfEditorObras ExplicitWidth = 543 ExplicitHeight = 323 inherited cxGrid: TcxGrid - Width = 543 - Height = 195 + Width = 853 + Height = 254 ExplicitWidth = 543 ExplicitHeight = 195 inherited cxGridView: TcxGridDBTableView @@ -83,12 +96,12 @@ inherited fEditorObras: TfEditorObras end end inherited frViewFiltroBase1: TfrViewFiltroBase - Width = 543 + Width = 853 ExplicitWidth = 543 inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 543 inherited dxLayoutControl1: TdxLayoutControl - Width = 543 + Width = 853 ExplicitWidth = 543 inherited txtFiltroTodo: TcxTextEdit ExplicitWidth = 273 @@ -99,31 +112,31 @@ inherited fEditorObras: TfEditorObras Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 337 - ExplicitLeft = 337 + Left = 523 + ExplicitLeft = 523 ExplicitWidth = 121 Width = 121 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 543 + Width = 853 ExplicitWidth = 543 inherited tbxBotones: TTBXToolbar - Width = 533 + Width = 843 ExplicitWidth = 533 end end end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 297 + Top = 356 ExplicitTop = 297 ExplicitWidth = 543 inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 543 + Width = 853 ExplicitWidth = 543 inherited TBXToolbar1: TTBXToolbar - Width = 533 + Width = 843 ExplicitWidth = 533 end end diff --git a/Source/Modulos/Obras/Views/uEditorObras.pas b/Source/Modulos/Obras/Views/uEditorObras.pas index a34c5fd1..8d56348b 100644 --- a/Source/Modulos/Obras/Views/uEditorObras.pas +++ b/Source/Modulos/Obras/Views/uEditorObras.pas @@ -120,8 +120,6 @@ procedure TfEditorObras.DuplicarInterno; var AObra : IBizObra; begin -AppFactuGES.ShowCapado; -{ inherited; AObra := FController.Duplicar(Obras); try @@ -129,7 +127,6 @@ AppFactuGES.ShowCapado; finally actRefrescar.Execute; end; -} end; procedure TfEditorObras.EliminarInterno; diff --git a/Source/Modulos/Obras/Views/uViewObras.dfm b/Source/Modulos/Obras/Views/uViewObras.dfm index 20887d80..68329aec 100644 --- a/Source/Modulos/Obras/Views/uViewObras.dfm +++ b/Source/Modulos/Obras/Views/uViewObras.dfm @@ -15,49 +15,66 @@ inherited frViewObras: TfrViewObras BestFitMaxWidth = 22 MinWidth = 22 Options.HorzSizing = False + VisibleForCustomization = False Width = 22 IsCaptionAssigned = True end object cxGridViewNOMBRE: TcxGridDBColumn DataBinding.FieldName = 'NOMBRE' + PropertiesClassName = 'TcxTextEditProperties' SortIndex = 0 SortOrder = soAscending Width = 304 end - object cxGridViewPERSONACONTACTO: TcxGridDBColumn - DataBinding.FieldName = 'PERSONA_CONTACTO' - Width = 118 + object cxGridViewCALLE: TcxGridDBColumn + DataBinding.FieldName = 'CALLE' + Visible = False + BestFitMaxWidth = 80 + end + object cxGridViewPOBLACION: TcxGridDBColumn + DataBinding.FieldName = 'POBLACION' + Visible = False + BestFitMaxWidth = 80 + end + object cxGridViewCODIGO_POSTAL: TcxGridDBColumn + DataBinding.FieldName = 'CODIGO_POSTAL' + Visible = False + BestFitMaxWidth = 80 + end + object cxGridViewPROVINCIA: TcxGridDBColumn + DataBinding.FieldName = 'PROVINCIA' + Visible = False + BestFitMaxWidth = 80 end object cxGridViewTELEFONO: TcxGridDBColumn DataBinding.FieldName = 'TELEFONO' - BestFitMaxWidth = 64 + BestFitMaxWidth = 80 Width = 118 end object cxGridViewMOVIL: TcxGridDBColumn DataBinding.FieldName = 'MOVIL' Visible = False + BestFitMaxWidth = 80 end object cxGridViewFAX: TcxGridDBColumn DataBinding.FieldName = 'FAX' + BestFitMaxWidth = 80 end - object cxGridViewCALLE: TcxGridDBColumn - DataBinding.FieldName = 'CALLE' - Visible = False - end - object cxGridViewPROVINCIA: TcxGridDBColumn - DataBinding.FieldName = 'PROVINCIA' - Visible = False - end - object cxGridViewPOBLACION: TcxGridDBColumn - DataBinding.FieldName = 'POBLACION' - Visible = False - end - object cxGridViewCODIGO_POSTAL: TcxGridDBColumn - DataBinding.FieldName = 'CODIGO_POSTAL' - Visible = False + object cxGridViewPERSONACONTACTO: TcxGridDBColumn + DataBinding.FieldName = 'PERSONA_CONTACTO' + BestFitMaxWidth = 80 + Width = 118 end object cxGridViewNOMBRE_CLIENTE: TcxGridDBColumn DataBinding.FieldName = 'NOMBRE_CLIENTE' + PropertiesClassName = 'TcxTextEditProperties' + BestFitMaxWidth = 80 + Width = 100 + end + object cxGridViewNOMBRE_SUBCONTRATA: TcxGridDBColumn + DataBinding.FieldName = 'NOMBRE_SUBCONTRATA' + PropertiesClassName = 'TcxTextEditProperties' + BestFitMaxWidth = 80 Width = 100 end end @@ -80,6 +97,9 @@ inherited frViewObras: TfrViewObras end end end + inherited pnlAgrupaciones: TTBXDockablePanel + ExplicitWidth = 554 + end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink ReportDocument.CreationDate = 38673.842406053240000000 diff --git a/Source/Modulos/Obras/Views/uViewObras.pas b/Source/Modulos/Obras/Views/uViewObras.pas index 9584a842..10302e24 100644 --- a/Source/Modulos/Obras/Views/uViewObras.pas +++ b/Source/Modulos/Obras/Views/uViewObras.pas @@ -13,7 +13,7 @@ uses dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX, - TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces; + TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxTextEdit; type IViewObras = interface(IViewGrid) @@ -36,6 +36,7 @@ type cxGridViewMOVIL: TcxGridDBColumn; cxGridViewFAX: TcxGridDBColumn; cxGridViewNOMBRE_CLIENTE: TcxGridDBColumn; + cxGridViewNOMBRE_SUBCONTRATA: TcxGridDBColumn; procedure cxGridViewIDCustomDrawCell( Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);