Index: /cprs/trunk/CPRS-Chart/fCombatVet.pas
===================================================================
--- /cprs/trunk/CPRS-Chart/fCombatVet.pas	(revision 1683)
+++ /cprs/trunk/CPRS-Chart/fCombatVet.pas	(revision 1683)
@@ -0,0 +1,65 @@
+unit fCombatVet;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, fBase508Form, StdCtrls, VA508AccessibilityManager, Buttons,
+  ExtCtrls;
+const
+  clCPRSYellow = TColor($01C9FF);  //Blue 1 Green 201 Red 255
+  clCPRSRed = TColor($2F01C1);  //Blue 47 Green 1 Red 193
+  clCPRSBlue = TColor($914F01);  //Blue 145 Green 79 Red 1
+
+type
+  TfrmCombatVet = class(TfrmBase508Form)
+    pnlTop: TPanel;
+    BitBtn1: TBitBtn;
+    edtServiceBranch: TEdit;
+    edtStatus: TEdit;
+    edtSeparationDate: TEdit;
+    edtExpireDate: TEdit;
+    edtOEF_OIF: TEdit;
+    lblServiceBranch: TLabel;
+    lblStatus: TLabel;
+    lblSepDate: TLabel;
+    lblExpireDate: TLabel;
+    procedure FormShow(Sender: TObject);
+  private
+    { Private declarations }
+  public
+    { Public declarations }
+  end;
+
+var
+  frmCombatVet: TfrmCombatVet;
+
+implementation
+
+{$R *.dfm}
+
+uses uCore, ORFn;
+
+procedure TfrmCombatVet.FormShow(Sender: TObject);
+const
+  FONTFACTOR = 2; //WAT - edit control height wasn't increasing as font size increased
+begin
+  inherited;
+  ResizeFormToFont(Self);
+  edtServiceBranch.Text := Patient.CombatVet.ServiceBranch;
+  edtStatus.Text := Patient.CombatVet.Status;
+  edtSeparationDate.Text := Patient.CombatVet.ServiceSeparationDate;
+  edtExpireDate.Text := Patient.CombatVet.ExpirationDate;
+  edtOEF_OIF.Text := Patient.CombatVet.OEF_OIF;
+  //WAT
+  edtServiceBranch.Height := Round(FONTFACTOR * MainFontWidth);
+  edtStatus.Height := Round(FONTFACTOR * MainFontWidth);
+  edtSeparationDate.Height := Round(FONTFACTOR * MainFontWidth);
+  edtExpireDate.Height := Round(FONTFACTOR * MainFontWidth);
+  if edtOEF_OIF.GetTextLen > 0 then  edtOEF_OIF.Height := Round(FONTFACTOR * MainFontWidth);
+  BitBtn1.Height := BitBtn1.Height + MainFontWidth;
+  BitBtn1.Width := BitBtn1.Width + MainFontWidth;
+  //WAT
+end;
+
+end.
Index: /cprs/trunk/CPRS-Lib/ORCtrlLib2006.dproj
===================================================================
--- /cprs/trunk/CPRS-Lib/ORCtrlLib2006.dproj	(revision 1683)
+++ /cprs/trunk/CPRS-Lib/ORCtrlLib2006.dproj	(revision 1683)
@@ -0,0 +1,52 @@
+﻿<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{da052835-cc1a-47fb-aa80-83418bab640b}</ProjectGuid>
+    <MainSource>ORCtrlLib2006.dpk</MainSource>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+    <DCC_DependencyCheckOutputName>C:\Vista\cprs\main\CPRS-Lib\dcu\ORCtrlLib2006.bpl</DCC_DependencyCheckOutputName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_DebugInformation>False</DCC_DebugInformation>
+    <DCC_WriteableConstants>True</DCC_WriteableConstants>
+    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+    <DCC_IntegerOverflowCheck>True</DCC_IntegerOverflowCheck>
+    <DCC_RangeChecking>True</DCC_RangeChecking>
+    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+    <DCC_BplOutput>C:\Vista\cprs\main\CPRS-Lib\dcu</DCC_BplOutput>
+    <DCC_Define>RELEASE</DCC_Define>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_DebugInformation>False</DCC_DebugInformation>
+    <DCC_WriteableConstants>True</DCC_WriteableConstants>
+    <DCC_IntegerOverflowCheck>True</DCC_IntegerOverflowCheck>
+    <DCC_RangeChecking>True</DCC_RangeChecking>
+    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+    <DCC_BplOutput>C:\Vista\cprs\main\CPRS-Lib\dcu</DCC_BplOutput>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Delphi.Personality</Borland.Personality>
+    <Borland.ProjectType>Package</Borland.ProjectType>
+    <BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">CPRS Custom Controls</Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">True</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">ORCtrlLib2006.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+  <ItemGroup>
+    <DelphiCompile Include="ORCtrlLib2006.dpk">
+      <MainSource>MainSource</MainSource>
+    </DelphiCompile>
+    <DCCReference Include="..\BDK50\BDK32_P50\Source\designide.dcp" />
+    <DCCReference Include="..\BDK50\BDK32_P50\Source\rtl.dcp" />
+    <DCCReference Include="..\BDK50\BDK32_P50\Source\VAShared2006.dcp" />
+    <DCCReference Include="..\BDK50\BDK32_P50\Source\vcl.dcp" />
+    <DCCReference Include="..\BDK50\BDK32_P50\Source\vclx.dcp" />
+    <DCCReference Include="ORCtrls.pas" />
+    <DCCReference Include="ORCtrlsDsgn.dcr" />
+    <DCCReference Include="ORCtrlsDsgn.dcr" />
+    <DCCReference Include="ORCtrlsDsgn.pas" />
+  </ItemGroup>
+</Project>
Index: /cprs/trunk/CPRS-Lib/VA10.dproj
===================================================================
--- /cprs/trunk/CPRS-Lib/VA10.dproj	(revision 1683)
+++ /cprs/trunk/CPRS-Lib/VA10.dproj	(revision 1683)
@@ -0,0 +1,108 @@
+﻿<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{d84528d5-4389-4881-b78c-4aa12f72bc21}</ProjectGuid>
+    <MainSource>VA10.dpk</MainSource>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+    <DCC_DependencyCheckOutputName>..\Packages\VA10.bpl</DCC_DependencyCheckOutputName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_AssertionsAtRuntime>False</DCC_AssertionsAtRuntime>
+    <DCC_DebugInformation>False</DCC_DebugInformation>
+    <DCC_WriteableConstants>True</DCC_WriteableConstants>
+    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+    <DCC_IntegerOverflowCheck>True</DCC_IntegerOverflowCheck>
+    <DCC_RangeChecking>True</DCC_RangeChecking>
+    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+    <DCC_MapFile>3</DCC_MapFile>
+    <DCC_ExeOutput>$(DELPHI)\dev\exesave</DCC_ExeOutput>
+    <DCC_DcuOutput>..\cprs-lib\DCU</DCC_DcuOutput>
+    <DCC_ObjOutput>..\cprs-lib\DCU</DCC_ObjOutput>
+    <DCC_HppOutput>..\cprs-lib\DCU</DCC_HppOutput>
+    <DCC_BplOutput>..\Packages</DCC_BplOutput>
+    <DCC_DcpOutput>..\Packages</DCC_DcpOutput>
+    <DCC_UnitSearchPath>..\cprs-lib;..\Packages</DCC_UnitSearchPath>
+    <DCC_ResourcePath>..\cprs-lib;..\Packages</DCC_ResourcePath>
+    <DCC_ObjPath>..\cprs-lib;..\Packages</DCC_ObjPath>
+    <DCC_IncludePath>..\cprs-lib;..\Packages</DCC_IncludePath>
+    <DCC_Define>RELEASE</DCC_Define>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_AssertionsAtRuntime>False</DCC_AssertionsAtRuntime>
+    <DCC_WriteableConstants>True</DCC_WriteableConstants>
+    <DCC_IntegerOverflowCheck>True</DCC_IntegerOverflowCheck>
+    <DCC_RangeChecking>True</DCC_RangeChecking>
+    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+    <DCC_MapFile>3</DCC_MapFile>
+    <DCC_ExeOutput>$(DELPHI)\dev\exesave</DCC_ExeOutput>
+    <DCC_DcuOutput>..\cprs-lib\DCU</DCC_DcuOutput>
+    <DCC_ObjOutput>..\cprs-lib\DCU</DCC_ObjOutput>
+    <DCC_HppOutput>..\cprs-lib\DCU</DCC_HppOutput>
+    <DCC_BplOutput>..\Packages</DCC_BplOutput>
+    <DCC_DcpOutput>..\Packages</DCC_DcpOutput>
+    <DCC_UnitSearchPath>..\cprs-lib;..\Packages</DCC_UnitSearchPath>
+    <DCC_ResourcePath>..\cprs-lib;..\Packages</DCC_ResourcePath>
+    <DCC_ObjPath>..\cprs-lib;..\Packages</DCC_ObjPath>
+    <DCC_IncludePath>..\cprs-lib;..\Packages</DCC_IncludePath>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Delphi.Personality</Borland.Personality>
+    <Borland.ProjectType>Package</Borland.ProjectType>
+    <BorlandProject>
+<BorlandProject xmlns=""> <Delphi.Personality>   <Parameters>
+      <Parameters Name="UseLauncher">False</Parameters>
+      <Parameters Name="LoadAllSymbols">True</Parameters>
+      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+    </Parameters>
+    <Package_Options>
+      <Package_Options Name="PackageDescription">Wrap Grid</Package_Options>
+      <Package_Options Name="ImplicitBuild">True</Package_Options>
+      <Package_Options Name="DesigntimeOnly">True</Package_Options>
+      <Package_Options Name="RuntimeOnly">False</Package_Options>
+    </Package_Options>
+    <VersionInfo>
+      <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+      <VersionInfo Name="MajorVer">1</VersionInfo>
+      <VersionInfo Name="MinorVer">0</VersionInfo>
+      <VersionInfo Name="Release">0</VersionInfo>
+      <VersionInfo Name="Build">0</VersionInfo>
+      <VersionInfo Name="Debug">False</VersionInfo>
+      <VersionInfo Name="PreRelease">False</VersionInfo>
+      <VersionInfo Name="Special">False</VersionInfo>
+      <VersionInfo Name="Private">False</VersionInfo>
+      <VersionInfo Name="DLL">False</VersionInfo>
+      <VersionInfo Name="Locale">1033</VersionInfo>
+      <VersionInfo Name="CodePage">1252</VersionInfo>
+    </VersionInfo>
+    <VersionInfoKeys>
+      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+      <VersionInfoKeys Name="Comments"></VersionInfoKeys>
+    </VersionInfoKeys>
+    <Source>
+      <Source Name="MainSource">VA10.dpk</Source>
+    </Source>
+  </Delphi.Personality> </BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <ItemGroup />
+  <ItemGroup>
+    <DelphiCompile Include="VA10.dpk">
+      <MainSource>MainSource</MainSource>
+    </DelphiCompile>
+    <DCCReference Include="Vawrgrid.pas" />
+    <DCCReference Include="vcl.dcp" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+</Project>
