diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js index 87d6b4a43378..4ad7bfa3a537 100644 --- a/public/main.profile.dart.js +++ b/public/main.profile.dart.js @@ -92781,7 +92781,7 @@ documentReport_closure8: function documentReport_closure8() { }, expenseReport(userCompany, reportsUIState, expenseMap, expenseCategoryMap, invoiceMap, clientMap, vendorMap, userMap, staticState) { - var t2, columns, t3, t4, t5, t6, expense, t7, client, invoice, vendor, row, t8, t9, t10, t11, t12, value, value0, value1, value2, value3, t13, value4, value5, value6, t14, value7, value8, t15, value9, value10, t16, t17, skip, t18, value11, t19, t20, t21, t22, selectedColumns, _null = null, + var t2, columns, t3, t4, t5, t6, expense, t7, client, invoice, vendor, row, t8, t9, value, value0, t10, t11, t12, value1, value2, value3, value4, value5, t13, value6, value7, value8, t14, value9, value10, t15, value11, value12, t16, t17, skip, t18, value13, t19, t20, t21, t22, selectedColumns, _null = null, data = A._setArrayType([], type$.JSArray_legacy_List_legacy_ReportElement), t1 = userCompany.settings, reportSettings = t1 == null ? _null : t1.reportSettings, @@ -92811,68 +92811,68 @@ if (expense.isDeleted) continue; row = A._setArrayType([], t5); - for (t7 = new J.ArrayIterator(t2, t2.length, t4), t8 = expense.id, t9 = expense.entityType, t10 = expense.createdUserId, t11 = expense.assignedUserId, t12 = expense.categoryId, value = expense.customValue4, value0 = expense.customValue3, value1 = expense.customValue2, value2 = expense.customValue1, value3 = invoice.date, t13 = invoice.id, value4 = expense.taxRate3, value5 = expense.taxRate2, value6 = expense.taxRate1, t14 = expense.paymentTypeId, value7 = expense.paymentDate, value8 = expense.date, t15 = expense.currencyId, value9 = expense.transactionReference, value10 = expense.amount, t16 = expense.usesInclusiveTaxes, t17 = t13.length !== 0, skip = false; t7.moveNext$0();) { + for (t7 = new J.ArrayIterator(t2, t2.length, t4), t8 = expense.id, t9 = expense.entityType, value = expense.privateNotes, value0 = expense.publicNotes, t10 = expense.createdUserId, t11 = expense.assignedUserId, t12 = expense.categoryId, value1 = expense.customValue4, value2 = expense.customValue3, value3 = expense.customValue2, value4 = expense.customValue1, value5 = invoice.date, t13 = invoice.id, value6 = expense.taxRate3, value7 = expense.taxRate2, value8 = expense.taxRate1, t14 = expense.paymentTypeId, value9 = expense.paymentDate, value10 = expense.date, t15 = expense.currencyId, value11 = expense.transactionReference, value12 = expense.amount, t16 = expense.usesInclusiveTaxes, t17 = t13.length !== 0, skip = false; t7.moveNext$0();) { t18 = t7.__interceptors$_current; switch (t18) { case B.ExpenseReportFields_0: - value11 = t16 ? value10 : value10 + expense.get$taxAmount(); + value13 = t16 ? value12 : value12 + expense.get$taxAmount(); break; case B.ExpenseReportFields_1: - value11 = t16 ? value10 - expense.get$taxAmount() : value10; + value13 = t16 ? value12 - expense.get$taxAmount() : value12; break; case B.ExpenseReportFields_2: - value11 = expense.get$taxAmount(); + value13 = expense.get$taxAmount(); break; case B.ExpenseReportFields_3: - value11 = value9; + value13 = value11; break; case B.ExpenseReportFields_4: - value11 = staticState.currencyMap._map$_map.$index(0, t15); + value13 = staticState.currencyMap._map$_map.$index(0, t15); break; case B.ExpenseReportFields_5: - value11 = value8; + value13 = value10; break; case B.ExpenseReportFields_6: - value11 = value7; + value13 = value9; break; case B.ExpenseReportFields_7: t19 = staticState.paymentTypeMap._map$_map.$index(0, t14); - value11 = t19 == null ? _null : t19.name; - if (value11 == null) - value11 = ""; + value13 = t19 == null ? _null : t19.name; + if (value13 == null) + value13 = ""; break; case B.ExpenseReportFields_8: - value11 = value6; + value13 = value8; break; case B.ExpenseReportFields_9: - value11 = value5; + value13 = value7; break; case B.ExpenseReportFields_10: - value11 = value4; + value13 = value6; break; case B.ExpenseReportFields_11: - value11 = client.displayName; + value13 = client.displayName; break; case B.ExpenseReportFields_12: - value11 = client.balance; + value13 = client.balance; break; case B.ExpenseReportFields_13: - value11 = client.address1; + value13 = client.address1; break; case B.ExpenseReportFields_14: - value11 = client.address2; + value13 = client.address2; break; case B.ExpenseReportFields_15: - value11 = client.shippingAddress1; + value13 = client.shippingAddress1; break; case B.ExpenseReportFields_16: - value11 = client.shippingAddress2; + value13 = client.shippingAddress2; break; case B.ExpenseReportFields_17: - value11 = invoice.number; + value13 = invoice.number; break; case B.ExpenseReportFields_18: - value11 = invoice.amount; + value13 = invoice.amount; break; case B.ExpenseReportFields_19: if (t17) { @@ -92880,69 +92880,75 @@ t19 = (t19 == null ? 0 : t19) < 0; } else t19 = true; - value11 = t19 ? "" : value3; + value13 = t19 ? "" : value5; break; case B.ExpenseReportFields_20: - value11 = vendor.name; + value13 = vendor.name; break; case B.ExpenseReportFields_21: - value11 = value2; + value13 = value4; break; case B.ExpenseReportFields_22: - value11 = value1; + value13 = value3; break; case B.ExpenseReportFields_23: - value11 = value0; + value13 = value2; break; case B.ExpenseReportFields_24: - value11 = value; + value13 = value1; break; case B.ExpenseReportFields_25: t19 = expenseCategoryMap._map$_map.$index(0, t12); - value11 = t19 == null ? _null : t19.name; - if (value11 == null) - value11 = ""; + value13 = t19 == null ? _null : t19.name; + if (value13 == null) + value13 = ""; break; case B.ExpenseReportFields_26: t19 = userMap._map$_map.$index(0, t11); if (t19 == null) - value11 = _null; + value13 = _null; else { t20 = t19.firstName; t21 = t20 + " "; t22 = t19.lastName; t19 = B.JSString_methods.trim$0(t21 + t22).length !== 0 ? B.JSString_methods.trim$0(t20 + " " + t22) : t19.email; - value11 = t19; + value13 = t19; } - if (value11 == null) - value11 = ""; + if (value13 == null) + value13 = ""; break; case B.ExpenseReportFields_27: t19 = userMap._map$_map.$index(0, t10); if (t19 == null) - value11 = _null; + value13 = _null; else { t20 = t19.firstName; t21 = t20 + " "; t22 = t19.lastName; t19 = B.JSString_methods.trim$0(t21 + t22).length !== 0 ? B.JSString_methods.trim$0(t20 + " " + t22) : t19.email; - value11 = t19; + value13 = t19; } - if (value11 == null) - value11 = ""; + if (value13 == null) + value13 = ""; + break; + case B.ExpenseReportFields_28: + value13 = value0; + break; + case B.ExpenseReportFields_29: + value13 = value; break; default: - value11 = ""; + value13 = ""; } - if (!A.ReportResult_matchField(A.EnumUtils_parse(t18), _null, reportsUIState, userCompany, value11)) + if (!A.ReportResult_matchField(A.EnumUtils_parse(t18), _null, reportsUIState, userCompany, value13)) skip = true; - t18 = J.getInterceptor$(value11); - if (t18.get$runtimeType(value11) === B.Type_bool_lhE) - row.push(new A.ReportBoolValue(value11, t9, t8)); - else if (t18.get$runtimeType(value11) === B.Type_double_K1J || t18.get$runtimeType(value11) === B.Type_int_tHn) - row.push(new A.ReportNumberValue(value11, _null, t15, _null, t9, t8)); + t18 = J.getInterceptor$(value13); + if (t18.get$runtimeType(value13) === B.Type_bool_lhE) + row.push(new A.ReportBoolValue(value13, t9, t8)); + else if (t18.get$runtimeType(value13) === B.Type_double_K1J || t18.get$runtimeType(value13) === B.Type_int_tHn) + row.push(new A.ReportNumberValue(value13, _null, t15, _null, t9, t8)); else - row.push(new A.ReportStringValue(value11, t9, t8)); + row.push(new A.ReportStringValue(value13, t9, t8)); } if (!skip) data.push(row); @@ -92952,7 +92958,7 @@ B.JSArray_methods.sort$1(data, new A.expenseReport_closure2(expenseReportSettings, selectedColumns)); t1 = type$.MappedListIterable_of_legacy_ExpenseReportFields_and_legacy_String; t2 = t1._eval$1("ListIterable.E"); - return new A.ReportResult(selectedColumns, A.List_List$of(new A.MappedListIterable(B.List_QcJ, new A.expenseReport_closure3(), t1), true, t2), A.List_List$of(new A.MappedListIterable(defaultColumns, new A.expenseReport_closure4(), t1), true, t2), data, true); + return new A.ReportResult(selectedColumns, A.List_List$of(new A.MappedListIterable(B.List_SvF, new A.expenseReport_closure3(), t1), true, t2), A.List_List$of(new A.MappedListIterable(defaultColumns, new A.expenseReport_closure4(), t1), true, t2), data, true); }, ExpenseReportFields: function ExpenseReportFields(t0, t1) { this.index = t0; @@ -396016,7 +396022,7 @@ }; A.expenseReport_closure.prototype = { call$1(e) { - return A.EnumUtils_fromString(B.List_QcJ, e, type$.legacy_ExpenseReportFields); + return A.EnumUtils_fromString(B.List_SvF, e, type$.legacy_ExpenseReportFields); }, $signature: 2396 }; @@ -436434,6 +436440,8 @@ B.ExpenseReportFields_25 = new A.ExpenseReportFields(25, "category"); B.ExpenseReportFields_26 = new A.ExpenseReportFields(26, "assigned_to"); B.ExpenseReportFields_27 = new A.ExpenseReportFields(27, "created_by"); + B.ExpenseReportFields_28 = new A.ExpenseReportFields(28, "public_notes"); + B.ExpenseReportFields_29 = new A.ExpenseReportFields(29, "private_notes"); B.ExpenseReportFields_3 = new A.ExpenseReportFields(3, "transaction_reference"); B.ExpenseReportFields_4 = new A.ExpenseReportFields(4, "currency"); B.ExpenseReportFields_5 = new A.ExpenseReportFields(5, "date"); @@ -437815,7 +437823,6 @@ B.Type__$ReportSettingsEntity_inD = A.typeLiteral("_$ReportSettingsEntity"); B.List_QLF = A._setArrayType(makeConstList([B.Type_ReportSettingsEntity_piR, B.Type__$ReportSettingsEntity_inD]), type$.JSArray_legacy_Type); B.List_QXN = A._setArrayType(makeConstList(["af", "am", "ar", "as", "az", "be", "bg", "bn", "bs", "ca", "cs", "da", "de", "el", "en", "es", "et", "eu", "fa", "fi", "fil", "fr", "gl", "gsw", "gu", "he", "hi", "hr", "hu", "hy", "id", "is", "it", "ja", "ka", "kk", "km", "kn", "ko", "ky", "lo", "lt", "lv", "mk", "ml", "mn", "mr", "ms", "my", "nb", "ne", "nl", "no", "or", "pa", "pl", "pt", "ro", "ru", "si", "sk", "sl", "sq", "sr", "sv", "sw", "ta", "te", "th", "tl", "tr", "uk", "ur", "uz", "vi", "zh", "zu"]), type$.JSArray_legacy_String); - B.List_QcJ = A._setArrayType(makeConstList([B.ExpenseReportFields_0, B.ExpenseReportFields_1, B.ExpenseReportFields_2, B.ExpenseReportFields_3, B.ExpenseReportFields_4, B.ExpenseReportFields_5, B.ExpenseReportFields_6, B.ExpenseReportFields_7, B.ExpenseReportFields_8, B.ExpenseReportFields_9, B.ExpenseReportFields_10, B.ExpenseReportFields_11, B.ExpenseReportFields_12, B.ExpenseReportFields_13, B.ExpenseReportFields_14, B.ExpenseReportFields_15, B.ExpenseReportFields_16, B.ExpenseReportFields_17, B.ExpenseReportFields_18, B.ExpenseReportFields_19, B.ExpenseReportFields_20, B.ExpenseReportFields_21, B.ExpenseReportFields_22, B.ExpenseReportFields_23, B.ExpenseReportFields_24, B.ExpenseReportFields_25, B.ExpenseReportFields_26, B.ExpenseReportFields_27]), type$.JSArray_legacy_ExpenseReportFields); B.Type_SubscriptionItemResponse_uzU = A.typeLiteral("SubscriptionItemResponse"); B.Type__$SubscriptionItemResponse_pM4 = A.typeLiteral("_$SubscriptionItemResponse"); B.List_QgW = A._setArrayType(makeConstList([B.Type_SubscriptionItemResponse_uzU, B.Type__$SubscriptionItemResponse_pM4]), type$.JSArray_legacy_Type); @@ -437866,6 +437873,7 @@ B.Offset_1_m1 = new A.Offset(1, -1); B.List_SbI = A._setArrayType(makeConstList([B.Offset_1_0, B.Offset_1_1, B.Offset_0_1, B.Offset_m1_1, B.Offset_m1_0, B.Offset_m1_m1, B.Offset_0_m1, B.Offset_1_m1]), A.findType("JSArray")); B.List_Sfa = A._setArrayType(makeConstList(["invoice_created", "invoice_sent", "invoice_viewed", "invoice_late", "payment_success", "payment_failure", "quote_created", "quote_sent", "quote_viewed", "quote_approved", "quote_expired", "credit_created", "credit_sent", "credit_viewed"]), type$.JSArray_legacy_String); + B.List_SvF = A._setArrayType(makeConstList([B.ExpenseReportFields_0, B.ExpenseReportFields_1, B.ExpenseReportFields_2, B.ExpenseReportFields_3, B.ExpenseReportFields_4, B.ExpenseReportFields_5, B.ExpenseReportFields_6, B.ExpenseReportFields_7, B.ExpenseReportFields_8, B.ExpenseReportFields_9, B.ExpenseReportFields_10, B.ExpenseReportFields_11, B.ExpenseReportFields_12, B.ExpenseReportFields_13, B.ExpenseReportFields_14, B.ExpenseReportFields_15, B.ExpenseReportFields_16, B.ExpenseReportFields_17, B.ExpenseReportFields_18, B.ExpenseReportFields_19, B.ExpenseReportFields_20, B.ExpenseReportFields_21, B.ExpenseReportFields_22, B.ExpenseReportFields_23, B.ExpenseReportFields_24, B.ExpenseReportFields_25, B.ExpenseReportFields_26, B.ExpenseReportFields_27, B.ExpenseReportFields_28, B.ExpenseReportFields_29]), type$.JSArray_legacy_ExpenseReportFields); B.Type__$CountryEntity_HRq = A.typeLiteral("_$CountryEntity"); B.List_THJ = A._setArrayType(makeConstList([B.Type_CountryEntity_1Wj, B.Type__$CountryEntity_HRq]), type$.JSArray_legacy_Type); B.TextAffinity_0 = new A.TextAffinity(0, "upstream");