task-manager 0.1.2 → 0.1.3

data/lib/task-manager/deadline_validator.rb

@@ -1,27 +1,36 @@
+# ActiveModel 必须包含type或class_name_type（plan_type）属性
 class DeadlineValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     type = get_type(record)
-    if type.blank?
-      record.errors[:type] << (options[:message] || 'invalid type')
-    else
-      record.errors[attribute] << (options[:message] || "deadline_hour is required") if value.blank? || value[:deadline_hour].blank?
-      record.errors[attribute] << (options[:message] || "deadline_minute is required") if value.blank? || value[:deadline_minute].blank?
+    return unless type
 
-      case type.to_sym
-      when :weekly, :monthly
-        record.errors[attribute] << (options[:message] || "deadline_day is required in a #{type} plan") if value.blank? || value[:deadline_day].blank?
-      when :quarterly, :yearly
-        record.errors[attribute] << (options[:message] || "deadline_month is required in a #{type} plan") if value.blank? || value[:deadline_month].blank?
-        record.errors[attribute] << (options[:message] || "deadline_day is required in a #{type} plan") if value.blank? || value[:deadline_day].blank?
-      else
-        record.errors[attribute] << (options[:message] || "invalid type!") unless type.to_sym == :daily
-      end
+    names = []
+    case type.to_sym
+    when :daily
+      names = [:hour, :minute]
+    when :weekly, :monthly
+      names = [:hour, :minute, :day]
+    when :quarterly, :yearly
+      names = [:hour, :minute, :day, :month]
     end
+
+    validate_deadline_of(record, attribute, value, names)
   end
 
+  private
   def get_type(record)
     return record.type if record.respond_to?(:type)
 
     record.send("#{record.class.name.demodulize.underscore}_type")
   end
+
+  def validate_deadline_of(record, attribute, value, names)
+    names = [names] unless names.is_a? Array
+
+    names.each do |name|
+      name = "deadline_#{name}".to_sym
+      record.errors[attribute] << ("#{name} is required") if value[name].blank?
+    end
+  end
+
 end

data/lib/task-manager/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: task-manager
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: squeel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.13
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -229,15 +245,13 @@ files:
 - app/assets/images/task-manager/icons/add.png
 - app/assets/images/task-manager/icons/delete.png
 - app/assets/images/task-manager/icons/edit.png
-- app/assets/javascripts/task-manager/application.js
 - app/assets/javascripts/task-manager/extjs/app/controller/Plans.js
 - app/assets/javascripts/task-manager/extjs/app/controller/Tasks.js
-- app/assets/javascripts/task-manager/extjs/app/helper/application_helper.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/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/AssigneesTree.js
 - app/assets/javascripts/task-manager/extjs/app/store/Booleans.js
 - app/assets/javascripts/task-manager/extjs/app/store/Days.js
 - app/assets/javascripts/task-manager/extjs/app/store/Hours.js
@@ -249,23 +263,20 @@ files:
 - app/assets/javascripts/task-manager/extjs/app/store/Tasks.js
 - 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/plan/AssignablesWindow.js
-- app/assets/javascripts/task-manager/extjs/app/view/plan/Edit.js
-- app/assets/javascripts/task-manager/extjs/app/view/plan/EditWindow.js
+- app/assets/javascripts/task-manager/extjs/app/view/assignee/TreeCombo.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
 - app/assets/javascripts/task-manager/extjs/app/view/plan/Index.js
-- app/assets/javascripts/task-manager/extjs/app/view/plan/New.js
 - app/assets/javascripts/task-manager/extjs/app/view/plan/Search.js
-- app/assets/javascripts/task-manager/extjs/app/view/plan/SelectAssignables.js
-- app/assets/javascripts/task-manager/extjs/app/view/plan/SelectAssignablesGrid.js
-- app/assets/javascripts/task-manager/extjs/app/view/plan/SelectAssignablesTree.js
-- app/assets/javascripts/task-manager/extjs/app/view/plan/Window.js
 - 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/Model.js
 - app/assets/javascripts/task-manager/extjs/lib/ux/MultiSelectablePagingGrid.js
 - app/assets/javascripts/task-manager/extjs/lib/ux/RowExpander.js
-- app/assets/stylesheets/task-manager/application.css.scss
+- app/assets/javascripts/task-manager/extjs/lib/ux/TreeCombo.js
+- app/assets/javascripts/task-manager/extjs.js
 - 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
