Index: cprs/branches/foia-cprs/CPRS-Lib/ORCtrlLib60.cfg
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/ORCtrlLib60.cfg	(revision 459)
+++ cprs/branches/foia-cprs/CPRS-Lib/ORCtrlLib60.cfg	(revision 460)
@@ -34,9 +34,9 @@
 -K$00400000
 -E"c:\program files\borland\delphi6\dev\exesave"
--N"c:\cprs\DcuSave"
--LE"c:\cprs\OR_3_195V25\Packages"
--LN"c:\cprs\OR_3_195V25\Packages"
--U"c:\cprs\OR_3_195V25\Packages"
--O"c:\cprs\OR_3_195V25\Packages"
--I"c:\cprs\OR_3_195V25\Packages"
--R"c:\cprs\OR_3_195V25\Packages"
+-N"..\Packages"
+-LE"..\Packages"
+-LN"..\Packages"
+-U"..\cprs-lib;..\Packages"
+-O"..\cprs-lib;..\Packages"
+-I"..\cprs-lib;..\Packages"
+-R"..\cprs-lib;..\Packages"
Index: cprs/branches/foia-cprs/CPRS-Lib/ORCtrlLib60.dof
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/ORCtrlLib60.dof	(revision 459)
+++ cprs/branches/foia-cprs/CPRS-Lib/ORCtrlLib60.dof	(revision 460)
@@ -43,11 +43,11 @@
 [Directories]
 OutputDir=$(DELPHI)\dev\exesave
-UnitOutputDir=c:\cprs\DcuSave
-PackageDLLOutputDir=c:\cprs\OR_3_195V25\Packages
-PackageDCPOutputDir=c:\cprs\OR_3_195V25\Packages
-SearchPath=c:\cprs\OR_3_195V25\Packages
+UnitOutputDir=..\Packages
+PackageDLLOutputDir=..\Packages
+PackageDCPOutputDir=..\Packages
+SearchPath=..\cprs-lib;..\Packages
 Packages=Vcl40;Vclx40;Vcldb40;vcldbx40;VclSmp40;Qrpt40;TeeUI40;teedb40;tee40;ibevnt40;nmfast40;VistABroker
 Conditionals=
-DebugSourceDirs=
+DebugSourceDirs=..\Packages
 UsePackages=0
 [Parameters]
@@ -88,37 +88,34 @@
 [Excluded Packages]
 C:\Program Files\Borland\Delphi6\Projects\Bpl\SharedRPCBroker_D60.bpl=VistA SharedBroker Components
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=..\Packages
 [HistoryLists\hlUnitAliases]
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 [HistoryLists\hlSearchPath]
-Count=13
-Item0=c:\cprs\OR_3_195V25\Packages
-Item1=D:\vista\cprs\OR_3_195V25\Packages
-Item2=D:\vista\cprs\OR_3_195V25\CPRS-Chart\dcu
-Item3=..\cprs-lib;..\Packages
-Item4=..\cprs-lib;..\Packages;..\cprs-chart;..\cprs-chart\dcu
-Item5=d:\vista\main\cprs-lib;d:\vista\main\Packages
-Item6=d:\vista\main\cprs-lib;d:\program files\vista\broker\bdk32\d5
-Item7=d:\vista\main\cprs-chart;d:\vista\main\cprs-lib;d:\vista\main\cprs-chart\encounter;d:\vista\main\cprs-chart\consults
-Item8=d:\vista\main\cprs-lib
-Item9=\Dev\CPRS\main\CPRS-Lib
-Item10=C:\Dev\CPRS\main\CPRS-Lib
-Item11=\Projects\Perforce\main\CPRS-Lib
-Item12=$(DELPHI)\Projects\Current\CPRS-Lib
+Count=10
+Item0=..\cprs-lib;..\Packages
+Item1=..\cprs-lib;..\Packages;..\cprs-chart;..\cprs-chart\dcu
+Item2=d:\vista\main\cprs-lib;d:\vista\main\Packages
+Item3=d:\vista\main\cprs-lib;d:\program files\vista\broker\bdk32\d5
+Item4=d:\vista\main\cprs-chart;d:\vista\main\cprs-lib;d:\vista\main\cprs-chart\encounter;d:\vista\main\cprs-chart\consults
+Item5=d:\vista\main\cprs-lib
+Item6=\Dev\CPRS\main\CPRS-Lib
+Item7=C:\Dev\CPRS\main\CPRS-Lib
+Item8=\Projects\Perforce\main\CPRS-Lib
+Item9=$(DELPHI)\Projects\Current\CPRS-Lib
 [HistoryLists\hlUnitOutputDirectory]
-Count=13
-Item0=c:\cprs\DcuSave
-Item1=c:\cprs\OR_3_195V25\DcuSave
-Item2=D:\vista\cprs\OR_3_195V25\Packages
-Item3=D:\vista\cprs\OR_3_195V25\CPRS-Chart\dcu
-Item4=..\cprs-lib\dcu
-Item5=..\cprs-lib
-Item6=d:\vista\main\cprs-lib\DCU
-Item7=d:\vista\main\cprs-lib\DCUSave
-Item8=d:\vista\main\cprs-chart\dcu
-Item9=\Dev\DCUSave
-Item10=C:\Dev\DCUSave
-Item11=\Projects\DCUSave
-Item12=$(DELPHI)\Projects\DCUSave
+Count=10
+Item0=..\Packages
+Item1=..\cprs-lib\dcu
+Item2=..\cprs-lib
+Item3=d:\vista\main\cprs-lib\DCU
+Item4=d:\vista\main\cprs-lib\DCUSave
+Item5=d:\vista\main\cprs-chart\dcu
+Item6=\Dev\DCUSave
+Item7=C:\Dev\DCUSave
+Item8=\Projects\DCUSave
+Item9=$(DELPHI)\Projects\DCUSave
 [HistoryLists\hlOutputDirectorry]
 Count=2
@@ -126,25 +123,19 @@
 Item1=d:\vista\main\cprs-chart
 [HistoryLists\hlBPLOutput]
-Count=10
-Item0=c:\cprs\OR_3_195V25\Packages
-Item1=D:\vista\cprs\OR_3_195V25\Packages
-Item2=D:\vista\cprs\OR_3_195V25\CPRS-Chart\dcu
-Item3=..\Packages
-Item4=d:\vista\main\Packages
-Item5=d:\vista\main\cprs-lib
-Item6=\Dev\Packages
-Item7=C:\Dev\Packages
-Item8=\Projects\Packages
-Item9=$(DELPHI)\Projects\Packages
+Count=7
+Item0=..\Packages
+Item1=d:\vista\main\Packages
+Item2=d:\vista\main\cprs-lib
+Item3=\Dev\Packages
+Item4=C:\Dev\Packages
+Item5=\Projects\Packages
+Item6=$(DELPHI)\Projects\Packages
 [HistoryLists\hlDCPOutput]
