Obras: mejor apariencia de la ficha de una obra.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@486 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Source/Modulos/Obras/Views/uEditorObra.dfm

@@ -21,7 +21,7 @@ inherited fEditorObra: TfEditorObra
         000000180806000000E0773DF8000000017352474200AECE1CE9000000046741
         4D410000B18F0BFC6105000000206348524D00007A26000080840000FA000000
         80E8000075300000EA6000003A98000017709CBA513C00000009704859730000
-        17110000171101CA26F33F000001C149444154484BED564D4B025114B55D3FA3
+        17100000171001186111DB000001C149444154484BED564D4B025114B55D3FA3
         4DAB7E444449DA0FC8428B3EC032A96428182209A4851F8B4C515A894A8A2DDC
         B82985A2A581A4B4103547FA5C54532EDAB83B791F8C98683E29770DDCC5CC65
         CE79E7BC731F6F0080AAAF0F11F4B3FA0ACEDCE9E7EAB9086A6915940A040250

Source/Modulos/Obras/Views/uViewObra.dfm

@@ -1,23 +1,23 @@
 inherited frViewObra: TfrViewObra
-  Width = 451
-  Height = 304
+  Width = 924
+  Height = 548
   Align = alClient
-  AutoSize = True
   ExplicitWidth = 451
   ExplicitHeight = 304
   object dxLayoutControlObra: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 451
-    Height = 304
+    Width = 924
+    Height = 548
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
+    ExplicitHeight = 497
     DesignSize = (
-      451
-      304)
+      924
+      548)
     object eNombre: TcxDBTextEdit
       Left = 130
       Top = 34
@@ -139,10 +139,10 @@ inherited frViewObra: TfrViewObra
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 5
-      Width = 116
+      Width = 203
     end
     object eCodigoPostal: TcxDBTextEdit
-      Left = 189
+      Left = 351
       Top = 145
       DataBinding.DataField = 'CODIGO_POSTAL'
       DataBinding.DataSource = DADataSource
@@ -158,7 +158,7 @@ inherited frViewObra: TfrViewObra
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 4
-      Width = 57
+      Width = 91
     end
     object cbProvincia: TcxDBComboBox
       Left = 130
@@ -183,11 +183,11 @@ inherited frViewObra: TfrViewObra
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 3
-      Width = 20
+      Width = 253
     end
     object eObservaciones: TcxDBMemo
       Left = 22
-      Top = 469
+      Top = 310
       DataBinding.DataField = 'OBSERVACIONES'
       DataBinding.DataSource = DADataSource
       Properties.ScrollBars = ssVertical
@@ -201,15 +201,15 @@ inherited frViewObra: TfrViewObra
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 11
-      Height = 20
-      Width = 390
+      TabOrder = 9
+      Height = 246
+      Width = 224
     end
     inline frViewSubcontrataObra1: TfrViewSubcontrataObra
-      Left = 276
-      Top = 283
-      Width = 136
-      Height = 150
+      Left = 472
+      Top = 34
+      Width = 503
+      Height = 159
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
@@ -218,52 +218,57 @@ inherited frViewObra: TfrViewObra
       ParentFont = False
       TabOrder = 10
       ReadOnly = False
-      ExplicitLeft = 276
-      ExplicitTop = 283
-      ExplicitWidth = 136
-      ExplicitHeight = 150
+      ExplicitLeft = 472
+      ExplicitTop = 34
+      ExplicitWidth = 503
+      ExplicitHeight = 159
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 136
-        ExplicitWidth = 136
+        Width = 503
+        Height = 265
+        ExplicitWidth = 503
+        ExplicitHeight = 265
+        DesignSize = (
+          503
+          265)
         inherited edtlNombre: TcxDBTextEdit
-          ExplicitWidth = 213
-          Width = 213
+          ExplicitWidth = 375
+          Width = 375
         end
         inherited edtNIFCIF: TcxDBTextEdit
-          ExplicitWidth = 213
-          Width = 213
+          ExplicitWidth = 375
+          Width = 375
         end
         inherited edtCalle: TcxDBTextEdit
-          ExplicitWidth = 213
-          Width = 213
+          ExplicitWidth = 375
+          Width = 375
         end
         inherited edtPoblacion: TcxDBTextEdit
-          ExplicitWidth = 95
-          Width = 95
+          ExplicitWidth = 257
+          Width = 257
         end
         inherited edtProvincia: TcxDBTextEdit
-          ExplicitWidth = 213
-          Width = 213
+          ExplicitWidth = 375
+          Width = 375
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 249
-          ExplicitLeft = 249
+          Left = 338
+          ExplicitLeft = 338
         end
         inherited Button3: TBitBtn
-          Left = 108
-          ExplicitLeft = 108
+          Left = 197
+          ExplicitLeft = 197
         end
         inherited edtPersonaContacto: TcxDBTextEdit
-          ExplicitWidth = 213
-          Width = 213
+          ExplicitWidth = 375
+          Width = 375
         end
         inherited edtReferenciaAsignada: TcxDBTextEdit
