mgage#1: Added improvements to calendar in reference to issue mgage#7 on pstaabp/webwork-dev. Not closing this bug yet. I think it needs better UI.

mgage#2: Added popover to open assignments on the calendar.
mgage#3: Hopefully fixed issue mgage#11.
mgage#4: allowed all set view to have a table that can be sorted (not currently working for the date columns).

Author: pstaabp

htdocs/css/problemsetlist.css

@@ -16,13 +16,17 @@
 
 .assign-reduced-credit {background-color: rgb(255,128,0);}
 
+
 .empty {background-color: none;}
 
 .assign { border-left: -2px; border-right: -2px; height: 15px;  width: 103%; margin-top: 2px; margin-bottom: 2px;
 float: left; display: table-cell; vertical-align: bottom;  z-index: 2; font-size: 13px;}
 
 .assign-set-name {cursor: pointer;}
 
+.assign-filled {height: 30px; background-color: rgb(250,100,100)}
+
+
 .calendar-button-row {margin: 20px;}
 
 //.list {list-style: none;}

htdocs/html-templates/frontpage.html

@@ -13,16 +13,16 @@ <h3>Welcome to WeBWorK</h3>
 
 <!-- The following is copied directly from the homework manager.  Code like this should appear in a separate file. -->
 
-<script type="text/template" id="calendarButtons">
+<script type="text/template" id="calendar-template">
+<div id="calendar-error-bar"></div>
 <div class="calendar-button-row">
-<button type="button" class="previous-week btn btn-small">Previous Week</button>
-<button type="button" class="next-week btn btn-small">Next Week</button>
+<button type="button" class="previous-week btn btn-small"><i class="icon-chevron-left"></i>Previous Week</button>
 <button type="button" class="view-month btn btn-small">Month View</button>
 <button type="button" class="view-week btn btn-small">Week View</button>
+<button type="button" class="next-week btn btn-small">Next Week<i class="icon-chevron-right"></i></button>
 </div>
-</script>
 
-<script type="text/template" id="calendarHeader">
+<table id='calendar-table' class='table-bordered'>
     <thead>
     <th>Sunday</th>
     <th>Monday</th>
@@ -32,4 +32,25 @@ <h3>Welcome to WeBWorK</h3>
     <th>Friday</th>
     <th>Saturday</th>
 </thead><tbody></tbody>
+<table id='calendar-table' class='table-bordered'></table>
+<div class="calendar-button-row">
+<button type="button" class="previous-week btn btn-small"><i class="icon-chevron-left"></i>Previous Week</button>
+<button type="button" class="view-month btn btn-small">Month View</button>
+<button type="button" class="view-week btn btn-small">Week View</button>
+<button type="button" class="next-week btn btn-small">Next Week<i class="icon-chevron-right"></i></button>
+</div>
+</script>
+
+
+<script type="text/template" id="calendar-date-bar">
+<div class="<%= classes %>" data-set="<%= setname %>" data-title="<%=setname%>" data-content="Users Assigned: <%=usersAssigned%>/<%=totalUsers%><br>Open To Students: <%=openToStudents%>"><span><%if(showName){%><%=setname %><%}%></span></div>
+
+</script>
+
+<script type="text/template" id="too-many-assignments-error">
+There are too many overlapping assignments to view efficiently.  Switch to week view for 
+a better rendering. 
 </script>
+
+
+

htdocs/html-templates/homework-manager.html

@@ -189,16 +189,17 @@ <h3>Help for the Homework Manager</h3>
 
 
 
-<script type="text/template" id="calendarButtons">
+<script type="text/template" id="calendar-template">
+<div id="calendar-error-bar"></div>
 <div class="calendar-button-row">
-<button type="button" class="previous-week btn btn-small">Previous Week</button>
-<button type="button" class="next-week btn btn-small">Next Week</button>
+<button type="button" class="previous-week btn btn-small"><i class="icon-chevron-left"></i>Previous Week</button>
+
 <button type="button" class="view-month btn btn-small">Month View</button>
 <button type="button" class="view-week btn btn-small">Week View</button>
+<button type="button" class="next-week btn btn-small">Next Week<i class="icon-chevron-right"></i></button>
 </div>
-</script>
 
