diff --git a/Build/Build.fbp5 b/Build/Build.fbp5 index ba0168c7..fa7acc29 100644 --- a/Build/Build.fbp5 +++ b/Build/Build.fbp5 @@ -127,12 +127,14 @@ project_path - + 0 {78526C82-A8E7-42B3-8C9D-1E229C79D915} + + True False True @@ -157,11 +159,13 @@ False False - - # + + + 16711680 - # + + False True False @@ -174,6 +178,37 @@ 1000 False + + + + 0 + + + + True + True + True + False + True + False + False + + 0 + False + 0 + 1000 + False + + + # 16711680 @@ -314,6 +349,163 @@ False + + # + 16711680 + + # + False + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + + 16711680 + + + + False + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + + 0 + + + + True + True + False + DiretorioRaiz + + False + True + False + + 0 + False + 0 + 1000 + False + + + + 0 + + True + + True + True + True + 1 + 1 + + False + DiretorioRaiz + False + True + False + + False + False + 0 + False + 0 + + trOriginalFile + + + 1000 + + + + False + False + tfDontFail + True + False + False + False + + + + + 0 + + True + + True + True + True + 1 + 1 + + False + DiretorioRaiz + False + True + False + + False + False + 0 + False + 0 + + trOriginalFile + + + 1000 + + + + False + False + tfDontFail + True + False + False + False + + %source_path% + + + DiretorioRaiz + qtNone + spNone + + False + PATTERNLIST + + False + sch*Client_Intf.pas + True + + + EXCLUDEPATTERNLIST + + + + # 16711680 @@ -348,56 +540,6 @@ 1000 False - - - - 16711680 - - - - False - True - False - True - False - - 0 - False - 0 - 1000 - False - - - - - 0 - - - - True - True - True - False - True - False - False - - 0 - False - 0 - 1000 - False - - - diff --git a/Source/ApplicationBase/ApplicationBase.dpk b/Source/ApplicationBase/ApplicationBase.dpk index a10c758c..95398a23 100644 --- a/Source/ApplicationBase/ApplicationBase.dpk +++ b/Source/ApplicationBase/ApplicationBase.dpk @@ -56,7 +56,7 @@ requires contains uFactuGES_App in 'uFactuGES_App.pas', uIDataModuleUsuarios in 'Usuarios\Model\Data\uIDataModuleUsuarios.pas', - uDataModuleUsuarios in 'Usuarios\Data\uDataModuleUsuarios.pas' {DataModuleUsuariosObj}, + uDataModuleUsuarios in 'Usuarios\Data\uDataModuleUsuarios.pas' {DataModuleUsuarios}, uUCROConn in 'Usuarios\Data\uUCROConn.pas', uUsuariosController in 'Usuarios\Controller\uUsuariosController.pas', uBizEmpresasDatosBancarios in 'Empresas\Model\uBizEmpresasDatosBancarios.pas', diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj index d506142a..7e833714 100644 --- a/Source/ApplicationBase/ApplicationBase.dproj +++ b/Source/ApplicationBase/ApplicationBase.dproj @@ -38,6 +38,8 @@ DEBUG False True + True + True Delphi.Personality @@ -58,32 +60,32 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -106,7 +108,7 @@ -
DataModuleUsuariosObj
+
DataModuleUsuarios
 diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.res index 8b251f31..1641339f 100644 Binary files a/Source/ApplicationBase/ApplicationBase.res and b/Source/ApplicationBase/ApplicationBase.res differ diff --git a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas index 14dd7073..f38cb497 100644 --- a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas +++ b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas @@ -72,7 +72,7 @@ end; constructor TEmpresasController.Create; begin - FDataModule := TDataModuleEmpresas.Create; + FDataModule := TDataModuleEmpresas.Create(Nil); end; procedure TEmpresasController.DescartarCambios(AEmpresa: IBizEmpresa); diff --git a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm index 14571f20..c4d77934 100644 --- a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm +++ b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm @@ -1,4 +1,4 @@ -object DataModuleEmpresasObj: TDataModuleEmpresasObj +inherited DataModuleEmpresas: TDataModuleEmpresas OldCreateOrder = True OnCreate = DAClientDataModuleCreate OnDestroy = DataModuleDestroy diff --git a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas index e6c673ac..e84f25c3 100644 --- a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas +++ b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.pas @@ -8,10 +8,10 @@ uses {vcl:} SysUtils, Classes, DB, DBClient, uROClient, uROBinMessage, uROWinInetHttpChannel, uDADesigntimeCall, uIDataModuleEmpresas, uBizEmpresas, uBizEmpresasDatosBancarios, uDARemoteDataAdapter, uDADataStreamer, uRODynamicRequest, uDAInterfaces, - uDAMemDataTable, uDABin2DataStreamer, uIntegerListUtils, uControllerBase; + uDAMemDataTable, uDABin2DataStreamer, uIntegerListUtils, uDataModuleBase; type - TDataModuleEmpresasObj = class(TDataModule) + TDataModuleEmpresas = class(TDataModuleBase, IDataModuleEmpresas) RORemoteService: TRORemoteService; rda_Empresas: TDARemoteDataAdapter; Bin2DataStreamer: TDABin2DataStreamer; @@ -29,18 +29,6 @@ type function GetItems : IBizEmpresa; end; - TDataModuleEmpresas = class(TMiInterfacedObject, IDataModuleEmpresas) - private - FDataModule : TDataModuleEmpresasObj; - public - constructor Create; - destructor Destroy; override; - - function GetItem(const ID : Integer) : IBizEmpresa; - function NewItem : IBizEmpresa; - function GetItems : IBizEmpresa; - end; - implementation {$R *.DFM} @@ -49,18 +37,18 @@ uses uDataModuleConexion, uDataTableUtils, Dialogs, FactuGES_Intf, schEmpresasClient_Intf, cxControls; -procedure TDataModuleEmpresasObj.DAClientDataModuleCreate(Sender: TObject); +procedure TDataModuleEmpresas.DAClientDataModuleCreate(Sender: TObject); begin RORemoteService.Channel := dmConexion.Channel; RORemoteService.Message := dmConexion.Message; end; -procedure TDataModuleEmpresasObj.DataModuleDestroy(Sender: TObject); +procedure TDataModuleEmpresas.DataModuleDestroy(Sender: TObject); begin - ShowMessage('TDataModuleEmpresasObj.Destroy'); + ShowMessage('TDataModuleEmpresas.Destroy'); end; -function TDataModuleEmpresasObj.GetItem(const ID: Integer): IBizEmpresa; +function TDataModuleEmpresas.GetItem(const ID: Integer): IBizEmpresa; begin ShowHourglassCursor; try @@ -78,7 +66,7 @@ begin end; end; -function TDataModuleEmpresasObj.GetItems: IBizEmpresa; +function TDataModuleEmpresas.GetItems: IBizEmpresa; var AEmpresa : TDAMemDataTable; begin @@ -98,12 +86,12 @@ begin end; end; -function TDataModuleEmpresasObj.NewItem: IBizEmpresa; +function TDataModuleEmpresas.NewItem: IBizEmpresa; begin Result := GetItem(ID_NULO) end; -function TDataModuleEmpresasObj._GetDatosBancarios: IBizEmpresasDatosBancarios; +function TDataModuleEmpresas._GetDatosBancarios: IBizEmpresasDatosBancarios; var ADatosBancarios : TDAMemDataTable; begin @@ -123,32 +111,4 @@ begin end; -{ TDataModuleEmpresas } - -constructor TDataModuleEmpresas.Create; -begin - FDataModule := TDataModuleEmpresasObj.Create(NIL); -end; - -destructor TDataModuleEmpresas.Destroy; -begin - FreeANDNIL(FDataModule); - inherited; -end; - -function TDataModuleEmpresas.GetItem(const ID: Integer): IBizEmpresa; -begin - Result := FDataModule.GetItem(ID); -end; - -function TDataModuleEmpresas.GetItems: IBizEmpresa; -begin - Result := FDataModule.GetItems; -end; - -function TDataModuleEmpresas.NewItem: IBizEmpresa; -begin - Result := FDataModule.NewItem; -end; - end. diff --git a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas index e75719a7..298b7c7c 100644 --- a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas +++ b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas @@ -3,7 +3,7 @@ unit schEmpresasClient_Intf; interface uses - Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids @@ -235,7 +235,7 @@ type end; { TEmpresasDataTableRules } - TEmpresasDataTableRules = class(TDADataTableRules, IEmpresas) + TEmpresasDataTableRules = class(TIntfObjectDADataTableRules, IEmpresas) private f_NOTAS: IROStrings; f_LOGOTIPO: IROStream; @@ -452,7 +452,7 @@ type end; { TEmpresasDatosBancoDataTableRules } - TEmpresasDatosBancoDataTableRules = class(TDADataTableRules, IEmpresasDatosBanco) + TEmpresasDatosBancoDataTableRules = class(TIntfObjectDADataTableRules, IEmpresasDatosBanco) private protected { Property getters and setters } @@ -542,6 +542,8 @@ end; destructor TEmpresasDataTableRules.Destroy; begin + f_NOTAS := Nil; + f_LOGOTIPO := Nil; inherited; end; diff --git a/Source/ApplicationBase/Empresas/Model/uBizEmpresas.pas b/Source/ApplicationBase/Empresas/Model/uBizEmpresas.pas index cc9eeb14..0c788ca7 100644 --- a/Source/ApplicationBase/Empresas/Model/uBizEmpresas.pas +++ b/Source/ApplicationBase/Empresas/Model/uBizEmpresas.pas @@ -44,7 +44,7 @@ type implementation uses - uDataTableUtils, Classes, DateUtils, SysUtils; + uDataTableUtils, Classes, DateUtils, SysUtils, Dialogs; { TBizEmpresa } @@ -58,6 +58,8 @@ end; destructor TBizEmpresa.Destroy; begin +Beep; +//showmessage('Destruyendo'); FDatosBancarios := NIL; FDatosBancariosLink.Free; inherited; diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas index a5bb5125..8bfcfa6c 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas +++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas @@ -56,7 +56,7 @@ implementation {$R *.dfm} uses - uCustomEditor, uDataModuleEmpresas, uDataModuleBase; + uCustomEditor, uDataModuleEmpresas; { ******************************* TfEditorEmpresa ******************************* diff --git a/Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas b/Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas index cb3ead53..7e958f99 100644 --- a/Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas +++ b/Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas @@ -89,7 +89,7 @@ uses procedure TUsuariosController.AsignarDataModule; begin - FDataModule := TDataModuleUsuarios.Create; + FDataModule := TDataModuleUsuarios.Create(Nil); end; procedure TUsuariosController.CambiarPassword(const AIDUser: Integer; diff --git a/Source/ApplicationBase/Usuarios/Data/uDataModuleUsuarios.dfm b/Source/ApplicationBase/Usuarios/Data/uDataModuleUsuarios.dfm index b01ed2dd..1b57dc5b 100644 --- a/Source/ApplicationBase/Usuarios/Data/uDataModuleUsuarios.dfm +++ b/Source/ApplicationBase/Usuarios/Data/uDataModuleUsuarios.dfm @@ -1,7 +1,5 @@ -object DataModuleUsuariosObj: TDataModuleUsuariosObj - OldCreateOrder = True - Height = 149 - Width = 273 +inherited DataModuleUsuarios: TDataModuleUsuarios + Height = 179 object srvUsuarios: TRORemoteService Message = dmConexion.ROMessage Channel = dmConexion.ROChannel diff --git a/Source/ApplicationBase/Usuarios/Data/uDataModuleUsuarios.pas b/Source/ApplicationBase/Usuarios/Data/uDataModuleUsuarios.pas index efccab10..70be30ee 100644 --- a/Source/ApplicationBase/Usuarios/Data/uDataModuleUsuarios.pas +++ b/Source/ApplicationBase/Usuarios/Data/uDataModuleUsuarios.pas @@ -7,10 +7,11 @@ uses FactuGES_Intf, uIntegerListUtils, uBizEmpresas, UCBase, UCDataConnector, uUCROConn, uDARemoteDataAdapter, uDARemoteCommand, uROClient, uRORemoteService, uDADataStreamer, - uDABin2DataStreamer, uDAScriptingProvider, uIDataModuleUsuarios, UCSettings; + uDABin2DataStreamer, uDAScriptingProvider, uIDataModuleUsuarios, UCSettings, + uDataModuleBase; type - TDataModuleUsuariosObj = class(TDataModule) + TDataModuleUsuarios = class(TDataModuleBase, IDataModuleUsuarios) srvUsuarios: TRORemoteService; UCSettingsSpanish: TUCSettings; private @@ -21,15 +22,6 @@ type procedure InicializarUserControl (AUserControl : TUserControl); end; - TDataModuleUsuarios = class(TInterfacedObject, IDataModuleUsuarios) - private - FDataModule : TDataModuleUsuariosObj; - public - procedure InicializarUserControl (AUserControl : TUserControl); - constructor Create; - destructor Destroy; override; - end; - implementation @@ -37,12 +29,12 @@ implementation uses Forms, Controls, uDataTableUtils, uDataModuleConexion, - Dialogs, Windows, uEmpresasController, uDataModuleBase, + Dialogs, Windows, uEmpresasController, schUsuariosClient_Intf; { TDAClientDataModule1 } -function TDataModuleUsuariosObj.CreateConnectorInstance: TUCDataConnector; +function TDataModuleUsuarios.CreateConnectorInstance: TUCDataConnector; begin // El propietario (Owner) es Application para que se encarge de la // liberación del conector que estamos creando. @@ -55,7 +47,7 @@ begin end; end; -procedure TDataModuleUsuariosObj.InicializarCamposUserControl( +procedure TDataModuleUsuarios.InicializarCamposUserControl( AUserControl: TUserControl); begin if not Assigned(AUserControl) then @@ -119,7 +111,7 @@ begin end; end; -procedure TDataModuleUsuariosObj.InicializarSettingsUserControl( +procedure TDataModuleUsuarios.InicializarSettingsUserControl( AUserControl: TUserControl); var SourceSettings : TUCSettings; @@ -360,8 +352,7 @@ begin end; end; -procedure TDataModuleUsuariosObj.InicializarUserControl( - AUserControl: TUserControl); +procedure TDataModuleUsuarios.InicializarUserControl(AUserControl: TUserControl); begin if Assigned(AUserControl) then begin @@ -370,23 +361,4 @@ begin end; end; -{ TDataModuleUsuarios } - -constructor TDataModuleUsuarios.Create; -begin - FDataModule := TDataModuleUsuariosObj.Create(NIL); -end; - -destructor TDataModuleUsuarios.Destroy; -begin - FreeANDNIL(FDataModule); - inherited; -end; - -procedure TDataModuleUsuarios.InicializarUserControl( - AUserControl: TUserControl); -begin - FDataModule.InicializarUserControl(AUserControl); -end; - end. diff --git a/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas b/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas index 1b5720ab..1d927631 100644 --- a/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas +++ b/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas @@ -3,7 +3,7 @@ unit schUsuariosClient_Intf; interface uses - Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids @@ -195,7 +195,7 @@ type end; { TUSUARIOSDataTableRules } - TUSUARIOSDataTableRules = class(TDADataTableRules, IUSUARIOS) + TUSUARIOSDataTableRules = class(TIntfObjectDADataTableRules, IUSUARIOS) private protected { Property getters and setters } @@ -343,7 +343,7 @@ type end; { TUSUARIOS_EVENTOSDataTableRules } - TUSUARIOS_EVENTOSDataTableRules = class(TDADataTableRules, IUSUARIOS_EVENTOS) + TUSUARIOS_EVENTOSDataTableRules = class(TIntfObjectDADataTableRules, IUSUARIOS_EVENTOS) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -451,7 +451,7 @@ type end; { TUSUARIOS_LOGONDataTableRules } - TUSUARIOS_LOGONDataTableRules = class(TDADataTableRules, IUSUARIOS_LOGON) + TUSUARIOS_LOGONDataTableRules = class(TIntfObjectDADataTableRules, IUSUARIOS_LOGON) private protected { Property getters and setters } @@ -528,7 +528,7 @@ type end; { TPERMISOSDataTableRules } - TPERMISOSDataTableRules = class(TDADataTableRules, IPERMISOS) + TPERMISOSDataTableRules = class(TIntfObjectDADataTableRules, IPERMISOS) private protected { Property getters and setters } @@ -605,7 +605,7 @@ type end; { TPERMISOSEXDataTableRules } - TPERMISOSEXDataTableRules = class(TDADataTableRules, IPERMISOSEX) + TPERMISOSEXDataTableRules = class(TIntfObjectDADataTableRules, IPERMISOSEX) private protected { Property getters and setters } diff --git a/Source/ApplicationBase/Usuarios/Views/uUsuarios.pas b/Source/ApplicationBase/Usuarios/Views/uUsuarios.pas index 6fb22fd6..9b355e6f 100644 --- a/Source/ApplicationBase/Usuarios/Views/uUsuarios.pas +++ b/Source/ApplicationBase/Usuarios/Views/uUsuarios.pas @@ -5,7 +5,7 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, DB, uDADataTable, dbcgrids, uDataModuleUsuarios, StdCtrls, - DBCtrls, uDataModuleBase, JvExControls, JvComponent, JvNavigationPane, + DBCtrls, JvExControls, JvComponent, JvNavigationPane, Grids, DBGrids, ActnList, uDAInterfaces; type diff --git a/Source/ApplicationBase/uFactuGES_App.pas b/Source/ApplicationBase/uFactuGES_App.pas index 61b7a447..27bcb3dc 100644 --- a/Source/ApplicationBase/uFactuGES_App.pas +++ b/Source/ApplicationBase/uFactuGES_App.pas @@ -134,7 +134,7 @@ var implementation uses - Dialogs, cxControls, uDataModuleBase, uUsuariosViewRegister, + Dialogs, cxControls, uUsuariosViewRegister, uEmpresasViewRegister; procedure TAppFactuGES.CambiarEmpresa(const AIDEmpresa: Integer); @@ -354,6 +354,8 @@ initialization finalization // Pongo esto aquí por ahora + AppFactuGES := NIL; + uUsuariosViewRegister.UnregisterViews; uEmpresasViewRegister.UnregisterViews; diff --git a/Source/Base/Base.dpk b/Source/Base/Base.dpk index b697db04..75877c69 100644 --- a/Source/Base/Base.dpk +++ b/Source/Base/Base.dpk @@ -81,7 +81,7 @@ contains uDataTableUtils in 'Utiles\uDataTableUtils.pas', uDBSelectionListUtils in 'Utiles\uDBSelectionListUtils.pas', uIntegerListUtils in 'Utiles\uIntegerListUtils.pas', - uDataModuleBase in 'uDataModuleBase.pas' {dmBase: TDataModule}, + uDMBase in 'uDMBase.pas' {dmBase: TDataModule}, uDataModuleConexion in 'Conexion\uDataModuleConexion.pas' {dmConexion: TDataModule}, uConfigurarConexion in 'Conexion\uConfigurarConexion.pas' {fConfigurarConexion: TForm}, uSistemaFunc in 'Utiles\uSistemaFunc.pas', @@ -98,8 +98,10 @@ contains uPasswordUtils in 'Utiles\uPasswordUtils.pas', uInfoProjectUtils in 'Utiles\uInfoProjectUtils.pas', uInformeRegistryUtils in 'Utiles\ClassRegistry\uInformeRegistryUtils.pas', + uCalculosUtils in 'Utiles\uCalculosUtils.pas', uControllerBase in 'Controladores\uControllerBase.pas', uControllerDetallesBase in 'Controladores\uControllerDetallesBase.pas', - uCalculosUtils in 'Utiles\uCalculosUtils.pas'; + schBase_Intf in 'schBase_Intf.pas', + uDataModuleBase in 'uDataModuleBase.pas' {DataModuleBase: TDataModule}; end. diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 83f2751b..a77c90b1 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -36,12 +36,21 @@ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp + True + True Delphi.Personality Package FalseTrueFalseLibreria base de FactuGESTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + + + + + + VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components @@ -57,55 +66,7 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
fConfigurarConexion
 @@ -117,7 +78,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DataModulBase
+ +
dmBase
 @@ -136,6 +142,13 @@ + + + + + + +