From 1fe2853ca41460705e4280ad25c74c51456ce75a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 Dec 2011 12:29:45 +0100 Subject: [PATCH] Update messages --- JoMAR/Controllers/JasonController.cs | 62 ++++++++++++++++++++++------ JoMAR/Controllers/RoomsController.cs | 4 +- JoMAR/Views/Chat/Index.cshtml | 17 ++++---- 3 files changed, 61 insertions(+), 22 deletions(-) diff --git a/JoMAR/Controllers/JasonController.cs b/JoMAR/Controllers/JasonController.cs index 6d7a8c9..de1fb2f 100644 --- a/JoMAR/Controllers/JasonController.cs +++ b/JoMAR/Controllers/JasonController.cs @@ -18,24 +18,60 @@ public ActionResult Index() public JsonResult getMessages(Guid id) { - List list = new List(); + JodADataContext db = new JodADataContext(); + List messages = new List(); + int i = 0; + + ChatRoom room = (from p in db.ChatRooms + where p.RoomID == id + select p).First(); + + ChatMessage[] msg = room.ChatMessages.ToArray(); + + foreach (var message in msg) + { + messages.Add(message.Date + " " + message.aspnet_User.UserName + " said: " + message.Text); + i++; + } + messages.Sort(); + return Json(messages.ToArray(), JsonRequestBehavior.AllowGet); - dynamic msg = (from p in db.ChatMessages - where p.RoomID == id - select p.Text).ToList(); + } + + /* public JsonResult addMessage(Guid id) + { + JodADataContext db = new JodADataContext(); + ChatMessage message = new ChatMessage(); + message.Date = DateTime.Now; + message.MessageID = Guid.NewGuid(); + message.UserID = (from p in db.aspnet_Users + where p.UserName == User.Identity.Name + select p).First().UserId; + message.RoomID = id; + //message.Text = collection["Message"]; + + + // Submit message to DB + db.ChatMessages.InsertOnSubmit(message); + db.SubmitChanges(); + }*/ + + public JsonResult getRooms() + { + JodADataContext db = new JodADataContext(); + List rooms = new List(); - //foreach (string o in msg) - //{ - // var myOp = new - // { - // text = o.Text + ChatRoom[] room = (from p in db.ChatRooms + where p.isPublic + select p).ToArray(); - // }; - // list.Add(myOp); - //} - return Json(msg, JsonRequestBehavior.AllowGet); + foreach (var r in room) + { + rooms.Add("Name: " + r.Name + " Owner: " + r.aspnet_User.UserName); + } + return Json(rooms.ToArray(), JsonRequestBehavior.AllowGet); } } diff --git a/JoMAR/Controllers/RoomsController.cs b/JoMAR/Controllers/RoomsController.cs index 735bed0..480ee9c 100644 --- a/JoMAR/Controllers/RoomsController.cs +++ b/JoMAR/Controllers/RoomsController.cs @@ -39,7 +39,7 @@ public ActionResult edit(Guid id) JodADataContext db = new JodADataContext(); ChatRoom room = (from p in db.ChatRooms - where p.RoomID.ToString() == Url.RequestContext.RouteData.Values.Last().Value + where p.RoomID.ToString() == (String)Url.RequestContext.RouteData.Values.Last().Value select p).First(); return View(room); @@ -127,7 +127,7 @@ public ActionResult delete(Guid id) JodADataContext db = new JodADataContext(); ChatRoom room = (from p in db.ChatRooms - where p.RoomID.ToString() == Url.RequestContext.RouteData.Values.Last().Value + where p.RoomID.ToString() == (String)Url.RequestContext.RouteData.Values.Last().Value select p).First(); return View(room); diff --git a/JoMAR/Views/Chat/Index.cshtml b/JoMAR/Views/Chat/Index.cshtml index 2c96950..c8112b2 100644 --- a/JoMAR/Views/Chat/Index.cshtml +++ b/JoMAR/Views/Chat/Index.cshtml @@ -24,7 +24,6 @@ } -
MessageBoard
@@ -33,15 +32,19 @@