Ignore:
Timestamp:
Jul 6, 2012, 3:37:41 PM (12 years ago)
Author:
Sam Habiel
Message:

Finally, v 1.7 to the main repo. I will delete the branch after this.

This commit merges all the BMX4 changes in the Scheduling GUI back to the main trunk.

Location:
Scheduling/trunk/cs/bsdx0200GUISourceCode
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Scheduling/trunk/cs/bsdx0200GUISourceCode

  • Scheduling/trunk/cs/bsdx0200GUISourceCode/DAL.cs

    r1186 r1474  
    1616    public class DAL
    1717    {
    18         private BMXNetConnectInfo _thisConnection; // set in constructor
     18        private RemoteSession _thisConnection; // set in constructor
    1919       
    2020        delegate DataTable RPMSDataTableDelegate(string CommandString, string TableName); // for use in calling (Sync and Async)
     
    2525        /// </summary>
    2626        /// <param name="conn">The current connection to use</param>
    27         public DAL(BMXNetConnectInfo conn)
     27        public DAL(RemoteSession conn)
    2828        {
    2929            this._thisConnection = conn;
     
    3939        {
    4040            string cmd = String.Format("BMX VERSION INFO^{0}", nmsp);
    41             return RPMSDataTable(cmd, "");
     41            return _thisConnection.TableFromCommand(cmd);
    4242        }
    4343
     
    5050        {
    5151            string cmd = String.Format("BSDX SCHEDULING USER INFO^{0}", DUZ);
    52             return RPMSDataTable(cmd, "");
     52            return _thisConnection.TableFromCommand(cmd);
    5353        }
    5454
     
    6565        /// BLUE (NJ3,0), [0;7]
    6666        ///</returns>
    67         public DataTable GetAccessTypes()
     67        public DataTable GetAccessTypes(DataSet dataSetToTakeTable, string tablename)
    6868        {
    6969            string sCommandText = "SELECT * FROM BSDX_ACCESS_TYPE";
    70             DataTable table = RPMSDataTable(sCommandText, "");
     70            DataTable table = _thisConnection.TableFromSQL(sCommandText, dataSetToTakeTable, tablename);
    7171            DataColumn dcKey = table.Columns["BMXIEN"];
    7272            DataColumn[] dcKeys = new DataColumn[1];
     
    9393            string sEnd = FMDateTime.Create(EndDate).DateOnly.FMDateString;
    9494            string cmd = String.Format("BSDX CLINIC LETTERS^{0}^{1}^{2}", sClinicList, sBegin, sEnd);
    95             return RPMSDataTable(cmd, "");
     95            return _thisConnection.TableFromCommand(cmd);
    9696        }
    9797
     
    107107        {
    108108            string cmd = String.Format("BSDX RESOURCE LETTERS^{0}", sClinicList);
    109             return RPMSDataTable(cmd, "");
     109            return _thisConnection.TableFromCommand(cmd);
    110110        }
    111111
     
    126126            string sEnd = FMDateTime.Create(EndDate).DateOnly.FMDateString;
    127127            string cmd = String.Format("BSDX REBOOK CLINIC LIST^{0}^{1}^{2}", sClinicList, sBegin, sEnd);
    128             return RPMSDataTable(cmd, "");
     128            return _thisConnection.TableFromCommand(cmd);
    129129        }
    130130
     
    139139        {
    140140            string cmd = String.Format("BSDX REBOOK LIST^{0}", sApptList);
    141             return RPMSDataTable(cmd, "");
     141            return _thisConnection.TableFromCommand(cmd);
    142142        }
    143143
     
    157157            string sEnd = FMDateTime.Create(EndDate).DateOnly.FMDateString;
    158158            string cmd = String.Format("BSDX CANCEL CLINIC LIST^{0}^{1}^{2}", sClinicList, sBegin, sEnd);
    159             return RPMSDataTable(cmd, "");
     159            return _thisConnection.TableFromCommand(cmd);
    160160        }
    161161
     
    173173            string sEnd = FMDateTime.Create(EndDate).DateOnly.FMDateString;
    174174            string cmd = String.Format("BSDX CANCEL AV BY DATE^{0}^{1}^{2}", sResourceID, sBegin, sEnd);
    175             return RPMSDataTable(cmd, "Cancelled");
     175            return _thisConnection.TableFromCommand(cmd);
    176176        }
    177177
     
    185185        {
    186186            string cmd = string.Format("BSDX REMOVE CHECK-IN^{0}", ApptID);
    187             return RPMSDataTable(cmd, "");
     187            return _thisConnection.TableFromCommand(cmd);
    188188        }
    189189
     
    197197        {
    198198            string cmd = string.Format("BSDX GET RAD EXAM FOR PT^{0}^{1}", DFN, SCIEN);
    199             DataTable tbl = RPMSDataTable(cmd, "");
     199            DataTable tbl = _thisConnection.TableFromCommand(cmd);
    200200            return (from row in tbl.AsEnumerable()
    201201                    select new RadiologyExam
     
    218218        {
    219219            string fmStartDate = FMDateTime.Create(dStart).FMDateString;
    220             string result = _thisConnection.bmxNetLib.TransmitRPC("BSDX SCHEDULE RAD EXAM", string.Format("{0}^{1}^{2}", DFN, examIEN, fmStartDate));
     220            string result = _thisConnection.TransmitRPC("BSDX SCHEDULE RAD EXAM", string.Format("{0}^{1}^{2}", DFN, examIEN, fmStartDate));
    221221            return result == "1" ? true : false;
    222222        }
     
    230230        public bool CancelRadiologyExam(int DFN, int examIEN)
    231231        {
    232             string result = _thisConnection.bmxNetLib.TransmitRPC("BSDX HOLD RAD EXAM", string.Format("{0}^{1}", DFN, examIEN));
     232            string result = _thisConnection.TransmitRPC("BSDX HOLD RAD EXAM", string.Format("{0}^{1}", DFN, examIEN));
    233233            return result == "1" ? true : false;
    234234        }
     
    241241        public bool CanCancelRadExam(int examIEN)
    242242        {
    243             string result = _thisConnection.bmxNetLib.TransmitRPC("BSDX CAN HOLD RAD EXAM", examIEN.ToString());
     243            string result = _thisConnection.TransmitRPC("BSDX CAN HOLD RAD EXAM", examIEN.ToString());
    244244            return result == "1" ? true : false;
    245245        }
     
    256256            get
    257257            {
    258                 string val = _thisConnection.bmxNetLib.TransmitRPC("BSDX GET PARAM", "BSDX AUTO PRINT RS");  //1 = true; 0 = false; "" = not set
     258                string val = _thisConnection.TransmitRPC("BSDX GET PARAM", "BSDX AUTO PRINT RS");  //1 = true; 0 = false; "" = not set
    259259                return val == "1" ? true : false;
    260260            }
    261261            set
    262262            {
    263                 TransmitRPCAsync _asyncTransmitter = new TransmitRPCAsync(_thisConnection.bmxNetLib.TransmitRPC);
     263                TransmitRPCAsync _asyncTransmitter = new TransmitRPCAsync(_thisConnection.TransmitRPC);
    264264                // 0 = success; anything else is wrong. Not being tested here as its success is not critical to application use.
    265265                _asyncTransmitter.BeginInvoke("BSDX SET PARAM", String.Format("{0}^{1}", "BSDX AUTO PRINT RS", value ? "1" : "0"), null, null);
     
    278278            get
    279279            {
    280                 string val = _thisConnection.bmxNetLib.TransmitRPC("BSDX GET PARAM", "BSDX AUTO PRINT AS");  //1 = true; 0 = false; "" = not set
     280                string val = _thisConnection.TransmitRPC("BSDX GET PARAM", "BSDX AUTO PRINT AS");  //1 = true; 0 = false; "" = not set
    281281                return val == "1" ? true : false;
    282282            }
    283283            set
    284284            {
    285                 TransmitRPCAsync _asyncTransmitter = new TransmitRPCAsync(_thisConnection.bmxNetLib.TransmitRPC);
     285                TransmitRPCAsync _asyncTransmitter = new TransmitRPCAsync(_thisConnection.TransmitRPC);
    286286                // 0 = success; anything else is wrong. Not being tested here as its success is not critical to application use.
    287287                _asyncTransmitter.BeginInvoke("BSDX SET PARAM", String.Format("{0}^{1}", "BSDX AUTO PRINT AS", value ? "1" : "0"), null, null);
     
    303303            DataTable dtOut;
    304304
    305 #if TRACE
    306             DateTime sendTime = DateTime.Now;
    307 #endif
    308305            try
    309306            {
    310                 RPMSDataTableDelegate rdtd = new RPMSDataTableDelegate(_thisConnection.RPMSDataTable);
     307                RPMSDataTableDelegate rdtd = new RPMSDataTableDelegate(_thisConnection.TableFromSQL);
    311308                dtOut = (DataTable)rdtd.Invoke(sSQL, sTableName);
    312309            }
     
    317314                throw ex;
    318315            }
    319 
    320 #if TRACE
    321             DateTime receiveTime = DateTime.Now;
    322             TimeSpan executionTime = receiveTime - sendTime;
    323             Debug.Write("RPMSDataTable Execution Time: " + executionTime.Milliseconds + " ms.\n");
    324 #endif
    325316
    326317            return dtOut;
Note: See TracChangeset for help on using the changeset viewer.