lohnausweis 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbae455707f8739303c8c831adaa348b3bb26059
-  data.tar.gz: 14c2472b821667bd404b066c56c7ac456a5d1408
+  metadata.gz: c27f2a1bd4f53cfd0a102d63909b97e12d931fbe
+  data.tar.gz: 59dc6a9d903d4a8b81f8ef3a68dc29cba8a4bc33
 SHA512:
-  metadata.gz: c4f4f6af6f99ba4ac8c3577d19ea50337a38848cdb7d534f3942bec4bcddfa319ffceb14fc8838492f2ec16bc96c93c6ce6f46547add9524091ec61701c860e5
-  data.tar.gz: 72c569d4f04d174c05f418fe8920d608175073c71b8b90947274761e54f55f107c338cfaf0d4a995e0341b117301f9bf5e00d7382b2e6d247e819bda13558128
+  metadata.gz: 5f56915c1b423c0ee46af2406c5215041f09a3e4479fe7e93b19129a05af8aa4f4aa79de3625a335d19464d500f541a78eb8900c343ce0a0b5f85db1dcc3e830
+  data.tar.gz: 785ede79119cf4ea9132d154ffe52f0cb6a86493c7097e9050d3201cb944cd9ebb59893adbb1411b8d8670edca0500763c8faa70db115b6da3dbc590dd21509d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lohnausweis (0.3.0)
+    lohnausweis (0.4.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/lohnausweis/daten.rb

@@ -121,7 +121,7 @@ module Planik
 
         @rohdaten.arbeitsliste.each do |a|
           d = []
-          d << a.datum.strftime("%d.%m.%Y")
+          d << I18n.l(a.datum, format: :mit_wochentag)
           d << a.name
           d << a.typ
           d << (a.zeit_von.nil? ? nil: a.zeit_von.strftime("%H:%M"))

data/lib/lohnausweis/pdf_generator.rb

@@ -25,12 +25,11 @@ module Planik
         next_y = 750
         next_y = header_new(next_y)
         next_y -= 50
-        next_y =  arbeitsliste_new(next_y)
-        next_y -= 50
         next_y = arbeitszeit_block(next_y)
-
         next_y -= 50
-        zulagen_block(next_y)
+        next_y = zulagen_block(next_y)
+        next_y -= 50
+        next_y =  arbeitsliste_new(next_y)
 
         footer()
         @pdf
@@ -50,7 +49,7 @@ module Planik
         next_y = lohn_block(next_y)
         next_y -= 50
         next_y = ferien_block(next_y)
-        next_y -= 50
+        next_y -= 70
         arbeitszeit_block(next_y)
 
         footer()
@@ -80,7 +79,7 @@ module Planik
               #@pdf.stroke_bounds
             end
             @pdf.move_down(50)
-            @pdf.text("Arbeitszeiten #{@daten.monat} #{@daten.jahr}", style: :bold)
+            @pdf.text("Arbeitszeiten #{@daten.monat_arbeit} #{@daten.jahr_arbeit}", style: :bold)
           end
           #@pdf.stroke_bounds
         end
@@ -161,7 +160,7 @@ module Planik
             # Neu
             # Aenderung für MEDPHONE März 2015: Nur Arbeitsliste, Arbeitszeit und Zulagen
             #@pdf.text("Anhang: Arbeitszeit von #{@daten.start_datum_for_arbeit} bis #{@daten.end_datum_for_arbeit}.")
-            @pdf.text("Generiert von Planik am #{Time.now.strftime("%d.%m.%Y um %H:%M Uhr")}", align: :right)
+            @pdf.text("Generiert von Planik am #{Time.now.strftime("%d.%m.%Y um %H:%M Uhr")}")
           end
         end
       end
@@ -184,49 +183,42 @@ module Planik
       # Aenderung für MEDPHONE März 2015: Nur Arbeitsliste, Arbeitszeit und Zulagen
       #
       def arbeitsliste_new(ypos)
-        bb = @pdf.bounding_box([XPOS, ypos], width: WIDTH+30) do
-          #@pdf.start_new_page
-          @pdf.text("Arbeitszeit von #{@daten.start_datum_for_arbeit} bis #{@daten.end_datum_for_arbeit}", style: :bold)
+        @pdf.move_down(50)
+        @pdf.text("Arbeitszeit von #{@daten.start_datum_for_arbeit} bis #{@daten.end_datum_for_arbeit}", style: :bold)
           arbeitsliste = @daten.arbeitsliste
-          inner_ypos = 10
-          make_arbeitsliste_table(XPOS, inner_ypos, arbeitsliste, true)
-          # ypos = 18
-          # @pdf.bounding_box([XPOS, ypos], width: WIDTH) do
-          #   @pdf.font("Helvetica", size: 8) do
-          #     @pdf.text("Generiert von Planik am #{Time.now.strftime("%d.%m.%Y um %H:%M Uhr")}", align: :right)
-          #   end
-          # end
-        end
-        bb.absolute_bottom
-
+        make_table_without_bounding_box(arbeitsliste, true)
       end
 
 
       def make_arbeitsliste_table(xpos, ypos, daten, title = false)
         @pdf.bounding_box([xpos, ypos], width: WIDTH+30) do #height dynamisch
-          p_width = @pdf.bounds.width
-          r1 = Rational(1, 6)
-          r2 = r1 * Rational(1, 2)
-          r3 = Rational(1, 4)
-          r4 = Rational(1, 9)
-
-          column_width = [p_width * r1, p_width * r3, p_width * r3, p_width * r2, p_width * r2, p_width * r4]
-          @pdf.table(daten, column_widths: column_width,
-                     cell_style: {
-                         borders: [], #keine Ränder
-                         padding_top: 3, padding_bottom: 3
+          make_table_without_bounding_box(daten, title)
+        end
+      end
 
-                     }
-          ) do |t|
-            if title
-              t.row(0).style(font_style: :bold) #Titel bold
-              t.row(0).background_color = "D8D8D8"
-            end
-            t.column(5).style(align: :right)
-            t.cells[t.row_length-1, 0].font_style = :bold
-            t.cells[t.row_length-1, 5].borders = [:top]
-            t.cells[t.row_length-1, 5].font_style = :bold
+      def make_table_without_bounding_box(daten, title)
+        p_width = @pdf.bounds.width
+        r1 = Rational(1, 6)
+        r2 = r1 * Rational(1, 2)
+        r3 = Rational(1, 4)
+        r4 = Rational(1, 9)
+
+        column_width = [p_width * r1, p_width * r3, p_width * r3, p_width * r2, p_width * r2, p_width * r4]
+        @pdf.table(daten, column_widths: column_width,
+                   cell_style: {
+                       borders: [], #keine Ränder
+                       padding_top: 3, padding_bottom: 3
+
+                   }
+        ) do |t|
+          if title
+            t.row(0).style(font_style: :bold) #Titel bold
+            t.row(0).background_color = "D8D8D8"
           end
+          t.column(5).style(align: :right)
+          t.cells[t.row_length-1, 0].font_style = :bold
+          t.cells[t.row_length-1, 5].borders = [:top]
+          t.cells[t.row_length-1, 5].font_style = :bold
         end
       end
 

data/lib/lohnausweis/version.rb

@@ -1,5 +1,5 @@
 module Planik
   module Lohnausweis
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/locale/de.yml

@@ -7,9 +7,10 @@ de:
       default: "%Y-%m-%d"
       short: "%b %d"
       long: "%B %d, %Y"
+      mit_wochentag: "%a, %d.%m.%Y"
 
     day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
-    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
+    abbr_day_names: [So, Mo, Di, Mi, Do, Fr, Sa]
 
     # Don't forget the nil at the beginning; there's no such thing as a 0th month
     month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]

