Index: rs/branches/tmg-cprs/CPRS-Chart/CPRSChart.dof =================================================================== --- /cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.dof (revision 464) +++ (revision ) @@ -1,176 +1,0 @@ -[FileVersion] -Version=7.0 -[Compiler] -A=8 -B=0 -C=1 -D=1 -E=0 -F=0 -G=1 -H=1 -I=1 -J=1 -K=0 -L=1 -M=0 -N=1 -O=1 -P=1 -Q=0 -R=0 -S=0 -T=0 -U=0 -V=1 -W=0 -X=1 -Y=1 -Z=1 -ShowHints=0 -ShowWarnings=1 -UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; -NamespacePrefix= -SymbolDeprecated=1 -SymbolLibrary=1 -SymbolPlatform=1 -UnitLibrary=1 -UnitPlatform=1 -UnitDeprecated=1 -HResultCompat=1 -HidingMember=1 -HiddenVirtual=1 -Garbage=1 -BoundsError=1 -ZeroNilCompat=1 -StringConstTruncated=1 -ForLoopVarVarPar=1 -TypedConstVarPar=1 -AsgToTypedConst=1 -CaseLabelRange=1 -ForVariable=1 -ConstructingAbstract=1 -ComparisonFalse=1 -ComparisonTrue=1 -ComparingSignedUnsigned=1 -CombiningSignedUnsigned=1 -UnsupportedConstruct=1 -FileOpen=1 -FileOpenUnitSrc=1 -BadGlobalSymbol=1 -DuplicateConstructorDestructor=1 -InvalidDirective=1 -PackageNoLink=1 -PackageThreadVar=1 -ImplicitImport=1 -HPPEMITIgnored=1 -NoRetVal=1 -UseBeforeDef=1 -ForLoopVarUndef=1 -UnitNameMismatch=1 -NoCFGFileFound=1 -MessageDirective=1 -ImplicitVariants=1 -UnicodeToLocale=1 -LocaleToUnicode=1 -ImagebaseMultiple=1 -SuspiciousTypecast=1 -PrivatePropAccessor=1 -UnsafeType=0 -UnsafeCode=0 -UnsafeCast=0 -[Linker] -MapFile=3 -OutputObjs=0 -ConsoleApp=1 -DebugInfo=0 -RemoteSymbols=0 -MinStackSize=32768 -MaxStackSize=1048576 -ImageBase=4194304 -ExeDescription= -[Directories] -OutputDir=P:\Vista\CPRS-1.0.26.69 -UnitOutputDir=P:\Vista\CPRS-1.0.26.69\CPRS-Chart\dcu -PackageDLLOutputDir= -PackageDCPOutputDir= -SearchPath=$(DELPHI)\Lib\Debug;$(DELPHI)\Source\ToolsAPI;P:\Vista\CPRS-1.0.26.69\CPRS-Chart;P:\Vista\CPRS-1.0.26.69\CPRS-Chart\dcu;P:\Vista\CPRS-1.0.26.69\CPRS-Lib\DCU;P:\Vista\CPRS-1.0.26.69\Packages;P:\Vista\CPRS-1.0.26.69\CPRS-Lib;P:\Vista\CPRS-1.0.26.69\dklang-package-3.01;P:\Vista\CPRS-1.0.26.69\TntWare\Delphi Unicode Controls\Source;P:\Vista\CPRS-1.0.26.69\TPNGGraphics -Packages=vcl;rtl;vclx;VclSmp;vclshlctrls;dbrtl;adortl;vcldb;qrpt;bdertl;vcldbx;dsnap;cds;bdecds;teeui;teedb;tee;teeqr;ibxpress;visualclx;visualdbclx;vclie;xmlrtl;inet;inetdbbde;inetdbxpress;inetdb;nmfast;dbexpress;dbxcds;indy;dclOffice2k;soaprtl;XWB_R60 -Conditionals=MSWINDOWS -DebugSourceDirs=P:\Vista\CPRS-1.0.26.69\dklang-package-3.01\ -UsePackages=0 -[Parameters] -RunParams=s=192.168.3.99 p=9230 CCOW=DISABLE -HostApplication= -Launcher= -UseLauncher=0 -DebugCWD= -[Language] -ActiveLang= -ProjectLang= -RootDir=C:\Program Files\Borland\Delphi6\Bin\ -[Version Info] -IncludeVerInfo=1 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=26 -Build=69 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 -[Version Info Keys] -CompanyName=Department of Veterans Affairs -FileDescription=1/21/2006 -FileVersion=1.0.26.69 -InternalName=1.0.26.69 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 215 -ProductName=Computerized Patient Record System -ProductVersion=1.0.0.0 -Comments=Version 1.0.26.69 -[HistoryLists\hlConditionals] -Count=1 -Item0=MSWINDOWS -[HistoryLists\hlUnitAliases] -Count=1 -Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; -[HistoryLists\hlSearchPath] -Count=14 -Item0=$(DELPHI)\Lib\Debug;$(DELPHI)\Source\ToolsAPI;P:\Vista\CPRS-1.0.26.69\CPRS-Chart;P:\Vista\CPRS-1.0.26.69\CPRS-Chart\dcu;P:\Vista\CPRS-1.0.26.69\CPRS-Lib\DCU;P:\Vista\CPRS-1.0.26.69\Packages;P:\Vista\CPRS-1.0.26.69\CPRS-Lib;P:\Vista\CPRS-1.0.26.69\dklang-package-3.01;P:\Vista\CPRS-1.0.26.69\TntWare\Delphi Unicode Controls\Source;P:\Vista\CPRS-1.0.26.69\TPNGGraphics -Item1=$(DELPHI)\Lib\Debug;$(DELPHI)\Source\ToolsAPI;P:\Vista\CPRS-1.0.26.69\CPRS-Chart;P:\Vista\CPRS-1.0.26.69\CPRS-Chart\dcu;P:\Vista\CPRS-1.0.26.69\CPRS-Lib\DCU;P:\Vista\CPRS-1.0.26.69\Packages;P:\Vista\CPRS-1.0.26.69\CPRS-Lib;P:\Vista\CPRS-1.0.26.69\dklang-package-3.01;P:\Vista\CPRS-1.0.26.69\TntWare\Delphi Unicode Controls\Source -Item2=$(DELPHI)\Lib\Debug;$(DELPHI)\Source\ToolsAPI;P:\Vista\CPRS-1.0.26.69\CPRS-Chart;P:\Vista\CPRS-1.0.26.69\CPRS-Chart\dcu;P:\Vista\CPRS-1.0.26.69\CPRS-Lib\DCU;P:\Vista\CPRS-1.0.26.69\Packages;P:\Vista\CPRS-1.0.26.69\CPRS-Lib;P:\Vista\CPRS-1.0.26.69\dklang-package-3.01 -Item3=$(DELPHI)\Lib\Debug;$(DELPHI)\Source\ToolsAPI;P:\Vista\CPRS-1.0.26.69\CPRS-Chart;P:\Vista\CPRS-1.0.26.69\CPRS-Chart\dcu;P:\Vista\CPRS-1.0.26.69\CPRS-Lib\DCU;P:\Vista\CPRS-1.0.26.69\Packages;P:\Vista\CPRS-1.0.26.69\CPRS-Lib -Item4=$(DELPHI)\Lib\Debug;$(DELPHI)\Source\ToolsAPI;P:\Vista\CPRS-1.0.26.69\CPRS-Chart;P:\Vista\CPRS-1.0.26.69\CPRS-Chart\dcu;P:\Vista\CPRS-1.0.26.69\CPRS-Lib\DCU;P:\Vista\CPRS-1.0.26.69\Packages -Item5=$(DELPHI)\Lib\Debug;$(DELPHI)\Source\ToolsAPI;P:\Vista\CPRS-1.0.26.69\CPRS-Chart;P:\Vista\CPRS-1.0.26.69\CPRS-Chart\dcu;P:\Vista\CPRS-1.0.26.69\CPRS-Lib\DCU -Item6=$(DELPHI)\Lib\Debug;$(DELPHI)\Source\ToolsAPI;P:\Vista\CPRS-1.0.26.69\CPRS-Chart;P:\Vista\CPRS-1.0.26.69\CPRS-Chart\dcu -Item7=$(DELPHI)\Lib\Debug;C:\Vista\cprs\OR_3_270V26_69\CPRS-Lib;C:\Program Files\Borland\Delphi7\Projects\OR_SRC_CREATION FILE 12 06 06 OR_3_270\OR_SRC_CREATION\CPRS-Lib;C:\Program Files\Borland\Delphi7\Projects\OR_SRC_CREATION FILE 12 06 06 OR_3_270\OR_SRC_CREATION\CPRS-Chart;C:\Vista\cprs\OR_3_270V26_69\CPRS-Chart\DCU;$(DELPHI)\Source\ToolsAPI -Item8=$(DELPHI)\Lib\Debug;C:\Program Files\Borland\Delphi7\Source\Rtl\Sys;C:\Vista\cprs\OR_3_270V26_69\CPRS-Lib;C:\Program Files\Borland\Delphi7\Projects\OR_SRC_CREATION FILE 12 06 06 OR_3_270\OR_SRC_CREATION\CPRS-Lib;C:\Program Files\Borland\Delphi7\Projects\OR_SRC_CREATION FILE 12 06 06 OR_3_270\OR_SRC_CREATION\CPRS-Chart;C:\Vista\cprs\OR_3_270V26_69\CPRS-Chart\DCU;$(DELPHI)\Source\ToolsAPI -Item9=$(DELPHI)\Lib\Debug;C:\Vista\cprs\OR_3_270V26_69\CPRS-Lib;C:\Program Files\Borland\Delphi7\Projects\OR_SRC_CREATION FILE 12 06 06 OR_3_270\OR_SRC_CREATION\CPRS-Lib;C:\Program Files\Borland\Delphi7\Projects\OR_SRC_CREATION FILE 12 06 06 OR_3_270\OR_SRC_CREATION\CPRS-Chart;C:\Vista\cprs\OR_3_270V26_69\CPRS-Chart\DCU;$(DELPHI)\Source\ToolsAPI;C:\Program Files\Borland\Delphi7\Source\Rtl\Sys -Item10=$(DELPHI)\Lib\Debug;C:\Vista\cprs\OR_3_270V26_69\CPRS-Lib;C:\Program Files\Borland\Delphi7\Projects\OR_SRC_CREATION FILE 12 06 06 OR_3_270\OR_SRC_CREATION\CPRS-Lib;C:\Program Files\Borland\Delphi7\Projects\OR_SRC_CREATION FILE 12 06 06 OR_3_270\OR_SRC_CREATION\CPRS-Chart;C:\Vista\cprs\OR_3_270V26_69\CPRS-Chart\DCU -Item11=$(DELPHI)\Lib\Debug;C:\Vista\cprs\OR_3_270V26_69\CPRS-Lib;C:\Program Files\Borland\Delphi7\Projects\OR_SRC_CREATION FILE 12 06 06 OR_3_270\OR_SRC_CREATION\CPRS-Lib -Item12=$(DELPHI)\Lib\Debug;C:\Vista\cprs\OR_3_270V26_69\CPRS-Lib -Item13=C:\Vista\cprs\OR_3_215V26_69\CPRS-Lib -[HistoryLists\hlUnitOutputDirectory] -Count=3 -Item0=P:\Vista\CPRS-1.0.26.69\CPRS-Chart\dcu -Item1=C:\Vista\cprs\OR_3_270V26_69\CPRS-Chart\DCU -Item2=C:\Vista\cprs\OR_3_215V26_69\CPRS-Chart\DCU -[HistoryLists\hlOutputDirectorry] -Count=3 -Item0=P:\Vista\CPRS-1.0.26.69 -Item1=C:\Vista\cprs\OR_3_270V26_69\CPRS-Chart -Item2=C:\Vista\cprs\OR_3_215V26_69\CPRS-Chart -[HistoryLists\hlBPLOutput] -Count=2 -Item0=C:\Vista\cprs\OR_3_270V26_69\Packages -Item1=C:\Vista\cprs\OR_3_215V26_69\Packages -[HistoryLists\hlDCPOutput] -Count=2 -Item0=C:\Vista\cprs\OR_3_270V26_69\Packages -Item1=C:\Vista\cprs\OR_3_215V26_69\Packages Index: /cprs/branches/tmg-cprs/CPRS-Chart/Encounter/mVisitRelated.pas =================================================================== --- /cprs/branches/tmg-cprs/CPRS-Chart/Encounter/mVisitRelated.pas (revision 464) +++ /cprs/branches/tmg-cprs/CPRS-Chart/Encounter/mVisitRelated.pas (revision 465) @@ -50,4 +50,5 @@ const + TAG_NONE_CHECKED = 0; TAG_SCYES = 1; TAG_AOYES = 2; @@ -121,14 +122,6 @@ begin inherited; - lblSCYes.Height := 13; lblSCNo.Height := 13; -// chkHNCYes.Visible := HNCOK; -// chkHNCNo.Visible := HNCOK; -// if not HNCOK then -// begin -// height := height - chkHNCYes.height + 1; -// bvlSCFrame.height := bvlSCFrame.height - chkHNCYes.height + 1; -// end; end; @@ -187,4 +180,13 @@ SetCheckState(chkHNCYes, chkHNCNo, PCEData.HNCRelated); SetCheckState(chkCVYes, chkCVNo, PCEData.CVRelated); + //PATCH: Added OR_3_215v26_70 11/07/2007 jb; //kt + // HDS00015356: GWOT Change that sets default answer to "YES" + //if not previously determined or new encounter. + if FSCCond.CVAllow then + begin + if PCEData.CVRelated = SCC_NA then + chkCVYes.Checked := True; + end; + //end patch //kt end; @@ -199,4 +201,13 @@ SetCheckState(chkHNCYes, chkHNCNo, AHNCRelated); SetCheckState(chkCVYes, chkCVNo, ACVRelated); + //PATCH: Added OR_3_215v26_70 11/07/2007 jb; //kt + // HDS00015356: GWOT Change that sets default answer to "YES" + //if not previously determined or new encounter. + if FSCCond.CVAllow then + begin + if ACVRelated = SCC_NA then + chkCVYes.Checked := True; + end; + //end patch //kt end; Index: /cprs/branches/tmg-cprs/CPRS-Chart/fFrame.dfm =================================================================== --- /cprs/branches/tmg-cprs/CPRS-Chart/fFrame.dfm (revision 464) +++ /cprs/branches/tmg-cprs/CPRS-Chart/fFrame.dfm (revision 465) @@ -1,5 +1,5 @@ object frmFrame: TfrmFrame - Left = 238 - Top = 200 + Left = 77 + Top = 20 Width = 684 Height = 487 Index: /cprs/branches/tmg-cprs/CPRS-Chart/uSignItems.pas =================================================================== --- /cprs/branches/tmg-cprs/CPRS-Chart/uSignItems.pas (revision 464) +++ /cprs/branches/tmg-cprs/CPRS-Chart/uSignItems.pas (revision 465) @@ -742,13 +742,13 @@ //end CQ3301/3302 - //PATCH: Added OR_3_215v26_70 11/07/2007 jb - // GWOT - CV Default to Yes. - if ( (si = siCombatVeteran) and (StsIdx = isUnKnown) ) then - begin - StsIdx := isChecked; - Flags[7] := 'C'; // HD200866 default as Combat Related - GWOT mandated Change - FItems.SetStrPiece(i, 4, Flags); // HD200866 default as Combat Related - GWOT mandated Change - end; - //End Patch + //PATCH: Added OR_3_215v26_70 11/07/2007 jb + // GWOT - CV Default to Yes. + if ( (si = siCombatVeteran) and (StsIdx = isUnKnown) ) then + begin + StsIdx := isChecked; + Flags[7] := 'C'; // HD200866 default as Combat Related - GWOT mandated Change + FItems.SetStrPiece(i, 4, Flags); // HD200866 default as Combat Related - GWOT mandated Change + end; + //End Patch case StsIdx of