From ef8d4e60062ba33830d3e0177468d05352c205ed Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 12 Jul 2010 14:25:21 +0000 Subject: [PATCH] More changes --- m/BSDX04.m | 15 +++++++-------- m/BSDX05.m | 10 ++-------- m/BSDX06.m | 11 +++-------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/m/BSDX04.m b/m/BSDX04.m index a8fa967..1f145f1 100644 --- a/m/BSDX04.m +++ b/m/BSDX04.m @@ -1,4 +1,4 @@ -BSDX04 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; +BSDX04 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; ; 7/11/10 6:14pm ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ; ; @@ -23,6 +23,12 @@ CASSCH(BSDXY,BSDXRES,BSDXSTART,BSDXEND,BSDXTYPES,BSDXSRCH) ;EP ;and to search for availability in the Find Appointment function ; ;BSDXRES is resource name + ; + ;//smh + ; BSDXSTART and BSDXEND both passed in FM Format. + ; BSDXSTART is the Date Portion of FM Date + ; BSDXEND -- pass date and h,m,s as well + ;//smh ; ;BSDXTYPES is |-delimited list of Access Type Names ;If BSDXTYPES is "" then the screen passes all types. @@ -58,13 +64,6 @@ CASSCH(BSDXY,BSDXRES,BSDXSTART,BSDXEND,BSDXTYPES,BSDXSRCH) ;EP ; D . S BSDXBS=0 - . S:BSDXSTART["@0000" BSDXSTART=$P(BSDXSTART,"@") - . S:BSDXEND["@0000" BSDXEND=$P(BSDXEND,"@") - . ;S:BSDXEND["@0:00" BSDXEND=$P(BSDXEND,"@") - . S %DT="T",X=BSDXSTART D ^%DT S BSDXSTART=Y - . I BSDXSTART=-1 S ^BSDXTMP($J,1)=$C(31) Q - . S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y - . I BSDXEND=-1 S ^BSDXTMP($J,1)=$C(31) Q . S BSDXRESN=BSDXRES . Q:BSDXRESN="" . Q:'$D(^BSDXRES("B",BSDXRESN)) diff --git a/m/BSDX05.m b/m/BSDX05.m index a25f6ba..d271227 100644 --- a/m/BSDX05.m +++ b/m/BSDX05.m @@ -1,4 +1,4 @@ -BSDX05 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; +BSDX05 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 6:28pm ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ; ; @@ -19,13 +19,7 @@ APBLKOV(BSDXY,BSDXSTART,BSDXEND,BSDXRES) ;EP S ^BSDXTMP($J,0)="D00030START_TIME^D00030END_TIME"_$C(30) D . S BSDXBS=0 - . S:BSDXSTART["@0000" BSDXSTART=$P(BSDXSTART,"@") - . S:BSDXEND["@0000" BSDXEND=$P(BSDXEND,"@") - . S %DT="T",X=BSDXSTART D ^%DT S BSDXSTART=Y - . I BSDXSTART=-1 S ^BSDXTMP($J,1)=$C(31) Q - . S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y - . I BSDXEND=-1 S ^BSDXTMP($J,1)=$C(31) Q - . I $L(BSDXEND,".")=1 S BSDXEND=BSDXEND+.9999 ;Go to end of day + . S BSDXEND=BSDXEND+.9999 ;Go to end of day . S BSDXRESN=BSDXRES . Q:BSDXRESN="" . Q:'$D(^BSDXRES("B",BSDXRESN)) diff --git a/m/BSDX06.m b/m/BSDX06.m index f51fe06..9299387 100644 --- a/m/BSDX06.m +++ b/m/BSDX06.m @@ -1,4 +1,4 @@ -BSDX06 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; +BSDX06 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 5:54pm ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ; ; @@ -20,13 +20,8 @@ TPBLKOV(BSDXY,BSDXSTART,BSDXEND,BSDXRES) ;EP S BSDXI=0 D . S BSDXBS=0 - . S:BSDXSTART["@0000" BSDXSTART=$P(BSDXSTART,"@") - . S:BSDXEND["@0000" BSDXEND=$P(BSDXEND,"@") - . S %DT="T",X=BSDXSTART D ^%DT S BSDXSTART=Y - . I BSDXSTART=-1 S ^BSDXTMP($J,1)=$C(31) Q - . S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y - . I BSDXEND=-1 S ^BSDXTMP($J,1)=$C(31) Q - . 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 + . S BSDXEND=BSDXEND+.9999 ;//smh - not sure about this change . S BSDXRESN=BSDXRES . Q:BSDXRESN="" . Q:'$D(^BSDXRES("B",BSDXRESN))