task-manager 0.1.4 → 0.1.5

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

@@ -19,8 +19,15 @@ Ext.define('TM.controller.Plans', {
   }, {
     ref: 'planForm',
     selector: 'plan_form'
+  }, {
+    ref: 'planGrid',
+    selector: 'plan_grid'
   }],
 
+  index: function() {
+    this.render('TM.view.plan.Index');
+  },
+
   init: function() {
     this.control({
       'plan_search button[action="query"]': {
@@ -38,6 +45,9 @@ Ext.define('TM.controller.Plans', {
       'plan_grid button[action="delete"]': {
         click: this.onDeleteClick
       },
+      'plan_grid': {
+        render: this.onGridRender
+      },
       'plan_form button[action="save"]': {
         click: this.onSaveClick
       },
@@ -47,10 +57,12 @@ Ext.define('TM.controller.Plans', {
     });
   },
 
+  // @protected
   onAddClick: function() {
     Ext.create('TM.view.plan.FormWindow', { title: '添加计划' }).show();
   },
 
+  // @protected
   onEditClick: function(btn) {
     var length = btn.up('plan_grid').getSelectionModel().getSelection().length;
     if (length == 0) {
@@ -70,6 +82,7 @@ Ext.define('TM.controller.Plans', {
     this.getPlanForm().loadRecord(record);
   },
 
+  // @protected
   onDeleteClick: function(btn) {
     var select = btn.up('plan_grid').getSelectionModel().getSelection()[0];
     if(select == null) {
@@ -87,6 +100,7 @@ Ext.define('TM.controller.Plans', {
     });
   },
 
+  // @protected
   onSaveClick: function(btn) {
     var self = this;
     var attrs = this.getPlanForm().getValues();
@@ -97,6 +111,8 @@ Ext.define('TM.controller.Plans', {
     record.save({
       success: function() {
         Ext.Msg.alert('提示', '保存计划成功!');
+
+        self.getPlanGrid().reconfigure();
         self.getPlanFormWindow().close();
       },
       failure: function() {
@@ -105,20 +121,26 @@ Ext.define('TM.controller.Plans', {
     });
   },
 
+  // @protected
   onCancelClick: function(btn) {
     this.getPlanFormWindow().close();
   },
 
+  // @protected
   onQueryClick: function(btn) {
     var params = this.getSearchForm().getValues();
     Ext.getStore('TM.store.Plans').load({ params: params });
   },
 
+  // @protected
   onSearchResetClick: function(btn) {
     this.getSearchForm().getForm().reset();
   },
 
-  index: function() {
-    this.render('TM.view.plan.Index');
+  // @protected
+  onGridRender: function(grid) {
+    if(grid.getStore().getCount() <= 0) {
+      grid.getStore().load();
+    }
   }
 });

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

@@ -8,6 +8,10 @@ Ext.define('TM.controller.Tasks', {
 		selector: 'task_search'
 	}],
 
+	index: function() {
+		this.render('TM.view.task.Index');
+	},
+
 	init: function() {
 		this.control({
 		  'task_search button[action="query"]': {
@@ -18,19 +22,25 @@ Ext.define('TM.controller.Tasks', {
 		  },
 		  'task_grid button[action="delete"]': {
 		    click: this.onDeleteClick
-		  }
+		  },
+      'task_grid': {
+        render: this.onGridRender
+      }
 		});
 	},
 
+  // @protected
 	onQueryClick: function(btn) {
     var params = this.getSearchForm().getValues();
     Ext.getStore('TM.store.Tasks').load({ params: params });
   },
 
+  // @protected
   onSearchResetClick: function(btn) {
     this.getSearchForm().getForm().reset();
   },
 
+  // @protected
 	onDeleteClick: function(btn) {
 		var select = btn.up('task_grid').getSelectionModel().getSelection()[0];
     if(select == null) {
@@ -50,7 +60,10 @@ Ext.define('TM.controller.Tasks', {
     });
 	},
 
-	index: function() {
-		this.render('TM.view.task.Index');
-	}
+  // @protected
+  onGridRender: function(grid) {
+    if(grid.getStore().getCount() <= 0) {
+      grid.getStore().load();
+    }
+  }
 });

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

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

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

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

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

@@ -2,6 +2,7 @@ Ext.define('TM.view.assignee.TreeCombo', {
   xtype: 'assignee_treecombo',
   extend: 'Ext.ux.TreeCombo',
   editable: false,
+  rootVisible: false,
 
   setValue: function(valueInit) {
     if(typeof valueInit === 'object') {

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

@@ -5,7 +5,7 @@ Ext.define('TM.view.callback.CheckboxCombo', {
   getSubmitValue: function() {
     var callbacks = [];
 
-    Ext.Array.forEach(this.value, function(c, i) {
+    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')

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

@@ -2,10 +2,6 @@ Ext.define('TM.view.plan.Form', {
   extend: 'Ext.form.Panel',
   xtype: 'plan_form',
 
-  //requires: [
-    //'Ext.ux.TreeCombo',
-  //],
-
   defaultPlanType: 'yearly',
   defaultBeginToRemind: 0,
 
@@ -29,28 +25,30 @@ Ext.define('TM.view.plan.Form', {
     },
 
     items: [{
-      fieldLabel: '计划名称',
+      fieldLabel: '名称',
       name: 'name',
       allowBlank: false
     }, {
       xtype: 'assignee_treecombo',
-      fieldLabel: '计划执行人',
+      fieldLabel: '执行人',
       name: 'assignables_attributes',
       store: Ext.getStore('TM.store.Assignees').toTreeStore()
     }, {
-      fieldLabel: '计划类型',
+      fieldLabel: '类型',
       name: 'plan_type',
       store: 'TM.store.Types',
       editable: false,
       valueField: 'value',
       xtype: 'combo',
-      blankText: '请选择计划类型!',
+      blankText: '请选择类型!',
       allowBlank: false
     }, {
       fieldLabel: '横向指标',
+      emptyText: '请用逗号分割指标项',
       name: 'data.x'
     }, {
       fieldLabel: '纵向指标',
+      emptyText: '请用逗号分割指标项',
       name: 'data.y'
     }, {
       fieldLabel: '生效时间',
@@ -60,15 +58,14 @@ Ext.define('TM.view.plan.Form', {
       format: 'Y/m/d',
       name: 'enabled_at'
     }, {
-      fieldLabel: '完成前几天提醒',
-      emptyText: '计划完成前多少天开始提醒，此处为倒计时。',
+      fieldLabel: '提前几天提醒',
       name: 'begin_to_remind'
     }, {
       fieldLabel: '是否自动完成',
       xtype: 'checkbox',
       name: 'autocompletable'
     }, {
-      fieldLabel: '超时回调',
+      fieldLabel: '逾期处理',
       xtype: 'callback_checkboxcombo',
       editable: false,
       name: 'callables_attributes',
@@ -80,7 +77,7 @@ Ext.define('TM.view.plan.Form', {
   }, {
     xtype: 'fieldset',
     itemId: 'deadline',
-    title: '计划完成截至时限',
+    title: '截止时间',
     layout: {
       type: 'table',
       columns: 2
@@ -142,6 +139,8 @@ Ext.define('TM.view.plan.Form', {
       delete values['data.' + name];
     }, this);
 
+    values.begin_to_remind = values.begin_to_remind * 24 * 60;
+
     return values;
   },
 
@@ -158,6 +157,8 @@ Ext.define('TM.view.plan.Form', {
       this.query('textfield[name="data.' + name + '"]')[0].setValue(record.get('data')[name]);
     }, this);
 
+    this.query('textfield[name="begin_to_remind"]')[0].setValue(record.get('begin_to_remind') / (24 * 60));
+
     this.checkSelectedAssignees(record.get('assignees'));
     this.checkSelectedCallbacks(record.get('callbacks'));
   },
@@ -210,7 +211,6 @@ Ext.define('TM.view.plan.Form', {
       }
     }, this);
 
-    //console.log(values);
     this.getAssigneesTreeCombo().setValue(values);
   },
 

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

@@ -69,7 +69,7 @@ Ext.define('TM.view.plan.Grid', {
     },
     flex: 3
   }, {
-    text: '超时回调',
+    text: '逾期处理',
     renderer: function(v, m, record) {
       var names = new Array();
       Ext.Array.forEach(record.get('callbacks'), function(callback, index) {names.push(callback.name)});
@@ -89,8 +89,11 @@ Ext.define('TM.view.plan.Grid', {
     },
     flex: 1
   }, {
-    text: '开始提醒天数',
+    text: '提前几天提醒',
     dataIndex: 'begin_to_remind',
+    renderer: function(v, m, record) {
+      return v / (24 * 60);
+    },
     flex: 1
   }]
 });

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

@@ -52,7 +52,7 @@ Ext.define('TM.view.task.Grid', {
     },
     flex:2
   }, {
-    text: '截至时间',
+    text: '截止时间',
     dataIndex: 'deadline',
     renderer: function(v, m, record) {
       return Ext.Date.format(v, 'Y年m月j日 H:i:s');

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

@@ -120,7 +120,6 @@ Ext.define('Ext.ux.form.CheckboxListCombo', {
             }
             me.resumeEvents();// resume events, though selectAll & deselectAll send them anyway
             me.view.resumeEvents();
-            console.log("CheckboxComboList.changed: " + allState + " / " + nChecked);
           }
         }
       }

data/app/models/task_manager/plan.rb

@@ -61,7 +61,7 @@ module TaskManager
 
       Task.create! do |t|
         t.name = name
-        t.data = { x: data[:x], y: data[:y] }
+        t.data = data.select{ |k, v| !(k.to_s.start_with?('deadline_')) }
         t.task_type = plan_type
         t.deadline = calculate_deadline(plan_type, data)
         t.reminding_at = reminding_at
@@ -118,7 +118,9 @@ module TaskManager
                        when :yearly then now.beginning_of_year
                        end
 
-        squeel{ (plan_type == type) & (last_task_created_at <= beginning_at) & (enabled_at <= now) }
+        squeel{ (plan_type == type) &
+                ((last_task_created_at <= beginning_at) | (last_task_created_at == nil)) &
+                (enabled_at <= now) }
       end
     end
   end

data/lib/task-manager/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: task-manager
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -324,7 +324,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2162932120880694104
+      hash: -419505164111857855
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -333,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2162932120880694104
+      hash: -419505164111857855
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24