Merge pull request #1352 from codecombat/master

Edited task schema

app/schemas/models/user_remark.coffee

@@ -12,7 +12,23 @@ _.extend UserRemarkSchema.properties,
   history: c.array {title: 'History', description: 'Records of our interactions with the user.'},
     c.object {title: 'Record'}, {date: c.date(title: 'Date'), content: {title: 'Content', type: 'string', format: 'markdown'}}
   tasks: c.array {title: 'Tasks', description: 'Task entries: when to email the contact about something.'},
-    c.object {title: 'Task'}, {date: c.date(title: 'Date'), action: {title: 'Action', type: 'string'}}
+    c.object {title: 'Task'}, 
+      date: c.date 
+        title: 'Date'
+      action: 
+        title: 'Action'
+        type: 'string'
+      status: 
+        title: 'Status'
+        description: 'The current status of the task'
+        type: 'string'
+        enum: ['Not started', 'In progress', 'Completed']
+      notes:
+        title: 'Notes'
+        description: 'Notes about the task in progress'
+        type: 'string'
+        format: 'markdown'
+        
 
   # denormalization
   userName: {title: 'Player Name', type: 'string'}

server/routes/mail.coffee

@@ -404,6 +404,10 @@ sendEmployerNewCandidatesAvailableEmail = (employer, cb) ->
 
 ### End Employer New Candidates Available Email ###
   
+### Task Emails ###
+userRemarkTaskEmailTask = ->
+  
+
 ### New Recruit Leaderboard Email ###
 ###
 newRecruitLeaderboardEmailTask = ->