Merge branch 'master' of github.com:ringe/JoMAR

ringe · Dec 8, 2011 · 41c6c69 · 41c6c69
2 parents 22b921b + 9524ac0
commit 41c6c69
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 12 deletions.
diff --git a/JoMAR/Controllers/JasonController.cs b/JoMAR/Controllers/JasonController.cs
@@ -27,14 +27,14 @@ public JsonResult getMessages(Guid id)
                                  where p.RoomID == id
                                  select p).First();
 
-            ChatMessage[] msg = room.ChatMessages.ToArray();
-
+            ChatMessage[] msg = room.ChatMessages.OrderBy(d => d.Date).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);
 
         }
@@ -56,5 +56,23 @@ where p.isPublic
             return Json(rooms.ToArray(), JsonRequestBehavior.AllowGet);
         }
 
+        public JsonResult getUsersOnRoom(Guid id)
+        {
+            JodADataContext db = new JodADataContext();
+            List<string> userList = new List<string>();
+
+            aspnet_User[] users = (from user in db.aspnet_Users
+                                   join m2m in db.UserRooms on user.UserId equals m2m.UserID
+                                   where m2m.RoomID == id
+                                   select user).ToArray();
+            foreach (var r in users)
+            {
+                userList.Add(r.UserName);
+            }
+
+            return Json(userList.ToArray(), JsonRequestBehavior.AllowGet);
+
+        }
+
     }
 }
diff --git a/JoMAR/Views/Chat/Index.cshtml b/JoMAR/Views/Chat/Index.cshtml
@@ -14,17 +14,14 @@
     <fieldset>
         <legend>ChatModel</legend>
         <div class="display-label right-float"></div>
-        <div class="fna right-float">
-            <h2>Users</h2>
+        <div class="display-field right-float">
+            <h4>Users</h4>
             <ul>
-                @foreach (var user in Model.Users)
-                {                            
-                     @Html.ActionLink(user.UserName, "", "Chat/" + user.UserName) <br/>
-                }
+              <select id="lb" style="width:250px" multiple="multiple" size="10"> </select>
             </ul>
         </div>
-        <div class="display-label">MessageBoard</div>
-        <div class="display-field">        
+        <div class="display-label left-float"> MessageBoard</div>
+        <div class="display-field left-float">        
             @Html.TextArea("Messages",new { @class = "messageBoard"}) 
         </div>
 
@@ -43,8 +40,15 @@
 }
 <script type="text/javascript">
     Messages.scrollTop = Messages.scrollHeight;
+   
 
-    window.setInterval(getPosts, 100);
+    window.setInterval(getPosts, 1000);
+    window.setInterval(getUsers, 5000);
+
+    $(document).ready(function () {
+        getUsers()
+        getPosts()
+    });
 
     function getPosts() {
         $.getJSON("/Jason/getMessages/@Model.RoomID", function (result) {
@@ -62,4 +66,15 @@
         return false;
     });
 
+    function getUsers() {
+        $.getJSON("/Jason/getUsersOnRoom/@Model.RoomID", function (data) {
+            var html = '';
+            var len = data.length;
+            for (var i = 0; i < len; i++) {
+                html += '<option value="' + data[i].toString() + '">' + data[i].toString() + '</option>';
+            }
+            $('#lb').html(html);
+        });
+    }
+
 </script>