dorsale 2.4.0 → 2.4.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 784128baeb6b43ea6d548bc00b3ff135aeef90b4
4
- data.tar.gz: a3a2a40bfd491bd1c09bd06572a42f5a9ddd0987
3
+ metadata.gz: a08c491a05f970f39cc2c0a2c41e25aee69ae6e3
4
+ data.tar.gz: dff69072c21dabbeb8c56c522aae407c05775d13
5
5
  SHA512:
6
- metadata.gz: 65600444caedc4c3bdbcfa9822dfd92abd022b32554659c2d2b7c375e89555d1888ef733ad29ec5d19dbd177e6887bc4324225321ded604a27dd7500ab187ad1
7
- data.tar.gz: 4da36e1234e2760ed1e7e1d75b0d6a7eef37e74e7e3f6acdefb627ae99866e29a3e53651601564fd9e0d7eb3c76da86ceafe3256d820e093f427e0050a49dd94
6
+ metadata.gz: 00132ceee7216380b1544086e74389f7280bf5bd733d10fd9b6842ba3a5031995a6a8628cdaeb7f9ab98eac699661a5d54a47758437c5b97138f3216b2724eba
7
+ data.tar.gz: f16f7989b12051331fa45316a00800c0270e9466224c4cb347322f765e0a9fdacd4f9144b250bb20b803707168a3dc106b70bcce845f644bb6731ba82c2c501c
@@ -12,13 +12,13 @@ module Dorsale
12
12
  end
13
13
 
14
14
  if params[:state] == "all"
15
- @expenses ||= Expense.all
15
+ @expenses ||= current_user_scope.expenses
16
16
  else
17
- @expenses ||= Expense.where(state: params[:state])
17
+ @expenses ||= current_user_scope.expenses.where(state: params[:state])
18
18
  end
19
19
 
20
20
  @expenses = @expenses.page(params[:page])
21
- @all_expenses ||= Expense.all
21
+ @all_expenses ||= current_user_scope.expenses
22
22
  end
23
23
 
24
24
  def new
@@ -30,7 +30,7 @@ module Dorsale
30
30
  def create
31
31
  authorize! :create, Expense
32
32
 
33
- @expense ||= Expense.new(expense_params)
33
+ @expense = current_user_scope.new_expense(expense_params)
34
34
 
35
35
  if @expense.save
36
36
  flash[:success] = t("expense_gun.expense.flash.created")
@@ -11,6 +11,10 @@ module Dorsale
11
11
  :dependent => :destroy,
12
12
  :class_name => ::Dorsale::Alexandrie::Attachment
13
13
 
14
+
15
+ belongs_to :user, class_name: User
16
+ validates :user, presence: true
17
+
14
18
  validates :name, presence: true
15
19
  validates :date, presence: true
16
20
 
@@ -55,4 +55,14 @@ class Dorsale::UserScope
55
55
  raise NotImplementedError
56
56
  end
57
57
 
58
+ #ExpenseGun
59
+
60
+ def expenses
61
+ raise NotImplementedError
62
+ end
63
+
64
+ def new_expense(attributes = {})
65
+ raise NotImplementedError
66
+ end
67
+
58
68
  end
@@ -30,7 +30,7 @@ h1 = t("expense_gun.expense.list")
30
30
  .panel-body
31
31
  p
32
32
  strong = t("labels.employee") + " : "
33
- = expense.user.full_name if expense.respond_to?(:user)
33
+ = expense.user.to_s if expense.respond_to?(:user)
34
34
 
35
35
  p
36
36
  strong = t("labels.state") + " : "
@@ -0,0 +1,5 @@
1
+ class AddUserOnExpenseGunExpense < ActiveRecord::Migration
2
+ def change
3
+ add_column :dorsale_expense_gun_expenses, :user_id, :integer
4
+ end
5
+ end
@@ -1,3 +1,3 @@
1
1
  module Dorsale
2
- VERSION = "2.4.0"
2
+ VERSION = "2.4.1"
3
3
  end
@@ -55,4 +55,15 @@ class Dorsale::UserScope
55
55
  (individuals + corporations).sort_by { |e| e.name.downcase }
56
56
  end
57
57
 
58
+ # ExpenseGun
59
+
60
+ def expenses
61
+ Dorsale::ExpenseGun::Expense.all
62
+ end
63
+
64
+ def new_expense(attributes = {})
65
+ attributes = attributes.merge(user: user)
66
+ expenses.new(attributes)
67
+ end
68
+
58
69
  end
@@ -11,7 +11,7 @@
11
11
  #
12
12
  # It's strongly recommended that you check this file into your version control system.
13
13
 
14
- ActiveRecord::Schema.define(version: 20160125201025) do
14
+ ActiveRecord::Schema.define(version: 20160317124838) do
15
15
 
16
16
  create_table "dorsale_addresses", force: :cascade do |t|
17
17
  t.string "street"
@@ -243,6 +243,7 @@ ActiveRecord::Schema.define(version: 20160125201025) do
243
243
  t.date "date"
244
244
  t.datetime "created_at", null: false
245
245
  t.datetime "updated_at", null: false
246
+ t.integer "user_id"
246
247
  end
247
248
 
248
249
  create_table "dorsale_flyboy_folders", force: :cascade do |t|
@@ -1,11 +1,14 @@
1
1
  FactoryGirl.define do
2
2
  factory :expense_gun_expense, class: ::Dorsale::ExpenseGun::Expense do
3
3
  name { Faker::Lorem.sentence(3) }
4
- date { Date.today }
4
+ date { Date.today }
5
+ user { create(:user) }
6
+
5
7
  after(:create) { |expense|
6
8
  rand(2..5).times {
7
- FactoryGirl.create(:expense_gun_expense_line, expense: expense)
9
+ create(:expense_gun_expense_line, expense: expense)
8
10
  }
9
11
  }
12
+
10
13
  end
11
14
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dorsale
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.0
4
+ version: 2.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - agilidée
@@ -700,6 +700,7 @@ files:
700
700
  - db/migrate/20151230104012_users_add_avatar.rb
701
701
  - db/migrate/20160104105725_dorsale_billing_machine_invoices_add_comments.rb
702
702
  - db/migrate/20160125201025_create_expense_gun.rb
703
+ - db/migrate/20160317124838_add_user_on_expense_gun_expense.rb
703
704
  - lib/active_record_comma_type_cast.rb
704
705
  - lib/dorsale.rb
705
706
  - lib/dorsale/alexandrie/prawn.rb