From af7f1b0a5e689a6ad4c9cff6bb3203c99ba784e7 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 4 Sep 2008 17:47:00 +0000 Subject: [PATCH] Poder ver la ficha de una obra desde un pedido a proveedor. git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@570 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- .../Views/uViewObraReserva.dfm | 199 +++++++++++++++++- .../Views/uViewObraReserva.pas | 28 ++- 2 files changed, 214 insertions(+), 13 deletions(-) diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewObraReserva.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewObraReserva.dfm index 90c2792f..9c2af920 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewObraReserva.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewObraReserva.dfm @@ -1,22 +1,21 @@ inherited frViewObraReserva: TfrViewObraReserva Width = 586 - Height = 72 + Height = 66 ExplicitWidth = 586 - ExplicitHeight = 72 + ExplicitHeight = 66 object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 Width = 586 - Height = 72 + Height = 66 Align = alClient ParentBackground = True TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth, acsHeight] - ExplicitHeight = 46 DesignSize = ( 586 - 72) + 66) object Label1: TLabel Left = 10 Top = 10 @@ -35,6 +34,7 @@ inherited frViewObraReserva: TfrViewObraReserva Properties.KeyFieldNames = 'ID' Properties.ListColumns = < item + SortOrder = soAscending FieldName = 'NOMBRE' end> Properties.ListOptions.AnsiSort = True @@ -47,13 +47,61 @@ inherited frViewObraReserva: TfrViewObraReserva Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 0 - Width = 551 + Width = 168 + end + object Button3: TBitBtn + Left = 432 + Top = 29 + Width = 144 + Height = 25 + Action = actVerObra + Caption = 'Ver datos de la obra...' + TabOrder = 1 + Glyph.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000000000000000000000000000000000000FF00FF00FF00 + FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF002A54A50058339A00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00A87F7C00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF002491C6000E485F00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00A87F7C00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF000098C8000E485F00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00A87F7C00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF000098C8000E485F00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00A87F7C00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF000098C8000E485F00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00A87F7C00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF000098C8000E485F00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF0000C8F800279DFA004878F800FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF000098C8000E485F00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF004878F800FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF000098C8000E485F00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF0000C8F80008F3FF004878F800FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF000098C8000C496300FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF0000C8F80008F3FF004878F800FF00FF00E7E7E700847B7B00FF00 + FF00FF00FF004E748700385E7100FF00FF007D736B005A5F5F00FF00FF00FF00 + FF00FF00FF0000C8F80008F3FF004878F800FF00FF0086868400797777005D5D + 5C00535452004F514F004B4F500064676700C9CCD000847B7B00FF00FF00FF00 + FF00FF00FF0000C8F80008F3FF004878F800FF00FF00847B7B00EFEFEF00847B + 7B0089898900EAECED00EAECED00EAECED00847B7B00FF00FF00FF00FF00FF00 + FF00FF00FF0000C8F80000C8F80000C8F800FF00FF008B624F00847B7B00FF00 + FF00847B7B00847B7B00847B7B00847B7B00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 + FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00} end object dxLayoutGroup1: TdxLayoutGroup ShowCaption = False @@ -66,11 +114,26 @@ inherited frViewObraReserva: TfrViewObraReserva ControlOptions.AutoColor = True ControlOptions.ShowBorder = False end - object dxLayoutControl1Item6: TdxLayoutItem - Offsets.Left = 15 + object dxLayoutControl1Group1: TdxLayoutGroup ShowCaption = False - Control = cbListaObrasReserva - ControlOptions.ShowBorder = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item6: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Offsets.Left = 15 + ShowCaption = False + Control = cbListaObrasReserva + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahRight + ShowCaption = False + Control = Button3 + ControlOptions.ShowBorder = False + end end end end @@ -82,4 +145,120 @@ inherited frViewObraReserva: TfrViewObraReserva Left = 160 Top = 8 end + object PngImageList: TPngImageList + PngImages = < + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000970485973000017120000171201679FD25200000A4F694343505068 + 6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7 + DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1 + 114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1 + 7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E + 11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0 + 07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08 + 801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027 + 7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A + 450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00 + 305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078 + 99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279 + 99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA + BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225 + EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5 + E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D + 814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9 + 582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35 + 00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380 + 6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000 + 44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64 + 801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E + 3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8 + 21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C + 46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064 + 74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4 + 6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704 + 128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384 + 51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4 + 37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9 + DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853 + E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1 + B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11 + DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867 + 197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA + 0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353 + E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659 + C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD + D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C + 744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48 + AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7 + 53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E + 4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5 + 35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F + 8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B + 4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8 + 6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711 + A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217 + 67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A + DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767 + 1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5 + 9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5 + D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761 + EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43 + 7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65 + F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69 + 0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577 + D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F + C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B + 17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816 + 8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC + 91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD + 31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507 + C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E + 2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39 + B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D + 6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D + 1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF + 66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97 + CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5 + 61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49 + FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D + D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9 + F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B + 625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367 + F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B + E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB + 9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D + DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41 + D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43 + 058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB + AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6 + 1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553 + D0A7FB93199393FF040398F3FC63332DDB000001014944415478DA63FCFFFF3F + 032580717019F0F324239CC36EFE9F3120B9E7BF8EE44F8696966AC69A9A5614 + 9B4062580D60D7E660F8D9EAC0C0DEBE1DACA9A4249BA1A7672A031F1F2B434A + 72225C6D5FFF2CB021780D686D6FFFFFF9E36786A7CF9E307CFBFE8DE1EFDF3F + 0C8CFFFE30884B483264A6A632AC5EBF1BBF0B5EBC78F17FCA94B970E77694FA + FF7FF5EA1543DFC2E38C392575FFBFBCB98BDF00F4003B3993F1FFEC8D3C0C73 + B67D86CB61C4C2CF4ACFFFD834C30C98BE818F61C1F68FD80D00B980E9AA3AC3 + BFDB8A385D80D70010A86D58F9BFB9219C3C178C00038E4F52FD3F73FB2BFC06 + 30323232E0CA60CB42B5FF7FBDAFC7907A6639DC0000A2ACDE77DC4275670000 + 000049454E44AE426082} + Name = 'PngImage0' + Background = clWindow + end> + Left = 248 + Top = 8 + Bitmap = {} + end + object ActionList1: TActionList + Images = PngImageList + Left = 280 + Top = 8 + object actVerObra: TAction + Caption = 'Ver datos de la obra...' + ImageIndex = 0 + OnExecute = actVerObraExecute + OnUpdate = actVerObraUpdate + end + end end diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewObraReserva.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewObraReserva.pas index 4ef368cb..6a2fd03f 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewObraReserva.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewObraReserva.pas @@ -9,7 +9,7 @@ uses cxDBLookupEdit, cxDBLookupComboBox, StdCtrls, cxControls, DB, uDADataTable, ActnList, uBizAlmacenes, uAlmacenesController, uPedidosProveedorController, Buttons, uDAInterfaces, uBizObras, uObrasController, cxButtonEdit, cxDBEdit, - ExtCtrls; + ExtCtrls, ImgList, PngImageList; type IViewDireccionEntregaPedidoProv = interface(IViewBase) @@ -28,6 +28,14 @@ type dsObras: TDADataSource; Label1: TLabel; dxLayoutControl1Item1: TdxLayoutItem; + dxLayoutControl1Item2: TdxLayoutItem; + Button3: TBitBtn; + dxLayoutControl1Group1: TdxLayoutGroup; + PngImageList: TPngImageList; + ActionList1: TActionList; + actVerObra: TAction; + procedure actVerObraExecute(Sender: TObject); + procedure actVerObraUpdate(Sender: TObject); protected FObrasController : IObrasController; FObras: IBizObra; @@ -35,7 +43,6 @@ type FController : IPedidosProveedorController; function GetPedidoProveedor: IBizPedidoProveedor; procedure SetPedidoProveedor(const Value: IBizPedidoProveedor); - public property PedidoProveedor: IBizPedidoProveedor read GetPedidoProveedor write SetPedidoProveedor; constructor Create(AOwner: TComponent); override; @@ -47,7 +54,21 @@ implementation {$R *.dfm} uses - uEditorRegistryUtils, uCustomView, uEditorElegirPersonaContactoPedido; + uEditorRegistryUtils, uCustomView, uEditorElegirPersonaContactoPedido, + uStringsUtils; + +procedure TfrViewObraReserva.actVerObraExecute(Sender: TObject); +begin + inherited; + FObrasController.Ver(FObras); +end; + +procedure TfrViewObraReserva.actVerObraUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Enabled := Assigned(FObras) and + (not EsCadenaVacia(cbListaObrasReserva.Text)); +end; constructor TfrViewObraReserva.Create(AOwner: TComponent); begin @@ -81,4 +102,5 @@ begin dsPedido.DataTable := FPedido.DataTable; end; + end.