From 7f9fe180ce7df7b6bf7d0ecc6690a12be6e2bcc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nitzsche?= <nitzsche@dmk-ebusiness.de>
Date: Thu, 8 Oct 2015 20:01:24 +0200
Subject: [PATCH] #1 New attributes added to datagrid

---
 .../Resources/config/datagrid.yml             | 57 ++++++++++++++++++-
 .../MemberBundle/Resources/config/form.yml    | 26 ++++-----
 2 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/src/DMKClub/Bundle/MemberBundle/Resources/config/datagrid.yml b/src/DMKClub/Bundle/MemberBundle/Resources/config/datagrid.yml
index 3205afb..48186d1 100644
--- a/src/DMKClub/Bundle/MemberBundle/Resources/config/datagrid.yml
+++ b/src/DMKClub/Bundle/MemberBundle/Resources/config/datagrid.yml
@@ -1,6 +1,6 @@
 datagrid:
     dmkclub-members-grid:
-        extended_entity_name: %dmkclub.member.entity.class%
+        extended_entity_name: "%dmkclub.member.entity.class%"
         source:
             type: orm
             acl_resource: orocrm_contact_view
@@ -9,18 +9,37 @@ datagrid:
                     - m.id
                     - c.firstName
                     - c.lastName
+                    - m.isHonorary
+                    - m.isActive
+                    - m.isFreeOfCharge
+                    - m.status
+                    - m.paymentOption
+                    - a.city
                     - m.createdAt
                     - m.updatedAt
                 from:
-                    - { table: %dmkclub.member.entity.class%, alias: m }
+                    - { table: "%dmkclub.member.entity.class%", alias: m }
                 join:
                     left:
                         - { join: m.contact, alias: c }
+                        - { join: m.postalAddress, alias: a }
         columns:
             firstName:
                 label:         orocrm.contact.first_name.label
             lastName:
                 label:         orocrm.contact.last_name.label
+            isHonorary:
+                label:         dmkclub.member.is_honorary.label
+            isActive:
+                label:         dmkclub.member.is_active.label
+            isFreeOfCharge:
+                label:         dmkclub.member.is_free_of_charge.label
+            status:
+                label:         dmkclub.member.status.label
+            paymentOption:
+                label:         dmkclub.member.payment_option.label
+            city:
+                label:         oro.address.city.label
             createdAt:
                 label:         oro.ui.created_at
                 frontend_type: datetime
@@ -43,6 +62,18 @@ datagrid:
                     data_name: c.lastName
                 firstName:
                     data_name: c.firstName
+                isHonorary:
+                    data_name: m.isHonorary
+                isActive:
+                    data_name: m.isActive
+                isFreeOfCharge:
+                    data_name: m.isFreeOfCharge
+                status:
+                    data_name: m.status
+                paymentOption:
+                    data_name: m.paymentOption
+                city:
+                    data_name: a.city
                 createdAt:
                     data_name: m.createdAt
                 updatedAt:
@@ -53,10 +84,30 @@ datagrid:
             columns:
                 firstName:
                     type: string
+                    enabled: false
                     data_name: c.firstName
                 lastName:
                     type: string
                     data_name: c.lastName
+                isHonorary:
+                    type: string
+                    enabled: false
+                    data_name: m.isHonorary
+                isFreeOfCharge:
+                    type: string
+                    enabled: false
+                    data_name: m.isFreeOfCharge
+                active:
+                    type: string
+                    enabled: false
+                    data_name: m.active
+                status:
+                    type: string
+                    data_name: m.status
+                city:
+                    type: string
+                    enabled: false
+                    data_name: a.city
                 createdAt:
                     type:      datetime
                     data_name: m.createdAt
@@ -64,6 +115,8 @@ datagrid:
                     type:      datetime
                     data_name: m.updatedAt
                     enabled: false
+            default:
+                status: { value: 'active', type: %oro_filter.form.type.filter.text.class%::TYPE_EQUAL }
         actions:
             view:
                 type: navigate
diff --git a/src/DMKClub/Bundle/MemberBundle/Resources/config/form.yml b/src/DMKClub/Bundle/MemberBundle/Resources/config/form.yml
index 0b6433a..a16c031 100644
--- a/src/DMKClub/Bundle/MemberBundle/Resources/config/form.yml
+++ b/src/DMKClub/Bundle/MemberBundle/Resources/config/form.yml
@@ -8,12 +8,12 @@ parameters:
 
 services:
     dmkclub.member.form.type:
-        class: %dmkclub.member.form.type.class%
+        class: "%dmkclub.member.form.type.class%"
         tags:
             - { name: form.type, alias: dmkclub_member_member }
 
     dmkclub.member.form.type.api:
-        class: %dmkclub.member.form.type.api.class%
+        class: "%dmkclub.member.form.type.api.class%"
         tags:
             - { name: form.type, alias: dmkclub_member_member_api }
 
@@ -34,31 +34,31 @@ services:
             - "dmkclub_member_member_api"
 
     dmkclub.member.form.handler:
-        class: %dmkclub.member.form.handler.class%
+        class: "%dmkclub.member.form.handler.class%"
         scope: request
         arguments:
-            - @dmkclub.member.form
-            - @request
-            - @doctrine.orm.entity_manager
+            - "@dmkclub.member.form"
+            - "@request"
+            - "@doctrine.orm.entity_manager"
         tags:
             - { name: oro_tag.tag_manager }
 
     dmkclub.member.form.handler.api:
-        class: %dmkclub.member.form.handler.class%
+        class: "%dmkclub.member.form.handler.class%"
         scope: request
         arguments:
-            - @dmkclub.member.form.api
-            - @request
-            - @doctrine.orm.entity_manager
+            - "@dmkclub.member.form.api"
+            - "@request"
+            - "@doctrine.orm.entity_manager"
 
     dmkclub.form.type.member_select:
-        class: %dmkclub.form.type.member_select.class%
+        class: "%dmkclub.form.type.member_select.class%"
         tags:
             - { name: form.type, alias: "dmkclub_member_member_select" }
 
     dmkclub.form.type.member_status:
-        class: %dmkclub.form.type.member_status.class%
+        class: "%dmkclub.form.type.member_status.class%"
         arguments:
-            - @dmkclub.member.status_provider
+            - "@dmkclub.member.status_provider"
         tags:
             - { name: form.type, alias: dmkclub_memberstatus }