lohnausweis 0.2.3 → 0.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +2 -1
  3. data/Gemfile.lock +2 -14
  4. data/lib/lohnausweis/daten_eintrag.rb +8 -5
  5. data/lib/lohnausweis/version.rb +1 -1
  6. data/lib/lohnausweis.rb +1 -1
  7. data/mit_korrektur_januar.pdf +30 -30
  8. data/spec/lohnausweis/pdf_generator_spec.rb +1 -1
  9. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 97d9a24e912e5b5b784ae43dbeea62429c6a85b0
4
- data.tar.gz: 49882d33573cf432adfc85358e61b4d2ea66daaf
3
+ metadata.gz: e8c6dd34f0558d8b4df9f0d36d3716b470dc2285
4
+ data.tar.gz: 5b0d37bd2a721bca22f686e3accb891f062637d2
5
5
  SHA512:
6
- metadata.gz: d7f359b92454e69febac3fa74e2f5cc906490ab0e87aeb2b2b0377b16a66d6b2b9176592832a87696c3718614104b5fc2f74da8787644b48a7ea182bfacad20a
7
- data.tar.gz: fd8052534c5abd2ed98ec73b9d30c9e331567cf8216df1f200393cbf6e904a10e9c05a5469ed3db70f5352e1a8ad1a06d02ce73bc81951f4ead44aff9896f2b1
6
+ metadata.gz: 68af0ad58e66ddb9f26edc286e532cbb60e1719ae18f924da137f09db9d755e4524dc638e3bdeaa35f4621005e804f725323f31e8fd9bf1893d8830ff29c413f
7
+ data.tar.gz: d080222bc66837ffba06875e827ec4f8079c0c79a83441ca0cd3df83ce5b055a456ffa7f843caae63d6f488e4ce7fb4e4dd67dfea98a2e1e5bc6bdaf285180a3
data/Gemfile CHANGED
@@ -4,4 +4,5 @@ source 'https://rubygems.org'
4
4
  gemspec
5
5
 
6
6
  gem 'prawn', '~>1.0'
7
- gem 'activesupport'
7
+ gem 'i18n'
8
+ #gem 'activesupport'
data/Gemfile.lock CHANGED
@@ -1,22 +1,13 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- lohnausweis (0.2.2)
4
+ lohnausweis (0.2.4)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
8
8
  specs:
9
- activesupport (4.0.4)
10
- i18n (~> 0.6, >= 0.6.9)
11
- minitest (~> 4.2)
12
- multi_json (~> 1.3)
13
- thread_safe (~> 0.1)
14
- tzinfo (~> 0.3.37)
15
- atomic (1.1.16)
16
9
  diff-lcs (1.2.5)
17
10
  i18n (0.6.9)
18
- minitest (4.7.5)
19
- multi_json (1.9.2)
20
11
  pdf-core (0.2.5)
21
12
  prawn (1.0.0)
22
13
  pdf-core (~> 0.2.2)
@@ -30,17 +21,14 @@ GEM
30
21
  rspec-expectations (2.14.5)
31
22
  diff-lcs (>= 1.1.3, < 2.0)
32
23
  rspec-mocks (2.14.6)
33
- thread_safe (0.3.1)
34
- atomic (>= 1.1.7, < 2)
35
24
  ttfunk (1.1.1)
36
- tzinfo (0.3.39)
37
25
 
38
26
  PLATFORMS
39
27
  ruby
40
28
 
41
29
  DEPENDENCIES
42
- activesupport
43
30
  bundler (~> 1.5)
31
+ i18n
44
32
  lohnausweis!
45
33
  prawn (~> 1.0)
46
34
  rake
data/lib/lohnausweis/daten_eintrag.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require 'mathn'
2
- require 'active_support/number_helper'
2
+ #require 'active_support/number_helper'
3
3
 
4
4
  module Planik
5
5
  module Lohnausweis
@@ -19,7 +19,8 @@ module Planik
19
19
 
20
20
  # Die Menge, gerundet auf zwei Kommastellen genau
21
21
  def menge_to_s
22
- menge.nil? ? nil : ActiveSupport::NumberHelper.number_to_rounded(menge, precision: 2)
22
+ return menge if menge.instance_of? String
23
+ menge.nil? ? nil :format('%.2f', menge)
23
24
  end
24
25
 
25
26
  # Default Wert ist nil
@@ -35,8 +36,10 @@ module Planik
35
36
 
36
37
  def value_gerundet_to_s value
37
38
  value = betrag_gerundet(value) if einheit == "Fr"
38
- x = ActiveSupport::NumberHelper.number_to_rounded(value, precision: 2)
39
- x = ActiveSupport::NumberHelper.number_to_delimited(x, delimiter: "'")
39
+ x = value
40
+ x = format('%.2f', value)
41
+ # x = ActiveSupport::NumberHelper.number_to_rounded(value, precision: 2)
42
+ # x = ActiveSupport::NumberHelper.number_to_delimited(x, delimiter: "'")
40
43
  x = "#{einheit} #{x}" if einheit