-Count=10
-Item0=c:\cprs\OR_3_195V25\Packages
-Item1=D:\vista\cprs\OR_3_195V25\Packages
-Item2=D:\vista\cprs\OR_3_195V25\CPRS-Chart\dcu
-Item3=..\Packages
-Item4=d:\vista\main\Packages
-Item5=d:\vista\main\cprs-lib
-Item6=\Dev\Packages
-Item7=C:\Dev\Packages
-Item8=\Projects\Packages
-Item9=$(DELPHI)\Projects\Packages
+Count=7
+Item0=..\Packages
+Item1=d:\vista\main\Packages
+Item2=d:\vista\main\cprs-lib
+Item3=\Dev\Packages
+Item4=C:\Dev\Packages
+Item5=\Projects\Packages
+Item6=$(DELPHI)\Projects\Packages
Index: cprs/branches/foia-cprs/CPRS-Lib/ORCtrlLib60.dpk
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/ORCtrlLib60.dpk	(revision 459)
+++ cprs/branches/foia-cprs/CPRS-Lib/ORCtrlLib60.dpk	(revision 460)
@@ -2,6 +2,6 @@
 
 {$R *.res}
+{$R '..\CPRS-Chart\Accessibility_TLB.dcr'}
 {$R 'ORCtrlsDsgn.dcr'}
-{$R '..\CPRS-Chart\Accessibility_TLB.dcr'}
 {$ALIGN 8}
 {$ASSERTIONS ON}
@@ -35,9 +35,8 @@
 
 contains
+  uAccessAPI in 'uAccessAPI.pas',
+  Accessibility_TLB in '..\CPRS-Chart\Accessibility_TLB.pas',
   ORCtrls in 'ORCtrls.pas',
-  ORCtrlsDsgn in 'ORCtrlsDsgn.pas',
-  uAccessAPI in 'uAccessAPI.pas',
-  Accessibility_TLB in '..\CPRS-Chart\Accessibility_TLB.pas';
+  ORCtrlsDsgn in 'ORCtrlsDsgn.pas';
 
 end.
