iSharkFly-Open
/
VistA-Scheduling
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation plus a few tiny fixes to routines

This commit is contained in:
sam 2010-07-15 13:38:10 +00:00
parent 5875df9b4a
commit d479a77167
8 changed files with 120 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
m/BSDX02.m
View File

@ -1,5 +1,8 @@
BSDX02 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 5:17pm BSDX02 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/15/10 12:25pm
;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
;
; Change Log
; July 15 2010: UJO/SMH - Pass FM dates in instead of US dates for i18n
; ;
; ;
CRSCHD(BSDXY,BSDXRES,BSDXSTART,BSDXEND) ;EP CRSCHD(BSDXY,BSDXRES,BSDXSTART,BSDXEND) ;EP

11
m/BSDX04.m
View File

@ -1,5 +1,8 @@
BSDX04 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; ; 7/11/10 6:14pm BSDX04 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; ; 7/15/10 12:44pm
;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
; Change Log:
; July 11 2010: Pass BSDXSTART and END as FM dates rather than US formatted dates
; for i18n
; ;
; ;
CASSCHD(BSDXY,BSDXRES,BSDXSTART,BSDXEND,BSDXTYPES,BSDXSRCH) ;EP CASSCHD(BSDXY,BSDXRES,BSDXSTART,BSDXEND,BSDXTYPES,BSDXSRCH) ;EP
@ -40,8 +43,8 @@ CASSCH(BSDXY,BSDXRES,BSDXSTART,BSDXEND,BSDXTYPES,BSDXSRCH) ;EP
;If 2nd or 3rd pieces are null, the screen for that piece is skipped ;If 2nd or 3rd pieces are null, the screen for that piece is skipped
; ;
;Test lines: ;Test lines:
;D CASSCH^BSDX04(.RES,"REMILLARD,MIKE","1-8-2000@0001","1-12-2004@2300") ZW RES ;D CASSCH^BSDX04(.RES,"REMILLARD,MIKE","<fmdate>","<fmdate>") ZW RES
;BSDX CREATE ASGND SLOT SCHED^ROGERS,BUCK^8-15-2003@0001^8-22-2003@2300^2 ;BSDX CREATE ASGND SLOT SCHED^ROGERS,BUCK^<fmdate>^<fmdate>^2
;S ^HW("BSDX04")=BSDXRES_U_BSDXSTART_U_BSDXEND ;S ^HW("BSDX04")=BSDXRES_U_BSDXSTART_U_BSDXEND
; ;
N BSDXERR,BSDXIEN,BSDXDEP,BSDXTYPED,BSDXTYPE,BSDXALO,BSDXBS,BSDXI,BSDXNEND,BSDXNSTART,BSDXPEND,BSDXRESD,BSDXRESN,BSDXS,BSDXZ,BSDXTMP,BSDXQ,BSDXNOT,BSDXNOD,BSDXAD N BSDXERR,BSDXIEN,BSDXDEP,BSDXTYPED,BSDXTYPE,BSDXALO,BSDXBS,BSDXI,BSDXNEND,BSDXNSTART,BSDXPEND,BSDXRESD,BSDXRESN,BSDXS,BSDXZ,BSDXTMP,BSDXQ,BSDXNOT,BSDXNOD,BSDXAD

5
m/BSDX05.m
View File

@ -1,9 +1,12 @@
BSDX05 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 6:28pm BSDX05 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/15/10 12:51pm
;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
; ;
; Change Log:
; UJO/SMH - July 11 2010: pass FM Dates for Start and End rather than US Dates
; ;
APBLKOV(BSDXY,BSDXSTART,BSDXEND,BSDXRES) ;EP APBLKOV(BSDXY,BSDXSTART,BSDXEND,BSDXRES) ;EP
;Called by BSDX APPT BLOCKS OVERLAP ;Called by BSDX APPT BLOCKS OVERLAP
; July 11 2010 - pass FM Dates for Start and End rather than US Dates
;(Duplicates old qryAppointmentBlocksOverlapB) ;(Duplicates old qryAppointmentBlocksOverlapB)
;BSDXRES is resource name ;BSDXRES is resource name
; ;

14
m/BSDX06.m
View File

