money_s3 0.12.0 → 1.0.0

data/lib/money_s3/parsers/msg_fakt_dpptype.rb

@@ -15,12 +15,13 @@ module MoneyS3
         submodel_at(Data2, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:dod_odb] = dod_odb.to_h_with_attrs if has? 'DodOdb'
-        hash[:polozka] = polozka.map(&:to_h_with_attrs) if has? 'Polozka'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:dod_odb] = dod_odb.to_h if has? 'DodOdb'
+        hash[:polozka] = polozka.map(&:to_h) if has? 'Polozka'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_fakt_poloz_type.rb

@@ -7,10 +7,11 @@ module MoneyS3
         submodel_at(MsgPolozType, 'SklPolozka')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:skl_polozka] = skl_polozka.to_h_with_attrs if has? 'SklPolozka'
+        hash[:skl_polozka] = skl_polozka.to_h if has? 'SklPolozka'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_fakt_type.rb

@@ -23,14 +23,15 @@ module MoneyS3
         submodel_at(Data, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
-
-        hash[:dod_odb] = dod_odb.to_h_with_attrs if has? 'DodOdb'
-        hash[:konec_prij] = konec_prij.to_h_with_attrs if has? 'KonecPrij'
-        hash[:polozka] = polozka.map(&:to_h_with_attrs) if has? 'Polozka'
-        hash[:uhrada] = uhrada.map(&:to_h_with_attrs) if has? 'Uhrada'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
+
+        hash[:dod_odb] = dod_odb.to_h if has? 'DodOdb'
+        hash[:konec_prij] = konec_prij.to_h if has? 'KonecPrij'
+        hash[:polozka] = polozka.map(&:to_h) if has? 'Polozka'
+        hash[:uhrada] = uhrada.map(&:to_h) if has? 'Uhrada'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_firma_type.rb

@@ -11,11 +11,12 @@ module MoneyS3
         submodel_at(FirmaType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:osoba] = osoba.map(&:to_h_with_attrs) if has? 'Osoba'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:osoba] = osoba.map(&:to_h) if has? 'Osoba'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_int_dokl_type.rb

@@ -15,12 +15,13 @@ module MoneyS3
         submodel_at(IntDoklType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:adresa] = adresa.to_h_with_attrs if has? 'Adresa'
-        hash[:polozka] = polozka.map(&:to_h_with_attrs) if has? 'Polozka'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:adresa] = adresa.to_h if has? 'Adresa'
+        hash[:polozka] = polozka.map(&:to_h) if has? 'Polozka'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_inv_dokl_type.rb

@@ -11,11 +11,12 @@ module MoneyS3
         submodel_at(InvDoklType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:polozka] = polozka.map(&:to_h_with_attrs) if has? 'Polozka'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:polozka] = polozka.map(&:to_h) if has? 'Polozka'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_km_karta_type.rb

@@ -11,11 +11,12 @@ module MoneyS3
         submodel_at(KmKartaType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:komponenta] = komponenta.map(&:to_h_with_attrs) if has? 'Komponenta'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:komponenta] = komponenta.map(&:to_h) if has? 'Komponenta'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_komponenta_type.rb

@@ -11,11 +11,12 @@ module MoneyS3
         submodel_at(MessageType, 'Sklad')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:km_karta] = km_karta.to_h_with_attrs if has? 'KmKarta'
-        hash[:sklad] = sklad.to_h_with_attrs if has? 'Sklad'
+        hash[:km_karta] = km_karta.to_h if has? 'KmKarta'
+        hash[:sklad] = sklad.to_h if has? 'Sklad'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_mzda_type.rb

@@ -11,11 +11,12 @@ module MoneyS3
         submodel_at(Data8, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:nepritomnost] = nepritomnost.map(&:to_h_with_attrs) if has? 'Nepritomnost'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:nepritomnost] = nepritomnost.map(&:to_h) if has? 'Nepritomnost'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_obj_type.rb

@@ -19,13 +19,14 @@ module MoneyS3
         submodel_at(ObjednavkaType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:dod_odb] = dod_odb.to_h_with_attrs if has? 'DodOdb'