-
Index: cprs/branches/foia-cprs/CPRS-Lib/ORCtrlLib60.dsk
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/ORCtrlLib60.dsk	(revision 460)
+++ cprs/branches/foia-cprs/CPRS-Lib/ORCtrlLib60.dsk	(revision 460)
@@ -0,0 +1,498 @@
+[Closed Files]
+File_0=SourceModule,'D:\vista\cprs\OR_3_195V25\CPRS-Lib\uStaticText.pas',0,1,1,1,1,0,0
+File_1=SourceModule,'D:\vista\cprs\OR_3_195V25\CPRS-Chart\unit2.pas',0,1,1,1,11,0,0
+File_2=SourceModule,'D:\vista\cprs\main\CPRS-Chart\uSignItems.pas',0,1,1044,54,1060,0,0
+File_3=SourceModule,'D:\vista\cprs\OR_3_215V26\CPRS-Chart\uSignItems.pas',0,1,1044,54,1060,0,0
+File_4=SourceModule,'D:\vista\cprs\OR_3_215V26\CPRS-Chart\fReview.pas',0,1,1833,42,1841,1,0
+File_5=SourceModule,'D:\vista\cprs\main\CPRS-Chart\fReview.pas',0,1,1830,44,1857,1,0
+File_6=SourceModule,'D:\vista\cprs\OR_3_195V25\CPRS-Lib\ORCtrls.pas',0,1,1,63,30,0,0
+File_7=SourceModule,'C:\PROGRA~1\Vista\BDK32_~1\Source\wsockc.pas',0,1,1455,1,1477,0,0
+File_8=SourceModule,'D:\vista\cprs\OR_3_195V25\CPRS-Chart\VERGENCECONTEXTORLib_TLB.pas',0,1,564,1,586,0,0
+
+[Modules]
+Module0=D:\vista\cprs\OR_3_195V25\CPRS-Chart\Orders\fOrdersSign.pas
+Module1=D:\vista\cprs\OR_3_195V25\CPRS-Chart\fReview.pas
+Module2=D:\vista\cprs\OR_3_195V25\CPRS-Chart\uSignItems.pas
+Module3=D:\vista\cprs\OR_3_195V25\CPRS-Chart\CPRSChart.dpr
+Count=4
+EditWindowCount=1
+PackageWindowCount=1
+TypeLibWindowCount=1
+
+[D:\vista\cprs\OR_3_195V25\CPRS-Chart\Orders\fOrdersSign.pas]
+ModuleType=SourceModule
+FormState=0
+FormOnTop=0
+
+[D:\vista\cprs\OR_3_195V25\CPRS-Chart\fReview.pas]
+ModuleType=SourceModule
+FormState=0
+FormOnTop=0
+
+[D:\vista\cprs\OR_3_195V25\CPRS-Chart\uSignItems.pas]
+ModuleType=SourceModule
+FormState=0
+FormOnTop=0
+
+[D:\vista\cprs\OR_3_195V25\CPRS-Chart\CPRSChart.dpr]
+ModuleType=SourceModule
+FormState=0
+FormOnTop=0
+SymbolFile=D:\vista\cprs\OR_3_195V25\CPRS-Chart\CPRSChart.dsm
+ModSinceCompile=1
+
+[D:\vista\cprs\OR_3_215V26\CPRS-Lib\ORCtrlLib60.dpk]
+FormState=0
+FormOnTop=1
+
+[D:\vista\cprs\OR_3_195V25\CPRS-Chart\CPRSChart.tlb]
+FormState=0
+FormOnTop=1
+
+[D:\Program Files\Borland\Delphi6\Projects\ProjectGroup1.bpg]
+FormState=0
+FormOnTop=0
+
+[D:\vista\cprs\OR_3_195V25\CPRS-Chart\mCoPayDesc.pas]
+FormState=0
+FormOnTop=0
+
+[EditWindow0]
+ViewCount=4
+CurrentView=3
+View0=0
+View1=1
+View2=2
+View3=3
+CodeExplorer=CodeExplorer@EditWindow0
+MessageView=MessageView@EditWindow0
+Create=1
+Visible=1
+State=0
+Left=1
+Top=104
+Width=1022
+Height=635
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=1014
+ClientHeight=608
+LeftPanelSize=0
+RightPanelSize=0
+BottomPanelSize=0
+BottomPanelClients=MessageView@EditWindow0
+BottomPanelData=00000400010000000B0000004D65737361676556696577F603000000000000021D00000000000000010000000000000000000000000100000000F3030000000000000100000000F3030000000000000100000000F3030000000000000100000000F3030000000000000100000000F3030000000000000100000000F3030000000000000100000000F5030000000000000100000000F5030000000000000100000000F5030000000000000100000000F50300000000000001000000000004000000000000010000000000040000000000000100000000F5030000000000000100000000F503000000000000010000000000040000000000000100000000720400000000000001000000007204000000000000010000000080040000000000000100000000720400000000000001000000007204000000000000010000000072040000000000000100000000750400000000000001000000008004000000000000010000000080040000000000000100000000000400000000000001000000000004000000000000010000000000040000000000000100000000F8030000000000000100000000F8030000000000000100000000F803000000000000010000000000040000000000000100000000F8030000000000000100000000F8030000000000000100000000EF030000000000000100000000EF03000000000000010000000000040000000000000100000000B0020000000000000100000000F5030000000000000100000000F503000000000000010000000000040000000000000100000000F40300000000000001000000000004000000000000010000000000040000000000000100000000F8030000000000000100000000F8030000000000000100000000F803000000000000010000000000040000000000000100000000F80300000000000001000000000004000000000000010000000000040000000000000100000000F803000000000000010000000000040000000000000100000000F8030000000000000100000000F8030000000000000100000000F80300000000000001000000000004000000000000010000000000040000000000000100000000F60300000000000001000000000004000000000000010000000000040000000000000100000000F6030000000000000100000000F6030000000000000100000000F60300000B0000004D65737361676556696577FFFFFFFF
+
+[View0]
+Module=D:\vista\cprs\OR_3_195V25\CPRS-Chart\CPRSChart.dpr
+CursorX=28
+CursorY=17
+TopLine=2
+LeftCol=1
+
+[View1]
+Module=D:\vista\cprs\OR_3_195V25\CPRS-Chart\uSignItems.pas
+CursorX=33
+CursorY=325
+TopLine=628
+LeftCol=1
+
+[View2]
+Module=D:\vista\cprs\OR_3_195V25\CPRS-Chart\fReview.pas
+CursorX=36
+CursorY=375
+TopLine=358
+LeftCol=1
+
+[View3]
+Module=D:\vista\cprs\OR_3_195V25\CPRS-Chart\Orders\fOrdersSign.pas
+CursorX=1
+CursorY=1439
+TopLine=1427
+LeftCol=1
+
+[PackageWindow0]
+Create=1
+Visible=1
+State=0
+Left=260
+Top=260
+Width=368
+Height=244
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=360
+ClientHeight=220
+TBDockHeight=244
+LRDockWidth=368
+Dockable=1
+StatusBar=0
+TextLabels=1
+Toolbar=1
+SectionWidth0=150
+SectionWidth1=210
+Module=D:\vista\cprs\OR_3_215V26\CPRS-Lib\ORCtrlLib60.dpk
+
+[TypeLibEditWindow0]
+Create=1
+Visible=0
+State=0
+Left=200
+Top=103
+Width=650
+Height=446
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=642
+ClientHeight=419
+Module=D:\vista\cprs\OR_3_195V25\CPRS-Chart\CPRSChart.tlb
+
+[Watches]
+Count=4
+Watch0='i',256,0,18,1,1
+Watch1='Piece(lbDiagnosis.Items[i],U,2)',256,0,18,1,1
+Watch2='lbDiagnosis.Items[itemNum]',256,0,18,1,0
+Watch3='lbPersonalDx.Items[J]',256,0,18,1,0
+
+[Breakpoints]
+Count=6
+Breakpoint0='D:\vista\cprs\OR_3_195V25\CPRS-Chart\uSignItems.pas',130,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint1='D:\vista\cprs\OR_3_195V25\CPRS-Chart\BA\fBAOptionsDiagnoses.pas',410,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint2='D:\vista\cprs\OR_3_195V25\CPRS-Chart\BA\fBAOptionsDiagnoses.pas',414,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint3='D:\vista\cprs\OR_3_195V25\CPRS-Chart\uSignItems.pas',275,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint4='D:\vista\cprs\OR_3_195V25\CPRS-Chart\Orders\fOrdersSign.pas',1099,'',0,1,'',1,0,0,'',1,'','',''
+Breakpoint5='D:\vista\cprs\OR_3_195V25\CPRS-Chart\uSignItems.pas',644,'',0,1,'',1,0,0,'',1,'','',''
+
+[AddressBreakpoints]
+Count=0
+
+[Main Window]
+Create=1
+Visible=1
+State=0
+Left=0
+Top=0
+Width=1024
+Height=105
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=1016
+ClientHeight=78
+
+[ProjectManager]
+Create=1
+Visible=1
+State=0
+Left=0
+Top=0
+Width=287
+Height=579
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=287
+ClientHeight=579
+TBDockHeight=571
+LRDockWidth=255
+Dockable=1
+
+[Components]
+Create=1
+Visible=0
+State=0
+Left=420
+Top=251
+Width=183
+Height=266
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=175
+ClientHeight=242
+
+[CPUWindow]
+Create=1
+Visible=0
+State=0
+Left=159
+Top=109
+Width=819
+Height=551
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=811
+ClientHeight=524
+DumpPane=212
+DisassemblyPane=377
+RegisterPane=231
+FlagPane=120
+
+[AlignmentPalette]
+Create=1
+Visible=0
+State=0
+Left=200
+Top=107
+Width=156
+Height=82
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=150
+ClientHeight=60
+
+[PropertyInspector]
+Create=1
+Visible=1
+State=0
+Left=0
+Top=0
+Width=287
+Height=579
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=287
+ClientHeight=579
+TBDockHeight=571
+LRDockWidth=255
+Dockable=1
+SplitPos=131
+ArrangeBy=Name
+SelectedItem=
+ExpandedItems=Brush,Font.Style
+HiddenCategories=
+
+[WatchWindow]
+Create=1
+Visible=1
+State=0
+Left=5
+Top=1
+Width=803
+Height=104
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=795
+ClientHeight=80
+TBDockHeight=149
+LRDockWidth=421
+Dockable=1
+
+[BreakpointWindow]
+Create=1
+Visible=1
+State=0
+Left=0
+Top=0
+Width=287
+Height=579
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=287
+ClientHeight=579
+TBDockHeight=197
+LRDockWidth=737
+Dockable=1
+Column0Width=151
+Column1Width=75
+Column2Width=200
+Column3Width=200
+Column4Width=75
+Column5Width=75
+
+[CallStackWindow]
+Create=1
+Visible=0
+State=0
+Left=365
+Top=303
+Width=294
+Height=161
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=286
+ClientHeight=137
+TBDockHeight=161
+LRDockWidth=294
+Dockable=1
+
+[ThreadStatusWindow]
+Create=1
+Visible=0
+State=0
+Left=0
+Top=0
+Width=1024
+Height=768
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=1016
+ClientHeight=744
+TBDockHeight=152
+LRDockWidth=624
+Dockable=1
+Column0Width=145
+Column1Width=100
+Column2Width=115
+Column3Width=250
+
+[ModuleWindow]
+Create=1
+Visible=0
+State=0
+Left=18
+Top=9
+Width=913
+Height=719
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=905
+ClientHeight=695
+TBDockHeight=355
+LRDockWidth=638
+Dockable=1
+Column0Width=125
+Column1Width=100
+Column2Width=356
+EntryPointPane=447
+CompUnitPane=530
+
+[ObjectTree]
+Create=1
+Visible=0
+State=0
+Left=0
+Top=105
+Width=190
+Height=264
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=182
+ClientHeight=240
+TBDockHeight=264
+LRDockWidth=190
+Dockable=1
+
+[DebugLogView]
+Create=1
+Visible=0
+State=0
+Left=0
+Top=0
+Width=798
+Height=712
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=790
+ClientHeight=688
+TBDockHeight=291
+LRDockWidth=417
+Dockable=1
+
+[LocalVarsWindow]
+Create=1
+Visible=0
+State=0
+Left=441
+Top=447
+Width=421
+Height=192
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=413
+ClientHeight=168
+TBDockHeight=192
+LRDockWidth=421
+Dockable=1
+
+[ToDo List]
+Create=1
+Visible=0
+State=0
+Left=107
+Top=48
+Width=866
+Height=649
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=858
+ClientHeight=625
+TBDockHeight=250
+LRDockWidth=713
+Dockable=1
+Column0Width=507
+Column1Width=30
+Column2Width=100
+Column3Width=70
+Column4Width=70
+SortOrder=6
+ShowHints=1
+ShowChecked=1
+
+[FPUWindow]
+Create=1
+Visible=0
+State=0
+Left=306
+Top=280
+Width=457
+Height=250
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=449
+ClientHeight=223
+RegisterPane=121
+FlagPane=59
+
+[CodeExplorer@EditWindow0]
+Create=1
+Visible=1
+State=0
+Left=0
+Top=0
+Width=287
+Height=579
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=287
+ClientHeight=579
+TBDockHeight=305
+LRDockWidth=140
+Dockable=1
+
+[MessageView@EditWindow0]
+Create=1
+Visible=0
+State=0
+Left=12
+Top=0
+Width=1002
+Height=29
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=1002
+ClientHeight=29
+TBDockHeight=29
+LRDockWidth=443
+Dockable=1
+
+[DockHosts]
+DockHostCount=1
+
+[DockSite0]
+DockSiteType=1
+Create=1
+Visible=1
+State=0
+Left=1
+Top=104
+Width=303
+Height=632
+MaxLeft=-1
+MaxTop=-1
+ClientWidth=295
+ClientHeight=608
+TBDockHeight=659
+LRDockWidth=263
+Dockable=1
+TabPosition=0
+ActiveTab=Object Inspector
+TabDockClients=PropertyInspector,ProjectManager,BreakpointWindow,CodeExplorer@EditWindow0
+
Index: cprs/branches/foia-cprs/CPRS-Lib/ORCtrls.pas
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/ORCtrls.pas	(revision 459)
+++ cprs/branches/foia-cprs/CPRS-Lib/ORCtrls.pas	(revision 460)
@@ -26,6 +26,4 @@
      FOnEnter: TNotifyEvent;
      FOnExit: TNotifyEvent;
