From fe4d7a0f53e1c2554bcfb97c4454485e01943241 Mon Sep 17 00:00:00 2001 From: roberto Date: Tue, 15 Jan 2008 17:04:57 +0000 Subject: [PATCH] Preparar empleados para que se les asignen usuarios git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@109 f4e31baf-9722-1c47-927c-6f952f962d4b --- Source/ApplicationBase/ApplicationBase.dproj | 56 ------- Source/ApplicationBase/ApplicationBase.res | Bin 5028 -> 384 bytes .../Usuarios/Model/schUsuariosClient_Intf.pas | 24 +-- .../Usuarios/Model/schUsuariosServer_Intf.pas | 24 +-- .../Usuarios/Views/uViewUsuario.dfm | 16 +- .../Usuarios/Views/uViewUsuario.pas | 3 +- Source/Base/Base.dproj | 95 +++++++----- Source/Base/Base.res | Bin 4748 -> 384 bytes .../Contactos/Data/uDataModuleEmpleados.dfm | 4 + .../Model/schContactosClient_Intf.pas | 87 +++++++---- .../Model/schContactosServer_Intf.pas | 95 ++++++++---- .../Contactos/Servidor/srvContactos_Impl.dfm | 45 +++--- .../Contactos/Views/Contactos_view.dproj | 50 +++--- .../Modulos/Contactos/Views/uViewContacto.dfm | 64 ++++---- .../Modulos/Contactos/Views/uViewEmpleado.dfm | 142 ++++++++++-------- .../Modulos/Contactos/Views/uViewEmpleado.pas | 3 +- Source/Servidor/FactuGES_Server.RES | Bin 23200 -> 23200 bytes Source/Servidor/FactuGES_Server.dpr | 10 +- Source/Servidor/FactuGES_Server.rc | 2 +- 19 files changed, 393 insertions(+), 327 deletions(-) diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj index 63291f84..98ba22d8 100644 --- a/Source/ApplicationBase/ApplicationBase.dproj +++ b/Source/ApplicationBase/ApplicationBase.dproj @@ -60,62 +60,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.res index 02236de8db669bbe3315cfec9671db4bcf8913dc..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 60 zcmZ3Y-oQLTfyse!vYwzEi1HKk5Mg0pWIzQA7$&b0RAQ=On0!u9Y_f@v!DJob3IIQa B3o!ry literal 5028 zcmbW5&x;&Y5XWni1tkRCgZEiPMD`#nRcWtPt_oH5Yzu$VV-wb1Bwk_-XFg2H+pSN=U zyka(dZfonp#SD5!jcwWcvJG#kp*8>anb&hWI5@DjY24FJ`|-&Wn^$uqCj8E%Jsr>a z(f=18FcLdGW67gkv_9X9SKG|36^E%gpYEy6iCd_cw7Wj~iaqH`jCsjRp5)Tjjm3D> z0$yNKhb0agb9}Iy*6di=$H_r$wE8prvehh4CJk(k3R41_1_tIpwah8HE0zJ2j_A8qJC;h zPS-&^`8?-X2glUhT>Qz`_tI1oCl0I;m#I0|PPJD&x?6D9=#RXC$36y!sH@L4V9JUQ zO~GN_lzo;~$4gKBX=lH9n~Y`sLpL>Q25j^&9{X3YYiX$(S>$ceRjZ9(sJ1i3RjRX$ zJu%I-9czh^DgT^)7wf?X1I?kkwO%pV4}9frWWqiC{m|pl-!`rHskb%S2V!cllLNls zE@6uUea$64TFH%f9$nE+PL0j$(Csl@jKP6E`|sEbVb9)6dbzX;O}gsJTj}n*BLwN2Tb~Kb^L{5h^^(TFzVy_mCyAq;GlLVY)tF3_WiN; zt9xq60Zw2BHhBxa;yCwUat@+RjSJ72e5G}Da6ls%zW<5a6%IO|%y~`w-r(SEy&sHI zL+1cCHjDjtOmT-3ZMb?3gym;Z+``j8sjb>;9XPzh1Ge(To)-Pdp&Ip5b5maQQy<>x z;4$(~Uhbs_4A-Xo;KtoTef7S9KQ-lxGhB4nh09EwmCN_M=+8a!eWK2a1qWTe_u|K$ z>+h*>83&sj-d=;xdarjSeloa(>HLWs?{nM%q2JF2IMkyqd$b@%^>5HxIH;ZY;n(Z; z`YV@X*6eMVNk4OW=Xi}Y7w2AH*r}hhAN!-V;LE^FW1cqe-%{<%KE%1>{(@uVA|LvF z|J6pX*Qr*1#WC+WyTI~!tifW$(x@{fY0n3w~h7eA|@stGrQv zano30;rWe#Pb24Q4SWw4<$gm$!H@c@ue~+n9nIRryEg0(+$zOst?!S#pU1kqlj4xy z?W|eF_rC5r|L#bP*?9l?`BR^oVDRJqA{V;Q?%brE8m88~7veY6SckRvIty{HpUhO;SN#DLEo$afXFl8=h$ZPu>i@PdBM=dt#yd=JphyT;Fi zIQqF4Zk}DR{Jtr;c?QAeNiOT~8RIN^y{oa_S@$Jhp*ytayUTk9_Q0WuHno^O%=2Eo zjKgr|XJEi(>X)&p@p#YD9yx%u`Y?vAdl!-udqj-iGgab^KEC$~j?P2=j!d8D-E*uG zP@i!u@lN!|@m<2%KqGbIPNWY$KVy5_|JC4MkPW+e z&io&azTZ-w4PUlv<9{JH&t1~k4ZCi&K0mV0)w=2kwc}k;o9EZfKmQ?L7$cFZqN!(7 z79-yEk6(P?x;?UocE|SZwq23GYqykn-@dl{ihArZyHd3)g}Zi19ANaOvTbPezTLA2 zwx{?Xq zvHQZlyTagY$NyOKw|y4255yC-x9uCPj3;=GabGB6&%V;Sd-4zMTQSKeVy~4PR1MtZ zO>e9~)aWzC-dDEorTx(gLsKo$y&SWuepUNrCv(HOCGxmqW^eg!hl+i1zpKb;y)Rt+ GWAk6yB6aNm diff --git a/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas b/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas index 315413be..13d25c03 100644 --- a/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas +++ b/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas @@ -9,12 +9,12 @@ 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_USUARIOS = '{CFE175CF-EB6D-4BF8-91B4-F0140B57453E}'; - RID_USUARIOS_EVENTOS = '{6013DEA6-697A-4A8C-8D92-51677BB6F39F}'; - RID_USUARIOS_LOGON = '{C666C96E-401A-4FB5-A0E2-F3DB7BAB5F3D}'; - RID_PERMISOS = '{02CCB513-8F98-406C-ADAC-21C189AABA29}'; - RID_PERMISOSEX = '{B8D57BF7-0B57-4A0B-8F9E-12E87D0B6B60}'; - RID_PERFILES = '{0AF2374A-D201-4B82-BB13-07265E1BAEBE}'; + RID_USUARIOS = '{4ED84753-A082-44F4-BEA1-B84E494129F1}'; + RID_USUARIOS_EVENTOS = '{5A454EB1-F5D2-4E55-8DC3-2C42AF250C42}'; + RID_USUARIOS_LOGON = '{50AFB47C-FF60-4F01-B19C-FED2D4E6C884}'; + RID_PERMISOS = '{65C900D5-5EF1-4B26-9D61-CD0183BD5CAF}'; + RID_PERMISOSEX = '{66351DE2-540F-4456-A330-2634D71EA2E4}'; + RID_PERFILES = '{A054E0CE-4F22-4376-88E2-07ABF712361C}'; { Data table names } nme_USUARIOS = 'USUARIOS'; @@ -129,7 +129,7 @@ const type { IUSUARIOS } IUSUARIOS = interface(IDAStronglyTypedDataTable) - ['{12D98238-4C08-4CB7-BAD1-1E2827ADE7A7}'] + ['{30EDE872-B7DB-48D5-91B1-01659A9C9475}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -296,7 +296,7 @@ type { IUSUARIOS_EVENTOS } IUSUARIOS_EVENTOS = interface(IDAStronglyTypedDataTable) - ['{54DEE63E-4D88-43D8-8D34-1F51030428DE}'] + ['{351226EB-9947-4892-A278-211C9F071DBF}'] { Property getters and setters } function GetAPLICACIONValue: String; procedure SetAPLICACIONValue(const aValue: String); @@ -427,7 +427,7 @@ type { IUSUARIOS_LOGON } IUSUARIOS_LOGON = interface(IDAStronglyTypedDataTable) - ['{D98BF482-EFA8-49ED-894A-E7774859C830}'] + ['{E20DC12D-CE5C-4CBF-A6E4-3EDF551CF78F}'] { Property getters and setters } function GetLOGONIDValue: String; procedure SetLOGONIDValue(const aValue: String); @@ -510,7 +510,7 @@ type { IPERMISOS } IPERMISOS = interface(IDAStronglyTypedDataTable) - ['{076A52A0-4BD5-4617-80DB-69BB4B4C4E4E}'] + ['{E5102A92-D8E5-4EBE-B311-813248EB7D0E}'] { Property getters and setters } function GetID_USUARIOValue: Integer; procedure SetID_USUARIOValue(const aValue: Integer); @@ -581,7 +581,7 @@ type { IPERMISOSEX } IPERMISOSEX = interface(IDAStronglyTypedDataTable) - ['{5778D823-11A3-4B43-8336-FB2ACBBCFCE5}'] + ['{8E1FEA71-ABDC-4688-A6A7-145E11A8C18D}'] { Property getters and setters } function GetID_USUARIOValue: Integer; procedure SetID_USUARIOValue(const aValue: Integer); @@ -664,7 +664,7 @@ type { IPERFILES } IPERFILES = interface(IDAStronglyTypedDataTable) - ['{44741F58-0B27-462C-BA49-A6944FFA7BAC}'] + ['{8A8536E6-95D0-4D6C-9F52-8EF5D46948A9}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); diff --git a/Source/ApplicationBase/Usuarios/Model/schUsuariosServer_Intf.pas b/Source/ApplicationBase/Usuarios/Model/schUsuariosServer_Intf.pas index aa60aab4..9be1d2bc 100644 --- a/Source/ApplicationBase/Usuarios/Model/schUsuariosServer_Intf.pas +++ b/Source/ApplicationBase/Usuarios/Model/schUsuariosServer_Intf.pas @@ -9,17 +9,17 @@ 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_USUARIOSDelta = '{D0217428-91FB-4128-8A0D-AF4A8A742D5A}'; - RID_USUARIOS_EVENTOSDelta = '{16B87039-04DC-47AD-81D6-E8648C69A484}'; - RID_USUARIOS_LOGONDelta = '{856F2E25-24EE-43BB-94F5-70DD65E4FD02}'; - RID_PERMISOSDelta = '{DB34A951-27E2-4A70-843F-9C41FF29179D}'; - RID_PERMISOSEXDelta = '{F40FC2C9-2DFF-4B12-8EE6-DAD609901516}'; - RID_PERFILESDelta = '{07C28883-A52C-4111-ABBE-14E908E7C705}'; + RID_USUARIOSDelta = '{06A56FDC-D1B7-4F90-B90A-5D74FCD7F5C6}'; + RID_USUARIOS_EVENTOSDelta = '{94A19FD9-F4DA-45FE-85BE-70F2BBA6409F}'; + RID_USUARIOS_LOGONDelta = '{FEDB5A65-D568-46CE-A595-5DC807BAB7DC}'; + RID_PERMISOSDelta = '{5B04B65B-14D8-4485-A305-214FDE2E6B38}'; + RID_PERMISOSEXDelta = '{FF8FC2AF-6D29-4EEE-A4CD-4DFD01041C25}'; + RID_PERFILESDelta = '{E9F8FD20-4505-4698-80CF-F4F641EB05F6}'; type { IUSUARIOSDelta } IUSUARIOSDelta = interface(IUSUARIOS) - ['{D0217428-91FB-4128-8A0D-AF4A8A742D5A}'] + ['{06A56FDC-D1B7-4F90-B90A-5D74FCD7F5C6}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldUSERNAMEValue : String; @@ -185,7 +185,7 @@ type { IUSUARIOS_EVENTOSDelta } IUSUARIOS_EVENTOSDelta = interface(IUSUARIOS_EVENTOS) - ['{16B87039-04DC-47AD-81D6-E8648C69A484}'] + ['{94A19FD9-F4DA-45FE-85BE-70F2BBA6409F}'] { Property getters and setters } function GetOldAPLICACIONValue : String; function GetOldID_USUARIOValue : Integer; @@ -316,7 +316,7 @@ type { IUSUARIOS_LOGONDelta } IUSUARIOS_LOGONDelta = interface(IUSUARIOS_LOGON) - ['{856F2E25-24EE-43BB-94F5-70DD65E4FD02}'] + ['{FEDB5A65-D568-46CE-A595-5DC807BAB7DC}'] { Property getters and setters } function GetOldLOGONIDValue : String; function GetOldID_USUARIOValue : Integer; @@ -398,7 +398,7 @@ type { IPERMISOSDelta } IPERMISOSDelta = interface(IPERMISOS) - ['{DB34A951-27E2-4A70-843F-9C41FF29179D}'] + ['{5B04B65B-14D8-4485-A305-214FDE2E6B38}'] { Property getters and setters } function GetOldID_USUARIOValue : Integer; function GetOldMODULOValue : String; @@ -468,7 +468,7 @@ type { IPERMISOSEXDelta } IPERMISOSEXDelta = interface(IPERMISOSEX) - ['{F40FC2C9-2DFF-4B12-8EE6-DAD609901516}'] + ['{FF8FC2AF-6D29-4EEE-A4CD-4DFD01041C25}'] { Property getters and setters } function GetOldID_USUARIOValue : Integer; function GetOldMODULOValue : String; @@ -550,7 +550,7 @@ type { IPERFILESDelta } IPERFILESDelta = interface(IPERFILES) - ['{07C28883-A52C-4111-ABBE-14E908E7C705}'] + ['{E9F8FD20-4505-4698-80CF-F4F641EB05F6}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldUSERNAMEValue : String; diff --git a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.dfm b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.dfm index bfb74722..958a85ea 100644 --- a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.dfm +++ b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.dfm @@ -1,22 +1,22 @@ inherited frViewUsuario: TfrViewUsuario - Width = 509 - Height = 275 + Width = 510 + Height = 321 OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy - ExplicitWidth = 509 - ExplicitHeight = 275 + ExplicitWidth = 510 + ExplicitHeight = 321 object dxLayoutControlArticulo: TdxLayoutControl Left = 0 Top = 0 - Width = 509 - Height = 249 + Width = 510 + Height = 273 Align = alTop ParentBackground = True TabOrder = 0 AutoContentSizes = [acsWidth] DesignSize = ( - 509 - 249) + 510 + 273) object PngSpeedButton3: TPngSpeedButton Left = 335 Top = 82 diff --git a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas index 66f47e55..7343f126 100644 --- a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas +++ b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas @@ -8,7 +8,8 @@ uses dxLayoutControl, cxCurrencyEdit, uCustomView, cxControls, DB, uDAInterfaces, uDADataTable, ActnList, cxCheckBox, cxDBEdit, cxMaskEdit, cxSpinEdit, cxHyperLinkEdit, cxContainer, cxEdit, cxTextEdit, Buttons, PngSpeedButton, - uBizUsuarios, cxDropDownEdit, ExtCtrls; + uBizUsuarios, cxDropDownEdit, ExtCtrls, cxLookupEdit, cxDBLookupEdit, + cxDBLookupComboBox; type IViewUsuario = interface(IViewBase) diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 42308ec1..4622730a 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -50,6 +50,20 @@ + + + + + + + + + + + + + + VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components @@ -65,33 +79,6 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -105,21 +92,9 @@ - - - - - - - - - - - - - +
fConfigurarConexion
TForm @@ -134,7 +109,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DataModuleBase
TDataModule @@ -159,6 +167,13 @@ + + + + + + +