@@ -308,7 +319,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -654506620442171938
+      hash: -799618091743939836
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -317,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -654506620442171938
+      hash: -799618091743939836
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

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

@@ -1,3 +0,0 @@
-Ext.define('TM.store.AssigneesTree', {
-  extend: 'Ext.data.TreeStore'
-});

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

@@ -1,23 +0,0 @@
-Ext.define('TM.view.plan.AssignablesWindow', {
-	extend: 'Ext.window.Window',
-	requires: ['TM.view.plan.SelectAssignables'],
-	xtype: 'plan_assignableswindow',
-
-	title: '选择执行人',
-	modal: true,
-
-  action: '',
-
-	width: 480,
-	height: 550,
-
-	layout: {
-		type: 'fit',
-		align: 'stretch'
-	},
-
-	items: [{
-	    xtype: 'plan_selectassignables',
-	    border: false
-  	}]
-});

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

@@ -1,189 +0,0 @@
-Ext.define('TM.view.plan.Edit', {
-  extend: 'Ext.form.Panel',
-  xtype: 'plan_edit',
-
-  defaults: {
-    xtype: 'fieldset',
-    margin: '5 10'
-  },
-
-  assignees: [],
-
-  items: [{
-    id: 'editFillField',
-    title: '基本信息',
-    layout: {
-      type: 'table',
-      columns: 1
-    },
-    defaults: {
-      xtype: 'textfield',
-      labelAlign: 'right',
-      margin: '10 0',
-      width: 510
-    },
-
-    items: [{
-      fieldLabel: '计划名称',
-      name: 'name',
-      allowBlank: false
-    },{
-      fieldLabel: '计划执行人',
-      name: 'assignables',
-      id: 'editassignables',
-      readOnly: true
-    }, {
-      fieldLabel: '计划类型',
-      name: 'plan_type',
-      store: 'TM.store.Types',
-      editable: false,
-      valueField: 'value',
-      xtype: 'combo',
-      blankText: '请选择计划类型!',
-      allowBlank: false
-    }, {
-      fieldLabel: '横向指标',
-      name: 'dataX'
-    }, {
-      fieldLabel: '纵向指标',
-      name: 'dataY'
-    }, {
-      fieldLabel: '生效时间',
-      xtype: 'datefield',
-      editable: false,
-      anchor: '100%',
-      format: 'Y/m/d',
-      name: 'enabled_at',
-      id: 'editenabled_at'
-    }, {
-      fieldLabel: '完成前几天提醒',
-      id: 'edit_begin_to_remind',
-      emptyText: '计划完成前多少天开始提醒，此处为倒计时。',
-      value: '0',
-      name: 'begin_to_remind'
-    }, {
-      fieldLabel: '是否自动完成',
-      xtype: 'checkbox',
-      name: 'autocompletable'
-    }]
-  }, {
-    xtype: 'fieldset',
-    id: 'editSelectField',
-    title: '计划完成截至时限',
-    layout: {
-      type: 'table',
-      columns: 2
-    },
-    defaults: {
-      labelAlign: 'right',
-    },
-    items: [{
-      fieldLabel: '月',
-      id: 'edit_quarterly_month',
-      name: 'quarterly_month',
-      xtype: 'combo',
-      store: 'TM.store.QuarterlyMonths',
-      valueField: 'value',
-      editable: false
-    }, {
-      fieldLabel: '月',
-      id: 'edit_month',
-      name: 'month',
-      xtype: 'combo',
-      store: 'TM.store.Months',
-      valueField: 'value',
-      editable: false
-    }, {
-      fieldLabel: '日',
-      id: 'edit_weekly_day',
-      name: 'weekly_day',
-      store: 'TM.store.WeekDays',
-      valueField: 'value',
-      xtype: 'combo',
-      editable: false
-    }, {
-      fieldLabel: '日',
-      id: 'edit_day',
-      name: 'day',
-      store: 'TM.store.Days',
-      valueField: 'value',
-      xtype: 'combo',
-      editable: false
-    }, {
-      fieldLabel: '时',
-      id: 'edit_hour',
-      name: 'hour',
-      store: 'TM.store.Hours',
-      valueField: 'value',
-      xtype: 'combo',
-      editable: false
-    }, {
-      fieldLabel: '分',
-      id: 'edit_minute',
-      name: 'minute',
-      store: 'TM.store.Minutes',
-      valueField: 'value',
-      xtype: 'combo',
-      editable: false
-    }]
-  }],
-
-  buttons: [{
-    text: '更新',
-    formBind: true,
-    action: 'update'
-  }, {
-    text: '关闭',
-    action: 'close'
-  }],
-
-  showYearlyField: function() {
-    var fieldSet = this.getComponent('editSelectField');
-    fieldSet.getComponent('edit_quarterly_month').hide();
-    fieldSet.getComponent('edit_weekly_day').hide();
-    fieldSet.getComponent('edit_month').show();
-    fieldSet.getComponent('edit_day').show();
-    fieldSet.getComponent('edit_hour').show();
-    fieldSet.getComponent('edit_minute').show();
-  },
-
-  showMonthlyField: function() {
-    var fieldSet = this.getComponent('editSelectField');
-    fieldSet.getComponent('edit_quarterly_month').hide();
-    fieldSet.getComponent('edit_weekly_day').hide();
-    fieldSet.getComponent('edit_month').hide();
-    fieldSet.getComponent('edit_day').show();
-    fieldSet.getComponent('edit_hour').show();
-    fieldSet.getComponent('edit_minute').show();
-  },
-
-  showQuarterlyField: function() {
-    var fieldSet = this.getComponent('editSelectField');
-    fieldSet.getComponent('edit_quarterly_month').show();
-    fieldSet.getComponent('edit_weekly_day').hide();
-    fieldSet.getComponent('edit_month').hide();
-    fieldSet.getComponent('edit_day').show();
-    fieldSet.getComponent('edit_hour').show();
-    fieldSet.getComponent('edit_minute').show();
-  },
-
-  showWeeklyField: function() {
-    var fieldSet = this.getComponent('editSelectField');
-    fieldSet.getComponent('edit_quarterly_month').hide();
-    fieldSet.getComponent('edit_weekly_day').show();
-    fieldSet.getComponent('edit_month').hide();
-    fieldSet.getComponent('edit_day').hide();
-    fieldSet.getComponent('edit_hour').show();
-    fieldSet.getComponent('edit_minute').show(); 
-  },
-
-  showDailyField: function() {
-    var fieldSet = this.getComponent('editSelectField');
-    fieldSet.getComponent('edit_quarterly_month').hide();
-    fieldSet.getComponent('edit_weekly_day').hide();
-    fieldSet.getComponent('edit_month').hide();
-    fieldSet.getComponent('edit_day').hide();
-    fieldSet.getComponent('edit_hour').show();
-    fieldSet.getComponent('edit_minute').show();
-  }
-});

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