-  protected
-
   published
      property OnEnter: TNotifyEvent read FOnEnter write FOnEnter;
@@ -543,4 +541,9 @@
     property OnSynonymCheck: TORSynonymCheckEvent read GetOnSynonymCheck write SetOnSynonymCheck;
     property CharsNeedMatch: integer  read FCharsNeedMatch  write SetNumForMatch;
+{UniqueAutoComplete Was added as a result of the following defects:
+ 7293 - PTM 85:  Backspace and Dosage:  Desired dosage does not populate if dosage is not in local dosage field
+ 7337 - PTM 160 Meds: #8 IMO - Simple - Change Order in which Error generated if "Enter" is hit instead of "OK"
+ 7278 - PTM 36 Meds: Select 40000 UNT/2ML and backspace to 4000 the dose selected remains 40000
+ 7284 - Inconsistencies of pulling in a dose from the Possible Dose File }
     property UniqueAutoComplete: Boolean read FUniqueAutoComplete write SetUniqueAutoComplete default False;
   end;
@@ -898,12 +901,16 @@
   TCaptionListBox = class(TListBox)
   private
+    FHoverItemPos: integer;
     FAccessible: IAccessible;
     FRightClickSelect: boolean;                  // When true, a right click selects teh item
+    FHintOnItem: boolean;
     procedure SetCaption(const Value: string);
     function GetCaption: string;
     procedure WMGetObject(var Message: TMessage); message WM_GETOBJECT;
     procedure WMRButtonUp(var Message: TWMRButtonUp); message WM_RBUTTONUP;
+    procedure WMMouseMove(var Message: TWMMouseMove); message WM_MOUSEMOVE;
   protected
     FCaptionComponent: TStaticText;
+    procedure DoEnter; override;
   public
     procedure MakeAccessible( Accessible: IAccessible);
@@ -911,4 +918,6 @@
     property RightClickSelect: boolean read FRightClickSelect write FRightClickSelect default FALSE;
     property Caption: string read GetCaption write SetCaption;
+    //Make the ListBox's hint contain the contents of the listbox Item the mouse is currently over.
+    property HintOnItem: boolean read FHintOnItem write FHintOnItem default FALSE;
   end;
 
@@ -1440,5 +1449,6 @@
 end;
 
-{  ----------------------------------------------------- }
+{ TORStaticText }
+
 procedure TORStaticText.DoEnter;
 begin
@@ -1454,5 +1464,4 @@
      FOnExit(Self);
 end;
-
 
 { TORStrings }
@@ -2236,4 +2245,5 @@
   //if Items.Count > 0 then SetFocusIndex(TopIndex);  // this seems to cause problems
   //Fix For ClearQuest: HDS00001576
+  //This fix has been commented out, becuase it causes problems
 {  if (Items.Count > 0) and (Not IsAMouseButtonDown()) and (ItemIndex = -1) then
     SetFocusIndex(TopIndex);//ItemIndex := TopIndex; }
@@ -3863,6 +3873,5 @@
   //FEditBox.SelectAll;
   //Fix For ClearQuest: HDS00001576
-  {Commented out the fix for CQ: 1576, always selecing first item is
-   causing issues.}
+  //This fix has been commented out, becuase it causes problems
 {  with FListBox do
   if (Items.Count > 0) and (Not IsAMouseButtonDown()) and (ItemIndex = -1) then
@@ -3872,5 +3881,5 @@
     //Calling keyUp after key down creates a better mimic of a Keystroke.
     FwdKeyUp(Self,key,[]);   //fixes clearquest: HDS00001418
-  end; }
+  end;              }
   inherited DoEnter;
   PostMessage(Handle, UM_GOTFOCUS, 0, 0)
@@ -6476,4 +6485,11 @@
 { TCaptionListBox }
 
+procedure TCaptionListBox.DoEnter;
+begin
+  inherited;
+  if HintOnItem then
+    FHoverItemPos := -1; //CQ: 7178 & 9911 - used as last item index for ListBox
+end;
+
 function TCaptionListBox.GetCaption: string;
 begin
@@ -6512,4 +6528,24 @@
   else
     inherited;
+end;
+
+procedure TCaptionListBox.WMMouseMove(var Message: TWMMouseMove);
+var
+  i : integer;
+begin
+  inherited;
+  //CQ: 7178 & 9911 - FHoverItemPos should be set to -1 in OnEnter
+  //Make the TListBox's hint contain the contents of the listbox Item the mouse is currently over
+  if HintOnItem then
+  begin
+    i := ItemAtPos(Point(Message.XPos, Message.YPos), true);
+    if i <> FHoverItemPos then
+      Application.CancelHint;
+    if i = -1 then
+      Hint := ''
+    else
+      Hint := Items[i];
+    FHoverItemPos := i;
+  end;
 end;
 
@@ -6811,5 +6847,2 @@
 
 end.
-
-
-
Index: cprs/branches/foia-cprs/CPRS-Lib/ORCtrlsDsgn.pas
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/ORCtrlsDsgn.pas	(revision 459)
+++ cprs/branches/foia-cprs/CPRS-Lib/ORCtrlsDsgn.pas	(revision 460)
@@ -164,3 +164,2 @@
 end.
 
-
Index: cprs/branches/foia-cprs/CPRS-Lib/ORDateLib60.dof
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/ORDateLib60.dof	(revision 459)
+++ cprs/branches/foia-cprs/CPRS-Lib/ORDateLib60.dof	(revision 460)
@@ -86,4 +86,6 @@
 ProductVersion=1.0.0.0
 Comments=
