Tecistel/Tecsitel_FactuGES2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Empleados: campo nuevo para poner la duracción del contrato.

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@273 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
David Arranz 2008-02-18 11:55:48 +00:00
parent fdbb2cf95c
commit 5205d2200d
9 changed files with 338 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Database/scripts/factuges.sql
View File

@ -527,7 +527,8 @@ CREATE TABLE EMPLEADOS_DATOS (
FORMACION_COMPLE TIPO_NOTAS,
FORMACION_RECIBIDA TIPO_NOTAS,
EXPERIENCIA TIPO_NOTAS,
CONTRATO VARCHAR(255)
CONTRATO VARCHAR(255),
DURACION VARCHAR(255)
);
@ -1584,7 +1585,8 @@ CREATE VIEW V_EMPLEADOS(
FORMACION_COMPLE,
FORMACION_RECIBIDA,
EXPERIENCIA,
CONTRATO)
CONTRATO,
DURACION)
AS
SELECT V_CONTACTOS.ID,
V_CONTACTOS.ID_CATEGORIA,
@ -1617,7 +1619,8 @@ SELECT V_CONTACTOS.ID,
EMPLEADOS_DATOS.FORMACION_COMPLE,
EMPLEADOS_DATOS.FORMACION_RECIBIDA,
EMPLEADOS_DATOS.EXPERIENCIA,
EMPLEADOS_DATOS.CONTRATO
EMPLEADOS_DATOS.CONTRATO,
EMPLEADOS_DATOS.DURACION
FROM V_CONTACTOS
INNER JOIN EMPLEADOS_DATOS ON (EMPLEADOS_DATOS.ID_EMPLEADO = V_CONTACTOS.ID)

5
Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm
View File

@ -376,6 +376,11 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
Size = 255
DisplayLabel = 'Contrato'
DictionaryEntry = 'Empleados_CONTRATO'
end
item
Name = 'DURACION'
DataType = datString
Size = 255
end>
Params = <>
StreamingOptions = [soDisableEventsWhileStreaming]

87
Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
View File