-        hash[:konec_prij] = konec_prij.to_h_with_attrs if has? 'KonecPrij'
-        hash[:polozka] = polozka.map(&:to_h_with_attrs) if has? 'Polozka'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:dod_odb] = dod_odb.to_h if has? 'DodOdb'
+        hash[:konec_prij] = konec_prij.to_h if has? 'KonecPrij'
+        hash[:polozka] = polozka.map(&:to_h) if has? 'Polozka'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_pohledavka_type.rb

@@ -15,12 +15,13 @@ module MoneyS3
         submodel_at(PohledavkaType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:adresa] = adresa.to_h_with_attrs if has? 'Adresa'
-        hash[:polozka] = polozka.map(&:to_h_with_attrs) if has? 'Polozka'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:adresa] = adresa.to_h if has? 'Adresa'
+        hash[:polozka] = polozka.map(&:to_h) if has? 'Polozka'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_pok_dokl_type.rb

@@ -19,13 +19,14 @@ module MoneyS3
         submodel_at(PokDoklType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:adresa] = adresa.to_h_with_attrs if has? 'Adresa'
-        hash[:polozka] = polozka.map(&:to_h_with_attrs) if has? 'Polozka'
-        hash[:uhrada] = uhrada.map(&:to_h_with_attrs) if has? 'Uhrada'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:adresa] = adresa.to_h if has? 'Adresa'
+        hash[:polozka] = polozka.map(&:to_h) if has? 'Polozka'
+        hash[:uhrada] = uhrada.map(&:to_h) if has? 'Uhrada'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_poloz_type.rb

@@ -11,11 +11,12 @@ module MoneyS3
         submodel_at(MessageType, 'Sklad')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:km_karta] = km_karta.to_h_with_attrs if has? 'KmKarta'
-        hash[:sklad] = sklad.to_h_with_attrs if has? 'Sklad'
+        hash[:km_karta] = km_karta.to_h if has? 'KmKarta'
+        hash[:sklad] = sklad.to_h if has? 'Sklad'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_predkontace_de_type.rb