41
44
  x
42
45
  end
@@ -110,7 +113,7 @@ module Planik
110
113
  end
111
114
 
112
115
  def ansatz_to_s
113
- x = ActiveSupport::NumberHelper.number_to_rounded(ansatz, precision: 2)
116
+ x = format('%.2f', ansatz)
114
117
  "#{x}%"
115
118
  end
116
119
 
data/lib/lohnausweis/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Planik
2
2
  module Lohnausweis
3
- VERSION = "0.2.3"
3
+ VERSION = "0.2.4"
4
4
  end
5
5
  end
data/lib/lohnausweis.rb CHANGED
@@ -3,7 +3,7 @@ require "lohnausweis/pdf_generator"
3
3
  require "lohnausweis/rohdaten"
4
4
  require "lohnausweis/daten_eintrag"
5
5
  require "lohnausweis/daten"
6
-
6
+ require "i18n"
7
7
  module Planik
8
8
  module Lohnausweis
9
9
 
data/mit_korrektur_januar.pdf CHANGED
@@ -17,7 +17,7 @@ endobj
17
17
  >>
18
18
  endobj
19
19
  4 0 obj
20
- << /Length 10967
20
+ << /Length 10963
21
21
  >>
22
22
  stream
23
23
  q
@@ -130,9 +130,9 @@ ET
130
130
  0.000 0.000 0.000 SCN
131
131
 
132
132
  BT
133
- 492.14399999999995 591.7040000000001 Td
133
+ 493.67199999999997 591.7040000000001 Td
134
134
  /F1.0 8 Tf
135
- [<46> 45 <722034273530302e3030>] TJ
135
+ [<46> 45 <7220343530302e3030>] TJ
136
136
  ET
137
137
 
138
138
  1 w
@@ -318,9 +318,9 @@ ET
318
318
  0.000 0.000 0.000 SCN
319
319
 
320
320
  BT
321
- 492.14399999999995 500.216 Td
321
+ 493.67199999999997 500.216 Td
322
322
  /F1.0 8 Tf
323
- [<46> 45 <722032273235302e3030>] TJ
323
+ [<46> 45 <7220323235302e3030>] TJ
324
324
  ET
325
325
 
326
326
  1 w
@@ -375,9 +375,9 @@ S
375
375
  0.000 0.000 0.000 SCN
376
376
 
377
377
  BT
378
- 490.96 469.58400000000006 Td
378
+ 492.864 469.58400000000006 Td
379
379
  /F2.0 8 Tf
380
- [<46722037273631392e3535>] TJ
380
+ [<467220373631392e3535>] TJ
381
381
  ET
382
382
 
383
383
  1 w
@@ -393,9 +393,9 @@ ET
393
393
  0.000 0.000 0.000 SCN
394
394
 
395
395
  BT
396
- 325.4773333333333 444.20000000000005 Td
396
+ 327.00533333333334 444.20000000000005 Td
397
397
  /F1.0 8 Tf
398
- [<46> 45 <722034273530302e3030>] TJ
398
+ [<46> 45 <7220343530302e3030>] TJ
399
399
  ET
400
400
 
401
401
  1 w
@@ -429,9 +429,9 @@ ET
429
429
  0.000 0.000 0.000 SCN
430
430
 
431
431
  BT
432
- 325.4773333333333 428.952 Td
432
+ 327.00533333333334 428.952 Td
433
433
  /F1.0 8 Tf
434
- [<46> 45 <722034273530302e3030>] TJ
434
+ [<46> 45 <7220343530302e3030>] TJ
435
435
  ET
436
436
 
437
437
  1 w
@@ -465,9 +465,9 @@ ET
465
465
  0.000 0.000 0.000 SCN
466
466
 
467
467
  BT
468
- 325.4773333333333 413.70400000000006 Td
468
+ 327.00533333333334 413.70400000000006 Td
469
469
  /F1.0 8 Tf
470
- [<46> 45 <722034273530302e3030>] TJ
470
+ [<46> 45 <7220343530302e3030>] TJ
471
471
  ET
472
472
 
473
473
  1 w
@@ -501,9 +501,9 @@ ET
501
501
  0.000 0.000 0.000 SCN
502
502
 
503
503
  BT
504
- 325.4773333333333 398.456 Td
504
+ 327.00533333333334 398.456 Td
505
505
  /F1.0 8 Tf
506
- [<46> 45 <722034273530302e3030>] TJ
506
+ [<46> 45 <7220343530302e3030>] TJ
507
507
  ET
508
508
 
509
509
  1 w
