Version 1.0.3

Tareas #789:Añador el campo 'Doctor' para los pacientes
Se adapta el programa para contemplar pabellones y doctores

git-svn-id: https://192.168.0.254/svn/Proyectos.FarmaciaPH_Etiquetas/trunk@31 7b0b1a58-4aa1-b946-8089-8453ede31e50

Source/Modulos/Contactos/Views/uViewPaciente.dfm

@@ -23,6 +23,19 @@ inherited frViewPaciente: TfrViewPaciente
       ExplicitLeft = 628
     end
     inherited eCalle: TcxDBTextEdit
+      Left = 121
+      Top = 274
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 9
+      ExplicitLeft = 121
+      ExplicitTop = 274
+      ExplicitWidth = 239
+      Width = 239
+    end
+    inherited cbProvincia: TcxDBComboBox
       Left = 121
       Top = 301
       Style.LookAndFeel.SkinName = ''
@@ -32,54 +45,41 @@ inherited frViewPaciente: TfrViewPaciente
       TabOrder = 10
       ExplicitLeft = 121
       ExplicitTop = 301
-      ExplicitWidth = 239
-      Width = 239
-    end
-    inherited cbProvincia: TcxDBComboBox
-      Left = 121
-      Top = 328
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 11
-      ExplicitLeft = 121
-      ExplicitTop = 328
       ExplicitWidth = 138
       Width = 138
     end
     inherited cbPoblacion: TcxDBComboBox
       Left = 121
-      Top = 355
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 13
-      ExplicitLeft = 121
-      ExplicitTop = 355
-      ExplicitWidth = 239
-      Width = 239
-    end
-    inherited eCodigoPostal: TcxDBTextEdit
-      Left = 295
       Top = 328
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 12
-      ExplicitLeft = 295
+      ExplicitLeft = 121
       ExplicitTop = 328
+      ExplicitWidth = 239
+      Width = 239
     end
-    inherited eObservaciones: TcxDBMemo
-      Top = 439
+    inherited eCodigoPostal: TcxDBTextEdit
+      Left = 295
+      Top = 301
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 22
-      ExplicitTop = 439
+      TabOrder = 11
+      ExplicitLeft = 295
+      ExplicitTop = 301
+    end
+    inherited eObservaciones: TcxDBMemo
+      Top = 412
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 21
+      ExplicitTop = 412
       ExplicitWidth = 629
       ExplicitHeight = 38
       Height = 38
@@ -87,7 +87,7 @@ inherited frViewPaciente: TfrViewPaciente
     end
     object eFechaNacimiento: TcxDBDateEdit [8]
       Left = 121
-      Top = 190
+      Top = 163
       DataBinding.DataField = 'FECHA_NACIMIENTO'
       DataBinding.DataSource = dsContacto
       Style.BorderColor = clWindowFrame
@@ -99,7 +99,7 @@ inherited frViewPaciente: TfrViewPaciente
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 7
+      TabOrder = 6
       Width = 239
     end
     object eNumeroSS: TcxDBTextEdit [9]
@@ -122,7 +122,7 @@ inherited frViewPaciente: TfrViewPaciente
     end
     object eFechaBaja: TcxDBDateEdit [10]
       Left = 121
-      Top = 217
+      Top = 190
       DataBinding.DataField = 'FECHA_BAJA'
       DataBinding.DataSource = dsContacto
       Style.BorderColor = clWindowFrame
@@ -134,12 +134,12 @@ inherited frViewPaciente: TfrViewPaciente
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
+      TabOrder = 7
       Width = 229
     end
     object eCausaBaja: TcxDBTextEdit [11]
       Left = 121
-      Top = 244
+      Top = 217
       DataBinding.DataField = 'CAUSA_BAJA'
       DataBinding.DataSource = dsContacto
       Style.BorderColor = clWindowFrame
@@ -154,21 +154,10 @@ inherited frViewPaciente: TfrViewPaciente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 9
+      TabOrder = 8
       Width = 229
     end
     inherited eTlfParticular: TcxDBTextEdit
-      Left = 485
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 16
-      ExplicitLeft = 485
-      ExplicitWidth = 166
-      Width = 166
-    end
-    inherited eTlfTrabajo: TcxDBTextEdit
       Left = 485
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
@@ -179,57 +168,18 @@ inherited frViewPaciente: TfrViewPaciente
       ExplicitWidth = 166
       Width = 166
     end
-    object ePabellon: TcxDBTextEdit [14]
-      Left = 121
-      Top = 163
-      DataBinding.DataField = 'PABELLON'
-      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 = 6
-      Width = 239
-    end
-    inherited eTlfMovil: TcxDBTextEdit
+    inherited eTlfTrabajo: TcxDBTextEdit
       Left = 485
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 17
+      TabOrder = 14
       ExplicitLeft = 485
       ExplicitWidth = 166
       Width = 166
     end