data/locale/en.yml

@@ -0,0 +1,134 @@
+en:
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%Y-%m-%d"
+      short: "%b %d"
+      long: "%B %d, %Y"
+      mit_wochentag: "%a, %d.%m.%Y"
+
+    day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
+    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
+
+    # Don't forget the nil at the beginning; there's no such thing as a 0th month
+    month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
+    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
+    # Used in date_select and datetime_select.
+    order:
+      - year
+      - month
+      - day
+
+  time:
+    formats:
+      default: "%a, %d %b %Y %H:%M:%S %z"
+      short: "%d %b %H:%M"
+      long: "%B %d, %Y %H:%M"
+    am: "am"
+    pm: "pm"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " and "
+      last_word_connector: ", and "
+  number:
+    # Used in NumberHelper.number_to_delimited()
+    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+    format:
+      # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
+      separator: "."
+      # Delimits thousands (e.g. 1,000,000 is a million) (always in groups of three)
+      delimiter: ","
+      # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
+      precision: 3
+      # If set to true, precision will mean the number of significant digits instead
+      # of the number of decimal digits (1234 with precision 2 becomes 1200, 1.23543 becomes 1.2)
+      significant: false
+      # If set, the zeros after the decimal separator will always be stripped (eg.: 1.200 will be 1.2)
+      strip_insignificant_zeros: false
+
+    # Used in NumberHelper.number_to_currency()
+    currency:
+      format:
+        # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
+        format: "%u%n"
+        unit: "$"
+        # These five are to override number.format and are optional
+        separator: "."
+        delimiter: ","
+        precision: 2
+        significant: false
+        strip_insignificant_zeros: false
+
+    # Used in NumberHelper.number_to_percentage()
+    percentage:
+      format:
+        # These five are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        # precision:
+        # significant: false
+        # strip_insignificant_zeros: false
+        format: "%n%"
+
+    # Used in NumberHelper.number_to_rounded()
+    precision:
+      format:
+        # These five are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        # precision:
+        # significant: false
+        # strip_insignificant_zeros: false
+
+    # Used in NumberHelper.number_to_human_size() and NumberHelper.number_to_human()
+    human:
+      format:
+        # These five are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        precision: 3
+        significant: true
+        strip_insignificant_zeros: true
+      # Used in number_to_human_size()
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+      # Used in NumberHelper.number_to_human()
+      decimal_units:
+        format: "%n %u"
+        # Decimal units output formatting
+        # By default we will only quantify some of the exponents
+        # but the commented ones might be defined or overridden
+        # by the user.
+        units:
+          # femto: Quadrillionth
+          # pico: Trillionth
+          # nano: Billionth
+          # micro: Millionth
+          # mili: Thousandth
+          # centi: Hundredth
+          # deci: Tenth
+          unit: ""
+          # ten:
+          #   one: Ten
+          #   other: Tens
+          # hundred: Hundred
+          thousand: Thousand
+          million: Million
+          billion: Billion
+          trillion: Trillion
+          quadrillion: Quadrillion