[glom] Film Manager example: Correct the Contacts reports.



commit 19aa827d9b1665d69a8db1e392209f85c393dad4
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Apr 13 14:29:39 2012 +0200

    Film Manager example: Correct the Contacts reports.
    
    	* examples/example_film_manager.glom: Copy them
    	from the Small Business example. They were missing
    	the Group By fields.

 ChangeLog                          |    8 ++++++++
 examples/example_film_manager.glom |   35 +++++++++++++++++++++++++++++++----
 2 files changed, 39 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d1a01d7..f01ecc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-04-13  Murray Cumming  <murrayc murrayc com>
 
+	Film Manager example: Correct the Contacts reports.
+
+	* examples/example_film_manager.glom: Copy them 
+	from the Small Business example. They were missing
+	the Group By fields.
+
+2012-04-13  Murray Cumming  <murrayc murrayc com>
+
 	Windows build: Fix some typos.
 
 	* glom/glom_create_from_example.cc:
diff --git a/examples/example_film_manager.glom b/examples/example_film_manager.glom
index 87a740f..e860b2c 100644
--- a/examples/example_film_manager.glom
+++ b/examples/example_film_manager.glom
@@ -2068,8 +2068,9 @@
         <data_layout_groups>
           <data_layout_group>
             <data_layout_item_groupby>
-              <data_layout_item name="character_id" editable="true" use_default_formatting="true">
-                <formatting/>
+              <groupby name="address_country" editable="true" use_default_formatting="true"/>
+              <data_layout_item name="contact_id" editable="true" use_default_formatting="true">
+                <formatting format_thousands_separator="true" format_decimal_places="2"/>
               </data_layout_item>
               <data_layout_item name="name_full" editable="true" use_default_formatting="true">
                 <formatting/>
@@ -2082,6 +2083,7 @@
           <trans loc="de" val="Kontakte nach Land"/>
           <trans loc="es" val="Contactos por paiÌs"/>
           <trans loc="fr" val="Contacts par pays"/>
+          <trans loc="gl" val="Contactos por paÃs"/>
           <trans loc="pt_BR" val="Contatos por paÃs"/>
           <trans loc="sl" val="Stiki po drÅavah"/>
         </trans_set>
@@ -2090,9 +2092,11 @@
         <data_layout_groups>
           <data_layout_group>
             <data_layout_item_groupby>
+              <groupby name="address_country" editable="true" use_default_formatting="true"/>
               <data_layout_item_groupby>
-                <data_layout_item name="character_id" editable="true" use_default_formatting="true">
-                  <formatting/>
+                <groupby name="address_town" editable="true" use_default_formatting="true"/>
+                <data_layout_item name="contact_id" editable="true" use_default_formatting="true">
+                  <formatting format_thousands_separator="true" format_decimal_places="2"/>
                 </data_layout_item>
                 <data_layout_item name="name_full" editable="true" use_default_formatting="true">
                   <formatting/>
@@ -2100,6 +2104,28 @@
                 <data_layout_item name="address_postcode" editable="true" use_default_formatting="true">
                   <formatting/>
                 </data_layout_item>
+                <data_layout_item_verticalgroup>
+                  <data_layout_item name="name_title" editable="true" use_default_formatting="true">
+                    <formatting/>
+                  </data_layout_item>
+                  <data_layout_item name="name_first" editable="true" use_default_formatting="true">
+                    <formatting/>
+                  </data_layout_item>
+                  <data_layout_item name="name_last" editable="true" use_default_formatting="true">
+                    <formatting/>
+                  </data_layout_item>
+                </data_layout_item_verticalgroup>
+                <data_layout_item_verticalgroup>
+                  <data_layout_item name="address_street1" editable="true" use_default_formatting="true">
+                    <formatting/>
+                  </data_layout_item>
+                  <data_layout_item name="address_street2" editable="true" use_default_formatting="true">
+                    <formatting/>
+                  </data_layout_item>
+                  <data_layout_item name="address_postcode" editable="true" use_default_formatting="true">
+                    <formatting/>
+                  </data_layout_item>
+                </data_layout_item_verticalgroup>
               </data_layout_item_groupby>
             </data_layout_item_groupby>
           </data_layout_group>
@@ -2109,6 +2135,7 @@
           <trans loc="de" val="Nach Land, nach Ort"/>
           <trans loc="es" val="Por paiÌs, por ciudad"/>
           <trans loc="fr" val="Par pays, par ville"/>
+          <trans loc="gl" val="Por paÃs, por cidade"/>
           <trans loc="pt_BR" val="Por paÃs, Por cidade"/>
           <trans loc="sl" val="Po drÅavi, po mestu"/>
         </trans_set>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]