-<script type="text/template" id="calendarHeader">
+<table id='calendar-table' class='table-bordered'>
     <thead>
     <th>Sunday</th>
     <th>Monday</th>
@@ -208,6 +209,24 @@ <h3>Help for the Homework Manager</h3>
     <th>Friday</th>
     <th>Saturday</th>
 </thead><tbody></tbody>
+<table id='calendar-table' class='table-bordered'></table>
+<div class="calendar-button-row">
+<button type="button" class="previous-week btn btn-small"><i class="icon-chevron-left"></i>Previous Week</button>
+<button type="button" class="view-month btn btn-small">Month View</button>
+<button type="button" class="view-week btn btn-small">Week View</button>
+<button type="button" class="next-week btn btn-small">Next Week<i class="icon-chevron-right"></i></button>
+</div>
+
+</script>
+
+<script type="text/template" id="calendar-date-bar">
+<div class="<%= classes %>" data-set="<%= setname %>" data-title="<%=setname%>" data-content="Users Assigned: <%=usersAssigned%>/<%=totalUsers%><br>Open To Students: <%=openToStudents%>"><span><%if(showName){%><%=setname %><%}%></span></div>
+
+</script>
+
+<script type="text/template" id="too-many-assignments-error">
+There are too many overlapping assignments to view efficiently.  Switch to week view for 
+a better rendering. 
 </script>
 
 <script type="text/template" id="settings-template">

htdocs/js/apps/FrontPage/FrontPage.js

