From 39179e1e403b1ee22d4ac0b8e9d2bcf139e47020 Mon Sep 17 00:00:00 2001 From: Brice TEXIER Date: Fri, 21 Aug 2015 23:59:13 +0200 Subject: [PATCH] Renames registry to register which is correct term --- app/themes/tekyla/stylesheets/variables.scss | 2 +- ...stry.xml => animal_husbandry_register.xml} | 4 +- ...registry.xml => intervention_register.xml} | 2 +- ..._registry.xml => land_parcel_register.xml} | 2 +- ...egistry.xml => phytosanitary_register.xml} | 2 +- .../{vat_registry.xml => vat_register.xml} | 2 +- config/locales/arb/aggregators.yml | 3 - config/locales/arb/nomenclatures.yml | 18 +- config/locales/eng/aggregators.yml | 12 +- config/locales/eng/nomenclatures.yml | 18 +- config/locales/fra/aggregators.yml | 6 +- config/locales/fra/nomenclatures.yml | 18 +- ...stry.xml => animal_husbandry_register.xml} | 14 +- ...registry.xml => intervention_register.xml} | 4 +- ..._registry.xml => land_parcel_register.xml} | 2 +- ...egistry.xml => phytosanitary_register.xml} | 2 +- .../{vat_registry.xml => vat_register.xml} | 2 +- config/locales/jpn/aggregators.yml | 3 - config/locales/jpn/nomenclatures.yml | 18 +- config/locales/por/aggregators.yml | 6 +- config/locales/por/nomenclatures.yml | 18 +- config/locales/spa/aggregators.yml | 3 - config/locales/spa/nomenclatures.yml | 18 +- ...21235105_rename_invalid_document_nature.rb | 80 ++ db/nomenclatures/db.xml | 20 +- ...230800_rename_invalid_document_natures.xml | 12 + db/schema.rb | 2 +- lib/nomen/migration/actions/item_change.rb | 13 +- lib/nomen/migrator/reference.rb | 4 +- lib/nomen/nomenclature.rb | 5 +- private/test/reporting/10/content.xml | 4 +- private/test/reporting/13/content.xml | 2 +- private/test/reporting/14/content.xml | 1118 ----------------- private/test/reporting/15/content.xml | 751 ----------- private/test/reporting/16/content.xml | 2 +- private/test/reporting/17/content.xml | 914 -------------- private/test/reporting/22/content.xml | 2 +- private/test/reporting/5/content.xml | 14 +- test/fixtures/document_templates.yml | 69 +- test/fixtures/schema_migrations | 2 +- 40 files changed, 222 insertions(+), 2971 deletions(-) rename config/aggregators/{animal_husbandry_registry.xml => animal_husbandry_register.xml} (98%) rename config/aggregators/{intervention_registry.xml => intervention_register.xml} (98%) rename config/aggregators/{land_parcel_registry.xml => land_parcel_register.xml} (98%) rename config/aggregators/{phytosanitary_registry.xml => phytosanitary_register.xml} (98%) rename config/aggregators/{vat_registry.xml => vat_register.xml} (97%) rename config/locales/fra/reporting/{animal_husbandry_registry.xml => animal_husbandry_register.xml} (97%) rename config/locales/fra/reporting/{intervention_registry.xml => intervention_register.xml} (99%) rename config/locales/fra/reporting/{land_parcel_registry.xml => land_parcel_register.xml} (99%) rename config/locales/fra/reporting/{phytosanitary_registry.xml => phytosanitary_register.xml} (99%) rename config/locales/fra/reporting/{vat_registry.xml => vat_register.xml} (99%) create mode 100644 db/migrate/20150821235105_rename_invalid_document_nature.rb create mode 100644 db/nomenclatures/migrate/20150821230800_rename_invalid_document_natures.xml delete mode 100644 private/test/reporting/14/content.xml delete mode 100644 private/test/reporting/15/content.xml delete mode 100644 private/test/reporting/17/content.xml diff --git a/app/themes/tekyla/stylesheets/variables.scss b/app/themes/tekyla/stylesheets/variables.scss index 07e5c4b3ff..9754f8eca3 100644 --- a/app/themes/tekyla/stylesheets/variables.scss +++ b/app/themes/tekyla/stylesheets/variables.scss @@ -86,7 +86,7 @@ $buttons-aliases: ("abort" "times") ("action" "cog") ("backup" "backward") ("bar ("observation" "comment-o") ("event" "calendar") ("task" "check-square-o") ("entity-link" "arrows-h") ("incoming-payment" "credit-card") ("outgoing-payment" "credit-card") ("issue" "bug") ("incoming-call" "call") ("outgoing-call" "call") ("incoming-email" "envelope-o") ("outgoing-email" "envelope-o") ("quote" "calculator") ("sale-opportunity" "file-text-o") ("sale" "eur") ("purchase" "shopping-cart") ("product-ownership" "key") ("product-localization" "map-marker") ("product-phase" "label") ("attachment" "paperclip") ("map" "map-marker") ("chart" "bar-chart") ("timeline" "history") ("cobbles" "view-stream") - ("veterinary_booklet" "medkit") ("animal_husbandry_registry" "cow") ("doer" "male") ("exchange_accountancy_file_fr" "file") ("input" "matter") ("intervention_registry" "cogs") ("manure_management_plan" "book") ("provisional_manure_management_plan" "book") ("land_parcel_registry" "tractor") ("phytosanitary_registry" "flask") ("vine_phytosanitary_registry" "flask") ("general_ledger" "money") ("income_statement" "money") ("activity_cost" "money") ("tool" "tractor") ("wine_bottling_registry" "bottles") ("wine_detention_registry" "flask") ("wine_manipulation_registry" "bottle"); + ("veterinary_booklet" "medkit") ("animal_husbandry_register" "cow") ("doer" "male") ("exchange_accountancy_file_fr" "file") ("input" "matter") ("intervention_register" "cogs") ("manure_management_plan" "book") ("provisional_manure_management_plan" "book") ("land_parcel_register" "tractor") ("phytosanitary_register" "flask") ("vine_phytosanitary_register" "flask") ("general_ledger" "money") ("income_statement" "money") ("activity_cost" "money") ("tool" "tractor") ("wine_bottling_register" "bottles") ("wine_detention_register" "flask") ("wine_manipulation_register" "bottle"); $buttons-states: hover whited active disabled normal; $buttons-radius: $default-border-radius; diff --git a/config/aggregators/animal_husbandry_registry.xml b/config/aggregators/animal_husbandry_register.xml similarity index 98% rename from config/aggregators/animal_husbandry_registry.xml rename to config/aggregators/animal_husbandry_register.xml index 9c1a78f76e..41625ecc7a 100644 --- a/config/aggregators/animal_husbandry_registry.xml +++ b/config/aggregators/animal_husbandry_register.xml @@ -1,12 +1,12 @@ - + -
+
diff --git a/config/aggregators/intervention_registry.xml b/config/aggregators/intervention_register.xml similarity index 98% rename from config/aggregators/intervention_registry.xml rename to config/aggregators/intervention_register.xml index 3c132da7e1..ea1880daef 100644 --- a/config/aggregators/intervention_registry.xml +++ b/config/aggregators/intervention_register.xml @@ -1,6 +1,6 @@ - + diff --git a/config/aggregators/land_parcel_registry.xml b/config/aggregators/land_parcel_register.xml similarity index 98% rename from config/aggregators/land_parcel_registry.xml rename to config/aggregators/land_parcel_register.xml index f5a260424d..9fb7a0ac00 100644 --- a/config/aggregators/land_parcel_registry.xml +++ b/config/aggregators/land_parcel_register.xml @@ -1,6 +1,6 @@ - + diff --git a/config/aggregators/phytosanitary_registry.xml b/config/aggregators/phytosanitary_register.xml similarity index 98% rename from config/aggregators/phytosanitary_registry.xml rename to config/aggregators/phytosanitary_register.xml index 7ca46cfd58..5dbbf16e09 100644 --- a/config/aggregators/phytosanitary_registry.xml +++ b/config/aggregators/phytosanitary_register.xml @@ -1,6 +1,6 @@ - + diff --git a/config/aggregators/vat_registry.xml b/config/aggregators/vat_register.xml similarity index 97% rename from config/aggregators/vat_registry.xml rename to config/aggregators/vat_register.xml index 7cb7bbd3f3..84b8e023f5 100644 --- a/config/aggregators/vat_registry.xml +++ b/config/aggregators/vat_register.xml @@ -1,6 +1,6 @@ - + diff --git a/config/locales/arb/aggregators.yml b/config/locales/arb/aggregators.yml index 860c08d254..cc8726fe40 100644 --- a/config/locales/arb/aggregators.yml +++ b/config/locales/arb/aggregators.yml @@ -2,7 +2,6 @@ arb: aggregator_parameters: # campaigns: "Campaigns" aggregator_properties: - # animal_husbandry_registry: "Animal husbandry registry" # area: "Area" # area_in_hectare: "Area in hectare" # breeding_number: "Breeding number" @@ -71,5 +70,3 @@ arb: # variant_variety: "Variant variety" # vine_yield: "Vine yield" # wages: "Wages" - aggregators: - # vat_registry: "Vat tax registry" diff --git a/config/locales/arb/nomenclatures.yml b/config/locales/arb/nomenclatures.yml index 0ad9f7eb80..b052941538 100644 --- a/config/locales/arb/nomenclatures.yml +++ b/config/locales/arb/nomenclatures.yml @@ -1383,7 +1383,7 @@ arb: document_natures: items: # activity_cost: "Activity cost" - # animal_husbandry_registry: "Animal husbandry registry" + # animal_husbandry_register: "Animal husbandry register" # animal_list: "Animal list" # animal_sheet: "Animal sheet" # balance_sheet: "Balance sheet" @@ -1395,17 +1395,17 @@ arb: # general_ledger: "General ledger" # income_statement: "Profit and loss statement" # incoming_delivery_docket: "Incoming delivery docket" - # intervention_registry: "Intervention registry" + # intervention_register: "Intervention register" # intervention_sheet: "Intervention sheet" # inventory_sheet: "Inventory sheet" # journal: "Journal" - # land_parcel_registry: "Land parcel registry" + # land_parcel_register: "Land parcel register" # manure_management_plan: "Manure management plan" # manure_management_plan_sheet: "Manure management plan (detail)" # outgoing_deliveries_journal: "Outgoing deliveries journal" # outgoing_delivery_docket: "Outgoing delivery docket" # phytosanitary_certification: "Phytosanitary certification" - # phytosanitary_registry: "Phytosanitary registry" + # phytosanitary_register: "Phytosanitary register" # prescription: "Prescription" # products_sheet: "Products sheet" # provisional_manure_management_plan: "Provisional manure management plan" @@ -1420,12 +1420,12 @@ arb: # stocks: "Stocks" # tax_assessment: "Tax assessment" # trial_balance: "Trial balance" - # vat_registry: "VAT registry" + # vat_register: "VAT register" # veterinary_booklet: "Veterinary booklet" - # vine_phytosanitary_registry: "Vine phytosanitary registry" - # wine_bottling_registry: "Wine bottling registry" - # wine_detention_registry: "Wine detention registry" - # wine_manipulation_registry: "Wine manipulation registry" + # vine_phytosanitary_register: "Vine phytosanitary register" + # wine_bottling_register: "Wine bottling register" + # wine_detention_register: "Wine detention register" + # wine_manipulation_register: "Wine manipulation register" # name: "Document natures" property_natures: # category: "Category" diff --git a/config/locales/eng/aggregators.yml b/config/locales/eng/aggregators.yml index 3734431a0d..90b9dcb5bd 100644 --- a/config/locales/eng/aggregators.yml +++ b/config/locales/eng/aggregators.yml @@ -25,7 +25,7 @@ eng: #~ active: "Active" #~ address: "Address" #~ amount: "Amount" - animal_husbandry_registry: "Animal husbandry registry" + # animal_husbandry_register: "Animal husbandry register" #~ animal_productions: "Animal productions" area: "Area" area_in_hectare: "Area in hectare" @@ -166,13 +166,13 @@ eng: #~ worker: "Worker" aggregators: #~ activity_cost: "Activity cost" - #~ animal_husbandry_registry: "Animal husbandry registry" + #~ animal_husbandry_register: "Animal husbandry register" #~ exchange_accountancy_file_fr: "Exchange accountancy file fr" #~ general_ledger: "General ledger" - #~ intervention_registry: "Intervention registry" - #~ land_parcel_registry: "Land parcel registry" - #~ phytosanitary_registry: "Phytosanitary registry" + #~ intervention_register: "Intervention register" + #~ land_parcel_register: "Land parcel register" + #~ phytosanitary_register: "Phytosanitary register" #~ products_sheet: "Products sheet" #~ income_statement: "Profit and loss statement" - vat_registry: "Vat tax registry" + #~ vat_register: "VAT register" #~ veterinary_booklet: "Veterinary booklet" diff --git a/config/locales/eng/nomenclatures.yml b/config/locales/eng/nomenclatures.yml index 009ab31b36..99fd49a002 100644 --- a/config/locales/eng/nomenclatures.yml +++ b/config/locales/eng/nomenclatures.yml @@ -1377,7 +1377,7 @@ eng: category: "Category" items: activity_cost: "Activity cost" - animal_husbandry_registry: "Animal husbandry registry" + animal_husbandry_register: "Animal husbandry register" animal_list: "Animal list" animal_sheet: "Animal sheet" balance_sheet: "Balance sheet" @@ -1389,17 +1389,17 @@ eng: general_ledger: "General ledger" income_statement: "Profit and loss statement" incoming_delivery_docket: "Incoming delivery docket" - intervention_registry: "Intervention registry" + intervention_register: "Intervention register" intervention_sheet: "Intervention sheet" inventory_sheet: "Inventory sheet" journal: "Journal" - land_parcel_registry: "Land parcel registry" + land_parcel_register: "Land parcel register" manure_management_plan: "Manure management plan" manure_management_plan_sheet: "Manure management plan (detail)" outgoing_deliveries_journal: "Outgoing deliveries journal" outgoing_delivery_docket: "Outgoing delivery docket" phytosanitary_certification: "Phytosanitary certification" - phytosanitary_registry: "Phytosanitary registry" + phytosanitary_register: "Phytosanitary register" prescription: "Prescription" products_sheet: "Products sheet" provisional_manure_management_plan: "Provisional manure management plan" @@ -1414,12 +1414,12 @@ eng: stocks: "Stocks" tax_assessment: "Tax assessment" trial_balance: "Trial balance" - vat_registry: "VAT registry" + vat_register: "VAT register" veterinary_booklet: "Veterinary booklet" - vine_phytosanitary_registry: "Vine phytosanitary registry" - wine_bottling_registry: "Wine bottling registry" - wine_detention_registry: "Wine detention registry" - wine_manipulation_registry: "Wine manipulation registry" + vine_phytosanitary_register: "Vine phytosanitary register" + wine_bottling_register: "Wine bottling register" + wine_detention_register: "Wine detention register" + wine_manipulation_register: "Wine manipulation register" entity_link_natures: name: "Entity link natures" property_natures: diff --git a/config/locales/fra/aggregators.yml b/config/locales/fra/aggregators.yml index 73a2be0050..6c7e0b86c8 100644 --- a/config/locales/fra/aggregators.yml +++ b/config/locales/fra/aggregators.yml @@ -6,7 +6,7 @@ fra: actor_name: "Nom de l'acteur" #? animal_group_name: "Nom du groupe d'animaux" #? animal_group_population: "Population du groupe d'animaux" #? - animal_husbandry_registry: "Registre d'élevage" + animal_husbandry_register: "Registre d'élevage" #? area: "Surface" area_in_hectare: "Surface (ha)" breeding_number: "Numéro d'élevage" @@ -91,5 +91,5 @@ fra: variant_variety: "Variété de la variante" vine_yield: "Rendement en vin" wages: "Salaires" - aggregators: - vat_registry: "Bilan de TVA" + aggregators: #? + vat_register: "Registre de TVA" #? diff --git a/config/locales/fra/nomenclatures.yml b/config/locales/fra/nomenclatures.yml index 48fd282b83..b21348be01 100644 --- a/config/locales/fra/nomenclatures.yml +++ b/config/locales/fra/nomenclatures.yml @@ -1383,7 +1383,7 @@ fra: document_natures: items: activity_cost: "Coût de production détaillé" - animal_husbandry_registry: "Registre d’élevage" + animal_husbandry_register: "Registre d’élevage" animal_list: "Liste des animaux" animal_sheet: "Fiche animal" balance_sheet: "Bilan comptable" @@ -1396,17 +1396,17 @@ fra: general_ledger: "Grand livre" income_statement: "Compte de résultat" incoming_delivery_docket: "Bon de réception" - intervention_registry: "Registre des interventions" + intervention_register: "Registre des interventions" intervention_sheet: "Fiche intervention" inventory_sheet: "Inventaire" journal: "Journal" - land_parcel_registry: "Cahier de tracabilité ‒ Parcelles" + land_parcel_register: "Cahier de tracabilité ‒ Parcelles" manure_management_plan: "Cahier d’épandage" manure_management_plan_sheet: "Plan prévisionnel de fumure détaillé" outgoing_deliveries_journal: "Journal de livraison" outgoing_delivery_docket: "Bon de livraison" phytosanitary_certification: "Certi-Phyto" - phytosanitary_registry: "Registre phytosanitaire" + phytosanitary_register: "Registre phytosanitaire" prescription: "Prescription vétérinaire" products_sheet: "Fiche des produits" provisional_manure_management_plan: "Plan prévisionnel de fumure (PPF)" @@ -1421,12 +1421,12 @@ fra: stocks: "Stocks" tax_assessment: "Avis d’imposition" trial_balance: "Balance comptable" - vat_registry: "Registre de TVA" + vat_register: "Registre de TVA" veterinary_booklet: "Carnet vétérinaire" - vine_phytosanitary_registry: "Registre phytosanitaire ‒ Vigne" - wine_bottling_registry: "Registre de conditionnement ‒ Vin" - wine_detention_registry: "Registre de détention ‒ Vin" - wine_manipulation_registry: "Registre de manipulation ‒ Vin" + vine_phytosanitary_register: "Registre phytosanitaire ‒ Vigne" + wine_bottling_register: "Registre de conditionnement ‒ Vin" + wine_detention_register: "Registre de détention ‒ Vin" + wine_manipulation_register: "Registre de manipulation ‒ Vin" name: "Types de documents" property_natures: category: "Catégories" diff --git a/config/locales/fra/reporting/animal_husbandry_registry.xml b/config/locales/fra/reporting/animal_husbandry_register.xml similarity index 97% rename from config/locales/fra/reporting/animal_husbandry_registry.xml rename to config/locales/fra/reporting/animal_husbandry_register.xml index 7e8dc0a5a5..2b96fc8df6 100644 --- a/config/locales/fra/reporting/animal_husbandry_registry.xml +++ b/config/locales/fra/reporting/animal_husbandry_register.xml @@ -1,5 +1,5 @@ - + @@ -16,22 +16,22 @@ - + - + - + - + - + - + diff --git a/config/locales/fra/reporting/intervention_registry.xml b/config/locales/fra/reporting/intervention_register.xml similarity index 99% rename from config/locales/fra/reporting/intervention_registry.xml rename to config/locales/fra/reporting/intervention_register.xml index 2032fdd65b..936ef9a3f6 100644 --- a/config/locales/fra/reporting/intervention_registry.xml +++ b/config/locales/fra/reporting/intervention_register.xml @@ -1,9 +1,9 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="402" splitType="Stretch"> - <staticText> - <reportElement style="strong" mode="Opaque" x="0" y="33" width="545" height="2" backcolor="#7C9DDD" uuid="6b3b0803-00f0-48c7-b822-16a58f7bba05"/> - <textElement verticalAlignment="Middle"> - <font pdfFontName="Open Sans"/> - </textElement> - <text><![CDATA[]]></text> - </staticText> - <textField isBlankWhenNull="true"> - <reportElement style="strong" x="115" y="78" width="215" height="22" uuid="6e95af2d-8119-4f23-a1ed-212a39858d51"/> - <textElement verticalAlignment="Middle"> - <paragraph firstLineIndent="4"/> - </textElement> - <textFieldExpression><![CDATA[$F{name}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="strong" x="448" y="104" width="100" height="22" uuid="2524edad-5835-4a84-9ccc-c33a38746210"/> - <textElement verticalAlignment="Middle"> - <paragraph firstLineIndent="4"/> - </textElement> - <textFieldExpression><![CDATA[$F{campaign_name}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="strong" x="115" y="104" width="215" height="22" uuid="1d2b7b4f-ca30-4317-9108-e1435a292a1f"/> - <textElement verticalAlignment="Middle"> - <paragraph firstLineIndent="4"/> - </textElement> - <textFieldExpression><![CDATA[$F{recommender_full_name}]]></textFieldExpression> - </textField> - <textField pattern="dd/MM/yyyy" isBlankWhenNull="true"> - <reportElement style="strong" x="448" y="78" width="100" height="22" uuid="3c27d087-3abb-4992-9a7c-19c9032e3d1e"/> - <textElement verticalAlignment="Middle"> - <paragraph firstLineIndent="4"/> - </textElement> - <textFieldExpression><![CDATA[$F{opened_at}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="strong" x="115" y="130" width="215" height="22" uuid="90e7bd87-5cab-4ace-8ee3-e4de65bf0c38"/> - <textElement verticalAlignment="Middle"> - <paragraph firstLineIndent="4"/> - </textElement> - <textFieldExpression><![CDATA[$F{default_computation_method_name}]]></textFieldExpression> - </textField> - <staticText> - <reportElement style="title" x="1" y="0" width="555" height="33" uuid="57c671d5-cbc7-4883-bb59-5feb61d25b98"/> - <textElement> - <font fontName="Open Sans" size="16" pdfFontName="Open Sans"/> - </textElement> - <text><![CDATA[Plan prévisionnel de fumure détaillé (PPF)]]></text> - </staticText> - <staticText> - <reportElement style="label" x="3" y="78" width="112" height="22" uuid="7e50687b-61ad-44d8-9e83-8d1cf7fb8f26"/> - <textElement verticalAlignment="Middle"> - <font fontName="Open Sans" size="10"/> - <paragraph firstLineIndent="4"/> - </textElement> - <text><![CDATA[Nom]]></text> - </staticText> - <staticText> - <reportElement style="label" x="336" y="104" width="112" height="22" uuid="811443f9-2af1-4699-b18f-58b5f8484e77"/> - <textElement verticalAlignment="Middle"> - <font fontName="Open Sans" size="10"/> - <paragraph firstLineIndent="4"/> - </textElement> - <text><![CDATA[Campagne]]></text> - </staticText> - <staticText> - <reportElement style="label" x="3" y="104" width="112" height="22" uuid="35b11da5-3fc8-4ae7-b860-feaf33ed9afb"/> - <textElement verticalAlignment="Middle"> - <font fontName="Open Sans" size="10"/> - <paragraph firstLineIndent="4"/> - </textElement> - <text><![CDATA[Prescripteur]]></text> - </staticText> - <staticText> - <reportElement style="label" x="3" y="130" width="112" height="22" uuid="f478a469-8454-4639-886f-3fd17f1db050"/> - <textElement verticalAlignment="Middle"> - <font fontName="Open Sans" size="10"/> - <paragraph firstLineIndent="4"/> - </textElement> - <text><![CDATA[Méthode réglementaire]]></text> - </staticText> - <staticText> - <reportElement style="label" x="336" y="78" width="112" height="22" uuid="55ba1330-d533-4b45-9006-9b5f69e457a9"/> - <textElement verticalAlignment="Middle"> - <font fontName="Open Sans" size="10"/> - <paragraph firstLineIndent="4"/> - </textElement> - <text><![CDATA[Ouverture du bilan]]></text> - </staticText> - <staticText> - <reportElement style="success" mode="Transparent" x="399" y="0" width="146" height="33" uuid="33dcb2d6-f471-4905-99b1-394ed6f9fd36"> - <printWhenExpression><![CDATA[$F{selected}.booleanValue() == true]]></printWhenExpression> - </reportElement> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Open Sans" size="24" isBold="true"/> - <paragraph rightIndent="4"/> - </textElement> - <text><![CDATA[VALIDE]]></text> - </staticText> - <staticText> - <reportElement style="warning" mode="Transparent" x="399" y="1" width="146" height="34" uuid="003cb0e5-7cd5-4af8-95df-149da6a17c2e"> - <printWhenExpression><![CDATA[$F{selected}.booleanValue() == false]]></printWhenExpression> - </reportElement> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font fontName="Open Sans" size="24" isBold="true"/> - <paragraph rightIndent="4"/> - </textElement> - <text><![CDATA[BROUILLON]]></text> - </staticText> - <textField evaluationTime="Report" isBlankWhenNull="true"> - <reportElement style="strong" x="448" y="130" width="100" height="22" uuid="61e09708-b743-42c0-8d36-3e4734f5da1a"/> - <textFieldExpression><![CDATA[$V{REPORT_COUNT}]]></textFieldExpression> - </textField> - <staticText> - <reportElement style="label" x="336" y="130" width="112" height="22" uuid="db5a7a34-7d29-462f-a006-fddcb4c2bd3c"/> - <textElement verticalAlignment="Middle"> - <font fontName="Open Sans" size="10"/> - <paragraph firstLineIndent="4"/> - </textElement> - <text><![CDATA[Parcelles culturales]]></text> - </staticText> - <componentElement> - <reportElement key="table 1" style="table 1" x="0" y="295" width="556" height="93" uuid="2ffb1ec1-f0cb-4f18-a288-726b2ac257b9"/> - <jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd"> - <datasetRun subDataset="zones" uuid="edd7d637-bfa0-4edd-927d-2a451e49e49b"> - <parametersMapExpression><![CDATA[$P{REPORT_PARAMETERS_MAP}]]></parametersMapExpression> - <datasetParameter name="REPORT_DATA_SOURCE"> - <datasetParameterExpression><![CDATA[$P{REPORT_DATA_SOURCE}]]></datasetParameterExpression> - </datasetParameter> - <datasetParameter name="REPORT_LOCALE"> - <datasetParameterExpression><![CDATA[$P{REPORT_LOCALE}]]></datasetParameterExpression> - </datasetParameter> - <datasetParameter name="XML_DATE_PATTERN"> - <datasetParameterExpression><![CDATA[$P{XML_DATE_PATTERN}]]></datasetParameterExpression> - </datasetParameter> - <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression> - </datasetRun> - <jr:column width="180" uuid="f639ef29-f17e-4741-b933-67ef46cf7bda"> - <jr:columnHeader style="table-th" height="30" rowSpan="1"> - <staticText> - <reportElement style="table-th" x="0" y="0" width="180" height="30" uuid="1e281ffc-6eb7-49c2-8399-4fcb59e60f23"/> - <textElement> - <font fontName="Open Sans" isBold="false"/> - </textElement> - <text><![CDATA[Nom de la zone]]></text> - </staticText> - </jr:columnHeader> - <jr:detailCell style="table-td" height="30" rowSpan="1"> - <textField> - <reportElement style="table-td" x="0" y="0" width="180" height="30" uuid="63784299-bab4-4b44-ad31-ce57c40eb9eb"/> - <textElement verticalAlignment="Middle"> - <paragraph leftIndent="4"/> - </textElement> - <textFieldExpression><![CDATA[$F{storage_name}]]></textFieldExpression> - </textField> - </jr:detailCell> - </jr:column> - <jr:column width="92" uuid="e1cabe34-ba49-4253-aa77-19755f630d7e"> - <jr:columnHeader style="table-th" height="30" rowSpan="1"> - <staticText> - <reportElement style="table-th" x="0" y="0" width="92" height="30" uuid="caad6624-488b-4a97-a5ae-69af400dda4d"/> - <textElement> - <font fontName="Open Sans" isBold="false"/> - </textElement> - <text><![CDATA[Numéro de la zone]]></text> - </staticText> - </jr:columnHeader> - <jr:detailCell style="table-td" height="30" rowSpan="1"> - <textField> - <reportElement style="table-td" x="0" y="0" width="92" height="30" uuid="46f27d45-3334-4b09-a551-70714f260753"/> - <textElement verticalAlignment="Middle"/> - <textFieldExpression><![CDATA[$F{storage_work_number}]]></textFieldExpression> - </textField> - </jr:detailCell> - </jr:column> - <jr:column width="189" uuid="0d352cb1-e3a3-44b0-9b4e-c8993730f459"> - <jr:columnHeader style="table-th" height="30" rowSpan="1"> - <staticText> - <reportElement style="table-th" x="0" y="0" width="189" height="30" uuid="2e01eb26-2cb4-4211-ab12-d64c1ba93223"/> - <textElement> - <font fontName="Open Sans" isBold="false"/> - </textElement> - <text><![CDATA[Variété]]></text> - </staticText> - </jr:columnHeader> - <jr:detailCell style="table-td" height="30" rowSpan="1"> - <textField> - <reportElement style="table-td" x="0" y="0" width="189" height="30" uuid="81601dd6-a527-42c5-bee7-697705388a5d"/> - <textElement verticalAlignment="Middle"/> - <textFieldExpression><![CDATA[$F{cultivation_variety_name}]]></textFieldExpression> - </textField> - </jr:detailCell> - </jr:column> - <jr:column width="92" uuid="75f9eda0-d5ab-4bb7-80cf-8f65713b603a"> - <jr:columnHeader style="table-th" height="30" rowSpan="1"> - <staticText> - <reportElement style="table-th" x="0" y="0" width="92" height="30" uuid="0bf14539-c95d-4b02-97e8-cc87e1543565"/> - <textElement> - <font fontName="Open Sans" isBold="false"/> - </textElement> - <text><![CDATA[Apport calculé]]></text> - </staticText> - </jr:columnHeader> - <jr:detailCell style="table-td" height="30" rowSpan="1"> - <textField> - <reportElement style="table-td" x="0" y="0" width="92" height="30" uuid="2bdb88e8-a327-46db-acb5-0a8e3cb74072"/> - <textElement verticalAlignment="Middle"/> - <textFieldExpression><![CDATA[$F{nitrogen_input}]]></textFieldExpression> - </textField> - </jr:detailCell> - </jr:column> - </jr:table> - </componentElement> - <staticText> - <reportElement style="emphasis" x="21" y="226" width="495" height="18" uuid="dbbdcc09-6f6d-4e91-8562-7f9f66117e84"> - <printWhenExpression><![CDATA[$F{default_computation_method_name}.toString() == "poitou_charentes_2013"]]></printWhenExpression> - </reportElement> - <textElement verticalAlignment="Middle"> - <font fontName="Open Sans" size="10"/> - <paragraph firstLineIndent="4"/> - </textElement> - <text><![CDATA[Arrêté préfectoral n°255 du 31/08/2012 (Poitou-Charentes)]]></text> - </staticText> - <staticText> - <reportElement style="label-strong" x="2" y="174" width="498" height="22" uuid="16c61d3b-6c6d-4727-b09f-2931737acd25"/> - <textElement verticalAlignment="Middle"> - <font fontName="Open Sans" size="10"/> - <paragraph firstLineIndent="4"/> - </textElement> - <text><![CDATA[Référence réglementaires]]></text> - </staticText> - <staticText> - <reportElement style="emphasis" x="23" y="207" width="495" height="18" uuid="56b2b089-bd68-4702-8fe8-23bf9b63cf83"/> - <textElement verticalAlignment="Middle"> - <font fontName="Open Sans" size="10"/> - <paragraph firstLineIndent="4"/> - </textElement> - <text><![CDATA[Arrêté national du 23/10/2013 modifiant l'arrêté national du 19/12/2011]]></text> - </staticText> - <staticText> - <reportElement style="label-strong" x="0" y="45" width="498" height="22" uuid="7d1f8e6b-fffc-4664-912e-414cc6ec06b4"/> - <textElement verticalAlignment="Middle"> - <font fontName="Open Sans" size="10"/> - <paragraph firstLineIndent="4"/> - </textElement> - <text><![CDATA[Informations générales]]></text> - </staticText> - <staticText> - <reportElement style="label-strong" x="3" y="273" width="498" height="22" uuid="c7f2777f-0391-4574-9998-ac755ea80af6"/> - <textElement verticalAlignment="Middle"> - <font fontName="Open Sans" size="10"/> - <paragraph firstLineIndent="4"/> - </textElement> - <text><![CDATA[Synthèse]]></text> - </staticText> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/private/test/reporting/16/content.xml b/private/test/reporting/16/content.xml index 1d1d5ce645..c366649266 100644 --- a/private/test/reporting/16/content.xml +++ b/private/test/reporting/16/content.xml @@ -1,5 +1,5 @@ - + diff --git a/private/test/reporting/17/content.xml b/private/test/reporting/17/content.xml deleted file mode 100644 index 4d6e9ef0bd..0000000000 --- a/private/test/reporting/17/content.xml +++ /dev/null @@ -1,914 +0,0 @@ - - - - - - - -