@@ -583,9 +583,9 @@ S
583
583
  0.000 0.000 0.000 SCN
584
584
 
585
585
  BT
586
- 490.96 367.82400000000007 Td
586
+ 492.864 367.82400000000007 Td
587
587
  /F2.0 8 Tf
588
- [<46722037273134342e3035>] TJ
588
+ [<467220373134342e3035>] TJ
589
589
  ET
590
590
 
591
591
  36.000 362.936 500.000 254.784 re
@@ -634,7 +634,7 @@ ET
634
634
  BT
635
635
  41 322.9200000000001 Td
636
636
  /F1.0 8 Tf
637
- [<46> 30 <6572> -15 <69656e677574686162656e2032303134>] TJ
637
+ [<46> 30 <6572> -15 <69656e616e737072> -15 <7563682032303134>] TJ
638
638
  ET
639
639
 
640
640
  1 w
@@ -801,9 +801,9 @@ ET
801
801
  0.000 0.000 0.000 SCN
802
802
 
803
803
  BT
804
- 507.53599999999994 216.88800000000003 Td
804
+ 511.9839999999999 216.88800000000003 Td
805
805
  /F1.0 8 Tf
806
- [<3135332e3637>] TJ
806
+ [<31382e3330>] TJ
807
807
  ET
808
808
 
809
809
  1 w
@@ -829,9 +829,9 @@ S
829
829
  0.000 0.000 0.000 SCN
830
830
 
831
831
  BT
832
- 509.31999999999994 201.50400000000002 Td
832
+ 504.87199999999996 201.50400000000002 Td
833
833
  /F2.0 8 Tf
834
- [<2d31382e3634>] TJ
834
+ [<2d3135342e3030>] TJ
835
835
  ET
836
836
 
837
837
  36.000 196.616 500.000 76.784 re
@@ -854,7 +854,7 @@ ET
854
854
  BT
855
855
  357.00800000000004 37.760000000000005 Td
856
856
  /F1.0 8 Tf
857
- [<47656e6572> -15 <696572> -40 <742076> 25 <6f6e20506c616e696b20616d2030392e30352e3230313420756d2031353a343520556872>] TJ
857
+ [<47656e6572> -15 <696572> -40 <742076> 25 <6f6e20506c616e696b20616d2030392e30352e3230313420756d2031373a313120556872>] TJ
858
858
  ET
859
859
 
860
860
  Q
@@ -1163,7 +1163,7 @@ ET
1163
1163
  BT
1164
1164
  357.00800000000004 48.256 Td
1165
1165
  /F1.0 8 Tf
1166
- [<47656e6572> -15 <696572> -40 <742076> 25 <6f6e20506c616e696b20616d2030392e30352e3230313420756d2031353a343520556872>] TJ
1166
+ [<47656e6572> -15 <696572> -40 <742076> 25 <6f6e20506c616e696b20616d2030392e30352e3230313420756d2031373a313120556872>] TJ
1167
1167
  ET
1168
1168
 
1169
1169
  Q
@@ -1189,16 +1189,16 @@ xref
1189
1189
  0000000109 00000 n
1190
1190
  0000000158 00000 n
1191
1191
  0000000221 00000 n
1192
- 0000011241 00000 n
1193
- 0000011433 00000 n
1194
- 0000011530 00000 n
1195
- 0000011632 00000 n
1196
- 0000015024 00000 n
1192
+ 0000011237 00000 n
1193
+ 0000011429 00000 n
1194
+ 0000011526 00000 n
1195
+ 0000011628 00000 n
1196
+ 0000015020 00000 n
1197
1197
  trailer
1198
1198
  << /Size 10
1199
1199
  /Root 2 0 R
1200
1200
  /Info 1 0 R
1201
1201
  >>
1202
1202
  startxref
1203
- 15216
1203
+ 15212
1204
1204
  %%EOF
data/spec/lohnausweis/pdf_generator_spec.rb CHANGED
@@ -10,7 +10,7 @@ module Planik
10
10
  r.end_datum = Date.new(2014, 06, 30)
11
11
  r.adresse = Rohdaten::Adresse.new("Margherita", "Giuba", "Mauerstrasse", "34E", "3456", "Oberutzwil")
12
12
  r.monatslohn = 4500
13
- r.arbeitszeit = Rohdaten::Arbeitszeit.new(-22.3, 150, 153.665)
13
+ r.arbeitszeit = Rohdaten::Arbeitszeit.new(-22.3, 150, 18.3)
14
14
  r.zulage_nacht = Rohdaten::MengeAnsatz.new(3.56, 8)
15
15
  r.zulage_wochenende = Rohdaten::MengeAnsatz.new(2.12, 8)
16
16
  r.kinderzulage = Rohdaten::MengeAnsatz.new(2, 260)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lohnausweis
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.3
4
+ version: 0.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christian Muehlethaler