-    inherited eFax: TcxDBTextEdit
-      Left = 485
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 18
-      ExplicitLeft = 485
-      ExplicitWidth = 166
-      Width = 166
-    end
-    inherited eNombre: TcxDBTextEdit
-      Left = 121
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 121
-      ExplicitWidth = 239
-      Width = 239
-    end
-    object cbDoctor: TcxDBComboBox [18]
+    object cbDoctor: TcxDBComboBox [14]
       Left = 121
       Top = 109
       DataBinding.DataField = 'DOCTOR'
@@ -257,6 +207,38 @@ inherited frViewPaciente: TfrViewPaciente
       TabOrder = 4
       Width = 183
     end
+    inherited eTlfMovil: TcxDBTextEdit
+      Left = 485
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 16
+      ExplicitLeft = 485
+      ExplicitWidth = 166
+      Width = 166
+    end
+    inherited eFax: TcxDBTextEdit
+      Left = 485
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 17
+      ExplicitLeft = 485
+      ExplicitWidth = 166
+      Width = 166
+    end
+    inherited eNombre: TcxDBTextEdit
+      Left = 121
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 121
+      ExplicitWidth = 239
+      Width = 239
+    end
     inherited eNIFCIF: TcxDBTextEdit
       Left = 231
       Style.LookAndFeel.SkinName = ''
@@ -274,7 +256,7 @@ inherited frViewPaciente: TfrViewPaciente
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 19
+      TabOrder = 18
       ExplicitLeft = 485
       ExplicitWidth = 137
       Width = 137
@@ -286,46 +268,12 @@ inherited frViewPaciente: TfrViewPaciente
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 20
+      TabOrder = 19
       ExplicitLeft = 485
       ExplicitWidth = 137
       Width = 137
     end
-    inherited ePaginaWeb: TcxDBHyperLinkEdit
-      Left = 485
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 21
-      ExplicitLeft = 485
-      ExplicitWidth = 137
-      Width = 137
-    end
-    inherited eReferencia: TcxDBTextEdit
-      Left = 121
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 121
-      ExplicitWidth = 73
-      Width = 73
-    end
-    inherited ePersonaContacto: TcxDBTextEdit
-      Left = 121
-      Top = 382
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 14
-      ExplicitLeft = 121
-      ExplicitTop = 382
-      ExplicitWidth = 239
-      Width = 239
-    end
-    object cbPabellon: TcxDBComboBox [25]
+    object cbPabellon: TcxDBComboBox [21]
       Left = 121
       Top = 136
       DataBinding.DataField = 'PABELLON'
@@ -353,6 +301,40 @@ inherited frViewPaciente: TfrViewPaciente
       TabOrder = 5
       Width = 239
     end
+    inherited ePaginaWeb: TcxDBHyperLinkEdit
+      Left = 485
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 20
+      ExplicitLeft = 485
+      ExplicitWidth = 137
+      Width = 137
+    end
+    inherited eReferencia: TcxDBTextEdit
+      Left = 121
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 121
+      ExplicitWidth = 73
+      Width = 73
+    end
+    inherited ePersonaContacto: TcxDBTextEdit
+      Left = 121
+      Top = 355
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 13
+      ExplicitLeft = 121
+      ExplicitTop = 355
+      ExplicitWidth = 239
+      Width = 239
+    end
     inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
       inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
         inherited dxLayoutControlContactoGroup4: TdxLayoutGroup
@@ -381,11 +363,6 @@ inherited frViewPaciente: TfrViewPaciente
               Control = cbPabellon
               ControlOptions.ShowBorder = False
             end
-            object dxLayoutControlContactoItem19: TdxLayoutItem
-              Caption = 'Pabell'#243'n:'
-              Control = ePabellon
-              ControlOptions.ShowBorder = False
-            end
             object dxLayoutControlContactoItem16: TdxLayoutItem
               AutoAligns = [aaVertical]
               AlignHorz = ahClient

Source/Modulos/Contactos/Views/uViewPaciente.pas

@@ -24,8 +24,6 @@ type
     eFechaBaja: TcxDBDateEdit;
     dxLayoutControlContactoItem24: TdxLayoutItem;
     eCausaBaja: TcxDBTextEdit;
-    ePabellon: TcxDBTextEdit;
-    dxLayoutControlContactoItem19: TdxLayoutItem;
     dxLayoutControlContactoItem20: TdxLayoutItem;
     cbDoctor: TcxDBComboBox;
     dxLayoutControlContactoItem21: TdxLayoutItem;