+[Excluded Packages]
+C:\Program Files\Borland\Delphi6\Projects\Bpl\SharedRPCBroker_D60.bpl=VistA SharedBroker Components
 [HistoryLists\hlUnitAliases]
 Count=1
Index: cprs/branches/foia-cprs/CPRS-Lib/ORDtTm.pas
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/ORDtTm.pas	(revision 459)
+++ cprs/branches/foia-cprs/CPRS-Lib/ORDtTm.pas	(revision 460)
@@ -285,4 +285,5 @@
 begin
   ResizeAnchoredFormToFont(self);
+  //FormStyle := fsStayOnTop;
   lstHour.TopIndex := 6;
   FFromSelf := False;
Index: cprs/branches/foia-cprs/CPRS-Lib/ORFn.pas
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/ORFn.pas	(revision 459)
+++ cprs/branches/foia-cprs/CPRS-Lib/ORFn.pas	(revision 460)
@@ -114,4 +114,6 @@
 procedure CallWhenIdleNotifyWhenDone(CallProc, DoneProc: TORIdleCallProc; Msg: String);
 procedure menuHideAllBut(aMenuItem: tMenuItem; butItems: array of tMenuItem);
+function TabIsPressed : Boolean;
+function ShiftTabIsPressed : Boolean;
 
 implementation  // ---------------------------------------------------------------------------
@@ -832,5 +834,4 @@
 
 procedure LimitStringLength(var AList: TStringList; MaxLength: Integer);
-{ change a TStringList so that all strings in the list are shorter than MaxLength }
 var
   i, SpacePos: Integer;
@@ -852,5 +853,5 @@
           while (x[SpacePos] <> ' ') and (SpacePos > 1) do Dec(SpacePos);      {**REV**}  {changed 0 to 1}
           if SpacePos = 1 then SpacePos := MaxLength;                          {**REV**}  {changed 0 to 1}
-          NewList.Add(Copy(x, 1, SpacePos - 1));
+          NewList.Add(Copy(x, 1, SpacePos ));  // CQ     PSI-05-040 change SpacePos-1 to SpacePos
           Delete(x, 1, SpacePos);
         end; {while Length(x)}
@@ -1710,4 +1711,15 @@
 end;
 
+function TabIsPressed : Boolean;
+begin
+  Result := Boolean(Hi(GetKeyState(VK_TAB))) and not Boolean(Hi(GetKeyState(VK_SHIFT)));
+end;
+
+function ShiftTabIsPressed : Boolean;
+begin
+  Result := Boolean(Hi(GetKeyState(VK_TAB))) and Boolean(Hi(GetKeyState(VK_SHIFT)));
+end;
+
+
 initialization
   FBaseFont := TFont.Create;
Index: cprs/branches/foia-cprs/CPRS-Lib/ORNet.pas
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/ORNet.pas	(revision 459)
+++ cprs/branches/foia-cprs/CPRS-Lib/ORNet.pas	(revision 460)
@@ -1,7 +1,11 @@
 unit ORNet;
 
+{$DEFINE CCOWBROKER}
+
 interface
 
-uses SysUtils, Windows, Classes, Forms, Controls, ORFn, TRPCB, RPCConf1, Dialogs; //, SharedRPCBroker;
+uses SysUtils, Windows, Classes, Forms, Controls, ORFn, TRPCB, RPCConf1, Dialogs    
+{$IFDEF CCOWBROKER}, CCOWRPCBroker {$ENDIF} ;  //, SharedRPCBroker;
+
 
 procedure SetBrokerServer(const AName: string; APort: Integer; WantDebug: Boolean);
@@ -32,8 +36,12 @@
 
 var
-  //RPCBrokerV: TSharedRPCBroker;                        // an RPC Broker object - used by all calls
+{$IFDEF CCOWBROKER}
+  RPCBrokerV: TCCOWRPCBroker;
+{$ELSE}
   RPCBrokerV: TRPCBroker;
+  //RPCBrokerV: TSharedRPCBroker;
+{$ENDIF}
   RPCLastCall: string;
-  
+
 implementation
 
@@ -59,6 +67,10 @@
   if RPCBrokerV = nil then
   begin
+{$IFDEF CCOWBROKER}
+    RPCBrokerV := TCCOWRPCBroker.Create(Application);
+{$ELSE}
+    RPCBrokerV := TRPCBroker.Create(Application);
     //RPCBrokerV := TSharedRPCBroker.Create(Application);
-    RPCBrokerV := TRPCBroker.Create(Application);
+{$ENDIF}
     with RPCBrokerV do
     begin