@@ -7,10 +7,11 @@ module MoneyS3
         submodel_at(Data4, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_predkontace_type.rb

@@ -7,10 +7,11 @@ module MoneyS3
         submodel_at(PredkontaceType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_prevodka_type.rb

@@ -23,14 +23,15 @@ module MoneyS3
         submodel_at(SklDoklType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
-
-        hash[:sklad_pro_pr] = sklad_pro_pr.to_h_with_attrs if has? 'SkladProPr'
-        hash[:dod_odb] = dod_odb.to_h_with_attrs if has? 'DodOdb'
-        hash[:konec_prij] = konec_prij.to_h_with_attrs if has? 'KonecPrij'
-        hash[:polozka] = polozka.map(&:to_h_with_attrs) if has? 'Polozka'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
+
+        hash[:sklad_pro_pr] = sklad_pro_pr.to_h if has? 'SkladProPr'
+        hash[:dod_odb] = dod_odb.to_h if has? 'DodOdb'
+        hash[:konec_prij] = konec_prij.to_h if has? 'KonecPrij'
+        hash[:polozka] = polozka.map(&:to_h) if has? 'Polozka'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_skl_dokl_type.rb

@@ -23,14 +23,15 @@ module MoneyS3
         submodel_at(SklDoklType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
-
-        hash[:dod_odb] = dod_odb.to_h_with_attrs if has? 'DodOdb'
-        hash[:konec_prij] = konec_prij.to_h_with_attrs if has? 'KonecPrij'
-        hash[:polozka] = polozka.map(&:to_h_with_attrs) if has? 'Polozka'
-        hash[:nep_platba] = nep_platba.map(&:to_h_with_attrs) if has? 'NepPlatba'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
+
+        hash[:dod_odb] = dod_odb.to_h if has? 'DodOdb'
+        hash[:konec_prij] = konec_prij.to_h if has? 'KonecPrij'
+        hash[:polozka] = polozka.map(&:to_h) if has? 'Polozka'
+        hash[:nep_platba] = nep_platba.map(&:to_h) if has? 'NepPlatba'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_stredisko_type.rb

@@ -7,10 +7,11 @@ module MoneyS3
         submodel_at(StrediskoType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_uc_osnov_type.rb

@@ -7,10 +7,11 @@ module MoneyS3
         submodel_at(UcOsnovaType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_uc_pohyb_type.rb

@@ -7,10 +7,11 @@ module MoneyS3
         submodel_at(Data3, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_zakazka_type.rb

@@ -7,10 +7,11 @@ module MoneyS3
         submodel_at(ZakazkaType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_zasoba_type.rb

@@ -15,12 +15,13 @@ module MoneyS3
         submodel_at(ZasobaType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:km_kart] = km_kart.to_h_with_attrs if has? 'KmKart'
-        hash[:sklad] = sklad.to_h_with_attrs if has? 'Sklad'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:km_kart] = km_kart.to_h if has? 'KmKart'
+        hash[:sklad] = sklad.to_h if has? 'Sklad'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_zauctovani_dph_detype.rb

@@ -7,10 +7,11 @@ module MoneyS3
         submodel_at(Data6, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_zauctovani_dph_type.rb

@@ -7,10 +7,11 @@ module MoneyS3
         submodel_at(Data5, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/msg_zavazek_type.rb

@@ -15,12 +15,13 @@ module MoneyS3
         submodel_at(ZavazekType, 'Data')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:adresa] = adresa.to_h_with_attrs if has? 'Adresa'
-        hash[:polozka] = polozka.map(&:to_h_with_attrs) if has? 'Polozka'
-        hash[:data] = data.to_h_with_attrs if has? 'Data'
+        hash[:adresa] = adresa.to_h if has? 'Adresa'
+        hash[:polozka] = polozka.map(&:to_h) if has? 'Polozka'
+        hash[:data] = data.to_h if has? 'Data'
 
         hash
         super.merge(hash)

data/lib/money_s3/parsers/mz_priplatek.rb

@@ -11,11 +11,17 @@ module MoneyS3
         at 'PripHodin'
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def prip_hodin_attributes
+        attributes_at 'PripHodin'
+      end
+
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:typ_priplatku] = typ_priplatku.to_h_with_attrs if has? 'TypPriplatku'
+        hash[:typ_priplatku] = typ_priplatku.to_h if has? 'TypPriplatku'
         hash[:prip_hodin] = prip_hodin if has? 'PripHodin'
+        hash[:prip_hodin_attributes] = prip_hodin_attributes if has? 'PripHodin'
 
         hash
       end

data/lib/money_s3/parsers/mzda_type.rb

@@ -11,34 +11,66 @@ module MoneyS3
         at 'Mesic'
       end
 
+      def mesic_attributes
+        attributes_at 'Mesic'
+      end
+
       def rok
         at 'Rok'
       end
 
+      def rok_attributes
+        attributes_at 'Rok'
+      end
+
       def prac_dnu
         at 'PracDnu'
       end
 
+      def prac_dnu_attributes
+        attributes_at 'PracDnu'
+      end
+
       def prac_hod
         at 'PracHod'
       end
 
+      def prac_hod_attributes
+        attributes_at 'PracHod'
+      end
+
       def odpr_dnu
         at 'OdprDnu'
       end
 
+      def odpr_dnu_attributes
+        attributes_at 'OdprDnu'
+      end
+
       def odpr_hod
         at 'OdprHod'
       end
 
+      def odpr_hod_attributes
+        attributes_at 'OdprHod'
+      end
+
       def odpr_sv_dnu
         at 'OdprSvDnu'
       end
 
+      def odpr_sv_dnu_attributes
+        attributes_at 'OdprSvDnu'
+      end
+
       def odpr_sv_hod
         at 'OdprSvHod'
       end
 
+      def odpr_sv_hod_attributes
+        attributes_at 'OdprSvHod'
+      end
+
       def seznam_nepritomnosti
         array_of_at(NepritomnostType, ['SeznamNepritomnosti', 'Nepritomnost'])
       end
@@ -47,20 +79,29 @@ module MoneyS3
         array_of_at(MzPriplatek, ['SeznamMzPriplatku', 'MzPriplatek'])
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
-        hash[:zamestnanec] = zamestnanec.to_h_with_attrs if has? 'Zamestnanec'
+        hash[:zamestnanec] = zamestnanec.to_h if has? 'Zamestnanec'
         hash[:mesic] = mesic if has? 'Mesic'
+        hash[:mesic_attributes] = mesic_attributes if has? 'Mesic'
         hash[:rok] = rok if has? 'Rok'
+        hash[:rok_attributes] = rok_attributes if has? 'Rok'
         hash[:prac_dnu] = prac_dnu if has? 'PracDnu'
+        hash[:prac_dnu_attributes] = prac_dnu_attributes if has? 'PracDnu'
         hash[:prac_hod] = prac_hod if has? 'PracHod'
+        hash[:prac_hod_attributes] = prac_hod_attributes if has? 'PracHod'
         hash[:odpr_dnu] = odpr_dnu if has? 'OdprDnu'
+        hash[:odpr_dnu_attributes] = odpr_dnu_attributes if has? 'OdprDnu'
         hash[:odpr_hod] = odpr_hod if has? 'OdprHod'
+        hash[:odpr_hod_attributes] = odpr_hod_attributes if has? 'OdprHod'
         hash[:odpr_sv_dnu] = odpr_sv_dnu if has? 'OdprSvDnu'
+        hash[:odpr_sv_dnu_attributes] = odpr_sv_dnu_attributes if has? 'OdprSvDnu'
         hash[:odpr_sv_hod] = odpr_sv_hod if has? 'OdprSvHod'
-        hash[:seznam_nepritomnosti] = seznam_nepritomnosti.map(&:to_h_with_attrs) if has? 'SeznamNepritomnosti'
-        hash[:seznam_mz_priplatku] = seznam_mz_priplatku.map(&:to_h_with_attrs) if has? 'SeznamMzPriplatku'
+        hash[:odpr_sv_hod_attributes] = odpr_sv_hod_attributes if has? 'OdprSvHod'
+        hash[:seznam_nepritomnosti] = seznam_nepritomnosti.map(&:to_h) if has? 'SeznamNepritomnosti'
+        hash[:seznam_mz_priplatku] = seznam_mz_priplatku.map(&:to_h) if has? 'SeznamMzPriplatku'
 
         hash
       end

data/lib/money_s3/parsers/mzdove_obdobi_type.rb

@@ -7,25 +7,41 @@ module MoneyS3
         at 'Mesic'
       end
 
+      def mesic_attributes
+        attributes_at 'Mesic'
+      end
+
       def rok
         at 'Rok'
       end
 
+      def rok_attributes
+        attributes_at 'Rok'
+      end
+
       def funkce
         at 'Funkce'
       end
 
+      def funkce_attributes
+        attributes_at 'Funkce'
+      end
+
       def prac_pomer
         submodel_at(PracPomer, 'PracPomer')
       end
 
-      def to_h_with_attrs
-        hash = ParserCore::HashWithAttributes.new({}, attributes)
+      def to_h
+        hash = {}
+        hash[:attributes] = attributes
 
         hash[:mesic] = mesic if has? 'Mesic'
+        hash[:mesic_attributes] = mesic_attributes if has? 'Mesic'
         hash[:rok] = rok if has? 'Rok'
+        hash[:rok_attributes] = rok_attributes if has? 'Rok'
         hash[:funkce] = funkce if has? 'Funkce'
-        hash[:prac_pomer] = prac_pomer.to_h_with_attrs if has? 'PracPomer'
+        hash[:funkce_attributes] = funkce_attributes if has? 'Funkce'
+        hash[:prac_pomer] = prac_pomer.to_h if has? 'PracPomer'
 
         hash
       end