-          Left = 210
-          ExplicitLeft = 210
+          Left = 299
+          ExplicitLeft = 299
         end
         inherited edtTlf: TcxDBTextEdit
-          ExplicitWidth = 20
-          Width = 20
+          ExplicitWidth = 182
+          Width = 182
         end
       end
       inherited DADataSource: TDADataSource
@@ -280,9 +285,9 @@ inherited frViewObra: TfrViewObra
       end
     end
     inline frViewClienteAsociadoObra1: TfrViewClienteAsociadoObra
-      Left = 276
-      Top = 34
-      Width = 136
+      Left = 472
+      Top = 229
+      Width = 503
       Height = 213
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
@@ -290,44 +295,44 @@ inherited frViewObra: TfrViewObra
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 9
+      TabOrder = 11
       ReadOnly = False
-      ExplicitLeft = 276
-      ExplicitTop = 34
-      ExplicitWidth = 136
+      ExplicitLeft = 472
+      ExplicitTop = 229
+      ExplicitWidth = 503
       ExplicitHeight = 213
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 136
+        Width = 503
         Height = 213
-        ExplicitWidth = 351
+        ExplicitWidth = 503
         ExplicitHeight = 213
         inherited edtlNombre: TcxDBTextEdit
-          ExplicitWidth = 210
-          Width = 210
+          ExplicitWidth = 429
+          Width = 429
         end
         inherited edtNIFCIF: TcxDBTextEdit
-          ExplicitWidth = 210
-          Width = 210
+          ExplicitWidth = 429
+          Width = 429
         end
         inherited edtCalle: TcxDBTextEdit
-          ExplicitWidth = 210
-          Width = 210
+          ExplicitWidth = 429
+          Width = 429
         end
         inherited edtPoblacion: TcxDBTextEdit
-          ExplicitWidth = 92
-          Width = 92
+          ExplicitWidth = 311
+          Width = 311
         end
         inherited edtProvincia: TcxDBTextEdit
-          ExplicitWidth = 210
-          Width = 210
+          ExplicitWidth = 429
+          Width = 429
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 192
-          ExplicitLeft = 192
+          Left = 338
+          ExplicitLeft = 338
         end
         inherited Button3: TBitBtn
-          Left = 82
-          ExplicitLeft = 82
+          Left = 228
+          ExplicitLeft = 228
         end
       end
     end
@@ -340,6 +345,8 @@ inherited frViewObra: TfrViewObra
         ControlOptions.ShowBorder = False
       end
       object dxLayoutControlObraGroup2: TdxLayoutGroup
+        AutoAligns = [aaHorizontal]
+        AlignVert = avClient
         ShowCaption = False
         Hidden = True
         LayoutDirection = ldHorizontal
@@ -347,6 +354,7 @@ inherited frViewObra: TfrViewObra
         object dxLayoutControlObraGroup4: TdxLayoutGroup
           AutoAligns = []
           AlignHorz = ahClient
+          AlignVert = avClient
           ShowCaption = False
           Hidden = True
           ShowBorder = False
@@ -420,13 +428,36 @@ inherited frViewObra: TfrViewObra
               end
             end
           end
+          object dxLayoutControlObraGroup8: TdxLayoutGroup
+            AutoAligns = [aaHorizontal]
+            AlignVert = avClient
+            Caption = 'Observaciones'
+            object dxLayoutControlObraItem11: TdxLayoutItem
+              AutoAligns = [aaHorizontal]
+              AlignVert = avClient
+              Caption = 'Observaciones'
+              ShowCaption = False
+              Control = eObservaciones
+              ControlOptions.ShowBorder = False
+            end
+          end
         end
-        object dxLayoutControlObraGroup10: TdxLayoutGroup
+        object dxLayoutControlObraGroup6: TdxLayoutGroup
           AutoAligns = [aaVertical]
           AlignHorz = ahClient
           ShowCaption = False
           Hidden = True
           ShowBorder = False
+          object dxLayoutControlObraGroup9: TdxLayoutGroup
+            AutoAligns = [aaVertical]
+            AlignHorz = ahClient
+            Caption = 'Subcontrata'
+            object dxLayoutControlObraItem8: TdxLayoutItem
+              Control = frViewSubcontrataObra1
+              ControlOptions.AutoColor = True
+              ControlOptions.ShowBorder = False
+            end
+          end
           object dxLayoutControlObraGroup7: TdxLayoutGroup
             AutoAligns = []
             AlignHorz = ahClient
@@ -439,27 +470,6 @@ inherited frViewObra: TfrViewObra
               ControlOptions.ShowBorder = False
             end
           end
-          object dxLayoutControlObraGroup9: TdxLayoutGroup
-            Caption = 'Subcontrata'
-            object dxLayoutControlObraItem8: TdxLayoutItem
-              Control = frViewSubcontrataObra1
-              ControlOptions.AutoColor = True
-              ControlOptions.ShowBorder = False
-            end
-          end
-        end
-      end
-      object dxLayoutControlObraGroup8: TdxLayoutGroup
-        AutoAligns = [aaHorizontal]
-        AlignVert = avClient
-        Caption = 'Observaciones'
-        object dxLayoutControlObraItem11: TdxLayoutItem
-          AutoAligns = [aaHorizontal]
-          AlignVert = avClient
-          Caption = 'Observaciones'
-          ShowCaption = False
-          Control = eObservaciones
-          ControlOptions.ShowBorder = False
         end
       end
     end

