Skip to content

Commit

Permalink
CPRS 31.121 (COVID-19 version) Update
Browse files Browse the repository at this point in the history 
NOTE: COVID functionality disabled as the source code that was supplied
was not complete. Instead, I compiled as much as is possible for me to
move forward.

Notable items:

- Add enhanced broker logger in uGN_RPCLog & fGN_RPCLog to .dpr file.
- A few lines in fFrame.pas are commented out because corresponding
source code in uCore.pas isn't supplied.
  • Loading branch information
@shabiel
shabiel committed Jun 17, 2020
1 parent 19193dc commit 3aef311
Show file tree
Hide file tree
Showing 4 changed files with 160 additions and 32 deletions.
6 changes: 4 additions & 2 deletions Packages/Order Entry Results Reporting/CPRS/CPRS-Chart/CPRSChart.dpr.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,10 @@ uses
mTreeGrid in '@SOURCE@\mTreeGrid.pas' {TreeGridFrame: TFrame},
mColumnTree in '@SOURCE@\mColumnTree.pas' {ColumnTreeFrame: TFrame},
mDrawers in '@SOURCE@\mDrawers.pas' {fraDrawers: TFrame},
mRadioListView in '@SOURCE@\mRadioListView.pas' {RadioLVFrame: TFrame};

mRadioListView in '@SOURCE@\mRadioListView.pas' {RadioLVFrame: TFrame},
uGN_RPCLog in '@SOURCE@\Tools\uGN_RPCLog.pas',
fGN_RPCLog in '@SOURCE@\Tools\fGN_RPCLog.pas';


{$R *.TLB}

