Settings

lib/data/models/client_model.dart

@@ -274,6 +274,8 @@ abstract class ClientEntity extends Object
     }
   }
 
+  bool get hasGroup => groupId != null && groupId.isNotEmpty;
+
   bool get hasLanguage => languageId != null && languageId.isNotEmpty;
 
   bool get hasEmailAddress =>

lib/ui/client/view/client_view_overview.dart

@@ -9,6 +9,7 @@ import 'package:invoiceninja_flutter/redux/task/task_selectors.dart';
 import 'package:invoiceninja_flutter/redux/expense/expense_selectors.dart';
 import 'package:invoiceninja_flutter/redux/quote/quote_selectors.dart';
 import 'package:invoiceninja_flutter/ui/app/FieldGrid.dart';
+import 'package:invoiceninja_flutter/ui/app/entities/entity_state_title.dart';
 import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
 import 'package:invoiceninja_flutter/ui/client/view/client_view_vm.dart';
 import 'package:invoiceninja_flutter/utils/formatting.dart';
@@ -31,9 +32,12 @@ class ClientOverview extends StatelessWidget {
     final localization = AppLocalization.of(context);
     final client = viewModel.client;
     final company = viewModel.company;
-    final state = StoreProvider.of<AppState>(context).state;
+    final state = StoreProvider
+        .of<AppState>(context)
+        .state;
     final statics = state.staticState;
     final fields = <String, String>{};
+    final group = client.hasGroup ? state.groupState.map[client.groupId] : null;
 
     if (client.hasLanguage &&
         client.languageId != company.settings.languageId) {
@@ -67,6 +71,23 @@ class ClientOverview extends StatelessWidget {
         client.privateNotes != null && client.privateNotes.isNotEmpty
             ? IconMessage(client.privateNotes)
             : Container(),
+        if (client.hasGroup) ...[
+          Material(
+            color: Theme
+                .of(context)
+                .canvasColor,
+            child: ListTile(
+              title: EntityStateTitle(entity: group),
+              leading: Icon(getEntityIcon(EntityType.group), size: 18.0),
+              trailing: Icon(Icons.navigate_next),
+              onTap: () => viewModel.onGroupPressed(context),
+            ),
+          ),
+          Container(
+            color: Theme.of(context).backgroundColor,
+            height: 12.0,
+          ),
+        ],
         FieldGrid(fields),
         Divider(
           height: 1.0,
@@ -79,8 +100,8 @@ class ClientOverview extends StatelessWidget {
           onLongPress: () =>
               viewModel.onEntityPressed(context, EntityType.invoice, true),
           subtitle:
-              memoizedInvoiceStatsForClient(client.id, state.invoiceState.map)
-                  .present(localization.active, localization.archived),
+          memoizedInvoiceStatsForClient(client.id, state.invoiceState.map)
+              .present(localization.active, localization.archived),
         ),
         EntityListTile(
           bottomPadding: 1,
@@ -90,78 +111,68 @@ class ClientOverview extends StatelessWidget {
           onLongPress: () =>
               viewModel.onEntityPressed(context, EntityType.payment, true),
           subtitle: memoizedPaymentStatsForClient(
-                  client.id, state.paymentState.map, state.invoiceState.map)
+              client.id, state.paymentState.map, state.invoiceState.map)
               .present(localization.active, localization.archived),
         ),
-        company.isModuleEnabled(EntityType.quote)
-            ? EntityListTile(
-                bottomPadding: 1,
-                icon: getEntityIcon(EntityType.quote),
-                title: localization.quotes,
-                onTap: () =>
-                    viewModel.onEntityPressed(context, EntityType.quote),
-                onLongPress: () =>
-                    viewModel.onEntityPressed(context, EntityType.quote, true),
-                subtitle:
-                    memoizedQuoteStatsForClient(client.id, state.quoteState.map)
-                        .present(localization.active, localization.archived),
-              )
-            : Container(),
-        company.isModuleEnabled(EntityType.project)
-            ? EntityListTile(
-                bottomPadding: 1,
-                icon: getEntityIcon(EntityType.project),
-                title: localization.projects,
-                onTap: () =>
-                    viewModel.onEntityPressed(context, EntityType.project),
-                onLongPress: () => viewModel.onEntityPressed(
-                    context, EntityType.project, true),
-                subtitle: memoizedProjectStatsForClient(
-                    client.id,
-                    state.projectState.map).present(localization.active, localization.archived),
-              )
-            : Container(),
-        company.isModuleEnabled(EntityType.task)
-            ? EntityListTile(
-                bottomPadding: 1,
-                icon: getEntityIcon(EntityType.task),
-                title: localization.tasks,
-                onTap: () =>
-                    viewModel.onEntityPressed(context, EntityType.task),
-                onLongPress: () =>
-                    viewModel.onEntityPressed(context, EntityType.task, true),
-                subtitle:
-                    memoizedTaskStatsForClient(client.id, state.taskState.map)
-                        .present(localization.active, localization.archived),
-              )
-            : Container(),
-        company.isModuleEnabled(EntityType.expense)
-            ? EntityListTile(
-                bottomPadding: 1,
-                icon: getEntityIcon(EntityType.expense),
-                title: localization.expenses,
-                onTap: () =>
-                    viewModel.onEntityPressed(context, EntityType.expense),
-                onLongPress: () => viewModel.onEntityPressed(
-                    context, EntityType.expense, true),
-                subtitle: memoizedExpenseStatsForClient(
-                        client.id, state.expenseState.map)
-                    .present(localization.active, localization.archived),
-              )
-            : Container(),
+        if (company.isModuleEnabled(EntityType.quote))
+          EntityListTile(
+            bottomPadding: 1,
+            icon: getEntityIcon(EntityType.quote),
+            title: localization.quotes,
+            onTap: () => viewModel.onEntityPressed(context, EntityType.quote),
+            onLongPress: () =>
+                viewModel.onEntityPressed(context, EntityType.quote, true),
+            subtitle:
+            memoizedQuoteStatsForClient(client.id, state.quoteState.map)
+                .present(localization.active, localization.archived),
+          ),
+        if (company.isModuleEnabled(EntityType.project))
+          EntityListTile(
+            bottomPadding: 1,
+            icon: getEntityIcon(EntityType.project),
+            title: localization.projects,
+            onTap: () => viewModel.onEntityPressed(context, EntityType.project),
+            onLongPress: () =>
+                viewModel.onEntityPressed(context, EntityType.project, true),
+            subtitle:
+            memoizedProjectStatsForClient(client.id, state.projectState.map)
+                .present(localization.active, localization.archived),
+          ),
+        if (company.isModuleEnabled(EntityType.task))
+          EntityListTile(
+            bottomPadding: 1,
+            icon: getEntityIcon(EntityType.task),
+            title: localization.tasks,
+            onTap: () => viewModel.onEntityPressed(context, EntityType.task),
+            onLongPress: () =>
+                viewModel.onEntityPressed(context, EntityType.task, true),
+            subtitle: memoizedTaskStatsForClient(client.id, state.taskState.map)
+                .present(localization.active, localization.archived),
+          ),
+        if (company.isModuleEnabled(EntityType.expense))
+          EntityListTile(
+            bottomPadding: 1,
+            icon: getEntityIcon(EntityType.expense),
+            title: localization.expenses,
+            onTap: () => viewModel.onEntityPressed(context, EntityType.expense),
+            onLongPress: () =>
+                viewModel.onEntityPressed(context, EntityType.expense, true),
+            subtitle:
+            memoizedExpenseStatsForClient(client.id, state.expenseState.map)
+                .present(localization.active, localization.archived),
+          ),
       ],
     );
   }
 }
 
 class EntityListTile extends StatelessWidget {
-  const EntityListTile(
-      {this.icon,
-      this.onTap,
-      this.onLongPress,
-      this.title,
-      this.subtitle,
-      this.bottomPadding = 12});
+  const EntityListTile({this.icon,
+    this.onTap,
+    this.onLongPress,
+    this.title,
+    this.subtitle,
+    this.bottomPadding = 12});
 
   final Function onTap;
   final Function onLongPress;
@@ -175,7 +186,9 @@ class EntityListTile extends StatelessWidget {
     return Column(
       children: <Widget>[
         Material(
-          color: Theme.of(context).canvasColor,
+          color: Theme
+              .of(context)
+              .canvasColor,
           child: ListTile(
             title: Text(title),
             subtitle: Text(subtitle),

lib/ui/client/view/client_view_vm.dart

@@ -7,6 +7,7 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/client/client_actions.dart';
 import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart';
+import 'package:invoiceninja_flutter/redux/group/group_actions.dart';
 import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart';
 import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart';
 import 'package:invoiceninja_flutter/redux/project/project_actions.dart';
@@ -41,7 +42,7 @@ class ClientViewScreen extends StatelessWidget {
   }
 }
 
-class ClientViewVM {
+class  ClientViewVM {
   ClientViewVM({
     @required this.state,
     @required this.client,
@@ -54,6 +55,7 @@ class ClientViewVM {
     @required this.isLoading,
     @required this.isDirty,
     @required this.onRefreshed,
+    @required this.onGroupPressed,
   });
 
   factory ClientViewVM.fromStore(Store<AppState> store) {
@@ -176,6 +178,9 @@ class ClientViewVM {
           store.dispatch(UpdateCurrentRoute(ClientScreen.route));
         }
       },
+      onGroupPressed: (context) {
+        store.dispatch(ViewGroup(context: context, groupId: client.groupId));
+      },
       onEntityAction: (BuildContext context, EntityAction action) =>
           handleClientAction(context, [client], action),
     );
@@ -187,6 +192,7 @@ class ClientViewVM {
   final Function(BuildContext, EntityAction) onEntityAction;
   final Function(BuildContext) onEditPressed;
   final Function onBackPressed;
+  final Function(BuildContext) onGroupPressed;
   final Function(BuildContext, EntityType, [bool]) onEntityPressed;
   final Function(BuildContext, bool) onRefreshed;
   final bool isSaving;