@ -1,5 +1,8 @@
BSDX06 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 5:54pm BSDX06 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/15/10 4:51pm
;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
; Change Log:
; UJO/SMH: July 15 2010: Change in BSDXSTART and BSDXEND: get
; dates in FM format for i18n
; ;
; ;
TPBLKOV(BSDXY,BSDXSTART,BSDXEND,BSDXRES) ;EP TPBLKOV(BSDXY,BSDXSTART,BSDXEND,BSDXRES) ;EP
@ -8,8 +11,8 @@ TPBLKOV(BSDXY,BSDXSTART,BSDXEND,BSDXRES) ;EP
;BSDXRES is resource name ;BSDXRES is resource name
; ;
;Test lines: ;Test lines:
;D TPBLKOV^BSDX06(.RES,"5-12-2003","5-16-2003","REMILLARD,MIKE") ZW RES ;D TPBLKOV^BSDX06(.RES,"3030513","3030516","REMILLARD,MIKE") ZW RES
;BSDX TYPE BLOCKS OVERLAP^1-1-2000^12-14-2004^REMILLARD,MIKE ;BSDX TYPE BLOCKS OVERLAP^303513^3030516^REMILLARD,MIKE
;S ^HW("BSDXD06")=BSDXSTART_U_BSDXEND_U_BSDXRES ;S ^HW("BSDXD06")=BSDXSTART_U_BSDXEND_U_BSDXRES
; ;
N BSDXERR,BSDXIEN,BSDXDEP,BSDXBS,BSDXI,BSDXNEND,BSDXNSTART,BSDXPEND,BSDXRESD,BSDXRESN,BSDXS,BSDXTPID,BSDXNOD,BSDXAD N BSDXERR,BSDXIEN,BSDXDEP,BSDXBS,BSDXI,BSDXNEND,BSDXNSTART,BSDXPEND,BSDXRESD,BSDXRESN,BSDXS,BSDXTPID,BSDXNOD,BSDXAD
@ -20,8 +23,7 @@ TPBLKOV(BSDXY,BSDXSTART,BSDXEND,BSDXRES) ;EP
S BSDXI=0 S BSDXI=0
D D
. S BSDXBS=0 . S BSDXBS=0
. ; I $L(BSDXEND,".")=1 S BSDXEND=BSDXEND+.9999 ;Go to end of day . I $L(BSDXEND,".")=1 S BSDXEND=BSDXEND+.9999 ;Go to end of day if only date (not time) is passed
. S BSDXEND=BSDXEND+.9999 ;//smh - not sure about this change
. S BSDXRESN=BSDXRES . S BSDXRESN=BSDXRES
. Q:BSDXRESN="" . Q:BSDXRESN=""
. Q:'$D(^BSDXRES("B",BSDXRESN)) . Q:'$D(^BSDXRES("B",BSDXRESN))

7
m/BSDX27.m
View File

@ -1,5 +1,8 @@
BSDX27 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/5/10 9:57pm BSDX27 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/15/10 12:22pm
;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
;
; Change Log: July 15, 2010
; UJO/SMH - i18n: FM Dates passed into routine for Clinic Letters - CLDISP tag
; ;
; ;
Q Q

13
m/BSDX33.m
View File