@@ -56,9 +56,10 @@ function(Backbone, _, User, ProblemSetList, Problem, WebPage, CalendarView, Prob
 
             this.problemSets.fetch();
 
-            this.dispatcher.on('problem-sets-loaded',this.postHWLoaded); 
-
-            this.render();
+            this.problemSets.on('fetchSuccess', function () {
+                self.render();
+                self.postHWLoaded();
+            }); 
 
 
 

htdocs/js/apps/HomeworkManager/AssignUsersView.js

@@ -64,6 +64,10 @@ define(['Backbone',
 			});
 			var _sets = this.parent.problemSets.filter(function(_set) { return (_(setNames).indexOf(_set.get("set_id")) >-1);});
 
+            console.log(_users);
+            console.log(_sets);
+
+            _(_sets).each(function(set) {set.assignToUsers(userNames)});
 		},
 		updateDates: function ()
 		{

htdocs/js/apps/HomeworkManager/HomeworkManager.js

@@ -17,7 +17,8 @@ require.config({
         "config":               "/webwork2_files/js/apps/config",
         "Closeable":            "/webwork2_files/js/lib/webwork/views/Closeable",
         "datepicker":           "/webwork2_files/js/lib/vendor/datepicker/js/bootstrap-datepicker",
-        "jquery-truncate":      "/webwork2_files/js/lib/vendor/jquery.truncate.min"
+        "jquery-truncate":      "/webwork2_files/js/lib/vendor/jquery.truncate.min",
+        "jquery-tablesorter":   "/webwork2_files/js/lib/vendor/jquery.tablesorter.min"
     },
     urlArgs: "bust=" +  (new Date()).getTime(),
     waitSeconds: 15,
@@ -30,7 +31,8 @@ require.config({
         'XDate':{ exports: 'XDate'},
         'config': ['XDate'],
         'datepicker': ['bootstrap'],
-        'jquery-truncate': ['jquery']
+        'jquery-truncate': ['jquery'],
+        'jquery-tablesorter': ['jquery']
     }
 });
 
@@ -58,7 +60,7 @@ function(Backbone, _,  UserList, ProblemSetList, Settings, CalendarView, HWDetai
 	    tagName: "div",
         initialize: function(){
     	    this.constructor.__super__.initialize.apply(this, {el: this.el});
-    	    _.bindAll(this, 'render','postHWLoaded');  // include all functions that need the this object
+    	    _.bindAll(this, 'render','postHWLoaded','setDropToEdit');  // include all functions that need the this object
     	    var self = this;
             this.dispatcher = _.clone(Backbone.Events);
 
@@ -99,10 +101,14 @@ function(Backbone, _,  UserList, ProblemSetList, Settings, CalendarView, HWDetai
                 self.announce.appendHTML("The HW set with name " + set.get("set_id") + " was deleted.");
             });
 
-            this.problemSets.on("fetchSuccess",function() {self.setListView.render();})
-
+            this.problemSets.on("fetchSuccess",function() {
+                self.problemSets.each(function(_set){
+                    _set.countUsers();
+                });
+                self.setListView.render();
+                self.postHWLoaded();
+            });
 
-            this.dispatcher.on("problem-sets-loaded",this.postHWLoaded);
 
             this.users = new UserList();
             this.users.fetch();

htdocs/js/apps/HomeworkManager/SetListView.js

@@ -3,7 +3,7 @@
 *
 */
 
-define(['Backbone', 'underscore','../../lib/webwork/views/EditableCell'], function(Backbone, _,EditableCell){
+define(['Backbone', 'underscore','../../lib/webwork/views/EditableCell','jquery-tablesorter'], function(Backbone, _,EditableCell){
 
     var SetListRowView = Backbone.View.extend({
         className: "set-list-row",
@@ -38,6 +38,9 @@ define(['Backbone', 'underscore','../../lib/webwork/views/EditableCell'], functi
                 tab.append((new SetListRowView({model: m})).el);
             });
 
+            tab.tablesorter();
+
+
         },
         addSet: function (_set) {
             this.$("#set-list-table").append((new SetListRowView({model: _set})).el);

htdocs/js/apps/config.js

@@ -80,8 +80,8 @@ define(['Backbone','backbone-validation'], function(Backbone){
 
         if (parsedDate) {
             var year = parsedDate[4];
-            var month = (parseInt(parsedDate[1],10)<10)?("0"+parseInt(parsedDate[2],10)):parseInt(parsedDate[2],10);
-            var dayOfMonth = (parseInt(parsedDate[2],10)<10)?("0"+parseInt(parsedDate[3],10)):parseInt(parsedDate[3],10);
+            var month = (parseInt(parsedDate[2],10)<10)?("0"+parseInt(parsedDate[2],10)):parseInt(parsedDate[2],10);
+            var dayOfMonth = (parseInt(parsedDate[3],10)<10)?("0"+parseInt(parsedDate[3],10)):parseInt(parsedDate[3],10);
 
             var hours = (/[aA][mM]/.test(parsedDate[6],10))? (parseInt(parsedDate[6],10)):(parseInt(parsedDate[6],10)+12);
             hours = (hours<10)?("0"+hours):hours;

htdocs/js/lib/vendor/jquery.tablesorter.min.js

@@ -99,7 +99,6 @@ define(['Backbone', 'underscore','config','XDate','./ProblemList'], function(Bac
             restrict_ip: "opt(yes,no)",
             relax_restrict_ip: "opt(yes,no)",
             restricted_login_proctor: "opt(yes,no)",
-            visible_to_students: "opt(yes,no)",
         },
         initialize: function(){
             _.bindAll(this,"fetch","addProblem","update");
@@ -193,7 +192,7 @@ define(['Backbone', 'underscore','config','XDate','./ProblemList'], function(Bac
             var dueDate2 = new XDate(_set.get("due_date"));
             return (openDate1<openDate2)?(dueDate1>openDate2):(dueDate2>openDate1);
         },
-        countSetUsers: function ()
+        countUsers: function ()
         {
             var self=this;
             if (this.usersAssigned.length>0) { self.trigger("countUsers",this.usersAssigned);}
@@ -205,7 +204,7 @@ define(['Backbone', 'underscore','config','XDate','./ProblemList'], function(Bac
             $.get(config.webserviceURL, requestObject, function (data) {
 
                     var response = $.parseJSON(data);
-                    this.usersAssigned = response.result_data;
+                    self.usersAssigned = response.result_data;
 
                     self.trigger("countUsers",this.usersAssigned);
 
@@ -214,7 +213,7 @@ define(['Backbone', 'underscore','config','XDate','./ProblemList'], function(Bac
         assignToUsers: function (_users){  // assigns this problem set to the users that come in as an array of usernames.  
             var self = this;
 
-
+            console.log("Assigning Problem Set " + this.get("set_id") + " to " + _users.join(" ")); 
             var requestObject = {xml_command: "assignSetToUsers", users: _users.join(","), set_id: this.get("set_id")};
             _.defaults(requestObject,config.requestObject);