diff --git a/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.dfm b/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.dfm index b158aeb6..f4bdc234 100644 --- a/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.dfm +++ b/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.dfm @@ -166,40 +166,25 @@ inherited frViewDatosYSeleccionCliente: TfrViewDatosYSeleccionCliente Caption = 'Elegir un cliente' TabOrder = 0 Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000000000000000000000000000000000000FF00FF00FF00 - FF00FF00FF00EB00EB00C507C600AB13AD00A119A2009F19A000A215A400AA10 - AC00B608B800CE00CE00EF00EF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00B426B000526840004A823400478F310043962F0042992F0043972F004690 - 3100488533004B7237005A405100D201D200FF00FF00FF00FF00FF00FF00FF00 - FF0062654E004F81350047903100409C2E003AA62C0038AA2B0039A72B003E9E - 2D00459230004D84340056753800A0189F00FF00FF00FF00FF00FF00FF00FF00 - FF005F6B4C004B89330042992F0039A82B0032B428002EBB260031B6270037AB - 2A00409C2E00498C3200527B3600B015B100FF00FF00FF00FF00FF00FF00FF00 - FF0090488700488D32003E9E2D0035AF290035B631007ACB7B002DBF280033B2 - 28003DA12D0047903100576A4800EC01EC00FF00FF00FF00FF00FF00FF00FF00 - FF00F008F1005F7351003E9F2D0034B0290080AC8100D2D3D30081BB820032B2 - 28003DA22D004A863A00C519C500FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00EE09EF007861730036923E00598CAE00498CBB004A81A6002B70 - 3A00606D5900D613D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00EA0CF400608CD00054A2D80053A1D6004F9DD300488B - C2009D11AC00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF008C67DE005CA9DD005CA9DD005AA7DC0056A4D900519F - D400565FAB00EA00EA00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00EC0DF60060A7DE0063B0E30063B0E30061AEE1005CA9DD0056A4 - D9004E94CC00C105C600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00C532ED0066B2E5006BB7E9006BB7E90067B3E60061AEE1005AA7 - DC00539FD500A817BE00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00BA3AE7004989B1004A85AC005895BD0068B2E30064B0E4005CA9 - DE0053A0D400AA1BC300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00CA23E8005098C400539AC7004E93BE00437DA2005190BA005198 - C6003C79A000BE08C300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00F804FC006995D40062ACDA005DA6D3005299C6004284AD003C7F - A900535AA100F300F300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00C140ED0071BAEA0068B2E00059A1CF004990BC004378 - AA00C315D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00FF00FF00C83EF000808BDF00668BCC007C60C700D116 - E400FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00} + 42020000424D4202000000000000420000002800000010000000100000000100 + 1000030000000002000000000000000000000000000000000000007C0000E003 + 00001F0000001F7C1F7C1F7C1D74186055547450735054505554365C19641D74 + 1F7C1F7C1F7C1F7C1F7C9658AA21091A281A481668164816481A091AC9190B29 + 1A681F7C1F7C1F7C1F7C8C25091A481A68168716A71687166716481A091ACA1D + 744C1F7C1F7C1F7C1F7CAB25291A6816A716C616E512C612A6166816291AEA19 + 56581F7C1F7C1F7C1F7C3241291A6716A616C61A2F3FE516C6168716481AAA25 + 1D741F7C1F7C1F7C1F7C3E78CB296716C616B0425A6BF042C6168716091E7860 + 1F7C1F7C1F7C1F7C1F7C1F7C3D748F39461E2B56295E0952C51DAC2D5A681F7C + 1F7C1F7C1F7C1F7C1F7C1F7C1F7C3D782C6A8A6E8A6A696A296253541F7C1F7C + 1F7C1F7C1F7C1F7C1F7C1F7C1F7C916DAB6EAB6E8B6E8A6E6A6A6A551D741F7C + 1F7C1F7C1F7C1F7C1F7C1F7C3D788C6ECC72CC72AC72AB6E8A6E496618601F7C + 1F7C1F7C1F7C1F7C1F7C1F7CD874CC72CD76CD76CC72AC728B6E6A6A555C1F7C + 1F7C1F7C1F7C1F7C1F7C1F7CF770295A09564B5ECD72CC72AB6E8A6A75601F7C + 1F7C1F7C1F7C1F7C1F7C1F7C99746A626A62495EE8514A5E6A62E75137601F7C + 1F7C1F7C1F7C1F7C1F7C1F7C1F7C4D6AAC6E8B6A6A620856E7556A511E781F7C + 1F7C1F7C1F7C1F7C1F7C1F7C1F7C1875EE76CD728B66495EE85558681F7C1F7C + 1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7CF978306E2C668F615A701F7C1F7C1F7C + 1F7C1F7C1F7C} end object Button2: TBitBtn Left = 131 @@ -210,40 +195,25 @@ inherited frViewDatosYSeleccionCliente: TfrViewDatosYSeleccionCliente Caption = 'Dar de alta un cliente' TabOrder = 1 Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000000000000000000000000000000000000FF00FF00FF00 - FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00D5BFB1006947 - 3100694731006947310069473100694731006947310069473100694731006947 - 3100694731006947310069473100694731006947310069473100D5BFB100F6F2 - EF00B7A29300B7A29300B7A29300B7A29300B7A29300B7A29300B7A29300B7A2 - 9300B7A29300B7A29300B7A29300B7A29300B7A2930069473100D5BFB1002A80 - 1E00136F0D00136F0D00136F0D00136F0D00136F0D00136F0D002A801E00E3D5 - CE00E0D1C900DFCFC600DCCBC100DBC9BF00B7A2930069473100D5BFB10059A8 - 5100448B2F003CA02C0032A4260032A526003D9E2C00438D2E00136F0D00E7DB - D500A1745C00A1745C00A1745C00A1745C00B7A2930069473100D5BFB10080BC - 790042952E0031A62600369B3200369E320032A727003E952C00136F0D00EAE0 - DA00E7DBD500E4D7D000E2D3CB00DFCFC600B7A2930069473100D5BFB100CFE8 - CD004CA741002D942F0071AB90006FA68E0030923100136F0D00EFE8E300EDE4 - DF00A1745C00A1745C00A1745C00A1745C00B7A2930069473100D5BFB100FFFF - FF00B9DDC2004F9DA000559BC8004E96C2004E8E8F00A8C2AA00F2ECE800EFE8 - E300EDE4DF00EAE0DA00E7DBD500E4D7D000B7A2930069473100D5BFB100FFFF - FF00A5CDE8005DAADD005CA9DD0057A4D900519ACC00A0BACA00F5F0ED00F2EC - E800EFE8E300EDE4DF00EAE0DA00E7DBD500B7A2930069473100D5BFB100ECF6 - FA006CB9DF0065B2E50065B1E5005FACDF0056A2D700689EBE00F7F4F100F5F0 - ED00F2ECE800006000000060000000600000B7A2930069473100D5BFB100E9F6 - FA005BB0D5005CA6D50065AFDF0062AFE20058A4D8003285A700FAF8F600F7F4 - F100F7A073000060000033CB510000600000B7A2930069473100D5BFB100F4FA - FC0078C0DD0056A0CD00569DCA00539CCA00448DBB003285A700FDFCFB000060 - 0000006000000060000040D86500006000000060000000600000D5BFB100FFFF - FF00CEEAF40062B5DE005DA7D5004B92BE003285A700C6DCE600FFFFFF000060 - 000060F898005AF28F004DE57A0040D865003AD25C0000600000D5BFB100FFFF - FF00FFFFFF00CEEAF400A5CDE800A5CDE800CEEAF400FFFFFF00FFFFFF000060 - 000000600000006000005AF28F00006000000060000000600000D5BFB100D5BF - B100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BF - B100D5BFB1000060000060F8980000600000D5BFB100D5BFB100FF00FF00FF00 - FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00006000000060000000600000FF00FF00FF00FF00} + 42020000424D4202000000000000420000002800000010000000100000000100 + 1000030000000002000000000000000000000000000000000000007C0000E003 + 00001F0000001F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C + 1F7C1F7C1F7CFA5A0D190D190D190D190D190D190D190D190D190D190D190D19 + 0D190D190D19FA5ADE77964A964A964A964A964A964A964A964A964A964A964A + 964A964A0D19FA5A050EA205A205A205A205A205A205050E5C675C673B633B63 + 3B5F964A0D19FA5AAB2A281687168612861267162816A2057C6BD42DD42DD42D + D42D964A0D19FA5AF03E48168612661A661A86124716A2059D6F7C6B5C6B5C67 + 3B63964A0D19FA5AB96789224516AE4A8D46461AA205BD739D6FD42DD42DD42D + D42D964A0D19FA5AFF7F776369526A66496229461557BE77BD739D6F9D6F7C6B + 5C6B964A0D19FA5AFF7F3477AB6EAB6E8A6E6A66F466DE77BE77BD739D6F9D6F + 7C6B964A0D19FA5ADD7FED6ECC72CC72AB6E8A6A6D5EDE7BDE77BE7780018001 + 8001964A0D19FA5ADD7FCB6A8B6AAC6EAC728B6E0652FF7BDE7B9E3A8001262B + 8001964A0D19FA5AFE7F0F6F8A666A666A66285E0652FF7F8001800180016833 + 800180018001FA5AFF7FB97BCC6E8B6A495E06527873FF7F8001EC4FCB47893F + 6833472F8001FA5AFF7FFF7FB97B34773477B97BFF7FFF7F800180018001CB47 + 800180018001FA5AFA5AFA5AFA5AFA5AFA5AFA5AFA5AFA5AFA5AFA5A8001EC4F + 8001FA5AFA5A1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C80018001 + 80011F7C1F7C} end object Button3: TBitBtn Left = 148 @@ -254,40 +224,25 @@ inherited frViewDatosYSeleccionCliente: TfrViewDatosYSeleccionCliente Caption = 'Ver ficha completa del cliente...' TabOrder = 8 Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000000000000000000000000000000000000FF00FF00FF00 - FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00D5BFB1006947 - 3100694731006947310069473100694731006947310069473100694731006947 - 3100694731006947310069473100694731006947310069473100D5BFB100F6F2 - EF00B7A29300B7A29300B7A29300B7A29300B7A29300B7A29300B7A29300B7A2 - 9300B7A29300B7A29300B7A29300B7A29300B7A2930069473100D5BFB1002A80 - 1E00136F0D00136F0D00136F0D00136F0D00136F0D00136F0D002A801E00E3D5 - CE00E0D1C900DFCFC600DCCBC100DBC9BF00B7A2930069473100D5BFB10059A8 - 5100448B2F003CA02C0032A4260032A526003D9E2C00438D2E00136F0D00E7DB - D500A1745C00A1745C00A1745C00A1745C00B7A2930069473100D5BFB10080BC - 790042952E0031A62600369B3200369E320032A727003E952C00136F0D00EAE0 - DA00E7DBD500E4D7D000E2D3CB00DFCFC600B7A2930069473100D5BFB100CFE8 - CD004CA741002D942F0071AB90006FA68E0030923100136F0D00EFE8E300EDE4 - DF00A1745C00A1745C00A1745C00A1745C00B7A2930069473100D5BFB100FFFF - FF00B9DDC2004F9DA000559BC8004E96C2004E8E8F00A8C2AA00F2ECE800EFE8 - E300EDE4DF00EAE0DA00E7DBD500E4D7D000B7A2930069473100D5BFB100FFFF - FF00A5CDE8005DAADD005CA9DD0057A4D900519ACC00A0BACA00F5F0ED00F2EC - E800EFE8E300EDE4DF00EAE0DA00E7DBD500B7A2930069473100D5BFB100ECF6 - FA006CB9DF0065B2E50065B1E5005FACDF0056A2D700689EBE00F7F4F100F5F0 - ED00F2ECE800EFE8E300EDE4DF00EAE0DA00B7A2930069473100D5BFB100E9F6 - FA005BB0D5005CA6D50065AFDF0062AFE20058A4D8003285A700FAF8F600F7F4 - F100F7A07300F7A07300F7A07300F7A07300B7A2930069473100D5BFB100F4FA - FC0078C0DD0056A0CD00569DCA00539CCA00448DBB003285A700FDFCFB00FAF8 - F600F7F4F100F5F0ED00F2ECE800EFE8E300B7A2930069473100D5BFB100FFFF - FF00CEEAF40062B5DE005DA7D5004B92BE003285A700C6DCE600FFFFFF00FDFC - FB00F7A07300F7A07300F7A07300F7A07300B7A2930069473100D5BFB100FFFF - FF00FFFFFF00CEEAF400A5CDE800A5CDE800CEEAF400FFFFFF00FFFFFF00FFFF - FF00FEFEFD00FCFAF900F9F6F400F6F2EF00F3EEEA0069473100D5BFB100D5BF - B100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BF - B100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100FF00FF00FF00 - FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00} + 42020000424D4202000000000000420000002800000010000000100000000100 + 1000030000000002000000000000000000000000000000000000007C0000E003 + 00001F0000001F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C + 1F7C1F7C1F7CFA5A0D190D190D190D190D190D190D190D190D190D190D190D19 + 0D190D190D19FA5ADE77964A964A964A964A964A964A964A964A964A964A964A + 964A964A0D19FA5A050EA205A205A205A205A205A205050E5C675C673B633B63 + 3B5F964A0D19FA5AAB2A281687168612861267162816A2057C6BD42DD42DD42D + D42D964A0D19FA5AF03E48168612661A661A86124716A2059D6F7C6B5C6B5C67 + 3B63964A0D19FA5AB96789224516AE4A8D46461AA205BD739D6FD42DD42DD42D + D42D964A0D19FA5AFF7F776369526A66496229461557BE77BD739D6F9D6F7C6B + 5C6B964A0D19FA5AFF7F3477AB6EAB6E8A6E6A66F466DE77BE77BD739D6F9D6F + 7C6B964A0D19FA5ADD7FED6ECC72CC72AB6E8A6A6D5EDE7BDE77BE77BD739D6F + 9D6F964A0D19FA5ADD7FCB6A8B6AAC6EAC728B6E0652FF7BDE7B9E3A9E3A9E3A + 9E3A964A0D19FA5AFE7F0F6F8A666A666A66285E0652FF7FFF7BDE7BDE77BE77 + BD73964A0D19FA5AFF7FB97BCC6E8B6A495E06527873FF7FFF7F9E3A9E3A9E3A + 9E3A964A0D19FA5AFF7FFF7FB97B34773477B97BFF7FFF7FFF7FFF7FFF7FDF7B + DE77BE770D19FA5AFA5AFA5AFA5AFA5AFA5AFA5AFA5AFA5AFA5AFA5AFA5AFA5A + FA5AFA5AFA5A1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C1F7C + 1F7C1F7C1F7C} end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False diff --git a/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.pas b/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.pas index bbff9649..409223f5 100644 --- a/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.pas +++ b/Source/Modulos/Contactos/Views/uViewDatosYSeleccionCliente.pas @@ -22,6 +22,10 @@ type procedure SetCliente(Value: IBizCliente); property Cliente: IBizCliente read GetCliente write SetCliente; + function GetID_Cliente: integer; + procedure SetID_Cliente(const Value: integer); + property ID_Cliente: integer read GetID_Cliente write SetID_Cliente; + function GetOnClienteChanged : TNotifyEvent; procedure SetOnClienteChanged (const Value : TNotifyEvent); property OnClienteChanged : TNotifyEvent read GetOnClienteChanged @@ -83,14 +87,16 @@ type function GetOnClienteChanged : TNotifyEvent; procedure SetOnClienteChanged (const Value : TNotifyEvent); procedure SetReadOnly(Value: Boolean); override; - + function GetID_Cliente: integer; + procedure SetID_Cliente(const Value: integer); public constructor Create(AOwner: TComponent); override; + destructor Destroy; override; property Controller: IClientesController read GetController write SetController; property Cliente: IBizCliente read GetCliente write SetCliente; property OnClienteChanged : TNotifyEvent read GetOnClienteChanged write SetOnClienteChanged; property MsgElegirCliente : String read GetMsgElegirCliente write SetMsgElegirCliente; - + property ID_Cliente: integer read GetID_Cliente write SetID_Cliente; end; implementation @@ -125,15 +131,15 @@ var ACliente : IBizCliente; begin inherited; - ACliente := (FController.Nuevo as IBizCliente); - FController.Ver(ACliente); + ACliente := (Controller.Nuevo as IBizCliente); + Controller.Ver(ACliente); Cliente := ACliente; end; procedure TfrViewDatosYSeleccionCliente.actVerContactoExecute(Sender: TObject); begin inherited; - FController.Ver(Cliente); + Controller.Ver(Cliente); end; procedure TfrViewDatosYSeleccionCliente.actVerContactoUpdate(Sender: TObject); @@ -146,6 +152,13 @@ constructor TfrViewDatosYSeleccionCliente.Create(AOwner: TComponent); begin inherited; FMsgElegirCliente := ''; + FController := NIL; +end; + +destructor TfrViewDatosYSeleccionCliente.Destroy; +begin + FController := NIL; + inherited; end; function TfrViewDatosYSeleccionCliente.GetCliente: IBizCliente; @@ -155,9 +168,18 @@ end; function TfrViewDatosYSeleccionCliente.GetController: IClientesController; begin + if not Assigned(FController) then + FController := TClientesController.Create; Result := FController; end; +function TfrViewDatosYSeleccionCliente.GetID_Cliente: integer; +begin + Result := -1; + if Assigned(FCliente) then + Result := FCliente.ID; +end; + function TfrViewDatosYSeleccionCliente.GetMsgElegirCliente: String; begin Result := FMsgElegirCliente; @@ -181,9 +203,17 @@ end; procedure TfrViewDatosYSeleccionCliente.SetController(Value: IClientesController); begin + if Assigned(FController) then + FController := NIL; + FController := Value; end; +procedure TfrViewDatosYSeleccionCliente.SetID_Cliente(const Value: integer); +begin + Self.Cliente := IBizCliente(Controller.Buscar(Value)); +end; + procedure TfrViewDatosYSeleccionCliente.SetMsgElegirCliente( const Value: String); begin