Merge remote-tracking branch 'origin/master'

# Conflicts:
#	FWA_MAIN/bin/FWA_MAIN.dll
#	FWA_MAIN/bin/FWA_MAIN.pdb
#	FWA_MAIN/obj/Debug/FWA_MAIN.dll
#	FWA_MAIN/obj/Debug/FWA_MAIN.pdb

.idea/config/applicationhost.config

@@ -155,7 +155,7 @@
       <virtualDirectoryDefaults allowSubDirConfig="true" />
       <site name="FWA_MAIN" id="1">
         <application path="/" applicationPool="Clr4IntegratedAppPool">
-          <virtualDirectory path="/" physicalPath="C:\Users\cmoore\RiderProjects\FWA_MAIN\FWA_MAIN" />
+          <virtualDirectory path="/" physicalPath="C:\Users\eggman\Nextcloud\TSCT\2nd Year\SEM 4\RiderProjects\FWA_MAIN\FWA_MAIN" />
         </application>
         <bindings>
           <binding protocol="http" bindingInformation="*:5000:localhost" />

FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-548208a3bcb0eba33fd1a778a97babd693b86e02fd9b8f09bf8b4cf3b1fd0e4a
+70b4448723339e99ed60f3c81dc6a5d1da61b1ddf61a97f8541739006170aed6

FWA_MAIN/patEdit.aspx.cs

@@ -30,20 +30,20 @@ namespace FWA_MAIN
             var ds = new DataSet();
             ds = PharmacyDataTier.PatientInfoSearch(patID);
             
-            txtPatID.Text = ds.Tables[0].Rows[0]["Patient_id"].ToString();
+            txtPatID.Text = ds.Tables[0].Rows[0]["Patient_id"].ToString().Trim();
-            txtFNAME.Text = ds.Tables[0].Rows[0]["FirstName"].ToString();
+            txtFNAME.Text = ds.Tables[0].Rows[0]["FirstName"].ToString().Trim();
-            txtLNAME.Text = ds.Tables[0].Rows[0]["LastName"].ToString();
+            txtLNAME.Text = ds.Tables[0].Rows[0]["LastName"].ToString().Trim();
-            txtMidInit.Text = ds.Tables[0].Rows[0]["MiddleIntials"].ToString();
+            txtMidInit.Text = ds.Tables[0].Rows[0]["MiddleIntials"].ToString().Trim();
-            txtWeight.Text = ds.Tables[0].Rows[0]["lbs"].ToString();
+            txtWeight.Text = ds.Tables[0].Rows[0]["lbs"].ToString().Trim();
-            txtHeightFt.Text = ds.Tables[0].Rows[0]["Height_feet"].ToString();
+            txtHeightFt.Text = ds.Tables[0].Rows[0]["Height_feet"].ToString().Trim();
-            txtHeightIn.Text = ds.Tables[0].Rows[0]["Height_inches"].ToString();
+            txtHeightIn.Text = ds.Tables[0].Rows[0]["Height_inches"].ToString().Trim();
-            DateTime date =  DateTime.Parse(ds.Tables[0].Rows[0]["DOB"].ToString());
+            DateTime date =  DateTime.Parse(ds.Tables[0].Rows[0]["DOB"].ToString().Trim());
             txtDOB.Text = date.ToString("d");
-            txtGender.Text = ds.Tables[0].Rows[0]["Gender"].ToString();
+            txtGender.Text = ds.Tables[0].Rows[0]["Gender"].ToString().Trim();
-            txtCity.Text = ds.Tables[0].Rows[0]["City"].ToString();
+            txtCity.Text = ds.Tables[0].Rows[0]["City"].ToString().Trim();
-            txtZip.Text = ds.Tables[0].Rows[0]["Zip"].ToString();
+            txtZip.Text = ds.Tables[0].Rows[0]["Zip"].ToString().Trim();
-            txtState.Text = ds.Tables[0].Rows[0]["UsState"].ToString();
+            txtState.Text = ds.Tables[0].Rows[0]["UsState"].ToString().Trim();
-            txtPhoneNum.Text = ds.Tables[0].Rows[0]["PhoneNumber"].ToString();
+            txtPhoneNum.Text = ds.Tables[0].Rows[0]["PhoneNumber"].ToString().Trim();
             
         }