task-manager 0.1.2 → 0.1.3

data/app/assets/javascripts/task-manager/extjs/app/view/plan/{Window.js → FormWindow.js}

@@ -1,9 +1,11 @@
-Ext.define('TM.view.plan.Window', {
+Ext.define('TM.view.plan.FormWindow', {
 	extend: 'Ext.window.Window',
-	requires: ['TM.view.plan.New'],
-	xtype: 'plan_window',
+	xtype: 'plan_formwindow',
+
+	requires: [
+    'TM.view.plan.Form'
+  ],
 
-	title: '添加计划',
 	modal: true,
 
 	width: 600,
@@ -15,7 +17,7 @@ Ext.define('TM.view.plan.Window', {
 	},
 
 	items: [{
-	    xtype: 'plan_new',
+	    xtype: 'plan_form',
 	    border: false
   }]
 });

data/app/assets/javascripts/task-manager/extjs/lib/ux/Model.js

@@ -0,0 +1,14 @@
+Ext.define('Ext.ux.Model', {
+  override: 'Ext.data.Model',
+
+  getPersistData: function() {
+    var data = {};
+    Ext.Array.each(this.fields.items, function(f) {
+      if(f.persist) {
+        data[f.name] = this.get(f.name);
+      }
+    }, this);
+
+    return data;
+  }
+});

data/app/assets/javascripts/task-manager/extjs/lib/ux/TreeCombo.js

@@ -0,0 +1,276 @@
+/*
+Tree combo
+Use with 'Ext.data.TreeStore'
+
+If store root note has 'checked' property tree combo becomes multiselect combo (tree store must have records with 'checked' property)
+
+Has event 'itemclick' that can be used to capture click
+
+Options:
+selectChildren - if set true and if store isn't multiselect, clicking on an non-leaf node selects all it's children
+canSelectFolders - if set true and store isn't multiselect clicking on a folder selects that folder also as a value
+
+Use:
+
+single leaf node selector:
+selectChildren: false
+canSelectFolders: false
+- this will select only leaf nodes and will not allow selecting non-leaf nodes
+
+single node selector (can select leaf and non-leaf nodes)
+selectChildren: false
+canSelectFolders: true
+- this will select single value either leaf or non-leaf
+
+children selector:
+selectChildren: true
+canSelectFolders: true
+- clicking on a node will select it's children and node, clicking on a leaf node will select only that node
+
+This config:
+selectChildren: true
+canSelectFolders: false
+- is invalid, you cannot select children without node
+
+*/
+Ext.define('Ext.ux.TreeCombo',
+{
+	extend: 'Ext.form.field.Picker',
+	alias: 'widget.treecombo',
+	tree: false,
+	constructor: function(config)
+	{
+		this.addEvents(
+		{
+			"itemclick" : true
+		});
+
+		this.listeners = config.listeners;
+		this.callParent(arguments);
+	},
+	records: [],
+	recursiveRecords: [],
+	selectChildren: true,
+	canSelectFolders: true,
+	multiselect: false,
+	displayField: 'text',
+	valueField: 'id',
+	recursivePush: function(node)
+	{
+		var	me = this;
+		me.recursiveRecords.push(node);
+		
+		node.eachChild(function(nodesingle)
+		{
+			if(nodesingle.hasChildNodes() == true)
+			{
+				me.recursivePush(nodesingle);
+			}
+			else me.recursiveRecords.push(nodesingle);
+		});
+	},
+	recursiveUnPush: function(node)
+	{
+		var	me = this;
+		Ext.Array.remove(me.records, node);
+		
+		node.eachChild(function(nodesingle)
+		{
+			if(nodesingle.hasChildNodes() == true)
+			{
+				me.recursiveUnPush(nodesingle);
+			}
+			else Ext.Array.remove(me.records, nodesingle);
+		});
+	},
+	afterLoadSetValue: false,
+	setValue: function(valueInit)
+	{
+		if(typeof valueInit == 'undefined') return;
+		
+		var	me = this,
+			tree = this.tree,
+			value = valueInit.split(',');
+			
+		inputEl = me.inputEl;
+
+		if(tree.store.isLoading())
+		{
+			me.afterLoadSetValue = valueInit;
+		}
+
+		if(inputEl && me.emptyText && !Ext.isEmpty(value))
+		{
+			inputEl.removeCls(me.emptyCls);
+		}
+
+		if(tree == false) return false;
+
+		var node = tree.getRootNode();
+		if(node == null) return false;
+
+		me.recursiveRecords = [];
+		me.recursivePush(node);
+
+		var valueFin = [];
+		var idsFin = [];
+		
+		if(me.multiselect == true)
+		{
+			Ext.each(me.recursiveRecords, function(record)
+			{
+				record.set('checked', false);
+			});
+		}
+		
+		me.records = [];
+		Ext.each(me.recursiveRecords, function(record)
+		{
+			var data = record.get(me.valueField);
+			Ext.each(value, function(val)
+			{
+				if(data == val) 
+				{
+					valueFin.push(record.get(me.displayField));
+					idsFin.push(data);
+					if(me.multiselect == true) record.set('checked', true);
+					me.records.push(record);
+				}
+			});
+		});
+
+		me.value = valueInit;
+		me.setRawValue(valueFin.join(', '));
+		
+		me.checkChange();
+		me.applyEmptyText();
+		return me;
+	},
+	getValue: function() 
+	{
+		return this.value;
+	},
+	getSubmitValue: function()
+	{
+		return this.value;
+	},
+	checkParentNodes: function(node)
+	{
+		if(node == null) return;
+		
+		var	me = this,
+			checkedAll = true,
+			ids = [];
+			
+		Ext.each(me.records, function(value)
+		{
+			ids.push(value.get(me.valueField));
+		});
+
+		node.eachChild(function(nodesingle)
+		{
+			if(!Ext.Array.contains(ids, nodesingle.get(me.valueField))) checkedAll = false;
+		});
+		
+		if(checkedAll == true)
+		{
+			me.records.push(node);
+			me.checkParentNodes(node.parentNode);
+		}
+		else
+		{
+			Ext.Array.remove(me.records, node);
+			me.checkParentNodes(node.parentNode);
+		}
+	},
+	initComponent: function() 
+	{
+		var	me = this;
+		
+		me.tree = Ext.create('Ext.tree.Panel',
+		{
+			alias: 'widget.assetstree',
+			hidden: true,
+			minHeight: 300,
+			rootVisible: (typeof me.rootVisible != 'undefined') ? me.rootVisible : true,
+			floating: true,
+			useArrows: true,
+			store: me.store,
+			listeners:
+			{
+				load: function(store, records)
+				{
+					if(me.afterLoadSetValue != false)
+					{
+						me.setValue(me.afterLoadSetValue);
+					}
+				},
+				itemclick: function(view, record, item, index, e, eOpts)
+				{
+					var values = [];
+					
+					var node = me.tree.getRootNode().findChild('id', record.get(me.valueField), true);
+					if(node == null) 
+					{
+						if(me.tree.getRootNode().get(me.valueField) == record.get(me.valueField)) node = me.tree.getRootNode();
+						else return false;
+					}
+					
+					if(me.multiselect == false) me.records = [];
+						
+					if(me.canSelectFolders == false && record.get('leaf') == false) return false;
+					if(record.get('leaf') == true || me.selectChildren == false) 
+					{
+						if(me.multiselect == false) me.records.push(record);
+						else
+						{
+							if(record.get('checked') == false) me.records.push(record);
+							else Ext.Array.remove(me.records, record);
+						}
+					}
+					else
+					{						
+						me.recursiveRecords = [];
+						if(me.multiselect == false || record.get('checked') == false)
+						{
+							me.recursivePush(node);
+							Ext.each(me.recursiveRecords, function(value)
+							{
+								if(!Ext.Array.contains(me.records, value)) me.records.push(value);
+							});
+						}
+						else if(record.get('checked') == true)
+						{
+							me.recursiveUnPush(node);
+						}
+					}
+					
+					if(me.canSelectFolders == true) me.checkParentNodes(node.parentNode);
+		
+					Ext.each(me.records, function(record)
+					{
+						values.push(record.get(me.valueField));
+					});
+
+					me.setValue(values.join(','));
+		
+					me.fireEvent('itemclick', me, record, item, index, e, eOpts, me.records, values);
+
+					if(me.multiselect == false) me.onTriggerClick();
+				}
+			}
+		});
+		
+		if(me.tree.getRootNode().get('checked') != null) me.multiselect = true;
+		
+		this.createPicker = function()
+		{
+			var	me = this;
+			return me.tree;
+		};
+		
+		this.callParent(arguments);
+	}	
+});
+
+//@ sourceURL=/ux/TreeCombo.js

data/app/controllers/task_manager/api/v1/plans_controller.rb

@@ -47,7 +47,7 @@ module TaskManager
         #     }, ...]
         #   }
         def index
-          plans = TaskManager::Plan.search(params[:q]).result
+          plans = TaskManager::Plan.search(params[:q]).result.order('id DESC')
           result = {
             total: plans.count,
             plans: ActiveModel::ArraySerializer.new(
@@ -84,7 +84,7 @@ module TaskManager
         #         "deadline_minute": ...         # 必填
         #       },
         #       "enabled_at": ...,               # 必填
-        #       "begin_to_remind": ...,          # 必填且小于等于0
+        #       "begin_to_remind": ...,          # 必填且大于等于0
         #       "autocompletable": ...,          # 必填，缺省值为false
         #       "assignables_attributes": [{     # 至少需要一个assignable
         #         "assignee_id": ...,
@@ -162,7 +162,7 @@ module TaskManager
         #         "deadline_minute": ...         # 必填
         #       },
         #       "enabled_at": ...,               # 必填
-        #       "begin_to_remind": ...,          # 必填且小于等于0
+        #       "begin_to_remind": ...,          # 必填且大于等于0
         #       "autocompletable": ...,          # 必填，缺省值为false
         #
         #       "assignables_attributes": [{

data/app/controllers/task_manager/api/v1/tasks_controller.rb

@@ -45,7 +45,7 @@ module TaskManager
         #     }, ...]
         #   }
         def index
-          tasks = TaskManager::Task.search(params[:q]).result
+          tasks = TaskManager::Task.search(params[:q]).result.order('id DESC')
           result = {
             total: tasks.count,
             tasks: ActiveModel::ArraySerializer.new(

data/app/models/task_manager/plan.rb

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
 module TaskManager
-  # TODO 验证data的合法性
   class Plan < ActiveRecord::Base
     include TaskManager::DeadlineCalculator
     extend Enumerize
@@ -24,7 +23,7 @@ module TaskManager
     validates_numericality_of :begin_to_remind, greater_than_or_equal_to: 0
 
     # validate the deadline
-    validates :data, deadline: true
+    validates :data, presence: true, deadline: true
 
     def assignees
       assignables.collect(&:assignee)
@@ -38,39 +37,10 @@ module TaskManager
     #
     # 为每一个计划的执行者创建一个计划任务。
     def generate_tasks
-      now = Time.now
-      default_deadline = case plan_type.to_sym
-                 when :daily then now.end_of_day
-                 when :weekly then now.end_of_week
-                 when :monthly then now.end_of_month
-                 when :quarterly then now.end_of_quarter
-                 when :yearly then now.end_of_year
-                 end
-
-      #reminding_at = default_deadline.ago(-(begin_to_remind * 60))
-      reminding_at = default_deadline.ago(begin_to_remind * 60)
-      status = autocompletable ? :finished : :new
-      finished_at = autocompletable ? Time.now : nil
-
       tasks = []
-      data.symbolize_keys!
-
       Plan.transaction do
         assignables.each do |a|
-          tasks << Task.create! do |t|
-            t.name = name
-            t.data = { x: data[:x], y: data[:y] }
-            t.task_type = plan_type
-            t.deadline = calculate_deadline(plan_type, data)
-            t.reminding_at = reminding_at
-            t.status = status
-            t.finished_at = finished_at
-            t.create_assignable(
-              assignee_id: a.assignee_id,
-              assignee_type: a.assignee_type,
-            )
-            t.callables = callables
-          end
+          tasks << generate_task_for_assignable(a)
         end
       end
 
@@ -79,6 +49,43 @@ module TaskManager
       tasks
     end
 
+    def generate_task_for_assignable(a)
+      data.symbolize_keys!
+
+      reminding_at = default_deadline.ago(begin_to_remind * 60)
+      if autocompletable
+        status, finished_at = :finished, Time.now
+      else
+        status, finished_at = :new, nil
+      end
+
+      Task.create! do |t|
+        t.name = name
+        t.data = { x: data[:x], y: data[:y] }
+        t.task_type = plan_type
+        t.deadline = calculate_deadline(plan_type, data)
+        t.reminding_at = reminding_at
+        t.status = status
+        t.finished_at = finished_at
+        t.create_assignable(
+          assignee_id: a.assignee_id,
+          assignee_type: a.assignee_type,
+        )
+        t.callables = callables
+      end
+    end
+
+    def default_deadline
+      now = Time.now
+      case plan_type.to_sym
+      when :daily then now.end_of_day
+      when :weekly then now.end_of_week
+      when :monthly then now.end_of_month
+      when :quarterly then now.end_of_quarter
+      when :yearly then now.end_of_year
+      end
+    end
+
     class << self
       # 返回所有需要创建新任务的计划
       #
@@ -91,9 +98,14 @@ module TaskManager
       #   2.4) 季计划：`Time.now.beginning_of_quarter <= last_task_created_at <= Time.now.end_of_quarter`
       #   2.5) 年计划：`Time.now.beginning_of_year <= last_task_created_at <= Time.now.end_of_year`
       def active
-        active_by_type(:daily) | active_by_type(:weekly) |
-          active_by_type(:monthly) | active_by_type(:quarterly) |
-          active_by_type(:yearly)
+        where{
+          sift(:active_by_type, 'daily') |
+          sift(:active_by_type, 'weekly') |
+          sift(:active_by_type, 'monthly') |
+          sift(:active_by_type, 'quarterly') |
+          sift(:active_by_type, 'yearly')
+
+        }
       end
 
       def active_by_type(type)
@@ -106,8 +118,7 @@ module TaskManager
                        when :yearly then now.beginning_of_year
                        end
 
-        where("plan_type = ? AND last_task_created_at <= ?",
-              type, beginning_at).where("enabled_at <= ?", now)
+        squeel{ (plan_type == type) & (last_task_created_at <= beginning_at) & (enabled_at <= now) }
       end
     end
   end