@@ -1,21 +0,0 @@
-Ext.define('TM.view.plan.EditWindow', {
-	extend: 'Ext.window.Window',
-	requires: ['TM.view.plan.Edit'],
-	xtype: 'plan_editwindow',
-
-	title: '修改计划',
-	modal: true,
-
-	width: 600,
-	height: 550,
-
-	layout: {
-		type: 'fit',
-		align: 'stretch'
-	},
-
-	items: [{
-	    xtype: 'plan_edit',
-	    border: false
-  }]
-});

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

@@ -1,190 +0,0 @@
-Ext.define('TM.view.plan.New', {
-  extend: 'Ext.form.Panel',
-  xtype: 'plan_new',
-
-  defaults: {
-    xtype: 'fieldset',
-    margin: '5 10'
-  },
-
-  assignees: [],
-
-  items: [{
-    id: 'fillField',
-    title: '基本信息',
-    layout: {
-      type: 'table',
-      columns: 1
-    },
-    defaults: {
-      xtype: 'textfield',
-      labelAlign: 'right',
-      margin: '10 0',
-      width: 510
-    },
-
-    items: [{
-      fieldLabel: '计划名称',
-      name: 'name',
-      allowBlank: false
-    },{
-      fieldLabel: '计划执行人',
-      name: 'assignables',
-      id: 'assignables',
-      readOnly: true
-    }, {
-      fieldLabel: '计划类型',
-      name: 'plan_type',
-      store: 'TM.store.Types',
-      editable: false,
-      valueField: 'value',
-      xtype: 'combo',
-      blankText: '请选择计划类型!',
-      allowBlank: false
-    }, {
-      fieldLabel: '横向指标',
-      name: 'dataX'
-    }, {
-      fieldLabel: '纵向指标',
-      name: 'dataY'
-    }, {
-      fieldLabel: '生效时间',
-      xtype: 'datefield',
-      editable: false,
-      anchor: '100%',
-      format: 'Y/m/d',
-      name: 'enabled_at',
-      id: 'enabled_at',
-      minValue: new Date()
-    }, {
-      fieldLabel: '完成前几天提醒',
-      id: 'new_begin_to_remind',
-      emptyText: '计划完成前多少天开始提醒，此处为倒计时。',
-      value: '0',
-      name: 'begin_to_remind'
-    }, {
-      fieldLabel: '是否自动完成',
-      xtype: 'checkbox',
-      name: 'autocompletable'
-    }]
-  }, {
-    xtype: 'fieldset',
-    id: 'selectField',
-    title: '计划完成截至时限',
-    layout: {
-      type: 'table',
-      columns: 2
-    },
-    defaults: {
-      labelAlign: 'right',
-    },
-    items: [{
-      fieldLabel: '月',
-      id: 'new_quarterly_month',
-      name: 'quarterly_month',
-      xtype: 'combo',
-      store: 'TM.store.QuarterlyMonths',
-      valueField: 'value',
-      editable: false
-    }, {
-      fieldLabel: '月',
-      id: 'new_month',
-      name: 'month',
-      xtype: 'combo',
-      store: 'TM.store.Months',
-      valueField: 'value',
-      editable: false
-    }, {
-      fieldLabel: '日',
-      id: 'new_weekly_day',
-      name: 'weekly_day',
-      store: 'TM.store.WeekDays',
-      valueField: 'value',
-      xtype: 'combo',
-      editable: false
-    }, {
-      fieldLabel: '日',
-      id: 'new_day',
-      name: 'day',
-      store: 'TM.store.Days',
-      valueField: 'value',
-      xtype: 'combo',
-      editable: false
-    }, {
-      fieldLabel: '时',
-      id: 'new_hour',
-      name: 'hour',
-      store: 'TM.store.Hours',
-      valueField: 'value',
-      xtype: 'combo',
-      editable: false
-    }, {
-      fieldLabel: '分',
-      id: 'new_minute',
-      name: 'minute',
-      store: 'TM.store.Minutes',
-      valueField: 'value',
-      xtype: 'combo',
-      editable: false
-    }]
-  }],
-
-  buttons: [{
-    text: '保存',
-    formBind: true,
-    action: 'save'
-  }, {
-    text: '重置',
-    action: 'reset'
-  }],
-
-  showYearlyField: function() {
-    var fieldSet = this.getComponent('selectField');
-    fieldSet.getComponent('new_quarterly_month').hide();
-    fieldSet.getComponent('new_weekly_day').hide();
-    fieldSet.getComponent('new_month').show();
-    fieldSet.getComponent('new_day').show();
-    fieldSet.getComponent('new_hour').show();
-    fieldSet.getComponent('new_minute').show();
-  },
-
-  showMonthlyField: function() {
-    var fieldSet = this.getComponent('selectField');
-    fieldSet.getComponent('new_quarterly_month').hide();
-    fieldSet.getComponent('new_weekly_day').hide();
-    fieldSet.getComponent('new_month').hide();
-    fieldSet.getComponent('new_day').show();
-    fieldSet.getComponent('new_hour').show();
-    fieldSet.getComponent('new_minute').show();
-  },
-
-  showQuarterlyField: function() {
-    var fieldSet = this.getComponent('selectField');
-    fieldSet.getComponent('new_quarterly_month').show();
-    fieldSet.getComponent('new_weekly_day').hide();
-    fieldSet.getComponent('new_month').hide();
-    fieldSet.getComponent('new_day').show();
-    fieldSet.getComponent('new_hour').show();
-    fieldSet.getComponent('new_minute').show();
-  },
-
-  showWeeklyField: function() {
-    var fieldSet = this.getComponent('selectField');
-    fieldSet.getComponent('new_quarterly_month').hide();
-    fieldSet.getComponent('new_weekly_day').show();
-    fieldSet.getComponent('new_month').hide();
-    fieldSet.getComponent('new_day').hide();
-    fieldSet.getComponent('new_hour').show();
-    fieldSet.getComponent('new_minute').show(); 
-  },
-
-  showDailyField: function() {
-    var fieldSet = this.getComponent('selectField');
-    fieldSet.getComponent('new_quarterly_month').hide();
-    fieldSet.getComponent('new_weekly_day').hide();
-    fieldSet.getComponent('new_month').hide();
-    fieldSet.getComponent('new_day').hide();
-    fieldSet.getComponent('new_hour').show();
-    fieldSet.getComponent('new_minute').show();
-  }
-});