diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js index e50827c049f0..aac3ba4c80aa 100644 --- a/public/main.profile.dart.js +++ b/public/main.profile.dart.js @@ -55017,7 +55017,7 @@ t1 = type$.legacy_String, t2 = A.BuiltMap_BuiltMap(B.Map_empty0, t1, type$.legacy_BuiltList_legacy_String); t1 = A.BuiltMap_BuiltMap(B.Map_empty0, t1, type$.legacy_ReportSettingsEntity); - return A._$UserSettingsEntity$_("#2F7DC3", A.BuiltList_BuiltList$from(A._setArrayType([A.DashboardField_DashboardField("total_active_invoices", _s14_), A.DashboardField_DashboardField("total_completed_payments", _s14_)], type$.JSArray_legacy_DashboardField), type$.legacy_DashboardField), 2, 1, false, 3, t1, t2); + return A._$UserSettingsEntity$_("#2F7DC3", A.BuiltList_BuiltList$from(A._setArrayType([A.DashboardField_DashboardField("total_active_invoices", _s14_), A.DashboardField_DashboardField("total_outstanding_invoices", _s14_), A.DashboardField_DashboardField("total_completed_payments", _s14_)], type$.JSArray_legacy_DashboardField), type$.legacy_DashboardField), 3, 1, false, 3, t1, t2); }, UserSettingsEntity__initializeBuilder(builder) { var t1, @@ -55027,9 +55027,9 @@ t1 = type$.legacy_String; builder.get$tableColumns().replace$1(0, A.BuiltMap_BuiltMap(B.Map_empty0, t1, type$.legacy_BuiltList_legacy_String)); builder.get$reportSettings().replace$1(0, A.BuiltMap_BuiltMap(B.Map_empty0, t1, type$.legacy_ReportSettingsEntity)); - builder.get$dashboardFields().replace$1(0, A.BuiltList_BuiltList$from(A._setArrayType([A.DashboardField_DashboardField("total_active_invoices", _s14_), A.DashboardField_DashboardField("total_completed_payments", _s14_)], type$.JSArray_legacy_DashboardField), type$.legacy_DashboardField)); + builder.get$dashboardFields().replace$1(0, A.BuiltList_BuiltList$from(A._setArrayType([A.DashboardField_DashboardField("total_active_invoices", _s14_), A.DashboardField_DashboardField("total_outstanding_invoices", _s14_), A.DashboardField_DashboardField("total_completed_payments", _s14_)], type$.JSArray_legacy_DashboardField), type$.legacy_DashboardField)); builder.get$_company_model$_$this()._dashboardFieldsPerRowMobile = 1; - builder.get$_company_model$_$this()._dashboardFieldsPerRowDesktop = 2; + builder.get$_company_model$_$this()._dashboardFieldsPerRowDesktop = 3; builder.get$_company_model$_$this()._includeDeletedClients = false; return builder; }, @@ -398113,13 +398113,9 @@ else { t8 = A._setArrayType([], t6); t9 = state.isSaving; - if (t9) - t10 = A.isAndroid() || A.isIOS(); - else - t10 = false; - if (t10) + if (t9 && A.getLayout(context) === B.AppLayout_mobile) t8.push(new A.Padding(B.EdgeInsets_0_0_20_0, A.Center$(new A.SizedBox(26, 26, A.CircularProgressIndicator$(_null, B.Color_4294967295, _null, _null, _null, 4, _null, _null), _null), _null, _null), _null)); - else if (A.isMacOS() || A.isWindows() || A.isLinux()) { + else if (A.getLayout(context) === B.AppLayout_desktop) { t10 = t9 ? _null : new A.EditScaffold_build_closure3(_this, context, store); t11 = A.getEntityActionIcon(B.EntityAction_cancel); t12 = t4.get$cancel(t4); @@ -402963,7 +402959,7 @@ }; A.ListScaffold.prototype = { build$1(_, context) { - var t3, t4, t5, t6, t7, _this = this, _null = null, + var t3, leadingWidth, t4, t5, _this = this, _null = null, store = A.StoreProvider_of(context, type$.legacy_AppState), state = A._lateReadCheck(store.__Store__state, "_state"), prefState = state.prefState, @@ -402976,42 +402972,48 @@ else if (A.getLayout(context) === B.AppLayout_mobile || prefState.appLayout === B.AppLayout_mobile || prefState.menuSidebarMode === B.AppSidebarMode_float) leading = new A.Builder(new A.ListScaffold_build_closure1(_this, t1), _null); else if (t2 !== B.EntityType_settings) { - t2 = A.Icon$(B.IconData_57415_MaterialIcons_null_false, _null, _null); - t3 = prefState.enableTooltips ? t1.get$createNew() : _null; - leading = A.IconButton$(B.Alignment_0_0, _null, _null, true, t2, _null, new A.ListScaffold_build_closure2(_this, context), B.EdgeInsets_8_8_8_8, _null, t3, _null); + t3 = A.ButtonStyle$(_null, _null, new A._MaterialStatePropertyAll(prefState.get$colorThemeModel().colorSuccess, type$._MaterialStatePropertyAll_legacy_Color), _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null); + leading = new A.Padding(B.EdgeInsets_20_0_12_0, A.OutlinedButton$(new A.IconText(t1.get$create(t1), B.IconData_57424_MaterialIcons_null_false, A.TextStyle$(_null, _null, B.Color_4294967295, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, true, _null, _null, _null, _null, _null, _null, _null, _null), _null, false, _null), _null, new A.ListScaffold_build_closure2(_this, context), t3), _null); + } + if (t2 === B.EntityType_settings) + leadingWidth = A.getLayout(context) === B.AppLayout_desktop ? 0 : 48; + else { + t2 = A.getLayout(context) === B.AppLayout_desktop ? 100 : 10; + t3 = _this.appBarLeadingActions.length; + leadingWidth = t2 + 44 * (t3 + (_this.onCheckboxPressed == null || A.getLayout(context) === B.AppLayout_mobile ? 1 : 2)); } t2 = type$.JSArray_legacy_Widget; t3 = A._setArrayType([A.Expanded$(leading, 1)], t2); if (A.getLayout(context) === B.AppLayout_desktop && _this.onCheckboxPressed != null) { t4 = A.Icon$(B.IconData_57687_MaterialIcons_null_false, _null, _null); t5 = prefState.enableTooltips ? t1.get$multiselect() : _null; - t3.push(A.Expanded$(A.IconButton$(B.Alignment_0_0, _null, _null, true, t4, _null, prefState.showKanban && state.uiState.get$mainRoute() === B.EntityType_task.toString$0(0) ? _null : new A.ListScaffold_build_closure3(_this), B.EdgeInsets_8_8_8_8, _null, t5, _null), 1)); + t3.push(A.IconButton$(B.Alignment_0_0, _null, _null, true, t4, _null, prefState.showKanban && state.uiState.get$mainRoute() === B.EntityType_task.toString$0(0) ? _null : new A.ListScaffold_build_closure3(_this), B.EdgeInsets_8_8_8_8, _null, t5, _null)); } t4 = _this.appBarLeadingActions; + if (t4.length !== 0) + t3.push(new A.SizedBox(4, _null, _null, _null)); B.JSArray_methods.addAll$1(t3, t4); leading = A.Row$(t3, B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null); t3 = A.getLayout(context) === B.AppLayout_mobile || prefState.appLayout === B.AppLayout_mobile || prefState.menuSidebarMode === B.AppSidebarMode_float ? new A.MenuDrawerBuilder(_null) : _null; if (A.getLayout(context) !== B.AppLayout_mobile) - t5 = (prefState.appLayout === B.AppLayout_mobile || prefState.historySidebarMode === B.AppSidebarMode_float) && !isSettings; + t4 = (prefState.appLayout === B.AppLayout_mobile || prefState.historySidebarMode === B.AppSidebarMode_float) && !isSettings; else - t5 = true; - t5 = t5 ? new A.HistoryDrawerBuilder(_null) : _null; - t4 = t4.length; - t6 = _this.onCheckboxPressed == null || A.getLayout(context) === B.AppLayout_mobile ? 1 : 2; - t7 = A._setArrayType([A.Expanded$(_this.appBarTitle, 1)], t2); + t4 = true; + t4 = t4 ? new A.HistoryDrawerBuilder(_null) : _null; + t5 = A._setArrayType([A.Expanded$(_this.appBarTitle, 1)], t2); if (A.getLayout(context) === B.AppLayout_desktop && _this.onCancelSettingsSection != null) - t7.push(A.TextButton$(false, A.Text$(t1.get$back(t1), _null, _null, _null, _null, _null, A.TextStyle$(_null, _null, state.get$headerTextColor(), _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, true, _null, _null, _null, _null, _null, _null, _null, _null), _null, _null, _null), _null, new A.ListScaffold_build_closure4(_this, store, state), _null)); - t1 = A.Row$(t7, B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null); - t7 = _this.appBarActions; - t2 = t7 == null ? A._setArrayType([], t2) : t7; + t5.push(A.TextButton$(false, A.Text$(t1.get$back(t1), _null, _null, _null, _null, _null, A.TextStyle$(_null, _null, state.get$headerTextColor(), _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, true, _null, _null, _null, _null, _null, _null, _null, _null), _null, _null, _null), _null, new A.ListScaffold_build_closure4(_this, store, state), _null)); + t1 = A.Row$(t5, B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null); + t5 = _this.appBarActions; + t2 = t5 == null ? A._setArrayType([], t2) : t5; t2 = A.List_List$of(t2, true, type$.legacy_Widget); if (!isSettings) - t7 = A.getLayout(context) === B.AppLayout_mobile || !prefState.isHistoryVisible; + t5 = A.getLayout(context) === B.AppLayout_mobile || !prefState.isHistoryVisible; else - t7 = false; - if (t7) + t5 = false; + if (t5) t2.push(new A.Builder(new A.ListScaffold_build_closure5(state, store), _null)); - return new A.WillPopScope(A.FocusTraversalGroup$(A.Scaffold$(A.AppBar$(t2, _null, false, _null, _null, _null, 1, _null, false, _null, false, _null, _null, _null, leading, 48 * (t4 + t6), true, _null, _null, _null, _null, _null, _null, t1, _null, _null, _null, 1, _null), _null, A.ClipRect$(_this.body, B.Clip_1, _null), _this.bottomNavigationBar, t3, t5, _this.floatingActionButton, B.C__EndDockedFabLocation), true, true, _null), new A.ListScaffold_build_closure6(store), _null); + return new A.WillPopScope(A.FocusTraversalGroup$(A.Scaffold$(A.AppBar$(t2, _null, false, _null, _null, _null, 1, _null, false, _null, false, _null, _null, _null, leading, leadingWidth, true, _null, _null, _null, _null, _null, _null, t1, _null, _null, _null, 1, _null), _null, A.ClipRect$(_this.body, B.Clip_1, _null), _this.bottomNavigationBar, t3, t4, _this.floatingActionButton, B.C__EndDockedFabLocation), true, true, _null), new A.ListScaffold_build_closure6(store), _null); }, get$body(receiver) { return this.body; @@ -440686,23 +440688,24 @@ } else t13 = true; t13 = t13 ? new A.HistoryDrawerBuilder(_null) : _null; - t14 = A._setArrayType([A.Expanded$(A.Text$(t1.get$reports(), _null, _null, _null, _null, _null, _null, _null, _null, _null), 1)], t3); - t15 = state.isSaving; - if (t15) - t14.push(new A.SizedBox(28, 28, A.CircularProgressIndicator$(_null, _null, _null, _null, _null, 4, _null, _null), _null)); - t14 = A.Row$(t14, B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_0, _null); + t14 = A.getLayout(context) === B.AppLayout_mobile ? 48 : 0; + t15 = A._setArrayType([A.Expanded$(A.Text$(t1.get$reports(), _null, _null, _null, _null, _null, _null, _null, _null, _null), 1)], t3); + t16 = state.isSaving; + if (t16) + t15.push(new A.SizedBox(28, 28, A.CircularProgressIndicator$(_null, _null, _null, _null, _null, 4, _null, _null), _null)); + t15 = A.Row$(t15, B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_0, _null); if (hideReports) - t16 = A._setArrayType([], t3); + t17 = A._setArrayType([], t3); else { - t16 = A._setArrayType([], t3); + t17 = A._setArrayType([], t3); if (A.getLayout(context) === B.AppLayout_desktop) - B.JSArray_methods.addAll$1(t16, A._setArrayType([new A.Builder(new A.ReportsScreen_build_closure19(_this, t1, reportResult), _null), new A.AppTextButton(t1.get$$export(), new A.ReportsScreen_build_closure20(_this, context), true, _null, _null)], t3)); - t17 = firstEntity == null ? _null : firstEntity.getActions$2$multiselect$userCompany(true, t8[t7].userCompany); - t16.push(new A.Padding(B.EdgeInsets_0_0_8_0, A.ActionMenuButton$(firstEntity, t17, _null, _null, false, new A.ReportsScreen_build_closure21(t1, reportResult, firstEntity)), _null)); + B.JSArray_methods.addAll$1(t17, A._setArrayType([new A.Builder(new A.ReportsScreen_build_closure19(_this, t1, reportResult), _null), new A.AppTextButton(t1.get$$export(), new A.ReportsScreen_build_closure20(_this, context), true, _null, _null)], t3)); + t18 = firstEntity == null ? _null : firstEntity.getActions$2$multiselect$userCompany(true, t8[t7].userCompany); + t17.push(new A.Padding(B.EdgeInsets_0_0_8_0, A.ActionMenuButton$(firstEntity, t18, _null, _null, false, new A.ReportsScreen_build_closure21(t1, reportResult, firstEntity)), _null)); if (A.getLayout(context) === B.AppLayout_mobile || !state.prefState.isHistoryVisible) - t16.push(new A.Builder(new A.ReportsScreen_build_closure22(state, t1, store), _null)); + t17.push(new A.Builder(new A.ReportsScreen_build_closure22(state, t1, store), _null)); } - t14 = A.AppBar$(t16, _null, false, _null, _null, _null, 1, _null, false, _null, false, _null, _null, _null, leading, _null, true, _null, _null, _null, _null, _null, _null, t14, _null, _null, _null, 1, _null); + t15 = A.AppBar$(t17, _null, false, _null, _null, _null, 1, _null, false, _null, false, _null, _null, _null, leading, t14, true, _null, _null, _null, _null, _null, _null, t15, _null, _null, _null, 1, _null); if (hideReports) { t2 = J.$index$asx(t5.$index(0, t9), _s23_); t2 = A._setArrayType([new A.HelpText(t2 == null ? J.$index$asx(t5.$index(0, "en"), _s23_) : t2, _null)], t3); @@ -440711,7 +440714,7 @@ t1 = A.Center$(A.Column$(t2, B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_2, B.MainAxisSize_1, B.VerticalDirection_1), _null, _null); } else { t5 = t8[t7].userCompany.company.id; - t15 = "" + t15; + t16 = "" + t16; t7 = type$.ValueKey_legacy_String; if (A.getLayout(context) === B.AppLayout_mobile) { t8 = A.List_List$of(t12, true, type$.legacy_Widget); @@ -440723,10 +440726,10 @@ t8 = A._setArrayType([t8], t3); if (A.getLayout(context) === B.AppLayout_mobile) t8.push(new A.Padding(B.EdgeInsets_16_0_16_0, A.Row$(A._setArrayType([new A.Builder(new A.ReportsScreen_build_closure24(_this, t1, reportResult), _null), new A.SizedBox(16, _null, _null, _null), A.Expanded$(new A.AppButton(_null, _null, t1.get$$export(), new A.ReportsScreen_build_closure25(_this, context), _null, _null), 1)], t3), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null), _null)); - t8.push(new A.ReportDataTable(t2, new A.ValueKey(t15 + "_" + t6 + "_" + reportsState.selectedGroup, t7))); - t1 = new A.ScrollableListView(t8, _null, _null, new A.ValueKey(t5 + "_" + t15 + "_" + t11 + "_" + t6, t7)); + t8.push(new A.ReportDataTable(t2, new A.ValueKey(t16 + "_" + t6 + "_" + reportsState.selectedGroup, t7))); + t1 = new A.ScrollableListView(t8, _null, _null, new A.ValueKey(t5 + "_" + t16 + "_" + t11 + "_" + t6, t7)); } - return new A.WillPopScope(A.Scaffold$(t14, _null, t1, _null, t4, t13, _null, _null), new A.ReportsScreen_build_closure26(store), _null); + return new A.WillPopScope(A.Scaffold$(t15, _null, t1, _null, t4, t13, _null, _null), new A.ReportsScreen_build_closure26(store), _null); } }; A.ReportsScreen_build_closure.prototype = { @@ -458457,7 +458460,7 @@ t6 = t5.filterClearedAt; t7 = this.viewModel.taskList; t5 = t5.filter; - t8 = A._setArrayType([A.Expanded$(A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(t4 ? B.IconData_59061_MaterialIcons_null_true : B._MdiIconData_7T13, _null, _null), _null, new A.TaskScreen_build_closure3(context, state, store), B.EdgeInsets_8_8_8_8, _null, _null, _null), 1)], type$.JSArray_legacy_Widget); + t8 = A._setArrayType([A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(t4 ? B.IconData_59061_MaterialIcons_null_true : B._MdiIconData_7T13, _null, _null), _null, new A.TaskScreen_build_closure3(context, state, store), B.EdgeInsets_8_8_8_8, _null, _null, _null)], type$.JSArray_legacy_Widget); t9 = t4 ? new A.KanbanViewBuilder(_null) : new A.TaskListBuilder(_null); t10 = A._setArrayType([], type$.JSArray_legacy_IconButton); if (t4) @@ -500104,6 +500107,7 @@ B.EdgeInsets_18_0_18_0 = new A.EdgeInsets(18, 0, 18, 0); B.EdgeInsets_18_20_18_10 = new A.EdgeInsets(18, 20, 18, 10); B.EdgeInsets_19_16_0_16 = new A.EdgeInsets(19, 16, 0, 16); + B.EdgeInsets_20_0_12_0 = new A.EdgeInsets(20, 0, 12, 0); B.EdgeInsets_20_0_20_0 = new A.EdgeInsets(20, 0, 20, 0); B.EdgeInsets_20_10_56_8 = new A.EdgeInsets(20, 10, 56, 8); B.EdgeInsets_20_16_20_16 = new A.EdgeInsets(20, 16, 20, 16);