task-manager 0.1.3 → 0.1.4

data/README.md

@@ -90,6 +90,64 @@ API文档](http://rdoc.info/github/menglifang/task-manager/master/TaskManager/Ap
 /*= require task-manager/extjs */
 ```
 
+在`app/assets/javascripts/extjs/app.js`文件中`controllers`添加：
+
+```javascript
+controllers: [..., 'TM.controller.Plans', 'TM.controller.Tasks'];
+```
+
+#### 后台
+
+##### Ruby Project
+
+* 在`app/controllers/task_manager`下创建`AssigneesController.rb`文件：
+
+示例：
+
+```ruby
+# -*- encoding: utf-8 -*-
+module TaskManager
+  class AssigneesController < ApplicationController
+    respond_to :json
+  
+    def index
+      departments = Department.all
+      assignees = departments.inject([]) do |c, i|
+        c << {
+          id: i.id,
+          parent_id: i.parent_id,
+          name: i.name,
+          class_name: i.class.name
+        }
+      end
+      # 或者使用如下方式
+      # assignees = departments.inject([]) { |c, i| c << i.as_json }
+  
+      result = {
+        total: assignees.count,
+        assignees: assignees
+      }
+  
+      render json: result, status: :ok
+    end
+  end
+end
+```
+
+* 在`config/routes.rb`文件中添加：
+
+```ruby
+resources :assignees, only: [:index], module: 'TaskManager'
+```
+
+使用`rake
+routes`命令，检查是否添加成功。如果成功，命令行中将会有如下输出：
+
+```
+Routes for TaskManager::Engine:
+assignees GET    /assigneess(.:format)     TaskManager/assignees#index {:format=>"json"}
+```
+
 ### 开发指南
 
 * 安装依赖包

data/app/assets/javascripts/task-manager/extjs.js

@@ -9,6 +9,7 @@
 //= require_self
 //
 //= require ./extjs/app/view/assignee/TreeCombo
+//= require ./extjs/app/view/callback/CheckboxCombo
 //= require ./extjs/app/view/task/Search
 //= require ./extjs/app/view/task/Grid
 //= require ./extjs/app/view/task/Index
@@ -24,6 +25,7 @@
 Ext.data.StoreManager.register(
 	Ext.create('TM.store.Tasks', { storeId: 'TM.store.Tasks'}),
   Ext.create('TM.store.Assignees', { storeId: 'TM.store.Assignees'}),
+  Ext.create('TM.store.Callbacks', { storeId: 'TM.store.Callbacks'}),
   Ext.create('TM.store.WeekDays', { storeId: 'TM.store.WeekDays'}),
   Ext.create('TM.store.QuarterlyMonths', { storeId: 'TM.store.QuarterlyMonths'}),
   Ext.create('TM.store.Months', { storeId: 'TM.store.Months'}),

data/app/assets/javascripts/task-manager/extjs/app/model/Callback.js

@@ -0,0 +1,34 @@
+Ext.define('TM.model.Callback', {
+  extend: 'Ext.data.Model',
+
+  fields: [
+    { name: 'id', type: 'int' },
+    { name: 'name' },
+    { name: 'class_name' }
+  ],
+
+  proxy: {
+    type: 'rest',
+    url: '/callbacks',
+    reader: {
+      root: 'callbacks',
+      totalProperty: 'total'
+    }
+  },
+
+  getId: function(detailed) {
+    if(detailed) {
+      return this.get('class_name') + '-' + this.get('id');
+    } else {
+      return this.get('id');
+    }
+  },
+
+  getParentId: function(detailed) {
+    if(this.get('parent_id') && detailed) {
+      return this.get('class_name') + '-' + this.get('parent_id');
+    } else {
+      return this.get('parent_id');
+    }
+  }
+});

data/app/assets/javascripts/task-manager/extjs/app/model/Plan.js

@@ -19,6 +19,7 @@ Ext.define('TM.model.Plan', {
     { name: 'updated_at', type: 'date', persist: false },
 
     { name: 'assignees', type: 'auto', persist: false, defaultValue: [] },
+    { name: 'callbacks', type: 'auto', persist: false, defaultValue: [] },
     { name: 'assignables_attributes', type: 'auto', defaultValue: [] },
     { name: 'callables_attributes', type: 'auto', defaultValue: [] }
   ],

data/app/assets/javascripts/task-manager/extjs/app/store/Callbacks.js

@@ -0,0 +1,6 @@
+Ext.define('TM.store.Callbacks', {
+  extend: 'Ext.data.Store',
+
+  autoLoad: true,
+  model: 'TM.model.Callback'
+});

data/app/assets/javascripts/task-manager/extjs/app/view/assignee/TreeCombo.js

@@ -1,6 +1,7 @@
 Ext.define('TM.view.assignee.TreeCombo', {
   xtype: 'assignee_treecombo',
   extend: 'Ext.ux.TreeCombo',
+  editable: false,
 
   setValue: function(valueInit) {
     if(typeof valueInit === 'object') {
@@ -38,7 +39,7 @@ Ext.define('TM.view.assignee.TreeCombo', {
   initComponent: function() {
     this.callParent(arguments);
 
-    this.on('show', this.unCheckNodes);
+    this.on('render', this.unCheckNodes);
   },
 
   // @private

data/app/assets/javascripts/task-manager/extjs/app/view/callback/CheckboxCombo.js

@@ -0,0 +1,17 @@
+Ext.define('TM.view.callback.CheckboxCombo', {
+  extend: 'Ext.ux.form.CheckboxListCombo',
+  xtype: 'callback_checkboxcombo',
+
+  getSubmitValue: function() {
+    var callbacks = [];
+
+    Ext.Array.forEach(this.value, function(c, i) {
+      callbacks.push({
+        callback_id: c,
+        callback_type: Ext.getStore('TM.store.Callbacks').getAt(0).get('class_name')
+      });
+    });
+
+    return callbacks;
+  }
+});

data/app/assets/javascripts/task-manager/extjs/app/view/plan/Form.js

@@ -1,8 +1,11 @@
 Ext.define('TM.view.plan.Form', {
-  requires: ['Ext.ux.TreeCombo'],
   extend: 'Ext.form.Panel',
   xtype: 'plan_form',
 
+  //requires: [
+    //'Ext.ux.TreeCombo',
+  //],
+
   defaultPlanType: 'yearly',
   defaultBeginToRemind: 0,
 
@@ -64,6 +67,15 @@ Ext.define('TM.view.plan.Form', {
       fieldLabel: '是否自动完成',
       xtype: 'checkbox',
       name: 'autocompletable'
+    }, {
+      fieldLabel: '超时回调',
+      xtype: 'callback_checkboxcombo',
+      editable: false,
+      name: 'callables_attributes',
+      store: 'TM.store.Callbacks',
+      multiSelect: true,
+      displayField: 'name',
+      valueField: 'id'
     }]
   }, {
     xtype: 'fieldset',
@@ -147,6 +159,7 @@ Ext.define('TM.view.plan.Form', {
     }, this);
 
     this.checkSelectedAssignees(record.get('assignees'));
+    this.checkSelectedCallbacks(record.get('callbacks'));
   },
 
   // @protected
@@ -163,6 +176,19 @@ Ext.define('TM.view.plan.Form', {
     this.refreshDeadline(this.defaultPlanType);
   },
 
+  // @private
+  checkSelectedCallbacks: function(callbacks) {
+    if (typeof callbacks === 'undefined') return;
+
+    var values = [];
+    callbacks.forEach(function(c) {
+      values.push(c.id);
+    });
+
+    //this.getCallbackCheckCombo().setValue(values.join(', '));
+    this.getCallbackCheckCombo().setValue(values);
+  },
+
   // @private
   checkSelectedAssignees: function(assignees) {
     if(typeof assignees === 'undefined') return;
@@ -184,7 +210,7 @@ Ext.define('TM.view.plan.Form', {
       }
     }, this);
 
-    console.log(values);
+    //console.log(values);
     this.getAssigneesTreeCombo().setValue(values);
   },
 
@@ -286,5 +312,10 @@ Ext.define('TM.view.plan.Form', {
   // @private
   getAssigneesTreeCombo: function() {
     return this.query('assignee_treecombo')[0];
+  },
+
+  // @private
+  getCallbackCheckCombo: function() {
+    return this.query('callback_checkboxcombo')[0];
   }
 });

data/app/assets/javascripts/task-manager/extjs/app/view/plan/FormWindow.js

@@ -9,7 +9,7 @@ Ext.define('TM.view.plan.FormWindow', {
 	modal: true,
 
 	width: 600,
-	height: 550,
+	height: 580,
 
 	layout: {
 		type: 'fit',

data/app/assets/javascripts/task-manager/extjs/app/view/plan/Grid.js

@@ -68,10 +68,14 @@ Ext.define('TM.view.plan.Grid', {
       return names.join(', ');
     },
     flex: 3
-  //}, {
-    //text: '最后任务生成时间',
-    //dataIndex: 'last_task_created_at',
-    //flex: 2
+  }, {
+    text: '超时回调',
+    renderer: function(v, m, record) {
+      var names = new Array();
+      Ext.Array.forEach(record.get('callbacks'), function(callback, index) {names.push(callback.name)});
+      return names.join(', ');
+    },
+    flex: 3
   }, {
     text: '生效时间',
     renderer: function(v, m, record) {

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

@@ -0,0 +1,129 @@
+// Note: add the styles shown in the comment at the end of this code block to your .css
+Ext.ns('Ext.ux.form');	// create namespace
+Ext.define('Ext.ux.form.CheckboxListCombo', {
+  extend: 'Ext.form.field.ComboBox',
+  alias: 'widget.checkboxlistcombo',
+
+  /**
+   * The following options were added to extend the ComboBox to provide additional functionality.
+   * The are now 4 possible display values in the text box of the combo:
+   * (1) .emptyText
+   * (2) .displayField - if only one item is selected
+   * (3) optional .briefDisplayField - if 2 or more items are selected
+   * (4) optional {nn} briefSummaryTitle - if more than a certain number of items are selected (and all won't fit)
+   * These features are only used if the values below are not falsy
+   */
+  briefDisplayField: false, 	// store field to use if there are multiple items selected (if not false)
+  briefDisplayLimit: false, 	// max # of "briefDisplayField" items to display, after which "## {briefSummaryTitle}" is displayed
+  briefSummaryTitle: false, 	// string to display if there are too many selected items for the display box
+  displayList: "",			      // will hold the delimited list of all selections (may not be in the combo if too many, but can be used as desired)
+  firstItemChecksAll: false, 	// if true then the first item is ignored other than for this purpose (value must be falsy)
+  allSelectedTitle: false,	  // if not set, it will be set to the displayValue of the first item
+
+  constructor: function(config) {
+    Ext.ux.form.CheckboxListCombo.superclass.constructor.call(this, config);
+  },
+
+  initComponent: function () {
+    if (this.briefDisplayField) {
+      this.briefDisplayTpl = Ext.create('Ext.XTemplate', '<tpl for=".">{[typeof values === "string" ? values : values.' + this.briefDisplayField + ']}<tpl if="xindex < xcount">' + this.delimiter + '</tpl></tpl>');
+    }
+    Ext.ux.form.CheckboxListCombo.superclass.initComponent.apply(this, arguments);
+    this.listConfig.checkboxComboId = this.id; // for firstItem checking (see below)
+  },
+
+  getDisplayValue: function () {
+    this.displayList = this.displayTplData && this.displayTplData.length 
+    ? (this.briefDisplayTpl || this.displayTpl).apply(this.displayTplData)
+    : "";
+    var ttl = this.allSelected
+    ? this.allSelectedTitle || "[" + this.emptyText + "]"
+    : (
+      (this.briefDisplayLimit && this.briefSummaryTitle && this.displayTplData && this.displayTplData.length > this.briefDisplayLimit) 
+      ? (this.displayTplData.length) + " " + this.briefSummaryTitle
+      : this.displayList
+    );
+    return ttl || this.emptyText;
+  },
+
+  lastQuery: '', // prevents clearing of the list after initial setValue
+  listConfig: {
+    getInnerTpl: function (displayField) {
+      return '<tpl for="."><div><img src="' + Ext.BLANK_IMAGE_URL + '" ' + 'class="ux-checkboxlistcombo-icon">{' + (displayField || 'text') + ':htmlEncode}</div></tpl>';
+    },
+    // from here down it's all about the first item checking/unchecking all others
+    previousAllChecked: false,
+    previousCheckCount: 0,
+    listeners: {
+      beforeselect: function ( me, node, selections, options ) {
+        // since selectionChange does not provide info on which node changed,
+        // we need to determine whether the all item was selected...
+        var combo = Ext.getCmp(me.view.checkboxComboId);
+        me.view.somethingChecked = true;
+        me.view.allChecked = combo && combo.firstItemChecksAll && !node.data[combo.valueField];
+        return true;
+      },
+      selectionchange: function (dataViewModel, selections, options) {
+        var me = dataViewModel,combo = Ext.getCmp(me.view.checkboxComboId), 
+        storeRecs, recs = [], d, i, j, nChecked, vField, dField, allState, allNodes, allItem, 
+        grayCls = "ux-checkboxcombolist-tri",
+        somethingChecked = me.view.somethingChecked,
+        allChecked = me.view.allChecked;
+        me.view.somethingChecked = false;
+        me.view.allChecked = false; // beforeselect doesn't fire on deselect
+        if (combo && combo.firstItemChecksAll) {
+          allNodes = me.view.getNodes();
+          if (allNodes.length) {
+            allItem = Ext.get(allNodes[0]);
+            vField = combo.valueField;
+            dField = combo.displayField;
+            storeRecs = Ext.clone(me.store.getRange(0));
+            for (i=nChecked=0;i<storeRecs.length;i++) {
+              d = storeRecs[i].data;
+              d.checked = false;
+              for (j=0;selections && !d.checked && j<selections.length;j++) {
+                if (selections[j].data[vField] == d[vField]) {
+                  d.checked = true;
+                  if (i>0) {
+                    nChecked++;
+                  } else if (!combo.allSelectedTitle) {
+                    combo.allSelectedTitle = d[dField];
+                  }
+                }
+              }
+              recs.push(d);
+            }
+            allState =  ( ( recs[0].checked && allChecked ) || (nChecked == recs.length-1 && somethingChecked)) 
+            ? 1 
+            : ( 0 < nChecked && nChecked < recs.length-1 ? 2 : 0);
+
+            me.view.suspendEvents();// suspend events, though selectAll & deselectAll send them anyway
+            me.suspendEvents();
+            switch (allState) {
+              case 0:		// None
+                //me.deselectAll(true); // Nope, doesn't suspend events
+                combo.allSelected = false;
+              allItem.removeCls(grayCls);
+              setTimeout(function () { me.deselectAll(false); },1); // suspendEvent is ignored, so we hack using a timer
+              break;
+              case 1:		// All
+                //me.selectAll(true); // Nope, doesn't suspend events
+                combo.allSelected = true;
+              allItem.removeCls(grayCls);
+              setTimeout(function () { me.selectAll(false); },1); // suspendEvent is ignored, so we hack using a timer
+              break;
+              case 2:		// Some (gray out the ALL item)
+                allItem.addCls(grayCls);
+              combo.allSelected = false;
+              me.deselect(0,true); // in this case the suspendEvent flag works
+              break;
+            }
+            me.resumeEvents();// resume events, though selectAll & deselectAll send them anyway
+            me.view.resumeEvents();
+            console.log("CheckboxComboList.changed: " + allState + " / " + nChecked);
+          }
+        }
+      }
+    }
+  },
+});

data/app/assets/stylesheets/task-manager/checkboxlistcombo.css.scss

@@ -0,0 +1,10 @@
+.ux-checkboxlistcombo-icon {
+    float: left; width:16px; height:16px;
+    background-position: -1px -1px ! important; background-repeat: no-repeat ! important;
+}
+.x-boundlist-item>div>.ux-checkboxlistcombo-icon {
+  background: url(image_path("extjs/resources/themes/images/default/grid/unchecked.gif")) no-repeat;
+}
+.x-boundlist-item.x-boundlist-selected>div>.ux-checkboxlistcombo-icon {
+  background: url(image_path("extjs/resources/themes/images/default/grid/checked.gif")) no-repeat;
+}

data/app/assets/stylesheets/task-manager/extjs.css.scss

@@ -9,6 +9,7 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
+ *= require ./checkboxlistcombo
  */
 .btn-add-icon {
   background: url(image_path('task-manager/icons/add.png')) no-repeat;

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

@@ -47,12 +47,11 @@ module TaskManager
         #     }, ...]
         #   }
         def index
-          plans = TaskManager::Plan.search(params[:q]).result.order('id DESC')
+          plans = TaskManager::Plan.page(params[:page]).per(params[:limit]).
+            order('id DESC').search(params[:q]).result
           result = {
-            total: plans.count,
-            plans: ActiveModel::ArraySerializer.new(
-              plans.page(params[:page]).per(params[:limit])
-            ).as_json
+            total: plans.total_count,
+            plans: ActiveModel::ArraySerializer.new(plans).as_json
           }
 
           render json: result, status: :ok
@@ -217,6 +216,7 @@ module TaskManager
         #   }
         def update
           plan.assignables.destroy_all
+          plan.callables.destroy_all
 
           if plan.update_attributes(params[:plan])
             render json: plan, status: :ok

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

@@ -45,12 +45,11 @@ module TaskManager
         #     }, ...]
         #   }
         def index
-          tasks = TaskManager::Task.search(params[:q]).result.order('id DESC')
+          tasks = TaskManager::Task.page(params[:page]).per(params[:limit]).
+            order('id DESC').search(params[:q]).result
           result = {
-            total: tasks.count,
-            tasks: ActiveModel::ArraySerializer.new(
-              tasks.page(params[:page]).per(params[:limit])
-            ).as_json
+            total: tasks.total_count,
+            tasks: ActiveModel::ArraySerializer.new(tasks).as_json
           }
 
           render json: result, status: :ok

data/app/serializers/task_manager/plan_serializer.rb

@@ -4,5 +4,6 @@ module TaskManager
       :begin_to_remind, :autocompletable, :created_at, :updated_at
 
     has_many :assignees
+    has_many :callbacks
   end
 end

data/lib/task-manager/version.rb

@@ -1,3 +1,3 @@
 module TaskManager
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: task-manager
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -249,10 +249,12 @@ files:
 - app/assets/javascripts/task-manager/extjs/app/controller/Tasks.js
 - app/assets/javascripts/task-manager/extjs/app/helper/ApplicationHelper.js
 - app/assets/javascripts/task-manager/extjs/app/model/Assignee.js
+- app/assets/javascripts/task-manager/extjs/app/model/Callback.js
 - app/assets/javascripts/task-manager/extjs/app/model/Plan.js
 - app/assets/javascripts/task-manager/extjs/app/model/Task.js
 - app/assets/javascripts/task-manager/extjs/app/store/Assignees.js
 - app/assets/javascripts/task-manager/extjs/app/store/Booleans.js
+- app/assets/javascripts/task-manager/extjs/app/store/Callbacks.js
 - app/assets/javascripts/task-manager/extjs/app/store/Days.js
 - app/assets/javascripts/task-manager/extjs/app/store/Hours.js
 - app/assets/javascripts/task-manager/extjs/app/store/Minutes.js
@@ -264,6 +266,7 @@ files:
 - app/assets/javascripts/task-manager/extjs/app/store/Types.js
 - app/assets/javascripts/task-manager/extjs/app/store/WeekDays.js
 - app/assets/javascripts/task-manager/extjs/app/view/assignee/TreeCombo.js
+- app/assets/javascripts/task-manager/extjs/app/view/callback/CheckboxCombo.js
 - app/assets/javascripts/task-manager/extjs/app/view/plan/Form.js
 - app/assets/javascripts/task-manager/extjs/app/view/plan/FormWindow.js
 - app/assets/javascripts/task-manager/extjs/app/view/plan/Grid.js
@@ -272,11 +275,13 @@ files:
 - app/assets/javascripts/task-manager/extjs/app/view/task/Grid.js
 - app/assets/javascripts/task-manager/extjs/app/view/task/Index.js
 - app/assets/javascripts/task-manager/extjs/app/view/task/Search.js
+- app/assets/javascripts/task-manager/extjs/lib/ux/CheckboxListCombo.js
 - app/assets/javascripts/task-manager/extjs/lib/ux/Model.js
 - app/assets/javascripts/task-manager/extjs/lib/ux/MultiSelectablePagingGrid.js
 - app/assets/javascripts/task-manager/extjs/lib/ux/RowExpander.js
 - app/assets/javascripts/task-manager/extjs/lib/ux/TreeCombo.js
 - app/assets/javascripts/task-manager/extjs.js
+- app/assets/stylesheets/task-manager/checkboxlistcombo.css.scss
 - app/assets/stylesheets/task-manager/extjs.css.scss
 - app/controllers/task_manager/api/v1/plans_controller.rb
 - app/controllers/task_manager/api/v1/tasks_controller.rb
@@ -319,7 +324,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -799618091743939836
+      hash: 2162932120880694104
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -328,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -799618091743939836
+      hash: 2162932120880694104
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24