Updating for mobile, and pan mobile refinement

hourglass/.meteor/packages

@@ -42,7 +42,6 @@ yogiben:admin-edit
 mfactory:admin-lte
 standard-minifier-css@1.3.2
 rochal:slimscroll
-meteorhacks:sikka
 mrt:jquery-ui
 rajit:bootstrap3-datepicker
 hammer:hammer@=2.0.4_1

hourglass/.meteor/versions

@@ -27,7 +27,6 @@ caching-compiler@1.1.8
 caching-html-compiler@1.0.7
 callback-hook@1.0.10
 check@1.2.4
-chuangbo:cookie@1.1.0
 coffeescript@1.11.1_2
 cosmos:browserify@0.10.0
 dandv:caret-position@2.1.1
@@ -74,8 +73,6 @@ mdg:validation-error@0.5.1
 meteor@1.6.0
 meteor-base@1.0.4
 meteorhacks:meteorx@1.4.1
-meteorhacks:picker@1.0.3
-meteorhacks:sikka@1.0.1
 meteorhacks:unblock@1.1.0
 mfactory:admin-lte@0.0.2
 minifier-css@1.2.15

hourglass/client/main/main.js

@@ -24,6 +24,7 @@ Session.set("user", {}); // Stores user preferences.
 Session.set("calendarEvents", []); // Stores calendar classes.
 Session.set("myClasses", []); // Stores user classes.
 Session.set("myWork", []); // Stores user related work.
+Session.set("filterWork", []); // Stores work that is filtered out.
 Session.set("requests", false); // Status of requests.
 Session.set("sidebarMode", ""); // Status of sidebars.
 Session.set("newWork", null); // If user creating new work.
@@ -49,13 +50,15 @@ Template.main.created = function() {
             $(".overlay").fadeOut(150);
         }
     });
