Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Settings

This commit is contained in:
Hillel Coren 2019-11-10 20:56:48 +02:00
parent 3813efe456
commit 69c90bbaa0
3 changed files with 90 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/data/models/client_model.dart
View File

@ -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 hasLanguage => languageId != null && languageId.isNotEmpty;
bool get hasEmailAddress => bool get hasEmailAddress =>

149
lib/ui/client/view/client_view_overview.dart
View File

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

8
lib/ui/client/view/client_view_vm.dart
View File

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