@ -1,10 +1,12 @@
BSDX33 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/6/10 8:43am BSDX33 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/15/10 12:33pm
;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
; Mods by WV/STAR ; Mods by WV/STAR
; ;
; Change Log:
; July 13, 2010 ; July 13, 2010
; v 1.3 adds fixes Rebooking behavior in application ; v 1.3 adds fixes Rebooking behavior in application (see RBNEXT)
; also adds i18 support - Dates passed in FM format from application ; also adds i18 support - Dates passed in FM format from application
; in tag SETRBK and RBNEXT
; ;
; ;
Q Q
@ -32,6 +34,7 @@ RBNEXT(BSDXY,BSDXDATE,BSDXRES,BSDXTPID) ;EP
S BSDXRESD=$O(^BSDXRES("B",BSDXRES,0)) S BSDXRESD=$O(^BSDXRES("B",BSDXRES,0))
I '+BSDXRESD D ERR2("BSDX REBOOK NEXT BLOCK: Invalid resource name") Q I '+BSDXRESD D ERR2("BSDX REBOOK NEXT BLOCK: Invalid resource name") Q
; ;
; i18n fix
; S X=BSDXDATE,%DT="XT" D ^%DT ; S X=BSDXDATE,%DT="XT" D ^%DT
; I Y=-1 D ERR2(1,"BSDX REBOOK NEXT BLOCK: Invalid datetime") Q ; I Y=-1 D ERR2(1,"BSDX REBOOK NEXT BLOCK: Invalid datetime") Q
; ;
@ -49,7 +52,7 @@ RBNEXT(BSDXY,BSDXDATE,BSDXRES,BSDXTPID) ;EP
I BSDXFND=0 S BSDXFND="" I BSDXFND=0 S BSDXFND=""
E S Y=BSDXFND X ^DD("DD") S BSDXFND=Y E S Y=BSDXFND X ^DD("DD") S BSDXFND=Y
S BSDXI=BSDXI+1 S BSDXI=BSDXI+1
;//smh - bug: Need to replace @ in FM date for C# to recognize it ;//smh - bug (V 1.3): Need to replace @ in FM date for C# to recognize it
S BSDXFND=$TR(BSDXFND,"@"," ") S BSDXFND=$TR(BSDXFND,"@"," ")
;//smh end fix ;//smh end fix
S ^BSDXTMP($J,BSDXI)="1^"_BSDXFND_"^"_$C(30)_$C(31) S ^BSDXTMP($J,BSDXI)="1^"_BSDXFND_"^"_$C(30)_$C(31)
@ -64,7 +67,7 @@ SETRBK(BSDXY,BSDXAPPT,BSDXDATE) ;EP
; ;
;Sets rebook date into appointment ;Sets rebook date into appointment
;BSDXAPPT - Appointment ID ;BSDXAPPT - Appointment ID
;BSDXDATE - Rebook Datetime in external format ;BSDXDATE - Rebook Datetime in internal format
;Called by BSDX REBOOK SET ;Called by BSDX REBOOK SET
; ;
;ErrorID: ;ErrorID:
@ -84,7 +87,7 @@ SETRBK(BSDXY,BSDXAPPT,BSDXDATE) ;EP
;I Y=-1 D ERR(1,"BSDX REBOOK SET: Invalid rebook datetime") Q ;I Y=-1 D ERR(1,"BSDX REBOOK SET: Invalid rebook datetime") Q
;S BSDXDATE=Y ;S BSDXDATE=Y
S BSDXIENS=BSDXAPPT_"," S BSDXIENS=BSDXAPPT_","
S BSDXFDA(9002018.4,BSDXIENS,.11)=BSDXDATE S BSDXFDA(9002018.4,BSDXIENS,.11)=+BSDXDATE
; ;
K BSDXMSG K BSDXMSG
D FILE^DIE("","BSDXFDA","BSDXMSG") D FILE^DIE("","BSDXFDA","BSDXMSG")

13
m/BSDX34.m
View File

@ -1,6 +1,9 @@
BSDX34 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 11:28am BSDX34 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/15/10 12:37pm
;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
; ;
; Change Log:
; July 10 2010:
; CANCLIN AND RBCLIN: Dates passed in FM format for i18n
; ;
Q Q
; ;
@ -24,7 +27,7 @@ CANCLIN(BSDXY,BSDXCLST,BSDXBEG,BSDXEND) ;EP
;between dates BSDXBEG and BSDXEND for each clinic in BSDXCLST. ;between dates BSDXBEG and BSDXEND for each clinic in BSDXCLST.
;Used in generating cancellation letters for a clinic ;Used in generating cancellation letters for a clinic
;BSDXCLST is a |-delimited list of BSDX RESOURCE iens. (The last |-piece is null, so discard it.) ;BSDXCLST is a |-delimited list of BSDX RESOURCE iens. (The last |-piece is null, so discard it.)
;BSDXBEG and BSDXEND are in external date form. ;v 1.3 BSDXBEG and BSDXEND are in fm format
;Called by BSDX CANCEL CLINIC LIST ;Called by BSDX CANCEL CLINIC LIST
N BSDXCAN N BSDXCAN
S BSDXCAN=1 S BSDXCAN=1
@ -48,6 +51,8 @@ RBCLIN(BSDXY,BSDXCLST,BSDXBEG,BSDXEND) ;EP
N %DT,Y,BSDXJ,BSDXCID,BSDXCLN,BSDXSTRT,BSDXAID,BSDXNOD,BSDXLIST,BSDX,BSDY N %DT,Y,BSDXJ,BSDXCID,BSDXCLN,BSDXSTRT,BSDXAID,BSDXNOD,BSDXLIST,BSDX,BSDY
;Convert beginning and ending dates ;Convert beginning and ending dates
;TODO: Validation of date to make sure it's a right FM Date ;TODO: Validation of date to make sure it's a right FM Date
S BSDXBEG=$P(BSDXBEG,".")
S BSDXEND=$P(BSDXEND,".")
S BSDXBEG=BSDXBEG-1,BSDXBEG=BSDXBEG_".9999" S BSDXBEG=BSDXBEG-1,BSDXBEG=BSDXBEG_".9999"
S BSDXEND=BSDXEND_".9999" S BSDXEND=BSDXEND_".9999"
; ;

