diff --git a/350-UTILITIES/SQL_To_Json/SQLToJSON/SQLToJSON/App.config b/350-UTILITIES/SQL_To_Json/SQLToJSON/SQLToJSON/App.config
index 8454aa8..fdb1ae0 100644
--- a/350-UTILITIES/SQL_To_Json/SQLToJSON/SQLToJSON/App.config
+++ b/350-UTILITIES/SQL_To_Json/SQLToJSON/SQLToJSON/App.config
@@ -12,16 +12,16 @@
-
+
-
-
+
+
-
+
diff --git a/350-UTILITIES/SQL_To_Json/SQLToJSON/SQLToJSON/Custom.cs b/350-UTILITIES/SQL_To_Json/SQLToJSON/SQLToJSON/Custom.cs
index 90e20f2..e9d5d97 100644
--- a/350-UTILITIES/SQL_To_Json/SQLToJSON/SQLToJSON/Custom.cs
+++ b/350-UTILITIES/SQL_To_Json/SQLToJSON/SQLToJSON/Custom.cs
@@ -36,51 +36,13 @@ namespace SQLToJSON
{
string JSONString = string.Empty;
JSONString = JsonConvert.SerializeObject(table);
- string XYX = JSONString.Replace(@"\r", "");
- string YYY = XYX.Replace(@"\n", "");
- string uuu = YYY.Replace(@"\", "");
-
- //System.Web.Script.Serialization.JavaScriptSerializer js = new System.Web.Script.Serialization.JavaScriptSerializer();
-
- //string vvv = js.Serialize(table);
- //JSONString= JToken.Parse(JSONString).ToString();
- //var obj = new JObject();
- //obj["data"] = JToken.FromObject(table);
-
- // string jsonString = obj.ToString();
- // dynamic DATA = new JObject();
- // var jsonObj = new JObject();
- // dynamic mo = jsonObj;
- // mo.data1 = new JObject() as dynamic;
- // foreach (var d in table)
- // {
- // dynamic data = new JObject();
- // data.loginId = d.loginId;
-
- // data.password = d.password;
- // data.firstName = d.firstName;
- // data.lastName = d.lastName;
- // data.userType = d.userType;
- // data.emailId = d.emailId;
- // data.isActive = d.isActive;
- // data.securityQuestion = d.securityQuestion;
- // data.securityAnswer = d.securityAnswer;
- // data.creatorId = d.creatorId;
- // data.creationDate = d.creationDate;
- // data.modifierId = d.modifierId;
- // data.modifiedDate = d.modifiedDate;
- // data.deactivationDate = d.deactivationDate;
- // data.module = d.module;
- // // data.ToString();
- // DATA.Add(data.ToString());
- // }
- //// }
- //// string abc = Convert.ToString(JsonConvert.DeserializeObject(JSONString));
- // //JSONString.Replace(@"\","");
- // //var json = JsonConvert.SerializeObject(new { root = table }, Formatting.Indented);
- // //json.Replace(@"\\\", "");
- //string x = DATA.ToString();
- return uuu;
+ string replacedString = JSONString.Replace(@"\r", "");
+ string replacedString1 = replacedString.Replace(@"\n", "");
+ string replacedString2 = replacedString1.Replace(@"\", "");
+
+ string finalString = Regex.Replace(replacedString2, "\\s+\"", "");
+
+ return finalString;
}
public dynamic GetModifiedTableWithUserModules(DataTable userTable, DataTable moduleTable)
@@ -138,29 +100,45 @@ namespace SQLToJSON
{
dynamic modul = new JObject();
string MO = mods.ToString().Replace(@"\", "");
- modul.name = mods;
+ if (MO == "CAM")
+ {
+ modul.name = "Complementary and Alternative Medicine";
+ }
+ else if (MO == "Anatomy Test")
+ {
+ modul.name = "Anatomy Tests";
+
+ }
+ else
+ {
+ modul.name = mods;
+ }
modul.slug = ConfigurationManager.AppSettings[(mods.ToString()).Replace(@"\", "")];
mo.modules.Add(modul);
}
-
- var lst = data2.Where(w => w.loginId == userloginId).Select(r => { r.module =(mo).ToString(); return r; }).ToList();
+
+ previousUserId = userloginId;
+
+
+
+ var lst = data2.Where(w => w.loginId == userloginId).Select(r => { r.module = (mo).ToString(); return r; }).ToList();
string moddd = ((from mod in lst
select mod.module).FirstOrDefault().ToString()).Replace(@"\", "");
string abc = Regex.Unescape(moddd);
var lst2 = data2.Where(w => w.loginId == userloginId).Select(r => { r.module = ((moddd)).ToString(); return r; }).ToList();
var reultantRow = lst2.FirstOrDefault();
- //lst.GroupBy(x => x.loginId).Select(g => g.First());
- RESULT.Add(reultantRow);
- // data2 = data2.Where(w => w.loginId == userloginId).Select(r => { r.module = mo.ToString(); return r; }).ToList();
+ //to create array of userType
+ List userTypes = new List();
+ var userType1 = (reultantRow.userType);
+ userTypes.Add(userType1);
+ //userTypes.Add("Admin");
+ reultantRow.userType = JsonConvert.SerializeObject(userTypes);
+ RESULT.Add(reultantRow);
}
}
-
- //var result = data2.GroupBy(x => x.loginId).Select(g => g.First());
- string bb = "";
-
return RESULT;
}
catch (Exception e)
diff --git a/350-UTILITIES/SQL_To_Json/SQLToJSON/SQLToJSON/Form1.cs b/350-UTILITIES/SQL_To_Json/SQLToJSON/SQLToJSON/Form1.cs
index ccb81f3..cae26f6 100644
--- a/350-UTILITIES/SQL_To_Json/SQLToJSON/SQLToJSON/Form1.cs
+++ b/350-UTILITIES/SQL_To_Json/SQLToJSON/SQLToJSON/Form1.cs
@@ -23,29 +23,6 @@ namespace SQLToJSON
private void button1_Click(object sender, EventArgs e)
{
- //string aiaUserCommand = "SELECT U.Id, U.LoginId, U.Password, U.FirstName, U.LastName, U.UserTypeId, R.Title AS UserRoleName, U.EmailId, U.IsActive, U.SecurityQuestionId, U.SecurityAnswer, U.CreatorId, U.CreationDate, U.ModifierId, U.ModifiedDate, U.DeactivationDate FROM AIAUser U INNER JOIN AIAUserActivity UA ON U.Id = UA.UserId INNER JOIN ROle R ON UA.RoleId = R.Id";
- //string roleCommand = "SELECT Role.Id, Role.Title, AIAUserActivity.UserId FROM ROle INNER JOIN AIAUserActivity ON Role.Id = AIAUserActivity.RoleId";
-
- //DataTable userTable = objClass.FetchDataFromTable(aiaUserCommand);
- //DataTable roleTable = objClass.FetchDataFromTable(roleCommand);
-
- //DataTable resultTable = objClass.ReturnModifiedTable(userTable, roleTable);
- //string aiaUserJson = objClass.DataTableToJSONWithJSONNet(resultTable);
-
- //System.IO.File.WriteAllText("D:/AIAUser.json", aiaUserJson);
- //label1.Text = "Conversion Successfull.";
-
-
-
- // raw quries having all Columns
- // SELECT U.Id, U.LoginId, U.Password, U.FirstName, U.LastName, U.UserTypeId, UT.Title AS UserRoleName,
- //U.EmailId, U.IsActive, U.SecurityQuestionId, sq.Title as SecurityQuestion, U.SecurityAnswer, U.CreatorId, U.CreationDate, U.ModifierId,
- // U.ModifiedDate, U.DeactivationDate FROM AIAUser U,UserType UT, SecurityQuestion sq
- // WHERE U.UserTypeId = UT.Id and U.SecurityQuestionId = sq.Id
-
- // select distinct ule.UserId,mt.ModuleId,rm.Title from LicenseToEdition le,AIAUserToLicenseEdition ule,
- //ModuleToLicense mt, ResourceModule rm where le.LicenseId = ule.LicenseEditionId and le.LicenseId=mt.LicenseId
- //and rm.Id = mt.ModuleId order by ule.UserId,mt.ModuleId
try
{
string userProfileQuery = "SELECT U.Id, U.LoginId as loginId, U.Password as password, U.FirstName as firstName, U.LastName as lastName, UT.Title AS userType,"
@@ -73,7 +50,7 @@ namespace SQLToJSON
}
catch (Exception ex)
{
-
+ System.IO.File.WriteAllText("D:/AIAUser.json", "EXCEPTION:"+ex.Message);
}