Expand Down
34 changes: 23 additions & 11 deletions Packages/Order Entry Results Reporting/CPRS/CPRS-Chart/CPRSChart.dproj.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<Icon_MainIcon>@SOURCE@/CPRSChart_Icon.ico</Icon_MainIcon>
<DCC_UnitSearchPath> @SOURCE@\..\CPRS-Lib;@SOURCE@\..\VA;@SOURCE@\..\..\..\RPC Broker\BDK\Source;@SOURCE@\..\VA\VA508Accessibility;@SOURCE@\..\PKI;$(DCC_UnitSearchPath);@SOURCE@\XE8\508\Source;@SOURCE@\XE8\Borland\Source;@SOURCE@\XE8\Broker\Source;@SOURCE@\XE8\CopyPaste\Source;@SOURCE@\XE8\ExceptionLogger\Source;@SOURCE@\XE8\FilemanComponents\Source;@SOURCE@\XE8\VA\Source;</DCC_UnitSearchPath>
<SanitizedProjectName>CPRSChart</SanitizedProjectName>
<DCC_MapFile>3</DCC_MapFile>
Expand All @@ -54,22 +55,21 @@
<ImageDebugInfo>true</ImageDebugInfo>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Release>31</VerInfo_Release>
<VerInfo_Build>118</VerInfo_Build>
<VerInfo_Build>121</VerInfo_Build>
<DCC_DcuOutput>.\dcu</DCC_DcuOutput>
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
<DCC_ImageBase>00400000</DCC_ImageBase>
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;VCLTee;Vcl.Win;System.Win;$(DCC_Namespace)</DCC_Namespace>
<VerInfo_Locale>1033</VerInfo_Locale>
<DCC_F>false</DCC_F>
<VerInfo_Keys>CompanyName=Department of Veterans Affairs;FileDescription=7/17/2019;FileVersion=1.0.31.118;InternalName=1.0.31.118 server required;LegalCopyright=Unauthorized access or misuse of this system and/or its data is a federal crime. Use of all data shall be in accordance with VA policy on security and privacy.;LegalTrademarks=;OriginalFilename=Patch 509;ProductName=Computerized Patient Record System;ProductVersion=1.0.31.118;Comments=Version 1.0.31.118;CFBundleName=;CFBundleDisplayName=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;CFBundleExecutable=</VerInfo_Keys>
<VerInfo_Keys>CompanyName=Department of Veterans Affairs;FileDescription=;FileVersion=1.0.31.121;InternalName=1.0.31.121 server required;LegalCopyright=Unauthorized access or misuse of this system and/or its data is a federal crime. Use of all data shall be in accordance with VA policy on security and privacy.;LegalTrademarks=;OriginalFilename=Patch 434;ProductName=Computerized Patient Record System;ProductVersion=1.0.31.121;Comments=Version 1.0.31.121;CFBundleName=;CFBundleDisplayName=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;CFBundleExecutable=</VerInfo_Keys>
<DCC_S>false</DCC_S>
<DCC_E>false</DCC_E>
<DCC_K>false</DCC_K>
<DCC_N>false</DCC_N>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_Keys>CompanyName=Department of Veterans Affairs;FileDescription=7/17/2019;FileVersion=1.0.31.118;InternalName=1.0.31.118 server required;LegalCopyright=Unauthorized access or misuse of this system and/or its data is a federal crime. Use of all data shall be in accordance with VA policy on security and privacy.;LegalTrademarks=;OriginalFilename=Patch 509;ProductName=Computerized Patient Record System;ProductVersion=1.0.31.118;Comments=Version 1.0.31.118A;CFBundleName=;CFBundleDisplayName=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;CFBundleExecutable=</VerInfo_Keys>
<Icon_MainIcon>@SOURCE@/CPRSChart_Icon.ico</Icon_MainIcon>
<VerInfo_Keys>CompanyName=Department of Veterans Affairs;FileDescription=;FileVersion=1.0.31.121;InternalName=1.0.31.121 server required;LegalCopyright=Unauthorized access or misuse of this system and/or its data is a federal crime. Use of all data shall be in accordance with VA policy on security and privacy.;LegalTrademarks=;OriginalFilename=Patch 485;ProductName=Computerized Patient Record System;ProductVersion=1.0.31.121;Comments=Version 1.0.31.121;CFBundleName=;CFBundleDisplayName=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;CFBundleExecutable=</VerInfo_Keys>
<DCC_DcuOutput>.\dcu</DCC_DcuOutput>
<DCC_ImageBase>00400000</DCC_ImageBase>
<DCC_F>false</DCC_F>
Expand All @@ -90,7 +90,8 @@
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<VerInfo_Keys>CompanyName=Department of Veterans Affairs;FileDescription=7/17/2019;FileVersion=1.0.31.118;InternalName=1.0.31.118 server required;LegalCopyright=Unauthorized access or misuse of this system and/or its data is a federal crime. Use of all data shall be in accordance with VA policy on security and privacy.;LegalTrademarks=;OriginalFilename=Patch 509;ProductName=Computerized Patient Record System;ProductVersion=1.0.31.118;Comments=Version 1.0.31.118A;CFBundleName=;CFBundleDisplayName=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;CFBundleExecutable=</VerInfo_Keys>
<VerInfo_Keys>CompanyName=Department of Veterans Affairs;FileDescription=;FileVersion=1.0.31.121;InternalName=1.0.31.121 server required;LegalCopyright=Unauthorized access or misuse of this system and/or its data is a federal crime. Use of all data shall be in accordance with VA policy on security and privacy.;LegalTrademarks=;OriginalFilename=Patch 485;ProductName=Computerized Patient Record System;ProductVersion=1.0.31.121;Comments=Version 1.0.31.121;CFBundleName=;CFBundleDisplayName=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;CFBundleExecutable=</VerInfo_Keys>
<Icon_MainIcon>@SOURCE@/CPRSChart.ico</Icon_MainIcon>
<DCC_DebugInfoInExe>false</DCC_DebugInfoInExe>
<DCC_DcuOutput>.\dcu</DCC_DcuOutput>
<DCC_ImageBase>00400000</DCC_ImageBase>
Expand All @@ -101,14 +102,16 @@
<DCC_N>false</DCC_N>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<Icon_MainIcon>@SOURCE@/CPRSChart.ico</Icon_MainIcon>
<VerInfo_Keys>CompanyName=Department of Veterans Affairs;FileDescription=;FileVersion=1.0.31.121;InternalName=1.0.31.121 server required;LegalCopyright=Unauthorized access or misuse of this system and/or its data is a federal crime. Use of all data shall be in accordance with VA policy on security and privacy.;LegalTrademarks=;OriginalFilename=Patch 485;ProductName=Computerized Patient Record System;ProductVersion=1.0.31.121;Comments=Version 1.0.31.121;CFBundleName=;CFBundleDisplayName=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;CFBundleExecutable=</VerInfo_Keys>
<DCC_RangeChecking>true</DCC_RangeChecking>
<DCC_MapFile>3</DCC_MapFile>
<DCC_Optimize>false</DCC_Optimize>
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<VerInfo_Keys>CompanyName=Department of Veterans Affairs;FileDescription=7/17/2019;FileVersion=1.0.31.118;InternalName=1.0.31.118 server required;LegalCopyright=Unauthorized access or misuse of this system and/or its data is a federal crime. Use of all data shall be in accordance with VA policy on security and privacy.;LegalTrademarks=;OriginalFilename=Patch 509;ProductName=Computerized Patient Record System;ProductVersion=1.0.31.118;Comments=Version 1.0.31.118A;CFBundleName=;CFBundleDisplayName=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;CFBundleExecutable=</VerInfo_Keys>
<Icon_MainIcon>CPRSChart_Icon.ico</Icon_MainIcon>
</PropertyGroup>
<ItemGroup>
<DelphiCompile Include="$(MainSource)">
Expand Down Expand Up @@ -962,10 +965,7 @@
<VersionInfoKeys Name="CFBundleAllowMixedLocalizations"/>
<VersionInfoKeys Name="CFBundleExecutable"/>
</VersionInfoKeys>
<Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k220.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp220.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
</Excluded_Packages>
<Excluded_Packages/>
</Delphi.Personality>
<Platforms>
<Platform value="Win32">True</Platform>
Expand All @@ -976,7 +976,13 @@
</ActiveXProjectInfo>
<ModelSupport>False</ModelSupport>
<Deployment Version="2">
<DeployFile LocalName="CPRSChart.exe" Configuration="Debug" Class="ProjectOutput">
<DeployFile LocalName="CPRSChart.ridl" Configuration="Release" Class="ProjectFile">
<Platform Name="Win32">
<RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="CPRSChart.exe" Configuration="Release" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>CPRSChart.exe</RemoteName>
<Overwrite>true</Overwrite>
Expand All @@ -988,6 +994,12 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="CPRSChart.exe" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>CPRSChart.exe</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployClass Required="true" Name="DependencyPackage">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
Expand Down
40 changes: 29 additions & 11 deletions Packages/Order Entry Results Reporting/CPRS/CPRS-Chart/fFrame.dfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,10 @@ inherited frmFrame: TfrmFrame
Menu = mnuFrame
OldCreateOrder = True
Visible = True
OnActivate = FormActivate
OnClose = FormClose
OnCloseQuery = FormCloseQuery
OnCreate = FormCreate
OnDestroy = FormDestroy
OnResize = FormResize
ExplicitWidth = 819
ExplicitHeight = 731
ExplicitHeight = 732
PixelsPerInch = 96
TextHeight = 13
object pnlNoPatientSelected: TPanel [0]
Expand Down Expand Up @@ -43,15 +39,15 @@ inherited frmFrame: TfrmFrame
TabOrder = 0
object bvlPageTop: TBevel
Left = 1
Top = 50
Top = 91
Width = 801
Height = 2
Margins.Left = 4
Margins.Top = 4
Margins.Right = 4
Margins.Bottom = 4
Align = alTop
ExplicitWidth = 791
ExplicitTop = 200
end
object pnlToolbar: TPanel
Left = 1
Expand Down Expand Up @@ -855,17 +851,17 @@ inherited frmFrame: TfrmFrame
Font.Name = 'MS Sans Serif'
Font.Style = []
ParentFont = False
TabOrder = 1
TabOrder = 2
TabPosition = tpBottom
OnChange = tabPageChange
OnMouseDown = tabPageMouseDown
OnMouseUp = tabPageMouseUp
end
object pnlPage: TPanel
Left = 1
Top = 52
Top = 93
Width = 801
Height = 577
Height = 536
Align = alClient
BevelOuter = bvNone
Font.Charset = DEFAULT_CHARSET
Expand All @@ -874,7 +870,7 @@ inherited frmFrame: TfrmFrame
Font.Name = 'MS Sans Serif'
Font.Style = []
ParentFont = False
TabOrder = 2
TabOrder = 3
object lstCIRNLocations: TORListBox
Left = 522
Top = 0
Expand Down Expand Up @@ -910,6 +906,25 @@ inherited frmFrame: TfrmFrame
CheckEntireLine = True
end
end
object pnlOtherInfo: TKeyClickPanel
Left = 1
Top = 50
Width = 801
Height = 41
Align = alTop
Color = clYellow
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
ParentBackground = False
ParentFont = False
TabOrder = 1
OnClick = pnlOtherInfoClick
OnMouseDown = pnlOtherInfoMouseDown
OnMouseUp = pnlOtherInfoMouseUp
end
end
inherited amgrMain: TVA508AccessibilityManager
Left = 8
Expand Down Expand Up @@ -1019,6 +1034,9 @@ inherited frmFrame: TfrmFrame
'Status = stsDefault')
(
'Component = txtCmdFlags'
'Status = stsDefault')
(
'Component = pnlOtherInfo'
'Status = stsDefault'))
end
object mnuFrame: TMainMenu
Expand Down
Loading

0 comments on commit 3aef311

Please sign in to comment.