74
m/i18n_log.log Normal file
View File

@ -0,0 +1,74 @@
------------------------------------------------------------------------
r849 | sam | 2010-07-10 18:32:30 +0300 (Sat, 10 Jul 2010) | 1 line
Changed paths:
# M /Scheduling/trunk/m/BSDX27.m
Updated BSDX27 - Receives FM dates rather than regular dates to support i18n
------------------------------------------------------------------------
r851 | sam | 2010-07-11 17:11:26 +0300 (Sun, 11 Jul 2010) | 1 line
Changed paths:
# M /Scheduling/trunk/m/BSDX02.m
# M /Scheduling/trunk/m/BSDX33.m
# M /Scheduling/trunk/m/BSDX34.m
Fixes to support i18n (Receive FM dates from C# instead of culture specific date).Also, fix for Rebooking. Now it works.
------------------------------------------------------------------------
r854 | sam | 2010-07-12 17:25:21 +0300 (Mon, 12 Jul 2010) | 1 line
Changed paths:
# M /Scheduling/trunk/m/BSDX04.m
# M /Scheduling/trunk/m/BSDX05.m
# M /Scheduling/trunk/m/BSDX06.m
More changes
------------------------------------------------------------------------
r858 | sam | 2010-07-13 09:58:25 +0300 (Tue, 13 Jul 2010) | 1 line
Changed paths:
M /Scheduling/trunk/m/BSDX29.m
changes to BSDX29 for i18n
------------------------------------------------------------------------
r861 | sam | 2010-07-13 12:05:30 +0300 (Tue, 13 Jul 2010) | 1 line
Changed paths:
M /Scheduling/trunk/m/BSDX01.m
Test update
------------------------------------------------------------------------
r862 | sam | 2010-07-13 12:07:13 +0300 (Tue, 13 Jul 2010) | 1 line
Changed paths:
M /Scheduling/trunk/m/BSDX01.m
Test update
------------------------------------------------------------------------
r863 | sam | 2010-07-13 16:04:57 +0300 (Tue, 13 Jul 2010) | 1 line
Changed paths:
M /Scheduling/trunk/m/BSDX07.m
M /Scheduling/trunk/m/BSDX12.m
M /Scheduling/trunk/m/BSDX13.m
M /Scheduling/trunk/m/BSDX33.m
more i18n work
------------------------------------------------------------------------
r865 | sam | 2010-07-14 11:20:30 +0300 (Wed, 14 Jul 2010) | 1 line
Changed paths:
M /Scheduling/trunk/m/BSDX09.m
Routine to pull extra registration data
------------------------------------------------------------------------
r867 | sam | 2010-07-14 15:08:39 +0300 (Wed, 14 Jul 2010) | 6 lines
Changed paths:
M /Scheduling/trunk/m/BSDX07.m
M /Scheduling/trunk/m/BSDX28.m
Two updates: Search by Primary ID now enabled;
bug in make appointment code that causes storage of non-canonical
appointment times (3091103.0900 e.g. rather than 3091103.09). causes a
problem when retrieving appointments.
------------------------------------------------------------------------
r871 | sam | 2010-07-14 15:55:40 +0300 (Wed, 14 Jul 2010) | 1 line
Changed paths:
M /Scheduling/trunk/m/BSDX09.m
PID added insted of SNN
------------------------------------------------------------------------