-    console.log(Session.get("user"));
+
     work.find().observeChanges({
         added: function (id, fields) {
             updateWork(id, fields, "added");
+            filterWork(Session.get("classDisp"),Session.get("typeFilter"), Session.get("user").preferences.hideTime);
         },
         changed: function (id, fields) {
             updateWork(id, fields, "changed");
+            filterWork(Session.get("classDisp"),Session.get("typeFilter"));
         },
         removed: function (id) {
             updateWork(id, null, "remove");
@@ -145,168 +148,9 @@ Template.registerHelper('overlayDim', (part) => { // Gets size of the overlay co
 Template.registerHelper('myClasses', () => { // Gets all classes and respective works.
     var myClasses = Session.get("user").classes;
     getClasses(myClasses);
-    /*var myClasses = Session.get("user").classes;
+    return Session.get("myClasses");
-    var classDisp = Session.get("classDisp");
-    if (myClasses.length === 0) { // Null checking.
-        return [];
-    } else {
-        var array = [];
-        for(var i = 0; i < myClasses.length; i++) {
-            var classObj;
-            if(myClasses[i] === Meteor.userId()) {
-                classObj.name = "Personal";
-                classObj.box = " owned";
-                classObj.mine = false; // Actual value is reversed.
-                classObj.subscribers = 1;
-            } else {
-                classObj = classes.findOne({_id: myClasses[i]});
-                if(classObj === undefined) return;
-                var isAdmin = classObj.admin === Meteor.userId();
-                classObj.box = (isAdmin) ?  " owned" : "";
-                classObj.mine = (isAdmin) ? false : true; // Actual value is reversed
-                classObj.subscribers = classObj.subscribers.length;
-                classObj.teachershort = (found.teacher === undefined) ? "" : found.teacher.split(" ").slice(1).reduce(function(a,b) { return a+ " " + b;});
-            }
-
-            classObj.selected = ((classDisp.indexOf(myClasses[i]) !== -1)) ? Session.get("user").preferences.theme.modeHighlight : "rgba(0,0,0,0)"; // Filter selected.
-            array.push(classObj);
-        }*/
-/*        var array = myClasses();
-        if(Meteor.Device.isPhone()) mobileWork();
-        Session.set("myClasses", array);
-        calendarEvents(array);
-        $("#fullcalendar").fullCalendar("removeEvents");
-        $("#fullcalendar").fullCalendar("addEventSource", Session.get("calendarEvents"))*/
-        return Session.get("myClasses");
-    
 });
 
-Template.registerHelper('myWork', () => {
-    return Session.get("myWork");
-});
-
-getClasses = function(myClasses) {
-    var array = [];
-    var classDisp = Session.get("classDisp");
-    for(var i = 0; i < myClasses.length; i++) {
-        var classObj = {};
-        if(myClasses[i] === Meteor.userId()) {
-            classObj.name = "Personal";
-            classObj.box = " owned";
-            classObj.mine = false; // Actual value is reversed.
-            classObj.subscribers = 1;
-            classObj.admin = Meteor.userId();
-            classObj._id = Meteor.userId();
-        } else {
-            classObj = classes.findOne({_id: myClasses[i]});
-            if(classObj === undefined) return;
-            var isAdmin = classObj.admin === Meteor.userId();
-            classObj.box = (isAdmin) ?  " owned" : "";
-            classObj.mine = (isAdmin) ? false : true; // Actual value is reversed
-            classObj.subscribers = classObj.subscribers.length;
-            classObj.teachershort = (classObj.teacher === undefined) ? "" : classObj.teacher.split(" ").slice(1).reduce(function(a,b) { return a+ " " + b;});
-        }
-
-        classObj.selected = ((classDisp.indexOf(myClasses[i]) !== -1)) ? Session.get("user").preferences.theme.modeHighlight : "rgba(0,0,0,0)"; // Filter selected.
-        array.push(classObj);
-    }
-    Session.set("myClasses", array);
-}
-
-updateWork = function(id, fields, type) {
-    if(type === "remove" && Session.get("myWork").filter(function(work) { // Removed work and exists in user data.
-        return work._id === id;
-    }).length !== 0) {
-        Session.set("myWork", Session.get("myWork").filter(function(work) {
-            return work._id !== id;
-        }));
-        return;
-    }
-
-    var classDisp = Session.get("classDisp");
-    var sideFilter = Session.get("typeFilter"); // Get sidebar type filter.
-    var hideTime = Session.get("user").preferences.timeHide; 
-    var workObj;
-
-    if(type === "added") {
-        workObj = Object.assign({}, fields, {_id: id})
-    } else if(type === "changed") {
-        workObj = work.findOne({_id: id});
-    }
-
-    workObj.classid = workObj.class;
-    workObj.realDate = workObj.dueDate;
-    workObj.dueDate = moment(workObj.dueDate).calendar(null, {
-        sameDay: '[Today]',
-        nextDay: '[Tomorrow]',
-        nextWeek: 'dddd',
-        lastDay: '[Yesterday]',
-        lastWeek: '[Last] dddd',
-        sameElse: 'MMMM Do'
-    });
-
-    if (workObj.dueDate === "Today") { // Font weight based on date proximity.
-        workObj.cardDate = "600";
-    } else if (workObj.dueDate === "Tomorrow") {
-        workObj.cardDate = "400";
-    }
-
-    workObj.typeColor = workColors[workObj.type];
-    workObj.confirmationLength = workObj.confirmations.length; // Counts the number of confirmations and reports for a particular work.
-    workObj.reportLength = workObj.reports.length;
-
-    workObj.creatorname = Meteor.users.findOne({
-        _id: workObj.creator
-    }).profile.name;
-
-    workObj.hide = false;
-
-    //Filters
-    var notInClassFilter = classDisp.length !== 0 && !_.contains(classDisp, workObj.classid);
-    var pastHideDate = hideTime !== 0 && (moment().subtract(hideTime, 'days'))._d > (moment(workObj.realDate))._d;
-    var markedDone = Session.get("user").preferences.done && !Meteor.Device.isPhone() && _.contains(workObj.done, Meteor.userId());
-    var reported = (workObj.reportLength / (workObj.reportLength + workObj.confirmationLength)) > 0.7; // Over 70% are reports
-
-    if(notInClassFilter || pastHideDate || markedDone) workObj.hide = true;
-
-    var normalColor = Session.get("user").preferences.theme.text;
-    // Ratio color handling
-    /*var conf = workObj.confirmations.length;
-    var repo = workObj.reports.length;
-    var ratio = conf / repo;
-    
-    if (Math.abs(conf - repo)) {
-        if ((conf + repo) <= 1) {
-            thisWork[j].doneRatio = normalColor;
-        } else {
-            thisWork[j].doneRatio = "#F9F906";
-        }
-    } else if (ratio >= 2) {
-        thisWork[j].doneRatio = "#33DD33";
-    } else if (ratio <= 0.9) {
-        thisWork[j].doneRatio = "#FF1A1A";
-    }*/
-
-    workObj.doneRatio = normalColor;
-
-    var myWork;
-    if(type === "added") {
-        myWork = Session.get("myWork");
-    } else if(type === "changed") {
-        myWork = Session.get("myWork").filter(function(work) {
-            return work._id !== id;
-        });
-    }
-    myWork.push(workObj);
-    Session.set("myWork", myWork.sort(function(a,b) {
-        return Date.parse(a.realDate) - Date.parse(b.realDate);
-    }));
-
-    calendarEvents();
-    $("#fullcalendar").fullCalendar("removeEvents");
-    $("#fullcalendar").fullCalendar("addEventSource", Session.get("calendarEvents"));
-}
-
 Template.registerHelper('pref', (val) => { // Obtains all user preferences.
     try {
         if(val === "school") return Session.get("user").school;
@@ -1145,124 +989,143 @@ startDragula = function() {
     });
 };
 
-myClasses = function() {
+getClasses = function(myClasses) {
     var array = [];
-    var courses = Session.get("user").classes;
+    var classDisp = Session.get("classDisp");
-    var classDisp = Session.get("classDisp"); // Get sidebar class filter.
+    for(var i = 0; i < myClasses.length; i++) {
-    var sideFilter = Session.get("typeFilter"); // Get sidebar type filter.
+        var classObj = {};
-    var hide = Session.get("user").preferences.timeHide;
+        if(myClasses[i] === Meteor.userId()) {
-
+            classObj.name = "Personal";
-    for (var i = 0; i < courses.length; i++) { // For each user class.
+            classObj.box = " owned";
-        if (courses[i] === Meteor.userId()) {
+            classObj.mine = false; // Actual value is reversed.
-            found = {
+            classObj.subscribers = 1;
-                _id: courses[i],
+            classObj.admin = Meteor.userId();
-                name: "Personal",
+            classObj._id = Meteor.userId();
-                subscribers: 1,
-                mine: false,
-                box: " owned"
-            };
         } else {
-            found = classes.findOne({
+            classObj = classes.findOne({_id: myClasses[i]});
-                _id: courses[i]
+            if(classObj === undefined) return;
-            });
+            var isAdmin = classObj.admin === Meteor.userId();
-            if(found === undefined) return;
+            classObj.box = (isAdmin) ?  " owned" : "";
-            found.subscribers = found.subscribers.length;
+            classObj.mine = (isAdmin) ? false : true; // Actual value is reversed
-            found.teachershort = (found.teacher === undefined) ? "" : found.teacher.split(" ").slice(1).reduce(function(a,b) { return a+ " " + b;});
+            classObj.subscribers = classObj.subscribers.length;
-            found.mine = true;
+            classObj.teachershort = (classObj.teacher === undefined) ? "" : classObj.teacher.split(" ").slice(1).reduce(function(a,b) { return a+ " " + b;});
-            if (found.admin === Meteor.userId()) { // If user owns this class.
-                found.box = " owned";
-                found.mine = false;
-            }
         }
 
-        found.selected = ((classDisp.indexOf(courses[i]) !== -1)) ? Session.get("user").preferences.theme.modeHighlight : "rgba(0,0,0,0)"; // Filter selected.
+        classObj.selected = ((classDisp.indexOf(myClasses[i]) !== -1)) ? Session.get("user").preferences.theme.modeHighlight : "rgba(0,0,0,0)"; // Filter selected.
-        array.push(found);
+        array.push(classObj);
+    }
+    Session.set("myClasses", array);
+}
 
-        var thisWork = work.find({
+updateWork = function(id, fields, type) {
-            class: courses[i]
+    if(type === "remove" && Session.get("myWork").filter(function(work) { // Removed work and exists in user data.
-        }).fetch();
+        return work._id === id;
+    }).length !== 0) {
+        Session.set("myWork", Session.get("myWork").filter(function(work) {
+            return work._id !== id;
+        }));
+        return;
+    }
 
-        if (classDisp.length !== 0 && classDisp.indexOf(found._id) === -1) { // Filter classes based on filter.
+    var workObj;
-            array[i].thisClassWork = [];
-            continue;
-        }
 
-        for (var j = 0; j < thisWork.length; j++) { // For each work in class.
+    if(type === "added") {
-            if (hide !== 0) { // Time to hide isn't never.
+        workObj = Object.assign({}, fields, {_id: id})
-                var due = (moment(thisWork[j].dueDate))._d;
+    } else if(type === "changed") {
-                var offset = (moment().subtract(hide, 'days'))._d;
+        workObj = work.findOne({_id: id});
-                if (offset > due) { // If due is before hide days before today
+    }
-                    thisWork[j] = "no";
-                }
-            }
 
-            if (thisWork[j] !== "no" && Session.get("user").preferences.done && !Meteor.Device.isPhone()) { // If done filter is true and not mobile.
+    workObj.classid = workObj.class;
-                if (thisWork[j].done.indexOf(Meteor.userId()) !== -1) { // If user marked this work done.
-                    thisWork[j] = "no";
-                }
-            }
 
-            if (thisWork[j] !== "no" && sideFilter.length !== 0 && !_.contains(sideFilter, thisWork[j].type)) {
+    workObj.shortname = (workObj.name.length <= 20) ? workObj.name : workObj.name.substring(0,20) + "...";
-                thisWork[j] = "no";
+    workObj.className = (workObj.classid === Meteor.userId()) ? "Personal" : classes.findOne({_id: workObj.classid}).name;
-            }
 
-            if (thisWork[j] !== "no" && Session.get("user").preferences.hideReport && (thisWork[j].confirmations.length / thisWork[j].reports.length) <= 0.9) {
+    workObj.realDate = workObj.dueDate;
-                thisWork[j] = "no";
+    workObj.dueDate = moment(workObj.dueDate).calendar(null, {
-            }
+        sameDay: '[Today]',
+        nextDay: '[Tomorrow]',
+        nextWeek: 'dddd',
+        lastDay: '[Yesterday]',
+        lastWeek: '[Last] dddd',
+        sameElse: 'MMMM Do'
+    });
 
-        }
+    workObj.shortdesc = (workObj.description === undefined) ? "" : (workObj.description.length <= 30 ) ? workObj.description : workObj.description.substring(0,30) + "...";
-        while (thisWork.indexOf("no") !== -1) thisWork.splice(thisWork.indexOf("no"), 1); // Splice all filtered works.
 
-        for (j = 0; j < thisWork.length; j++) {
+    if (workObj.dueDate === "Today") { // Font weight based on date proximity.
-            thisWork[j].classid = courses[i];
+        workObj.cardDate = "600";
-            thisWork[j].realDate = thisWork[j].dueDate;
+    } else if (workObj.dueDate === "Tomorrow") {
-            thisWork[j].dueDate = moment(thisWork[j].dueDate).calendar(null, {
+        workObj.cardDate = "400";
-                sameDay: '[Today]',
+    }
-                nextDay: '[Tomorrow]',
-                nextWeek: 'dddd',
-                lastDay: '[Yesterday]',
-                lastWeek: '[Last] dddd',
-                sameElse: 'MMMM Do'
-            });
 
-            if (thisWork[j].dueDate === "Today") { // Font weight based on date proximity.
+    workObj.confirmationLength = workObj.confirmations.length; // Counts the number of confirmations and reports for a particular work.
-                thisWork[j].cardDate = "600";
+    workObj.reportLength = workObj.reports.length;
-            } else if (thisWork[j].dueDate === "Tomorrow") {
-                thisWork[j].cardDate = "400";
-            }
-            thisWork[j].typeColor = workColors[thisWork[j].type];
 
-            thisWork[j].confirmationLength = thisWork[j].confirmations.length; // Counts the number of confirmations and reports for a particular work.
+    workObj.typeColor = workColors[workObj.type];
-            thisWork[j].reportLength = thisWork[j].reports.length;
 
-            thisWork[j].creatorname = Meteor.users.findOne({
+    workObj.creatorname = Meteor.users.findOne({
-                _id: thisWork[j].creator
+        _id: workObj.creator
-            }).profile.name;
+    }).profile.name;
-            var conf = thisWork[j].confirmations.length;
-            var repo = thisWork[j].reports.length;
-            var ratio = conf / repo;
-            var normalColor = Session.get("user").preferences.theme.text;
 
+    var normalColor = Session.get("user").preferences.theme.text;
+    // Ratio color handling
+    /*var conf = workObj.confirmations.length;
+    var repo = workObj.reports.length;
+    var ratio = conf / repo;
     
+    if (Math.abs(conf - repo)) {
+        if ((conf + repo) <= 1) {
             thisWork[j].doneRatio = normalColor;
-            // Ratio color handling
+        } else {
-            /*if (Math.abs(conf - repo)) {
+            thisWork[j].doneRatio = "#F9F906";
-                if ((conf + repo) <= 1) {
-                    thisWork[j].doneRatio = normalColor;
-                } else {
-                    thisWork[j].doneRatio = "#F9F906";
-                }
-            } else if (ratio >= 2) {
-                thisWork[j].doneRatio = "#33DD33";
-            } else if (ratio <= 0.9) {
-                thisWork[j].doneRatio = "#FF1A1A";
-            }*/
         }
-        array[i].thisClassWork = thisWork.sort(function(a, b) {
+    } else if (ratio >= 2) {
-            return Date.parse(a.realDate) - Date.parse(b.realDate);
+        thisWork[j].doneRatio = "#33DD33";
+    } else if (ratio <= 0.9) {
+        thisWork[j].doneRatio = "#FF1A1A";
+    }*/
+
+    workObj.doneRatio = normalColor;
+
+    var myWork;
+    if(type === "added") {
+        myWork = Session.get("myWork");
+    } else if(type === "changed") {
+        myWork = Session.get("myWork").filter(function(work) {
+            return work._id !== id;
         });
     }
-    return array;
+    myWork.push(workObj);
+    Session.set("myWork", myWork);
+}
+
+filterWork = function(classDisp, typeFilter, hideTime) {
+    var allWork = Session.get("filterWork").concat(Session.get("myWork"));
+    var hideWork = [];
+    var displayWork = [];
+    
+    _.each(allWork, function(workObj) {
+        var notInClassFilter = classDisp.length !== 0 && !_.contains(classDisp, workObj.classid);
+        var notInTypeFilter = typeFilter.length !== 0 && !_.contains(typeFilter, workObj.type);
+        var pastHideDate = hideTime !== 0 && (moment().subtract(hideTime, 'days'))._d > (moment(workObj.realDate))._d;
+        var markedDone = Session.get("user").preferences.done && !Meteor.Device.isPhone() && _.contains(workObj.done, Meteor.userId());
+        var reported = (workObj.reportLength / (workObj.reportLength + workObj.confirmationLength)) > 0.7; // Over 70% are reports
+
+        if(notInClassFilter || notInTypeFilter || pastHideDate || markedDone || reported) {
+            hideWork.push(workObj);
+        } else {
+            displayWork.push(workObj);
+        }
+    });
+
+    Session.set("myWork", displayWork.sort(function(a,b) { // Display work.
+        return Date.parse(a.realDate) - Date.parse(b.realDate);
+    }));
+    Session.set("filterWork", hideWork); // Not displayed
+
+    calendarEvents();
+    $("#fullcalendar").fullCalendar("removeEvents");
+    $("#fullcalendar").fullCalendar("addEventSource", Session.get("calendarEvents"));
 }
 
 function calendarEvents() {

hourglass/client/menus/menus.js

@@ -99,6 +99,7 @@ Template.sidebarMenuPlate.events({
             array.push(classid);
         }
         Session.set("classDisp", array);
+        filterWork(Session.get("classDisp"),Session.get("typeFilter"), Session.get("user").preferences.hideTime);
     },
     'click .sideFilter' (event) {
         var type = event.target.getAttribute("type");
@@ -109,6 +110,7 @@ Template.sidebarMenuPlate.events({
             array.push(type);
         }
         Session.set("typeFilter", array);
+        filterWork(Session.get("classDisp"),Session.get("typeFilter"), Session.get("user").preferences.hideTime);
     },
     'click #disableFilter' () {
         Session.set("classDisp", []);

hourglass/client/mobile/mobile.css

@@ -66,7 +66,6 @@
 }
 
 .mClassContainer {
-	opacity: 0;
 	border-bottom: 1px solid #AAA;
 	position: relative;
 }

hourglass/client/mobile/mobile.html

@@ -97,7 +97,7 @@
 			<div class="mobileClassContent">
 				<h4 class="mName">{{name}}</h4>
 				<h4 class="mDate">{{dueDate}}</h4>
-				<h4 class="mClass">{{class}}</h4>
+				<h4 class="mClass">{{className}}</h4>
 				<h4 class="mDesc">{{shortdesc}}</h4>
 				<div style="color:{{doneRatio}}">
     				<i class="fa fa-thumbs-up" aria-hidden="true"></i>	

hourglass/client/mobile/mobile.js

@@ -1,4 +1,3 @@
-Session.set("mobileWork", []);
 Session.set("mobileMode", "main");
 Session.set("classDisp", []);
 Session.set("typeFilter", []);
@@ -18,7 +17,20 @@ Template.registerHelper('optionInfo', (type) => {
 });
 
 Template.mobile.created = function() {
-	mobileWork();
+	getClasses(Session.get("user").classes);
+	work.find().observeChanges({
+        added: function (id, fields) {
+            updateWork(id, fields, "added");
+            filterWork(Session.get("classDisp"),Session.get("typeFilter"), Session.get("user").preferences.hideTime);
+        },
+        changed: function (id, fields) {
+            updateWork(id, fields, "changed");
+            filterWork(Session.get("classDisp"),Session.get("typeFilter"), Session.get("user").preferences.hideTime);
+        },
+        removed: function (id) {
+            updateWork(id, null, "remove");
+        }
+    });
 }
 
 Template.mobile.rendered = function() {
@@ -225,6 +237,7 @@ Template.mobileClass.rendered = function() {
 	});
 
 	movable.on('panmove', function(e) {
+		if(Math.abs(e.originalEvent.gesture.deltaY) >= 10) return;
 		var dX = deltaX + (e.originalEvent.gesture.deltaX);
 		if(dX < 0) {
 			$.Velocity.hook(jQuery(e.target), 'translateX', dX/25 + 'px');
@@ -372,6 +385,7 @@ Template.mSidebarClasses.rendered = function() {
 	        }
 	        Session.set("classDisp", array);
 	        timedPushback(true);
+	        filterWork(Session.get("classDisp"),Session.get("typeFilter"), Session.get("user").preferences.hideTime);
 	    }
 	});
 }
@@ -394,6 +408,7 @@ Template.mSideTypeFilter.rendered = function() {
 	        }
 	        Session.set("typeFilter", array);
 	        timedPushback(true);
+	        filterWork(Session.get("classDisp"),Session.get("typeFilter"), Session.get("user").preferences.hideTime);
 		}
 	});
 }
@@ -407,7 +422,13 @@ Template.mobile.helpers({
 		return (Session.get("sidebarMode") === "mobile") ? Session.get("user").preferences.theme.iconHighlight : "";
 	},
 	myWork(done) {
-		return (done === "done") ? Session.get("mobileWork")[1] : Session.get("mobileWork")[0];
+		return (done === "done") ? 
+			Session.get("myWork").filter(function(work) {
+				return _.contains(work.done, Meteor.userId());
+			}) : 
+			Session.get("myWork").filter(function(work) {
+				return !_.contains(work.done, Meteor.userId());
+			})
 	},
 	showMode(mode) {
 		return Session.equals("mobileMode", mode);
@@ -425,11 +446,14 @@ Template.mobile.helpers({
         return array;
     },
     noneText(type) {
-    	if(type === "main") {
+		return (type === "main") ? 
-    		return Session.get("noneText")[0];
+		(Session.get("myWork").filter(function(work) {
-    	} else {
+			return _.contains(work.done, Meteor.userId());
-    		return Session.get("noneText")[1];
+		}).length === 0) ? "none" : "block"
-    	}
+		: 
+		(Session.get("myWork").filter(function(work) {
+			return !_.contains(work.done, Meteor.userId());
+		}).length === 0) ? "none" : "block";
     },
     buttonType() {
     	if(Session.equals("mobileMode","main") || Session.equals("mobileMode","done")) {
@@ -702,36 +726,3 @@ function timedPushback(type) {
 		}, fadeTime);
 	}
 }
-
-mobileWork = function() {
-	var array = myClasses();
-	if(array === undefined) return;
-	var notDoneWork = [];
-	var doneWork = [];
-	for(var i = 0; i < array.length; i++) {
-		for(var j = 0; j < array[i].thisClassWork.length; j++) {
-			var classid = array[i].thisClassWork[j].classid;
-			var desc = array[i].thisClassWork[j].description;
-			if(desc) {
-				array[i].thisClassWork[j].shortdesc = (desc.length <= 30 ) ? desc : desc.substring(0,30) + "...";
-			}
-			array[i].thisClassWork[j].shortname = (name.length <= 20) ? name : name.substring(0,20) + "...";
-			array[i].thisClassWork[j]["class"] = (classid === Meteor.userId()) ? "Personal" : classes.findOne({_id:classid}).name;
-			if(_.contains(array[i].thisClassWork[j].done, Meteor.userId())) {
-				array[i].thisClassWork[j].isDone = true;
-				doneWork.push(array[i].thisClassWork[j]);
-			} else {
-				notDoneWork.push(array[i].thisClassWork[j]);
-			}
-		}
-	}
-	doneWork = doneWork.sort(function(a,b) {
-		return Date.parse(a.realDate) - Date.parse(b.realDate);
-	});
-	notDoneWork = notDoneWork.sort(function(a,b) {
-		return Date.parse(a.realDate) - Date.parse(b.realDate);
-	});
-
-	Session.set("mobileWork", [notDoneWork, doneWork]);
-	Session.set("noneText", [(notDoneWork.length === 0) ? "block": "none", (doneWork.length === 0) ? "block": "none"]);
-}