Source/Modulos/Obras/Views/uViewObra.pas

@@ -60,13 +60,13 @@ type
     dxLayoutControlObraGroup2: TdxLayoutGroup;
     dxLayoutControlObraGroup8: TdxLayoutGroup;
     dxLayoutControlObraGroup9: TdxLayoutGroup;
-    dxLayoutControlObraGroup10: TdxLayoutGroup;
     dxLayoutControlObraItem8: TdxLayoutItem;
     frViewSubcontrataObra1: TfrViewSubcontrataObra;
     frViewClienteAsociadoObra1: TfrViewClienteAsociadoObra;
     dxLayoutControlObraItem12: TdxLayoutItem;
     dxLayoutControlObraItem13: TdxLayoutItem;
     dxLayoutControlObraGroup11: TdxLayoutGroup;
+    dxLayoutControlObraGroup6: TdxLayoutGroup;
     procedure cbPoblacionPropertiesInitPopup(Sender: TObject);
     procedure cbProvinciaPropertiesInitPopup(Sender: TObject);
   protected

Source/Modulos/Obras/Views/uViewSubcontrataObra.dfm

@@ -1,19 +1,21 @@
 inherited frViewSubcontrataObra: TfrViewSubcontrataObra
-  Width = 473
-  Height = 287
-  ExplicitWidth = 473
-  ExplicitHeight = 287
+  Width = 514
+  Height = 273
+  ExplicitWidth = 514
+  ExplicitHeight = 273
   inherited dxLayoutControl1: TdxLayoutControl
-    Width = 473
+    Width = 514
     Height = 273
     ExplicitWidth = 473
     ExplicitHeight = 273
     DesignSize = (
-      473
+      514
       273)
     inherited edtlNombre: TcxDBTextEdit
       Left = 118
       ExplicitLeft = 118
+      ExplicitWidth = 345
+      Width = 345
     end
     inherited edtNIFCIF: TcxDBTextEdit
       Left = 118
@@ -21,6 +23,8 @@ inherited frViewSubcontrataObra: TfrViewSubcontrataObra
       TabOrder = 7
       ExplicitLeft = 118
       ExplicitTop = 153
+      ExplicitWidth = 345
+      Width = 345
     end
     inherited edtCalle: TcxDBTextEdit
       Left = 118
@@ -28,6 +32,8 @@ inherited frViewSubcontrataObra: TfrViewSubcontrataObra
       TabOrder = 8
       ExplicitLeft = 118
       ExplicitTop = 180
+      ExplicitWidth = 345
+      Width = 345
     end
     inherited edtPoblacion: TcxDBTextEdit
       Left = 118
@@ -35,6 +41,8 @@ inherited frViewSubcontrataObra: TfrViewSubcontrataObra
       TabOrder = 9
       ExplicitLeft = 118
       ExplicitTop = 207
+      ExplicitWidth = 227
+      Width = 227
     end
     inherited edtProvincia: TcxDBTextEdit
       Left = 118
@@ -42,24 +50,26 @@ inherited frViewSubcontrataObra: TfrViewSubcontrataObra
       TabOrder = 11
       ExplicitLeft = 118
       ExplicitTop = 234
+      ExplicitWidth = 345
+      Width = 345
     end
     inherited edtCodigoPostal: TcxDBTextEdit
-      Left = 381
+      Left = 422
       Top = 207
       TabOrder = 10
-      ExplicitLeft = 381
+      ExplicitLeft = 422
       ExplicitTop = 207
     end
     inherited Button1: TBitBtn
       Caption = 'Elegir subcontrata'
     end
     inherited Button3: TBitBtn
-      Left = 240
+      Left = 281
       Top = 122
       Width = 223
       Caption = 'Ver ficha completa de la subcontrata...'
       TabOrder = 6
-      ExplicitLeft = 240
+      ExplicitLeft = 281
       ExplicitTop = 122
       ExplicitWidth = 223
     end
@@ -84,10 +94,10 @@ inherited frViewSubcontrataObra: TfrViewSubcontrataObra
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 5
       Height = 21
-      Width = 585
+      Width = 345
     end
     object edtReferenciaAsignada: TcxDBTextEdit [10]
-      Left = 342
+      Left = 383
       Top = 68
       Anchors = [akLeft, akTop, akRight]
       AutoSize = False
@@ -130,7 +140,7 @@ inherited frViewSubcontrataObra: TfrViewSubcontrataObra
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 3
       Height = 21
-      Width = 169
+      Width = 152
     end
     inherited dxLayoutControl1Group_Root: TdxLayoutGroup
       object dxLayoutControl1Group4: TdxLayoutGroup [2]