Index: cprs/branches/foia-cprs/CPRS-Lib/fGMV_InputTemp.dfm
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/fGMV_InputTemp.dfm	(revision 460)
+++ cprs/branches/foia-cprs/CPRS-Lib/fGMV_InputTemp.dfm	(revision 460)
@@ -0,0 +1,328 @@
+object frmGMV_InputTemp: TfrmGMV_InputTemp
+  Left = 322
+  Top = 254
+  BorderStyle = bsNone
+  Caption = 'frmGMV_InputTemp'
+  ClientHeight = 447
+  ClientWidth = 728
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  OnClose = FormClose
+  OnCloseQuery = FormCloseQuery
+  OnCreate = FormCreate
+  OnResize = FormResize
+  PixelsPerInch = 96
+  TextHeight = 13
+  object pnlInputTemplate: TPanel
+    Left = 0
+    Top = 41
+    Width = 728
+    Height = 406
+    Align = alClient
+    BevelOuter = bvNone
+    Caption = 'pnlInputTemplate'
+    TabOrder = 0
+    object Bevel1: TBevel
+      Left = 0
+      Top = 50
+      Width = 728
+      Height = 2
+      Align = alTop
+      Shape = bsBottomLine
+    end
+    object pnlInputTemplateHeader: TPanel
+      Left = 0
+      Top = 0
+      Width = 728
+      Height = 24
+      Align = alTop
+      Alignment = taLeftJustify
+      Caption = '  Input Template'
+      TabOrder = 1
+    end
+    object hc: THeaderControl
+      Left = 0
+      Top = 52
+      Width = 728
+      Height = 17
+      DragReorder = False
+      Enabled = False
+      Sections = <
+        item
+          Alignment = taCenter
+          ImageIndex = -1
+          Text = '#'
+          Width = 29
+        end
+        item
+          ImageIndex = -1
+          Text = 'Unavailable'
+          Width = 0
+        end
+        item
+          ImageIndex = -1
+          Text = 'U...  R...'
+          Width = 60
+        end
+        item
+          ImageIndex = -1
+          Text = 'Vital'
+          Width = 111
+        end
+        item
+          ImageIndex = -1
+          Text = 'Value'
+          Width = 90
+        end
+        item
+          ImageIndex = -1
+          Text = 'Units'
+          Width = 75
+        end
+        item
+          ImageIndex = -1
+          Text = 'Qualifiers'
+          Width = 50
+        end>
+      Style = hsFlat
+    end
+    object pnlScrollBox: TPanel
+      Left = 0
+      Top = 69
+      Width = 728
+      Height = 337
+      Align = alClient
+      BevelOuter = bvNone
+      BorderWidth = 4
+      TabOrder = 3
+      object sbxMain: TScrollBox
+        Left = 4
+        Top = 4
+        Width = 707
+        Height = 261
+        BorderStyle = bsNone
+        TabOrder = 0
+      end
+    end
+    object pnlOptions: TPanel
+      Left = 0
+      Top = 24
+      Width = 728
+      Height = 26
+      Align = alTop
+      BevelOuter = bvNone
+      Color = 12698049
+      TabOrder = 0
+      object bvU: TBevel
+        Left = 8
+        Top = 3
+        Width = 20
+        Height = 21
+        Shape = bsFrame
+        Visible = False
+      end
+      object bvUnavailable: TBevel
+        Left = 135
+        Top = 3
+        Width = 21
+        Height = 21
+        Shape = bsFrame
+        Visible = False
+      end
+      object lblUnavailable: TLabel
+        Left = 160
+        Top = 6
+        Width = 56
+        Height = 13
+        Caption = 'Un&available'
+        FocusControl = ckbUnavailable
+        Visible = False
+        WordWrap = True
+      end
+      object Label3: TLabel
+        Left = 34
+        Top = 6
+        Width = 73
+        Height = 13
+        Caption = '&Patient on pass'
+        FocusControl = ckbOnPass
+      end
+      object ckbOnPass: TCheckBox
+        Left = 12
+        Top = 5
+        Width = 12
+        Height = 17
+        Hint = 'Mark all vitals in the template as "Patient On Pass"'
+        Alignment = taLeftJustify
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 0
+        OnClick = ckbOnPassClick
+        OnEnter = ckbOnPassEnter
+        OnExit = ckbOnPassExit
+      end
+      object pnlCPRSMetricStyle: TPanel
+        Left = 584
+        Top = 0
+        Width = 144
+        Height = 26
+        Align = alRight
+        BevelOuter = bvNone
+        ParentColor = True
+        TabOrder = 2
+        object chkCPRSSTyle: TCheckBox
+          Left = 1
+          Top = 5
+          Width = 136
+          Height = 17
+          Hint = 'Switch between dropdown and check box presentation of metric'
+          TabStop = False
+          Alignment = taLeftJustify
+          Caption = '&Units as Drop Down List'
+          TabOrder = 0
+          OnClick = acMetricStyleChangedExecute
+        end
+      end
+      object ckbUnavailable: TCheckBox
+        Left = 140
+        Top = 5
+        Width = 11
+        Height = 17
+        Hint = 'Mark all vitals in the template as "Patient Unavailable" '
+        Alignment = taLeftJustify
+        Caption = 'Patient on Pass'
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 1
+        Visible = False
+      end
+    end
+  end
+  object pnlTools: TPanel
+    Left = 0
+    Top = 0
+    Width = 728
+    Height = 41
+    Align = alTop
+    BevelOuter = bvNone
+    TabOrder = 1
+    Visible = False
+    object pnlPatient: TPanel
+      Left = 0
+      Top = 0
+      Width = 208
+      Height = 41
+      Align = alLeft
+      Color = clInfoBk
+      Constraints.MinWidth = 165
+      TabOrder = 0
+      object lblPatientName: TLabel
+        Left = 7
+        Top = 5
+        Width = 73
+        Height = 13
+        Caption = 'PatientName'
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = 'MS Sans Serif'
+        Font.Style = [fsBold]
+        ParentFont = False
+      end
+      object lblPatientInfo: TLabel
+        Left = 7
+        Top = 21
+        Width = 85
+        Height = 13
+        Caption = 'PatientInformation'
+      end
+    end
+    object pnlSettings: TPanel
+      Left = 208
+      Top = 0
+      Width = 520
+      Height = 41
+      Align = alClient
+      TabOrder = 1
+      object lblHospital: TLabel
+        Left = 115
+        Top = 5
+        Width = 3
+        Height = 13
+      end
+      object lblDateTime: TLabel
+        Left = 115
+        Top = 21
+        Width = 3
+        Height = 13
+      end
+      object lblHospitalCap: TLabel
+        Left = 7
+        Top = 5
+        Width = 100
+        Height = 13
+        Caption = 'Hospital Location'
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = 'MS Sans Serif'
+        Font.Style = [fsBold]
+        ParentFont = False
+      end
+      object Label2: TLabel
+        Left = 7
+        Top = 21
+        Width = 61
+        Height = 13
+        Caption = 'Date/Time'
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = 'MS Sans Serif'
+        Font.Style = [fsBold]
+        ParentFont = False
+      end
+      object Panel1: TPanel
+        Left = 445
+        Top = 1
+        Width = 74
+        Height = 39
+        Align = alRight
+        BevelOuter = bvNone
+        TabOrder = 0
+        object SpeedButton1: TSpeedButton
+          Left = 8
+          Top = 8
+          Width = 57
+          Height = 25
+          Flat = True
+          OnClick = SpeedButton1Click
+        end
+      end
+    end
+  end
+  object ActionList1: TActionList
+    Left = 336
+    Top = 8
+    object acMetricStyleChanged: TAction
+      Caption = 'acMetricStyleChanged'
+      OnExecute = acMetricStyleChangedExecute
+    end
+    object acSaveInput: TAction
+      Caption = 'acSaveInput'
+      OnExecute = acSaveInputExecute
+    end
+    object acSetOnPass: TAction
+      Caption = 'acSetOnPass'
+      OnExecute = acSetOnPassExecute
+    end
+    object acUnavailableBoxStatus: TAction
+      Caption = 'acUnavailableBoxStatus'
+    end
+  end
+end
Index: cprs/branches/foia-cprs/CPRS-Lib/fGMV_Qualifiers.dfm
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/fGMV_Qualifiers.dfm	(revision 460)
+++ cprs/branches/foia-cprs/CPRS-Lib/fGMV_Qualifiers.dfm	(revision 460)
@@ -0,0 +1,74 @@
+object frmGMV_Qualifiers: TfrmGMV_Qualifiers
+  Left = 460
+  Top = 247
+  BorderIcons = []
+  BorderStyle = bsNone
+  ClientHeight = 246
+  ClientWidth = 247
+  Color = clBtnFace
+  Constraints.MinWidth = 127
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -14
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  OnActivate = FormActivate
+  OnClose = FormClose
+  OnCreate = FormCreate
+  PixelsPerInch = 120
+  TextHeight = 16
+  object pnlMain: TPanel
+    Left = 0
+    Top = 0
+    Width = 247
+    Height = 246
+    Align = alClient
+    BevelInner = bvLowered
+    BorderWidth = 1
+    TabOrder = 0
+    object pnlBottom: TPanel
+      Left = 3
+      Top = 178
+      Width = 241
+      Height = 65
+      Align = alBottom
+      BevelOuter = bvNone
+      TabOrder = 0
+      OnResize = pnlBottomResize
+      DesignSize = (
+        241
+        65)
+      object btnOK: TButton
+        Left = 85
+        Top = 34
+        Width = 74
+        Height = 25
+        Anchors = [akTop, akRight]
+        Caption = '&OK'
+        Default = True
+        ModalResult = 1
+        TabOrder = 0
+      end
+      object btnCancel: TButton
+        Left = 161
+        Top = 34
+        Width = 74
+        Height = 25
+        Anchors = [akTop, akRight]
+        Cancel = True
+        Caption = '&Cancel'
+        ModalResult = 2
+        TabOrder = 1
+      end
+      object edtQuals: TEdit
+        Left = 9
+        Top = 0
+        Width = 224
+        Height = 24
+        TabOrder = 2
+        Text = 'edtQuals'
+      end
+    end
+  end
+end
Index: cprs/branches/foia-cprs/CPRS-Lib/fGMV_SupO2.dfm
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/fGMV_SupO2.dfm	(revision 460)
+++ cprs/branches/foia-cprs/CPRS-Lib/fGMV_SupO2.dfm	(revision 460)
@@ -0,0 +1,202 @@
+object frmGMV_SupO2: TfrmGMV_SupO2
+  Left = 815
+  Top = 181
+  BorderIcons = [biSystemMenu]
+  BorderStyle = bsNone
+  Caption = 'frmGMV_SupO2'
+  ClientHeight = 193
+  ClientWidth = 313
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -14
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  Position = poDefault
+  OnActivate = FormActivate
+  PixelsPerInch = 120
+  TextHeight = 16
+  object pnlMain: TPanel
+    Left = 0
+    Top = 0
+    Width = 313
+    Height = 193
+    Align = alClient
+    BevelInner = bvLowered
+    BorderWidth = 1
+    TabOrder = 0
+    object pnlBottom: TPanel
+      Left = 3
+      Top = 142
+      Width = 307
+      Height = 48
+      Align = alBottom
+      BevelOuter = bvLowered
+      TabOrder = 0
+      DesignSize = (
+        307
+        48)
+      object btnOK: TButton
+        Left = 146
+        Top = 12
+        Width = 73
+        Height = 25
+        Anchors = [akTop, akRight]
+        Caption = 'O&K'
+        ModalResult = 1
+        TabOrder = 0
+        OnClick = btnOKClick
+      end
+      object btnCancel: TButton
+        Left = 223
+        Top = 12
+        Width = 70
+        Height = 25
+        Anchors = [akTop, akRight]
+        Cancel = True
+        Caption = '&Cancel'
+        ModalResult = 2
+        TabOrder = 1
+      end
+    end
+    object Panel1: TPanel
+      Left = 3
+      Top = 30
+      Width = 307
+      Height = 74
+      Align = alTop
+      BevelOuter = bvNone
+      TabOrder = 1
+      object lblFlow: TLabel
+        Left = 9
+        Top = 21
+        Width = 63
+        Height = 16
+        Caption = '&Flow Rate:'
+        FocusControl = edtFlow
+      end
+      object lblO2Con: TLabel
+        Left = 9
+        Top = 50
+        Width = 105
+        Height = 16
+        Caption = '&O2 Concentration:'
+        FocusControl = edtO2Con
+      end
+      object lblPercent: TLabel
+        Left = 117
+        Top = 50
+        Width = 20
+        Height = 16
+        Caption = '(%)'
+        ParentShowHint = False
+        ShowHint = False
+      end
+      object lblLitMin: TLabel
+        Left = 98
+        Top = 21
+        Width = 38
+        Height = 16
+        Hint = 'liters/minute'
+        Caption = '(l/min)'
+        ParentShowHint = False
+        ShowHint = True
+      end
+      object edtFlow: TEdit
+        Left = 146
+        Top = 16
+        Width = 121
+        Height = 24
+        Hint = 'Enter values between 0.5 and 20'
+        MaxLength = 4
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 0
+        OnKeyUp = edtFlowKeyUp
+      end
+      object edtO2Con: TEdit
+        Left = 146
+        Top = 46
+        Width = 121
+        Height = 24
+        Hint = 'Enter value between 21 and 100'
+        MaxLength = 3
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 1
+        OnKeyUp = edtO2ConKeyUp
+      end
+      object udFlow: TUpDown
+        Left = 271
+        Top = 16
+        Width = 19
+        Height = 26
+        Min = -32768
+        Max = 32767
+        TabOrder = 2
+        OnChangingEx = udFlowChangingEx
+      end
+      object udO2: TUpDown
+        Left = 271
+        Top = 46
+        Width = 19
+        Height = 25
+        Min = -32768
+        Max = 32767
+        TabOrder = 3
+        OnChangingEx = udO2ChangingEx
+      end
+    end
+    object Panel2: TPanel
+      Left = 3
+      Top = 3
+      Width = 307
+      Height = 27
+      Align = alTop
+      BevelInner = bvRaised
+      BevelOuter = bvNone
+      Caption = 'Supplemental Oxygen'
+      TabOrder = 2
+    end
+    object pnlQual: TPanel
+      Left = 3
+      Top = 138
+      Width = 307
+      Height = 4
+      Align = alClient
+      BevelOuter = bvNone
+      TabOrder = 3
+    end
+    object Panel5: TPanel
+      Left = 3
+      Top = 104
+      Width = 307
+      Height = 34
+      Align = alTop
+      BevelOuter = bvNone
+      TabOrder = 4
+      object lblMethodValue: TLabel
+        Left = 10
+        Top = 7
+        Width = 45
+        Height = 16
+        Caption = '&Method'
+        FocusControl = cbMethod
+      end
+      object cbMethod: TComboBox
+        Left = 146
+        Top = 1
+        Width = 147
+        Height = 24
+        Hint = 'Select Method from the list'
+        Style = csDropDownList
+        ItemHeight = 16
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 0
+        OnChange = cbMethodChange
+      end
+    end
+  end
+end
Index: cprs/branches/foia-cprs/CPRS-Lib/mGMV_InputOne2.dfm
===================================================================
--- cprs/branches/foia-cprs/CPRS-Lib/mGMV_InputOne2.dfm	(revision 460)
+++ cprs/branches/foia-cprs/CPRS-Lib/mGMV_InputOne2.dfm	(revision 460)
@@ -0,0 +1,262 @@
+object fraGMV_InputOne2: TfraGMV_InputOne2
+  Left = 0
+  Top = 0
+  Width = 854
+  Height = 25
+  TabOrder = 0
+  object pnlMain: TPanel
+    Left = 0
+    Top = 0
+    Width = 854
+    Height = 25
+    Align = alClient
+    BevelOuter = bvNone
+    TabOrder = 0
+    object pnlValues: TPanel
+      Left = 205
+      Top = 0
+      Width = 187
+      Height = 25
+      Align = alLeft
+      BevelOuter = bvNone
+      ParentColor = True
+      TabOrder = 1
+      object lblUnit: TLabel
+        Left = 119
+        Top = 8
+        Width = 29
+        Height = 13
+        Caption = 'lblUnit'
+      end
+      object bvMetric: TBevel
+        Left = 162
+        Top = 4
+        Width = 21
+        Height = 21
+        Shape = bsFrame
+        Visible = False
+      end
+      object cbxInput: TComboBox
+        Left = 1
+        Top = 1
+        Width = 112
+        Height = 21
+        Hint = 'Enter the appropriate vitals measurement'
+        Style = csDropDownList
+        DropDownCount = 12
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clBlack
+        Font.Height = -11
+        Font.Name = 'MS Sans Serif'
+        Font.Style = []
+        ItemHeight = 13
+        ParentFont = False
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 0
+        OnChange = cbxInputChange
+        OnClick = cbxInputClick
+        OnExit = cbxInputExit
+        OnKeyDown = cbxInputKeyDown
+      end
+      object ckbMetric: TCheckBox
+        Left = 166
+        Top = 6
+        Width = 15
+        Height = 17
+        Hint = 
+          'Check to switch display values between English and Metric equiva' +
+          'lents'
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 1
+        OnClick = ckbMetricClick
+        OnEnter = ckbMetricEnter
+        OnExit = ckbMetricExit
+      end
+      object cbxUnits: TComboBox
+        Left = 116
+        Top = 1
+        Width = 69
+        Height = 21
+        Hint = 'Press to select metric'
+        Style = csDropDownList
+        ItemHeight = 13
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 2
+        Visible = False
+        OnChange = acMetricChangedExecute
+      end
+    end
+    object pnlRefusedUnavailable: TPanel
+      Left = 0
+      Top = 0
+      Width = 75
+      Height = 25
+      Align = alLeft
+      BevelOuter = bvNone
+      ParentColor = True
+      TabOrder = 0
+      object lblNum: TLabel
+        Left = 0
+        Top = 0
+        Width = 24
+        Height = 25
+        Align = alLeft
+        Alignment = taRightJustify
+        AutoSize = False
+        Caption = '#. '
+        Layout = tlCenter
+      end
+      object bvU: TBevel
+        Left = 28
+        Top = 3
+        Width = 21
+        Height = 21
+        Shape = bsFrame
+        Visible = False
+      end
+      object bvR: TBevel
+        Left = 53
+        Top = 3
+        Width = 21
+        Height = 21
+        Shape = bsFrame
+        Visible = False
+      end
+      object cbxRefused: TCheckBox
+        Left = 54
+        Top = 5
+        Width = 16
+        Height = 17
+        Hint = 'Mark as Refused'
+        Alignment = taLeftJustify
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 1
+        OnClick = cbxRefusedClick
+        OnEnter = cbxRefusedEnter
+        OnExit = cbxRefusedExit
+        OnMouseUp = cbxRefusedMouseUp
+      end
+      object cbxUnavailable: TCheckBox
+        Left = 32
+        Top = 5
+        Width = 13
+        Height = 17
+        Hint = 'Mark as Unavailable'
+        Alignment = taLeftJustify
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 0
+        OnClick = cbxUnavailableClick
+        OnEnter = cbxUnavailableEnter
+        OnExit = cbxUnavailableExit
+        OnMouseUp = cbxUnavailableMouseUp
+      end
+    end
+    object pnlQualifiers: TPanel
+      Left = 392
+      Top = 0
+      Width = 462
+      Height = 25
+      Align = alClient
+      BevelOuter = bvNone
+      ParentColor = True
+      TabOrder = 2
+      object lblQualifiers: TLabel
+        Left = 28
+        Top = 5
+        Width = 53
+        Height = 13
+        Hint = 'Current qualifiers to be filed with this vital measurement'
+        Caption = 'lblQualifiers'
+        ParentShowHint = False
+        ShowHint = True
+      end
+      object bvQual: TBevel
+        Left = 2
+        Top = 3
+        Width = 23
+        Height = 21
+        Shape = bsFrame
+        Visible = False
+      end
+      object bbtnQualifiers: TBitBtn
+        Left = 5
+        Top = 5
+        Width = 17
+        Height = 16
+        Hint = 'Press to display the qualifier selection screen'
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 0
+        OnClick = bbtnQualifiersClick
+        OnEnter = bbtnQualifiersEnter
+        OnExit = bbtnQualifiersExit
+        Glyph.Data = {
+          7E040000424D7E0400000000000036040000280000000B000000060000000100
+          08000000000048000000C40E0000C40E00000001000000000000000000000000
+          80000080000000808000800000008000800080800000C0C0C000C0DCC000F0CA
+          A6000020400000206000002080000020A0000020C0000020E000004000000040
+          20000040400000406000004080000040A0000040C0000040E000006000000060
+          20000060400000606000006080000060A0000060C0000060E000008000000080
+          20000080400000806000008080000080A0000080C0000080E00000A0000000A0
+          200000A0400000A0600000A0800000A0A00000A0C00000A0E00000C0000000C0
+          200000C0400000C0600000C0800000C0A00000C0C00000C0E00000E0000000E0
+          200000E0400000E0600000E0800000E0A00000E0C00000E0E000400000004000
+          20004000400040006000400080004000A0004000C0004000E000402000004020
+          20004020400040206000402080004020A0004020C0004020E000404000004040
+          20004040400040406000404080004040A0004040C0004040E000406000004060
+          20004060400040606000406080004060A0004060C0004060E000408000004080
+          20004080400040806000408080004080A0004080C0004080E00040A0000040A0
+          200040A0400040A0600040A0800040A0A00040A0C00040A0E00040C0000040C0
+          200040C0400040C0600040C0800040C0A00040C0C00040C0E00040E0000040E0
+          200040E0400040E0600040E0800040E0A00040E0C00040E0E000800000008000
+          20008000400080006000800080008000A0008000C0008000E000802000008020
+          20008020400080206000802080008020A0008020C0008020E000804000008040
+          20008040400080406000804080008040A0008040C0008040E000806000008060
+          20008060400080606000806080008060A0008060C0008060E000808000008080
+          20008080400080806000808080008080A0008080C0008080E00080A0000080A0
+          200080A0400080A0600080A0800080A0A00080A0C00080A0E00080C0000080C0
+          200080C0400080C0600080C0800080C0A00080C0C00080C0E00080E0000080E0
+          200080E0400080E0600080E0800080E0A00080E0C00080E0E000C0000000C000
+          2000C0004000C0006000C0008000C000A000C000C000C000E000C0200000C020
+          2000C0204000C0206000C0208000C020A000C020C000C020E000C0400000C040
+          2000C0404000C0406000C0408000C040A000C040C000C040E000C0600000C060
+          2000C0604000C0606000C0608000C060A000C060C000C060E000C0800000C080
+          2000C0804000C0806000C0808000C080A000C080C000C080E000C0A00000C0A0
+          2000C0A04000C0A06000C0A08000C0A0A000C0A0C000C0A0E000C0C00000C0C0
+          2000C0C04000C0C06000C0C08000C0C0A000F0FBFF00A4A0A000808080000000
+          FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF00FAFAFAFAFA00
+          FAFAFAFAFA00FAFAFAFA000000FAFAFAFA00FAFAFA0000000000FAFAFA00FAFA
+          00000000000000FAFA00FA000000000000000000FA0000000000000000000000
+          0000}
+      end
+    end
+    object pnlName: TPanel
+      Left = 75
+      Top = 0
+      Width = 130
+      Height = 25
+      Align = alLeft
+      BevelOuter = bvNone
+      ParentColor = True
+      TabOrder = 3
+      object lblVital: TLabel
+        Left = 0
+        Top = 0
+        Width = 113
+        Height = 25
+        Hint = 'Display name of the vitals measurement'
+        Align = alLeft
+        AutoSize = False
+        Caption = 'lblVital'
+        ParentShowHint = False
+        ShowHint = True
+        Layout = tlCenter
+      end
+    end
+  end
+end