@ -9,19 +9,19 @@ const
{ Data table rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_Contactos = '{A01DF458-CA42-490D-B20E-900420045A23}';
RID_GruposCliente = '{856B01A2-B957-42EF-922D-7B21671BBE74}';
RID_DatosBancarios = '{A805FC27-FB69-42D8-964D-E109662823EC}';
RID_Clientes = '{6D8EA837-CBD8-4CD6-B78F-3D6CBB862164}';
RID_Proveedores = '{81C670DC-5013-443F-94B8-8BDB6A45D0B9}';
RID_Empleados = '{F639F514-FA26-470A-9168-33B20AB0A5C6}';
RID_DireccionesContacto = '{84E91303-9464-453C-9D0D-B6018DE5C0E0}';
RID_ClientesDescuentos = '{FC4C2315-A1D2-44EC-8600-0596BCFF0D0B}';
RID_GruposProveedor = '{98B4C0FA-AAD3-4DC1-9C1A-277BE5D6A64C}';
RID_GruposEmpleado = '{443813CE-FC5E-409B-8CCA-2DDD27AA5DD0}';
RID_Contactos_Refresh = '{DFC7E7BE-F226-491E-87C9-5E4C80C6F900}';
RID_ContratosEmpleados = '{2F3CC454-F247-4FB4-8BA4-B91262485533}';
RID_DescripcionesProveedores = '{275FEFB5-D5C3-49BC-BE17-4B14ADCFCB99}';
RID_Contactos = '{A4D7F874-9AA6-478C-AAB9-8C72B89D5587}';
RID_GruposCliente = '{1C96451B-7D16-472A-8A32-1980C73168F1}';
RID_DatosBancarios = '{17AE17CD-D4F4-49B3-8EB5-001FAC1E35A9}';
RID_Clientes = '{DF344842-83AC-4CD8-BF84-C4AD0BF0BC4C}';
RID_Proveedores = '{FEC4E64E-F9A3-4CCC-8FF4-95D40EF5D976}';
RID_Empleados = '{60C35CF4-7BCF-4B5F-B49B-97C322134C9F}';
RID_DireccionesContacto = '{9A84C7A3-D210-451C-A3C6-4E68505DCC05}';
RID_ClientesDescuentos = '{064EFA39-B948-4B38-BB8B-D2BDF7A9A889}';
RID_GruposProveedor = '{AAA36EB6-1D98-4A1E-B26C-70DB3B6970D4}';
RID_GruposEmpleado = '{F3EC9B3B-3E20-4A89-89BD-78CF3DDC024A}';
RID_Contactos_Refresh = '{8A0B1D05-EF34-47A3-B06C-2AA9942097E2}';
RID_ContratosEmpleados = '{048968BF-970A-4A6E-B42D-C2083E283280}';
RID_DescripcionesProveedores = '{505162D5-88A0-4873-8205-7BD33AE36269}';
{ Data table names }
nme_Contactos = 'Contactos';
@ -294,6 +294,7 @@ const
fld_EmpleadosFORMACION_RECIBIDA = 'FORMACION_RECIBIDA';
fld_EmpleadosEXPERIENCIA = 'EXPERIENCIA';
fld_EmpleadosCONTRATO = 'CONTRATO';
fld_EmpleadosDURACION = 'DURACION';
{ Empleados field indexes }
idx_EmpleadosID = 0;
@ -327,6 +328,7 @@ const
idx_EmpleadosFORMACION_RECIBIDA = 28;
idx_EmpleadosEXPERIENCIA = 29;
idx_EmpleadosCONTRATO = 30;
idx_EmpleadosDURACION = 31;
{ DireccionesContacto fields }
fld_DireccionesContactoID = 'ID';
@ -455,7 +457,7 @@ const
type
{ IContactos }
IContactos = interface(IDAStronglyTypedDataTable)
['{442364C9-699A-42A2-BD2B-634824DB9D4C}']
['{9BC70D6F-DDBB-455A-8ED6-277F6F015990}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -754,7 +756,7 @@ type
{ IGruposCliente }
IGruposCliente = interface(IDAStronglyTypedDataTable)
['{35E7B4ED-6CB6-40E3-9440-84F5FC62866C}']
['{CD452866-91FC-4B57-AF2E-51EFC32955CA}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -801,7 +803,7 @@ type
{ IDatosBancarios }
IDatosBancarios = interface(IDAStronglyTypedDataTable)
['{1067D207-71F4-4FA3-A662-4980479F297A}']
['{634A6F68-7F67-4E95-96CF-79E555FD64B4}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -932,7 +934,7 @@ type
{ IClientes }
IClientes = interface(IDAStronglyTypedDataTable)
['{F5CD5D3C-EF2D-4C2D-B033-369E7FF496FE}']
['{D56F28C2-CEFE-4755-9092-F7D740DED9C9}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1375,7 +1377,7 @@ type
{ IProveedores }
IProveedores = interface(IDAStronglyTypedDataTable)
['{BBCE4DC0-BCDB-43F4-9184-A5738876A8B0}']
['{6DF906CE-7A60-4F70-B2E1-EF3B18FE5785}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1794,7 +1796,7 @@ type
{ IEmpleados }
IEmpleados = interface(IDAStronglyTypedDataTable)
['{F6216CB9-7373-46E3-A4E1-94646AF537D9}']
['{CB027BF3-E930-4108-8992-BC7CB8F78B34}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1915,6 +1917,10 @@ type
procedure SetCONTRATOValue(const aValue: String);
function GetCONTRATOIsNull: Boolean;
procedure SetCONTRATOIsNull(const aValue: Boolean);
function GetDURACIONValue: String;
procedure SetDURACIONValue(const aValue: String);
function GetDURACIONIsNull: Boolean;
procedure SetDURACIONIsNull(const aValue: Boolean);
{ Properties }
@ -1980,6 +1986,8 @@ type
property EXPERIENCIAIsNull: Boolean read GetEXPERIENCIAIsNull write SetEXPERIENCIAIsNull;
property CONTRATO: String read GetCONTRATOValue write SetCONTRATOValue;
property CONTRATOIsNull: Boolean read GetCONTRATOIsNull write SetCONTRATOIsNull;
property DURACION: String read GetDURACIONValue write SetDURACIONValue;
property DURACIONIsNull: Boolean read GetDURACIONIsNull write SetDURACIONIsNull;
end;
{ TEmpleadosDataTableRules }
@ -2116,6 +2124,10 @@ type
procedure SetCONTRATOValue(const aValue: String); virtual;
function GetCONTRATOIsNull: Boolean; virtual;
procedure SetCONTRATOIsNull(const aValue: Boolean); virtual;
function GetDURACIONValue: String; virtual;
procedure SetDURACIONValue(const aValue: String); virtual;
function GetDURACIONIsNull: Boolean; virtual;
procedure SetDURACIONIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID: Integer read GetIDValue write SetIDValue;
@ -2180,6 +2192,8 @@ type
property EXPERIENCIAIsNull: Boolean read GetEXPERIENCIAIsNull write SetEXPERIENCIAIsNull;
property CONTRATO: String read GetCONTRATOValue write SetCONTRATOValue;
property CONTRATOIsNull: Boolean read GetCONTRATOIsNull write SetCONTRATOIsNull;
property DURACION: String read GetDURACIONValue write SetDURACIONValue;
property DURACIONIsNull: Boolean read GetDURACIONIsNull write SetDURACIONIsNull;
public
constructor Create(aDataTable: TDADataTable); override;
@ -2189,7 +2203,7 @@ type
{ IDireccionesContacto }
IDireccionesContacto = interface(IDAStronglyTypedDataTable)
['{53FE106D-EC9A-4532-BEA8-CD41DAA2EB54}']
['{9BFD1F3F-13FE-40FC-A5DD-236EBCC45998}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -2404,7 +2418,7 @@ type
{ IClientesDescuentos }
IClientesDescuentos = interface(IDAStronglyTypedDataTable)
['{9759ECA3-182C-4CB0-938A-8554DFF4B1C2}']
['{C0E7C4E7-306A-441E-A310-31D2C8801423}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -2487,7 +2501,7 @@ type
{ IGruposProveedor }
IGruposProveedor = interface(IDAStronglyTypedDataTable)
['{B498AC23-EBFE-4406-AD14-7C99C40A088D}']
['{B0E72900-9B72-4A0A-9DB9-F87C56E6A002}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -2534,7 +2548,7 @@ type
{ IGruposEmpleado }
IGruposEmpleado = interface(IDAStronglyTypedDataTable)
['{973B4979-9390-4923-B95C-4C88C77F68C2}']
['{425C3BF6-7FB4-41CE-AB81-CE7220B030ED}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -2581,7 +2595,7 @@ type
{ IContactos_Refresh }
IContactos_Refresh = interface(IDAStronglyTypedDataTable)
['{917172A1-5EDB-43D8-B8C5-A708ADB8AA6B}']
['{BE66BA4F-21CD-4F00-9640-6D2A7C8BC2CA}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -2856,7 +2870,7 @@ type
{ IContratosEmpleados }
IContratosEmpleados = interface(IDAStronglyTypedDataTable)
['{19938FAD-FE0E-4DBB-8754-1DD175921CE6}']
['{23DC52D6-E760-444F-BB2D-134398ECCB26}']
{ Property getters and setters }
function GetCONTRATOValue: String;
procedure SetCONTRATOValue(const aValue: String);
@ -2891,7 +2905,7 @@ type
{ IDescripcionesProveedores }
IDescripcionesProveedores = interface(IDAStronglyTypedDataTable)
['{663EDF89-9632-4999-8426-33DD3287B421}']
['{A512DEBE-E8E2-4E28-852A-E89484CEA0B3}']
{ Property getters and setters }
function GetDESCRIPCION_PROVEEDORValue: String;
procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String);
@ -5840,6 +5854,27 @@ begin
DataTable.Fields[idx_EmpleadosCONTRATO].AsVariant := Null;
end;
function TEmpleadosDataTableRules.GetDURACIONValue: String;
begin
result := DataTable.Fields[idx_EmpleadosDURACION].AsString;
end;
procedure TEmpleadosDataTableRules.SetDURACIONValue(const aValue: String);
begin
DataTable.Fields[idx_EmpleadosDURACION].AsString := aValue;
end;
function TEmpleadosDataTableRules.GetDURACIONIsNull: boolean;
begin
result := DataTable.Fields[idx_EmpleadosDURACION].IsNull;
end;
procedure TEmpleadosDataTableRules.SetDURACIONIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_EmpleadosDURACION].AsVariant := Null;
end;
{ TDireccionesContactoDataTableRules }
constructor TDireccionesContactoDataTableRules.Create(aDataTable: TDADataTable);

95
Source/Modulos/Contactos/Model/schContactosServer_Intf.pas
View File

@ -9,24 +9,24 @@ const
{ Delta rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_ContactosDelta = '{48772AD3-B3EF-47A9-9A2E-4B73FBA9F204}';
RID_GruposClienteDelta = '{5CA21C80-5EE4-4BC4-A0AF-4EA4E0188770}';
RID_DatosBancariosDelta = '{97461A25-FB3D-49BA-989A-A2E864F15627}';
RID_ClientesDelta = '{5016B0EA-1E67-418C-A1D6-EF9F83F925A4}';
RID_ProveedoresDelta = '{6DC81353-DA9A-4A2C-A6AD-CFAA90594978}';
RID_EmpleadosDelta = '{03404F6B-31CE-4F3B-8D43-DAFFDC77CBBB}';
RID_DireccionesContactoDelta = '{066EBDC7-C2AD-4209-A7C3-23944DD103FC}';
RID_ClientesDescuentosDelta = '{413AE0E8-F254-4E30-ABED-EBE6F71364D1}';
RID_GruposProveedorDelta = '{C9615F62-830B-4D69-BBFB-30DE694AE18C}';
RID_GruposEmpleadoDelta = '{A377B6BA-5DDE-4A8E-9BAC-0902EDBAF875}';
RID_Contactos_RefreshDelta = '{EEC8A345-7AF4-457A-A883-D2AFDF07612D}';
RID_ContratosEmpleadosDelta = '{5E3050CF-49C5-47E4-909F-0B9E07569989}';
RID_DescripcionesProveedoresDelta = '{45A8AB79-936E-4D24-90FE-35C63BA77AB5}';
RID_ContactosDelta = '{D88BCAA7-5886-4CD4-BECA-2B4D8D21D8A6}';
RID_GruposClienteDelta = '{24C81A94-CB18-447A-8456-93B88582D6EE}';
RID_DatosBancariosDelta = '{B8CD12A2-4C6A-497F-A846-DD30666F98EB}';
RID_ClientesDelta = '{25F17FB7-C487-4575-8923-DDB43C061A63}';
RID_ProveedoresDelta = '{E8A7D090-1BE0-4634-89FB-68667B108276}';
RID_EmpleadosDelta = '{EAD95E6C-4119-43F9-9511-00EABC406D71}';
RID_DireccionesContactoDelta = '{E0D5C7C8-B321-4931-9AB1-6006701F5E74}';
RID_ClientesDescuentosDelta = '{C8D3CE65-0FD7-4E5C-8CB4-6C726AEF3915}';
RID_GruposProveedorDelta = '{B7B504ED-0204-492C-A44E-B3E06C143342}';
RID_GruposEmpleadoDelta = '{7EF7BDCC-C559-4C6B-A4A3-C179D2ED2C17}';
RID_Contactos_RefreshDelta = '{1F66DD99-4349-4931-87A9-9245408B5EBC}';
RID_ContratosEmpleadosDelta = '{901039B3-7FD1-45A7-8262-B946DD38E534}';
RID_DescripcionesProveedoresDelta = '{6C4014E7-35BD-4C80-8AFD-CF99C24D9787}';
type
{ IContactosDelta }
IContactosDelta = interface(IContactos)
['{48772AD3-B3EF-47A9-9A2E-4B73FBA9F204}']
['{D88BCAA7-5886-4CD4-BECA-2B4D8D21D8A6}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@ -325,7 +325,7 @@ type
{ IGruposClienteDelta }
IGruposClienteDelta = interface(IGruposCliente)
['{5CA21C80-5EE4-4BC4-A0AF-4EA4E0188770}']
['{24C81A94-CB18-447A-8456-93B88582D6EE}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@ -371,7 +371,7 @@ type
{ IDatosBancariosDelta }
IDatosBancariosDelta = interface(IDatosBancarios)
['{97461A25-FB3D-49BA-989A-A2E864F15627}']
['{B8CD12A2-4C6A-497F-A846-DD30666F98EB}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CONTACTOValue : Integer;
@ -501,7 +501,7 @@ type
{ IClientesDelta }
IClientesDelta = interface(IClientes)
['{5016B0EA-1E67-418C-A1D6-EF9F83F925A4}']
['{25F17FB7-C487-4575-8923-DDB43C061A63}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@ -944,7 +944,7 @@ type
{ IProveedoresDelta }
IProveedoresDelta = interface(IProveedores)
['{6DC81353-DA9A-4A2C-A6AD-CFAA90594978}']
['{E8A7D090-1BE0-4634-89FB-68667B108276}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@ -1363,7 +1363,7 @@ type
{ IEmpleadosDelta }
IEmpleadosDelta = interface(IEmpleados)
['{03404F6B-31CE-4F3B-8D43-DAFFDC77CBBB}']
['{EAD95E6C-4119-43F9-9511-00EABC406D71}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@ -1396,6 +1396,7 @@ type
function GetOldFORMACION_RECIBIDAValue : IROStrings;
function GetOldEXPERIENCIAValue : IROStrings;
function GetOldCONTRATOValue : String;
function GetOldDURACIONValue : String;
{ Properties }
property OldID : Integer read GetOldIDValue;
@ -1429,6 +1430,7 @@ type
property OldFORMACION_RECIBIDA : IROStrings read GetOldFORMACION_RECIBIDAValue;
property OldEXPERIENCIA : IROStrings read GetOldEXPERIENCIAValue;
property OldCONTRATO : String read GetOldCONTRATOValue;
property OldDURACION : String read GetOldDURACIONValue;
end;
{ TEmpleadosBusinessProcessorRules }
@ -1627,6 +1629,12 @@ type
function GetOldCONTRATOIsNull: Boolean; virtual;
procedure SetCONTRATOValue(const aValue: String); virtual;
procedure SetCONTRATOIsNull(const aValue: Boolean); virtual;
function GetDURACIONValue: String; virtual;
function GetDURACIONIsNull: Boolean; virtual;
function GetOldDURACIONValue: String; virtual;
function GetOldDURACIONIsNull: Boolean; virtual;
procedure SetDURACIONValue(const aValue: String); virtual;
procedure SetDURACIONIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID : Integer read GetIDValue write SetIDValue;
@ -1753,6 +1761,10 @@ type
property CONTRATOIsNull : Boolean read GetCONTRATOIsNull write SetCONTRATOIsNull;
property OldCONTRATO : String read GetOldCONTRATOValue;
property OldCONTRATOIsNull : Boolean read GetOldCONTRATOIsNull;
property DURACION : String read GetDURACIONValue write SetDURACIONValue;
property DURACIONIsNull : Boolean read GetDURACIONIsNull write SetDURACIONIsNull;
property OldDURACION : String read GetOldDURACIONValue;
property OldDURACIONIsNull : Boolean read GetOldDURACIONIsNull;
public
constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@ -1762,7 +1774,7 @@ type
{ IDireccionesContactoDelta }
IDireccionesContactoDelta = interface(IDireccionesContacto)
['{066EBDC7-C2AD-4209-A7C3-23944DD103FC}']
['{E0D5C7C8-B321-4931-9AB1-6006701F5E74}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CONTACTOValue : Integer;
@ -1977,7 +1989,7 @@ type
{ IClientesDescuentosDelta }
IClientesDescuentosDelta = interface(IClientesDescuentos)
['{413AE0E8-F254-4E30-ABED-EBE6F71364D1}']
['{C8D3CE65-0FD7-4E5C-8CB4-6C726AEF3915}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CLIENTEValue : Integer;
@ -2059,7 +2071,7 @@ type
{ IGruposProveedorDelta }
IGruposProveedorDelta = interface(IGruposProveedor)
['{C9615F62-830B-4D69-BBFB-30DE694AE18C}']
['{B7B504ED-0204-492C-A44E-B3E06C143342}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@ -2105,7 +2117,7 @@ type
{ IGruposEmpleadoDelta }
IGruposEmpleadoDelta = interface(IGruposEmpleado)
['{A377B6BA-5DDE-4A8E-9BAC-0902EDBAF875}']
['{7EF7BDCC-C559-4C6B-A4A3-C179D2ED2C17}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@ -2151,7 +2163,7 @@ type
{ IContactos_RefreshDelta }
IContactos_RefreshDelta = interface(IContactos_Refresh)
['{EEC8A345-7AF4-457A-A883-D2AFDF07612D}']
['{1F66DD99-4349-4931-87A9-9245408B5EBC}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldNIF_CIFValue : String;
@ -2426,7 +2438,7 @@ type
{ IContratosEmpleadosDelta }
IContratosEmpleadosDelta = interface(IContratosEmpleados)
['{5E3050CF-49C5-47E4-909F-0B9E07569989}']
['{901039B3-7FD1-45A7-8262-B946DD38E534}']
{ Property getters and setters }
function GetOldCONTRATOValue : String;
@ -2460,7 +2472,7 @@ type
{ IDescripcionesProveedoresDelta }
IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores)
['{45A8AB79-936E-4D24-90FE-35C63BA77AB5}']
['{6C4014E7-35BD-4C80-8AFD-CF99C24D9787}']
{ Property getters and setters }
function GetOldDESCRIPCION_PROVEEDORValue : String;
@ -6747,6 +6759,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosCONTRATO] := Null;
end;
function TEmpleadosBusinessProcessorRules.GetDURACIONValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosDURACION];
end;
function TEmpleadosBusinessProcessorRules.GetDURACIONIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosDURACION]);
end;
function TEmpleadosBusinessProcessorRules.GetOldDURACIONValue: String;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpleadosDURACION];
end;
function TEmpleadosBusinessProcessorRules.GetOldDURACIONIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpleadosDURACION]);
end;
procedure TEmpleadosBusinessProcessorRules.SetDURACIONValue(const aValue: String);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosDURACION] := aValue;
end;
procedure TEmpleadosBusinessProcessorRules.SetDURACIONIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosDURACION] := Null;
end;
{ TDireccionesContactoBusinessProcessorRules }
constructor TDireccionesContactoBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

4
Source/Modulos/Contactos/Model/uBizEmpleadosServer.pas
View File

@ -98,6 +98,7 @@ begin
ParamByName('FORMACION_RECIBIDA').Value := aChange.NewValueByName[fld_EmpleadosFORMACION_RECIBIDA];
ParamByName('EXPERIENCIA').Value := aChange.NewValueByName[fld_EmpleadosEXPERIENCIA];
ParamByName('CONTRATO').Value := aChange.NewValueByName[fld_EmpleadosCONTRATO];
ParamByName('DURACION').Value := aChange.NewValueByName[fld_EmpleadosDURACION];
Execute;
end;
finally
@ -128,7 +129,8 @@ begin
ParamByName('FORMACION_COMPLE').Value := aChange.NewValueByName[fld_EmpleadosFORMACION_COMPLE];
ParamByName('FORMACION_RECIBIDA').Value := aChange.NewValueByName[fld_EmpleadosFORMACION_RECIBIDA];
ParamByName('EXPERIENCIA').Value := aChange.NewValueByName[fld_EmpleadosEXPERIENCIA];
ParamByName('CONTRATO').Value := aChange.NewValueByName[fld_EmpleadosCONTRATO];
ParamByName('CONTRATO').Value := aChange.NewValueByName[fld_EmpleadosCONTRATO];
ParamByName('DURACION').Value := aChange.NewValueByName[fld_EmpleadosDURACION];
Execute;
end;
finally

28
Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
View File

@ -1199,6 +1199,10 @@ object srvContactos: TsrvContactos
item
DatasetField = 'CONTRATO'
TableField = 'CONTRATO'
end
item
DatasetField = 'DURACION'
TableField = 'DURACION'
end>
end>
Name = 'Empleados'
@ -1381,6 +1385,11 @@ object srvContactos: TsrvContactos
DataType = datString
Size = 255
DictionaryEntry = 'Empleados_CONTRATO'
end
item
Name = 'DURACION'
DataType = datString
Size = 255
end>
end
item
@ -3376,6 +3385,10 @@ object srvContactos: TsrvContactos
item
Name = 'CONTRATO'
Value = ''
end
item
Name = 'DURACION'
Value = ''
end>
Statements = <
item
@ -3384,10 +3397,10 @@ object srvContactos: TsrvContactos
SQL =
'INSERT'#10' INTO EMPLEADOS_DATOS'#10' (ID_EMPLEADO, FECHA_NACIMIENTO' +
', CATEGORIA, FECHA_ALTA_EMPRESA, FORMACION_BASE,'#10' FORMACION_C' +
'OMPLE, FORMACION_RECIBIDA, EXPERIENCIA, CONTRATO)'#10' VALUES'#10' (' +
':ID_EMPLEADO, :FECHA_NACIMIENTO, :CATEGORIA, :FECHA_ALTA_EMPRESA' +
', :FORMACION_BASE,'#10' :FORMACION_COMPLE, :FORMACION_RECIBIDA, :' +
'EXPERIENCIA, :CONTRATO)'#10
'OMPLE, FORMACION_RECIBIDA, EXPERIENCIA, CONTRATO, DURACION)'#10' VA' +
'LUES'#10' (:ID_EMPLEADO, :FECHA_NACIMIENTO, :CATEGORIA, :FECHA_AL' +
'TA_EMPRESA, :FORMACION_BASE,'#10' :FORMACION_COMPLE, :FORMACION_R' +
'ECIBIDA, :EXPERIENCIA, :CONTRATO, :DURACION)'#10
StatementType = stSQL
ColumnMappings = <>
end>
@ -3427,6 +3440,10 @@ object srvContactos: TsrvContactos
Name = 'CONTRATO'
Value = ''
end
item
Name = 'DURACION'
Value = ''
end
item
Name = 'OLD_ID_EMPLEADO'
Value = ''
@ -3441,7 +3458,8 @@ object srvContactos: TsrvContactos
'CHA_ALTA_EMPRESA,'#10' FORMACION_BASE = :FORMACION_BASE,'#10' FORM' +
'ACION_COMPLE = :FORMACION_COMPLE,'#10' FORMACION_RECIBIDA = :FORM' +
'ACION_RECIBIDA,'#10' EXPERIENCIA = :EXPERIENCIA,'#10' CONTRATO = :' +
'CONTRATO'#10' WHERE'#10' (ID_EMPLEADO = :OLD_ID_EMPLEADO)'#10
'CONTRATO,'#10' DURACION = :DURACION'#10' WHERE'#10' (ID_EMPLEADO = :O' +
'LD_ID_EMPLEADO)'#10
StatementType = stSQL
ColumnMappings = <>
end>

86
Source/Modulos/Contactos/Views/uEditorEmpleado.dfm
View File

@ -109,32 +109,32 @@ inherited fEditorEmpleado: TfEditorEmpleado
ExplicitTop = 162
end
inherited eCalle: TcxDBTextEdit
Top = 189
ExplicitTop = 189
Top = 216
ExplicitTop = 216
ExplicitWidth = 174
Width = 174
end
inherited eProvincia: TcxDBTextEdit
Top = 243
ExplicitTop = 243
Top = 270
ExplicitTop = 270
ExplicitWidth = 174
Width = 174
end
inherited ePoblacion: TcxDBTextEdit
Top = 216
ExplicitTop = 216
Top = 243
ExplicitTop = 243
ExplicitWidth = 108
Width = 108
end
inherited eCodigoPostal: TcxDBTextEdit
Left = 308
Top = 216
ExplicitLeft = 308
ExplicitTop = 216
Left = 265
Top = 243
ExplicitLeft = 265
ExplicitTop = 243
end
inherited eObservaciones: TcxDBMemo
Top = 321
ExplicitTop = 321
Top = 348
ExplicitTop = 348
ExplicitWidth = 185
ExplicitHeight = 148
Height = 148
@ -147,47 +147,45 @@ inherited fEditorEmpleado: TfEditorEmpleado
Width = 80
end
inherited eFechaAltaEmpresa: TcxDBDateEdit
Left = 287
Top = 84
ExplicitLeft = 287
ExplicitTop = 84
Top = 111
ExplicitTop = 111
ExplicitWidth = 80
Width = 80
end
inherited cbCategoria: TcxDBComboBox
Top = 111
ExplicitTop = 111
Top = 138
ExplicitTop = 138
ExplicitWidth = 225
Width = 225
end
inherited eTlfParticular: TcxDBTextEdit
Left = 496
Left = 453
Top = 57
ExplicitLeft = 496
ExplicitLeft = 453
ExplicitTop = 57
ExplicitWidth = 172
Width = 172
end
inherited eTlfTrabajo: TcxDBTextEdit
Left = 496
Left = 453
Top = 30
ExplicitLeft = 496
ExplicitLeft = 453
ExplicitTop = 30
ExplicitWidth = 172
Width = 172
end
inherited eTlfMovil: TcxDBTextEdit
Left = 496
Left = 453
Top = 84
ExplicitLeft = 496
ExplicitLeft = 453
ExplicitTop = 84
ExplicitWidth = 172
Width = 172
end
inherited eFax: TcxDBTextEdit
Left = 496
Left = 453
Top = 111
ExplicitLeft = 496
ExplicitLeft = 453
ExplicitTop = 111
ExplicitWidth = 172
Width = 172
@ -199,39 +197,43 @@ inherited fEditorEmpleado: TfEditorEmpleado
Width = 263
end
inherited cbContrato: TcxDBComboBox
Top = 138
ExplicitTop = 138
Left = 453
Top = 270
ExplicitLeft = 453
ExplicitTop = 270
ExplicitWidth = 292
Width = 292
end
inherited eNIFCIF: TcxDBTextEdit
Left = 217
Left = 197
Top = 30
ExplicitLeft = 217
ExplicitLeft = 197
ExplicitTop = 30
ExplicitWidth = 194
Width = 194
end
inherited eMailTrabajo: TcxDBHyperLinkEdit
Left = 496
Left = 453
Top = 162
Properties.Prefix = 'mailto:'
ExplicitLeft = 496
ExplicitLeft = 453
ExplicitTop = 162
ExplicitWidth = 129
Width = 129
end
inherited eMailParticular: TcxDBHyperLinkEdit
Left = 496
Left = 453
Top = 190
Properties.Prefix = 'mailto:'
ExplicitLeft = 496
ExplicitLeft = 453
ExplicitTop = 190
ExplicitWidth = 165
Width = 165
end
inherited ePaginaWeb: TcxDBHyperLinkEdit
Left = 496
Left = 453
Top = 217
ExplicitLeft = 496
ExplicitLeft = 453
ExplicitTop = 217
ExplicitWidth = 165
Width = 165
@ -243,11 +245,19 @@ inherited fEditorEmpleado: TfEditorEmpleado
Width = 97
end
inherited ePersonaContacto: TcxDBTextEdit
Top = 270
ExplicitTop = 270
Top = 297
ExplicitTop = 297
ExplicitWidth = 256
Width = 256
end
inherited eDuracionContrato: TcxDBTextEdit
Left = 453
Top = 297
ExplicitLeft = 453
ExplicitTop = 297
ExplicitWidth = 114
Width = 114
end
end
inherited dsContacto: TDADataSource
Left = 8

208
Source/Modulos/Contactos/Views/uViewEmpleado.dfm
View File

@ -6,44 +6,56 @@ inherited frViewEmpleado: TfrViewEmpleado
inherited dxLayoutControlContacto: TdxLayoutControl
Height = 391
ExplicitHeight = 391
inherited PngSpeedButton1: TPngSpeedButton
Left = 613
ExplicitLeft = 613
end
inherited PngSpeedButton2: TPngSpeedButton
Left = 613
ExplicitLeft = 613
end
inherited PngSpeedButton3: TPngSpeedButton
Left = 613
ExplicitLeft = 613
end
inherited eCalle: TcxDBTextEdit
Left = 121
Top = 193
TabOrder = 7
Top = 226
TabOrder = 6
ExplicitLeft = 121
ExplicitTop = 193
ExplicitTop = 226
ExplicitWidth = 260
Width = 260
end
inherited eProvincia: TcxDBTextEdit
Left = 121
Top = 247
TabOrder = 10
Top = 280
TabOrder = 9
ExplicitLeft = 121
ExplicitTop = 247
ExplicitTop = 280
ExplicitWidth = 260
Width = 260
end
inherited ePoblacion: TcxDBTextEdit
Left = 121
Top = 220
TabOrder = 8
Top = 253
TabOrder = 7
ExplicitLeft = 121
ExplicitTop = 220
ExplicitTop = 253
ExplicitWidth = 159
Width = 159
end
inherited eCodigoPostal: TcxDBTextEdit
Left = 348
Top = 220
TabOrder = 9
ExplicitLeft = 348
ExplicitTop = 220
Left = 239
Top = 253
TabOrder = 8
ExplicitLeft = 239
ExplicitTop = 253
end
inherited eObservaciones: TcxDBMemo
Top = 331
TabOrder = 19
ExplicitTop = 331
Top = 364
TabOrder = 20
ExplicitTop = 364
ExplicitHeight = 148
Height = 148
end
@ -65,8 +77,8 @@ inherited frViewEmpleado: TfrViewEmpleado
Width = 121
end
object eFechaAltaEmpresa: TcxDBDateEdit [9]
Left = 262
Top = 82
Left = 121
Top = 109
DataBinding.DataField = 'FECHA_ALTA_EMPRESA'
DataBinding.DataSource = dsContacto
Style.BorderColor = clWindowFrame
@ -83,7 +95,7 @@ inherited frViewEmpleado: TfrViewEmpleado
end
object cbCategoria: TcxDBComboBox [10]
Left = 121
Top = 109
Top = 136
DataBinding.DataField = 'CATEGORIA'
DataBinding.DataSource = dsContacto
Properties.ImmediatePost = True
@ -106,30 +118,30 @@ inherited frViewEmpleado: TfrViewEmpleado
Width = 225
end
inherited eTlfParticular: TcxDBTextEdit
Left = 538
TabOrder = 13
ExplicitLeft = 538
Left = 429
TabOrder = 12
ExplicitLeft = 429
ExplicitWidth = 91
Width = 91
end
inherited eTlfTrabajo: TcxDBTextEdit
Left = 538
TabOrder = 12
ExplicitLeft = 538
Left = 429
TabOrder = 11
ExplicitLeft = 429
ExplicitWidth = 127
Width = 127
end
inherited eTlfMovil: TcxDBTextEdit
Left = 538
TabOrder = 14
ExplicitLeft = 538
Left = 429
TabOrder = 13
ExplicitLeft = 429
ExplicitWidth = 155
Width = 155
end
inherited eFax: TcxDBTextEdit
Left = 538
TabOrder = 15
ExplicitLeft = 538
Left = 429
TabOrder = 14
ExplicitLeft = 429
ExplicitWidth = 121
Width = 121
end
@ -139,31 +151,9 @@ inherited frViewEmpleado: TfrViewEmpleado
ExplicitWidth = 263
Width = 263
end
inherited eNIFCIF: TcxDBTextEdit
Left = 255
ExplicitLeft = 255
ExplicitWidth = 100
Width = 100
end
inherited eMailTrabajo: TcxDBHyperLinkEdit
Left = 538
Properties.Prefix = 'mailto:'
TabOrder = 16
ExplicitLeft = 538
ExplicitWidth = 129
Width = 129
end
inherited eMailParticular: TcxDBHyperLinkEdit
Left = 538
Properties.Prefix = 'mailto:'
TabOrder = 17
ExplicitLeft = 538
ExplicitWidth = 165
Width = 165
end
object cbContrato: TcxDBComboBox [19]
Left = 121
Top = 136
object cbContrato: TcxDBComboBox [16]
Left = 429
Top = 280
DataBinding.DataField = 'CONTRATO'
DataBinding.DataSource = dsContacto
Properties.ImmediatePost = True
@ -182,13 +172,35 @@ inherited frViewEmpleado: TfrViewEmpleado
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 6
TabOrder = 18
Width = 292
end
inherited eNIFCIF: TcxDBTextEdit
Left = 198
ExplicitLeft = 198
ExplicitWidth = 100
Width = 100
end
inherited eMailTrabajo: TcxDBHyperLinkEdit
Left = 429
Properties.Prefix = 'mailto:'
TabOrder = 15
ExplicitLeft = 429
ExplicitWidth = 129
Width = 129
end
inherited eMailParticular: TcxDBHyperLinkEdit
Left = 429
Properties.Prefix = 'mailto:'
TabOrder = 16
ExplicitLeft = 429
ExplicitWidth = 165
Width = 165
end
inherited ePaginaWeb: TcxDBHyperLinkEdit
Left = 538
TabOrder = 18
ExplicitLeft = 538
Left = 429
TabOrder = 17
ExplicitLeft = 429
ExplicitWidth = 165
Width = 165
end
@ -200,13 +212,31 @@ inherited frViewEmpleado: TfrViewEmpleado
end
inherited ePersonaContacto: TcxDBTextEdit
Left = 121
Top = 274
TabOrder = 11
Top = 307
TabOrder = 10
ExplicitLeft = 121
ExplicitTop = 274
ExplicitTop = 307
ExplicitWidth = 256
Width = 256
end
object eDuracionContrato: TcxDBTextEdit [23]
Left = 429
Top = 307
DataBinding.DataField = 'DURACION'
DataBinding.DataSource = dsContacto
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 19
Width = 114
end
inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
inherited dxLayoutControlContactoGroup4: TdxLayoutGroup
@ -219,36 +249,25 @@ inherited frViewEmpleado: TfrViewEmpleado
inherited dxLayoutControlContactoItem13: TdxLayoutItem
Caption = 'Nombre y apellidos:'
end
object dxLayoutControlContactoGroup10: TdxLayoutGroup
ShowCaption = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControlContactoItem16: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Fecha nacimiento:'
Control = eFechaNacimiento
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem19: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Fecha de alta:'
Control = eFechaAltaEmpresa
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem16: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Fecha nacimiento:'
Control = eFechaNacimiento
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem19: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Fecha de alta:'
Control = eFechaAltaEmpresa
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem20: TdxLayoutItem
Caption = 'Categor'#237'a:'
Control = cbCategoria
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem21: TdxLayoutItem
Caption = 'Tipo de contrato:'
Control = cbContrato
ControlOptions.ShowBorder = False
end
end
inherited dxLayoutControlContactoGroup3: TdxLayoutGroup
inherited dxLayoutControlContactoItem167: TdxLayoutItem
@ -271,6 +290,19 @@ inherited frViewEmpleado: TfrViewEmpleado
inherited dxLayoutControlContactoGroup5: TdxLayoutGroup
Visible = False
end
object dxLayoutControlContactoGroup14: TdxLayoutGroup
Caption = 'Contrato'
object dxLayoutControlContactoItem21: TdxLayoutItem
Caption = 'Tipo de contrato:'
Control = cbContrato
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem22: TdxLayoutItem
Caption = 'Duraci'#243'n:'
Control = eDuracionContrato
ControlOptions.ShowBorder = False
end
end
end
end
end

4
Source/Modulos/Contactos/Views/uViewEmpleado.pas
View File

@ -20,11 +20,13 @@ type
dxLayoutControlContactoItem16: TdxLayoutItem;
dxLayoutControlContactoItem19: TdxLayoutItem;
eFechaAltaEmpresa: TcxDBDateEdit;
dxLayoutControlContactoGroup10: TdxLayoutGroup;
dxLayoutControlContactoItem20: TdxLayoutItem;
cbCategoria: TcxDBComboBox;
dxLayoutControlContactoItem21: TdxLayoutItem;
cbContrato: TcxDBComboBox;
dxLayoutControlContactoItem22: TdxLayoutItem;
eDuracionContrato: TcxDBTextEdit;
dxLayoutControlContactoGroup14: TdxLayoutGroup;
procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject);
procedure cbCategoriaPropertiesInitPopup(Sender: TObject);