taxtank-core 0.32.9 → 0.32.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/collections/collection-dictionary.mjs +2 -1
- package/esm2022/lib/collections/collection.mjs +2 -2
- package/esm2022/lib/collections/report/vehicle-expense/vehicle-expense.collection.mjs +2 -2
- package/esm2022/lib/forms/abstract.form.mjs +3 -2
- package/esm2022/lib/forms/budget/budget.form.mjs +40 -20
- package/esm2022/lib/forms/client/annual-client-details.form.mjs +2 -2
- package/esm2022/lib/forms/sole/bas-report.form.mjs +1 -1
- package/esm2022/lib/models/budget/budget.mjs +6 -4
- package/esm2022/lib/models/dictionary/dictionary.mjs +9 -5
- package/esm2022/lib/models/report/property/property-report-item.mjs +2 -2
- package/fesm2022/taxtank-core.mjs +56 -31
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/lib/collections/collection-dictionary.d.ts +1 -0
- package/lib/collections/collection.d.ts +1 -1
- package/lib/forms/abstract.form.d.ts +1 -0
- package/lib/forms/budget/budget.form.d.ts +7 -5
- package/lib/models/dictionary/dictionary.d.ts +2 -0
- package/package.json +2 -1
|
@@ -4,6 +4,7 @@ import hasIn from 'lodash/hasIn';
|
|
|
4
4
|
import intersection from 'lodash/intersection';
|
|
5
5
|
import uniqBy from 'lodash/uniqBy';
|
|
6
6
|
/**
|
|
7
|
+
* @TODO refactor with Map
|
|
7
8
|
* List of collections grouped by passed property
|
|
8
9
|
*/
|
|
9
10
|
export class CollectionDictionary {
|
|
@@ -106,4 +107,4 @@ export class CollectionDictionary {
|
|
|
106
107
|
});
|
|
107
108
|
}
|
|
108
109
|
}
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collection-dictionary.js","sourceRoot":"","sources":["../../../../../projects/tt-core/src/lib/collections/collection-dictionary.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,YAAY,CAAC;AAC7B,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,MAAM,cAAc,CAAC;AAGjC,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAC/C,OAAO,MAAM,MAAM,eAAe,CAAC;AAEnC;;;GAGG;AACH,MAAM,OAAO,oBAAoB;IAW/B,YAAY,UAAsB,EAAE,IAAI,GAAG,IAAI;QAV/C;;WAEG;QACH,UAAK,GAAkC,EAAE,CAAC;QAQxC,IAAI,CAAC,qBAAqB,GAAG,UAAU,CAAC,WAAkD,CAAC;QAC3F,gEAAgE;QAChE,IAAI,UAAU,CAAC,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YACvE,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;SACnC;IACH,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,GAAoB,EAAE,GAAG,MAAuB;QACpD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACf;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,GAAG,CAAC,GAAoB,EAAE,QAAoB,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACrE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,GAAG,CAAC,GAAoB;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAyB;QAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;SAClC;QAED,OAAO,IAAI,CAAC,gBAAgB,CAC1B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAoB,EAAY,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CACpG,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,QAAkB,EAAE;QACnC,OAAO,IAAI,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,MAAM,GAAG,KAAK;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAU,EAAE;YAC/C,IAAI,CAAC,GAAG,CAAC,EAAE;gBACT,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACzB;YACD,IAAI,CAAC,GAAG,CAAC,EAAE;gBACT,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACzB;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB,CAAC,IAAyB;QACxC,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACrF,CAAC;IAED;;OAEG;IACK,UAAU,CAAC,UAAsB,EAAE,IAAY;QACrD,yCAAyC;QACzC,MAAM,GAAG,GAAqC,EAAE,CAAC;QAEjD,yBAAyB;QACzB,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAY,EAAQ,EAAE;YAC9C,IAAI,GAAG,GAAW,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAElC,8EAA8E;YAC9E,IAAI,GAAG,KAAK,SAAS,EAAE;gBACrB,GAAG,GAAG,OAAO,CAAC;aACf;YAED,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACb,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;aACf;YAED,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,iCAAiC;QACjC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAW,EAAQ,EAAE;YAC7C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;CACF","sourcesContent":["import get from 'lodash/get';\nimport flatten from 'lodash/flatten';\nimport hasIn from 'lodash/hasIn';\nimport { Collection as BaseCollection } from './collection';\nimport { AbstractModel } from '../db/Models';\nimport intersection from 'lodash/intersection';\nimport uniqBy from 'lodash/uniqBy';\n\n/**\n * @TODO refactor with Map\n * List of collections grouped by passed property\n */\nexport class CollectionDictionary<Collection extends BaseCollection<AbstractModel>> {\n  /**\n   * List of grouped collections\n   */\n  items: { [key: string]: Collection } = {};\n\n  /**\n   * Constructor function of passed collection for creating new instances\n   */\n  private collectionConstructor: new (items: object[]) => Collection;\n\n  constructor(collection: Collection, path = 'id') {\n    this.collectionConstructor = collection.constructor as new (items: object[]) => Collection;\n    // group if provided path was found in the 1st collection's item\n    if (collection.length && hasIn(collection.items[0], path.split('.')[0])) {\n      this.groupItems(collection, path);\n    }\n  }\n\n  /**\n   * List of collections keys\n   */\n  get keys(): string[] {\n    return Object.keys(this.items);\n  }\n\n  /**\n   * push new elements in existing item\n   */\n  addTo(key: string | number, ...models: AbstractModel[]): void {\n    if (!this.items[key]) {\n      this.add(key);\n    }\n\n    this.items[key].push(...models);\n  }\n\n  /**\n   * Add new item by key\n   */\n  add(key: string | number, value: Collection = this.createCollection([])) {\n    this.items[key] = value;\n  }\n\n  /**\n   * Get collection by key or return empty collection if key does not exist\n   */\n  get(key: string | number): Collection {\n    return this.items[key] ? this.items[key] : this.createCollection([]);\n  }\n\n  /**\n   * @TODO bad name, it just gets items by keys, same as get method by multiple keys\n   * Join several collections by ids, return collection of uniq models (skip duplicates)\n   */\n  merge(keys: number[] | string[]): Collection {\n    if (!this.length) {\n      return this.createCollection([]);\n    }\n\n    return this.createCollection(\n      uniqBy(flatten(keys.map((key: number | string): object[] => this.get(key.toString()).items)), 'id')\n    );\n  }\n\n  /**\n   * Create instance of collection\n   */\n  createCollection(items: object[] = []): Collection {\n    return new this.collectionConstructor(items);\n  }\n\n  get length(): number {\n    return this.keys.length;\n  }\n\n  /**\n   * @Todo find a better solution to get list of the sorted keys\n   * Get array of the \"keys\" by provided order\n   */\n  getSortedKeys(isDesc = false): string[] {\n    return this.keys.sort((a: any, b: any): number => {\n      if (a > b) {\n        return !isDesc ? 1 : -1;\n      }\n      if (a < b) {\n        return !isDesc ? -1 : 1;\n      }\n      return 0;\n    });\n  }\n\n  keysIntersection(keys: string[] | number[]): string[] {\n    return intersection(keys.map((key: string | number) => key.toString()), this.keys);\n  }\n\n  /**\n   * Group collection items by passed path into items object\n   */\n  private groupItems(collection: Collection, path: string): void {\n    // Create empty initial object for groups\n    const obj: { [key: string]: Array<object> } = {};\n\n    // Group collection items\n    collection.items.forEach((item: object): void => {\n      let key: string = get(item, path);\n\n      // if object does not have property for grouping it will be grouped as 'other'\n      if (key === undefined) {\n        key = 'other';\n      }\n\n      if (!obj[key]) {\n        obj[key] = [];\n      }\n\n      obj[key].push(item);\n    });\n\n    // Create collections from groups\n    Object.keys(obj).forEach((key: string): void => {\n      this.items[key] = this.createCollection(obj[key]);\n    });\n  }\n}\n"]}
|
|
@@ -81,7 +81,7 @@ export class Collection {
|
|
|
81
81
|
groupBy(path = 'id') {
|
|
82
82
|
return new CollectionDictionary(this, path);
|
|
83
83
|
}
|
|
84
|
-
indexBy(path) {
|
|
84
|
+
indexBy(path = 'id') {
|
|
85
85
|
return new Dictionary(this.items, path);
|
|
86
86
|
}
|
|
87
87
|
filter(callback) {
|
|
@@ -152,4 +152,4 @@ export class Collection {
|
|
|
152
152
|
return this;
|
|
153
153
|
}
|
|
154
154
|
}
|
|
155
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../../../projects/tt-core/src/lib/collections/collection.ts"],"names":[],"mappings":"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","sourcesContent":["import { CollectionDictionary } from './collection-dictionary';\r\nimport first from 'lodash/first';\r\nimport last from 'lodash/last';\r\nimport get from 'lodash/get';\r\nimport { sort } from '../functions/array';\r\nimport { AbstractModel } from '../db/Models';\r\nimport { Dictionary, FinancialYear } from '../models';\r\nimport round from 'lodash/round';\r\nimport orderBy from 'lodash/orderBy';\r\n\r\n/**\r\n * Base collection class. Contains common properties and methods for all collections\r\n */\r\nexport class Collection<Model extends AbstractModel> implements Iterable<Model> {\r\n  // list of collection's items\r\n  items: Model[];\r\n\r\n  /**\r\n   * index of current item, used to iterate over the collection\r\n   */\r\n  index = 0;\r\n\r\n  constructor(items: Model[] = []) {\r\n    this.items = items;\r\n    // @TODO Alex: Think and implement some smart solution for default sort\r\n  }\r\n\r\n  /**\r\n   * Iterator that allow to iterate collection items\r\n   */\r\n  [Symbol.iterator](): Iterator<Model> {\r\n    return this.items.values();\r\n  }\r\n\r\n  create(items: Model[] = []): this {\r\n    return new (this.constructor as any)(items);\r\n  }\r\n\r\n  get length(): number {\r\n    return this.items.length;\r\n  }\r\n\r\n  toArray(): Model[] {\r\n    return [...this.items];\r\n  }\r\n\r\n  get first(): Model {\r\n    return first(this.items);\r\n  }\r\n\r\n  get last(): Model {\r\n    return last(this.items);\r\n  }\r\n\r\n  reset(): Model {\r\n    this.index = 0;\r\n\r\n    return this.items[this.index];\r\n  }\r\n\r\n  next(): Model {\r\n    if (this.index < this.length) {\r\n      this.index++;\r\n\r\n      return this.items[this.index];\r\n    }\r\n\r\n    return null;\r\n  }\r\n\r\n  back(): Model {\r\n    if (this.index > 0) {\r\n      this.index--;\r\n\r\n      return this.items[this.index];\r\n    }\r\n\r\n    return null;\r\n  }\r\n\r\n  getIds(): number[] {\r\n    return this.items.map((item: Model): number => item['id']);\r\n  }\r\n\r\n  map(callback: (item: Model) => any): any[] {\r\n    return this.items.map(callback);\r\n  }\r\n\r\n  mapBy(path: string): any[] {\r\n    return this.items.map((item: Model): any => get(item, path))\r\n  }\r\n\r\n  sortBy(paths: string | string[] = ['id'], order: string | string[] = ['desc']): this {\r\n    this.items = orderBy(this.items, paths instanceof Array ? paths : [paths], order instanceof Array ? order : [order]);\r\n\r\n    return this;\r\n  }\r\n\r\n  sort(callback: (a: Model, b: Model) => number): this {\r\n    this.items.sort(callback);\r\n\r\n    return this;\r\n  }\r\n\r\n  /**\r\n   * Get total sum of items by field\r\n   */\r\n  sumBy(path: string, abs = false): number {\r\n    return this.reduce(\r\n      (sum: number, item: Model): number => sum + (abs ? Math.abs(Number(get(item, path))) : Number(get(item, path)))\r\n    );\r\n  }\r\n\r\n  groupBy(path = 'id'): CollectionDictionary<this> {\r\n    return new CollectionDictionary(this, path);\r\n  }\r\n\r\n  indexBy(path: string): Dictionary<Model> {\r\n    return new Dictionary(this.items, path);\r\n  }\r\n\r\n  filter(callback: (item: Model) => boolean): this {\r\n    return this.create(this.items.filter(callback));\r\n  }\r\n\r\n  filterBy(path: string, values: any): this {\r\n    return this.filter((item: Model) => (Array.isArray(values) ? values : [values]).includes(get(item, path)));\r\n  }\r\n\r\n  filterByRange(path: string, from: any, to: any): this {\r\n    return this.filter((item: Model): boolean => get(item, path) >= from && get(item, path) <= to);\r\n  }\r\n\r\n  filterByFinancialYear(path: string, financialYear: FinancialYear = new FinancialYear()): this {\r\n    return this.filterByRange(path, financialYear.startDate, financialYear.endDate);\r\n  }\r\n\r\n  find(callback: (item: Model) => boolean): Model | null {\r\n    return this.items.find(callback);\r\n  }\r\n\r\n  findBy(path: string, value: any): Model | null {\r\n    return this.items.find((model: Model) => value === get(model, path));\r\n  }\r\n\r\n  findIndexBy(path: string, value: any): number {\r\n    return this.items.findIndex((item: Model) => get(item, path) === value) ?? null;\r\n  }\r\n\r\n  push(...items: Model[]): this {\r\n    this.items.push(...items);\r\n\r\n    return this.create(this.items);\r\n  }\r\n\r\n  remove(...items: Model[]): this {\r\n    items.forEach((item) => {\r\n      const index: number = this.findIndexBy('id', item.id);\r\n      if (index < 0) {\r\n        return;\r\n      }\r\n\r\n      this.items.splice(index, 1);\r\n    });\r\n\r\n    return this;\r\n  }\r\n\r\n  /**\r\n   * @TODO it's filter, not remove\r\n   */\r\n  removeBy(path: string, values: any): this {\r\n    return this.filter((item: Model) => !(Array.isArray(values) ? values : [values]).includes(get(item, path)));\r\n  }\r\n\r\n  replaceBy(path: string, value: any, item: Model): this {\r\n    const index: number = this.findIndexBy(path, value);\r\n    if (index >= 0) {\r\n      this.items.splice(index, 1, item);\r\n    }\r\n\r\n    return this.create(this.items);\r\n  }\r\n\r\n  diff(items: Model[]): this {\r\n    return this.filter((model: Model) => !items.map((item: Model) => item.id).includes(model.id));\r\n  }\r\n\r\n  minBy(path: string): Model {\r\n    return this.items.reduce((prev: Model, current: Model) => (get(prev, path) < get(current, path) ? prev : current));\r\n  }\r\n\r\n  maxBy(path: string): Model {\r\n    return this.items.reduce((prev: Model, current: Model) => (get(prev, path) > get(current, path) ? prev : current));\r\n  }\r\n\r\n  /**\r\n   * float math issues https://stackoverflow.com/questions/12511057/float-sum-with-javascript\r\n   */\r\n  reduce(callback: (sum: number, item: Model) => number, init = 0): number {\r\n    return +this.items.reduce(callback, init).toFixed(10);\r\n  }\r\n\r\n  slice(from: number, to: number): this {\r\n    this.items.slice(from, to);\r\n\r\n    return this;\r\n  }\r\n}\r\n"]}
|
|
155
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../../../projects/tt-core/src/lib/collections/collection.ts"],"names":[],"mappings":"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","sourcesContent":["import { CollectionDictionary } from './collection-dictionary';\r\nimport first from 'lodash/first';\r\nimport last from 'lodash/last';\r\nimport get from 'lodash/get';\r\nimport { sort } from '../functions/array';\r\nimport { AbstractModel } from '../db/Models';\r\nimport { Dictionary, FinancialYear } from '../models';\r\nimport round from 'lodash/round';\r\nimport orderBy from 'lodash/orderBy';\r\n\r\n/**\r\n * Base collection class. Contains common properties and methods for all collections\r\n */\r\nexport class Collection<Model extends AbstractModel> implements Iterable<Model> {\r\n  // list of collection's items\r\n  items: Model[];\r\n\r\n  /**\r\n   * index of current item, used to iterate over the collection\r\n   */\r\n  index = 0;\r\n\r\n  constructor(items: Model[] = []) {\r\n    this.items = items;\r\n    // @TODO Alex: Think and implement some smart solution for default sort\r\n  }\r\n\r\n  /**\r\n   * Iterator that allow to iterate collection items\r\n   */\r\n  [Symbol.iterator](): Iterator<Model> {\r\n    return this.items.values();\r\n  }\r\n\r\n  create(items: Model[] = []): this {\r\n    return new (this.constructor as any)(items);\r\n  }\r\n\r\n  get length(): number {\r\n    return this.items.length;\r\n  }\r\n\r\n  toArray(): Model[] {\r\n    return [...this.items];\r\n  }\r\n\r\n  get first(): Model {\r\n    return first(this.items);\r\n  }\r\n\r\n  get last(): Model {\r\n    return last(this.items);\r\n  }\r\n\r\n  reset(): Model {\r\n    this.index = 0;\r\n\r\n    return this.items[this.index];\r\n  }\r\n\r\n  next(): Model {\r\n    if (this.index < this.length) {\r\n      this.index++;\r\n\r\n      return this.items[this.index];\r\n    }\r\n\r\n    return null;\r\n  }\r\n\r\n  back(): Model {\r\n    if (this.index > 0) {\r\n      this.index--;\r\n\r\n      return this.items[this.index];\r\n    }\r\n\r\n    return null;\r\n  }\r\n\r\n  getIds(): number[] {\r\n    return this.items.map((item: Model): number => item['id']);\r\n  }\r\n\r\n  map(callback: (item: Model) => any): any[] {\r\n    return this.items.map(callback);\r\n  }\r\n\r\n  mapBy(path: string): any[] {\r\n    return this.items.map((item: Model): any => get(item, path))\r\n  }\r\n\r\n  sortBy(paths: string | string[] = ['id'], order: string | string[] = ['desc']): this {\r\n    this.items = orderBy(this.items, paths instanceof Array ? paths : [paths], order instanceof Array ? order : [order]);\r\n\r\n    return this;\r\n  }\r\n\r\n  sort(callback: (a: Model, b: Model) => number): this {\r\n    this.items.sort(callback);\r\n\r\n    return this;\r\n  }\r\n\r\n  /**\r\n   * Get total sum of items by field\r\n   */\r\n  sumBy(path: string, abs = false): number {\r\n    return this.reduce(\r\n      (sum: number, item: Model): number => sum + (abs ? Math.abs(Number(get(item, path))) : Number(get(item, path)))\r\n    );\r\n  }\r\n\r\n  groupBy(path = 'id'): CollectionDictionary<this> {\r\n    return new CollectionDictionary(this, path);\r\n  }\r\n\r\n  indexBy(path = 'id'): Dictionary<Model> {\r\n    return new Dictionary(this.items, path);\r\n  }\r\n\r\n  filter(callback: (item: Model) => boolean): this {\r\n    return this.create(this.items.filter(callback));\r\n  }\r\n\r\n  filterBy(path: string, values: any): this {\r\n    return this.filter((item: Model) => (Array.isArray(values) ? values : [values]).includes(get(item, path)));\r\n  }\r\n\r\n  filterByRange(path: string, from: any, to: any): this {\r\n    return this.filter((item: Model): boolean => get(item, path) >= from && get(item, path) <= to);\r\n  }\r\n\r\n  filterByFinancialYear(path: string, financialYear: FinancialYear = new FinancialYear()): this {\r\n    return this.filterByRange(path, financialYear.startDate, financialYear.endDate);\r\n  }\r\n\r\n  find(callback: (item: Model) => boolean): Model | null {\r\n    return this.items.find(callback);\r\n  }\r\n\r\n  findBy(path: string, value: any): Model | null {\r\n    return this.items.find((model: Model) => value === get(model, path));\r\n  }\r\n\r\n  findIndexBy(path: string, value: any): number {\r\n    return this.items.findIndex((item: Model) => get(item, path) === value) ?? null;\r\n  }\r\n\r\n  push(...items: Model[]): this {\r\n    this.items.push(...items);\r\n\r\n    return this.create(this.items);\r\n  }\r\n\r\n  remove(...items: Model[]): this {\r\n    items.forEach((item) => {\r\n      const index: number = this.findIndexBy('id', item.id);\r\n      if (index < 0) {\r\n        return;\r\n      }\r\n\r\n      this.items.splice(index, 1);\r\n    });\r\n\r\n    return this;\r\n  }\r\n\r\n  /**\r\n   * @TODO it's filter, not remove\r\n   */\r\n  removeBy(path: string, values: any): this {\r\n    return this.filter((item: Model) => !(Array.isArray(values) ? values : [values]).includes(get(item, path)));\r\n  }\r\n\r\n  replaceBy(path: string, value: any, item: Model): this {\r\n    const index: number = this.findIndexBy(path, value);\r\n    if (index >= 0) {\r\n      this.items.splice(index, 1, item);\r\n    }\r\n\r\n    return this.create(this.items);\r\n  }\r\n\r\n  diff(items: Model[]): this {\r\n    return this.filter((model: Model) => !items.map((item: Model) => item.id).includes(model.id));\r\n  }\r\n\r\n  minBy(path: string): Model {\r\n    return this.items.reduce((prev: Model, current: Model) => (get(prev, path) < get(current, path) ? prev : current));\r\n  }\r\n\r\n  maxBy(path: string): Model {\r\n    return this.items.reduce((prev: Model, current: Model) => (get(prev, path) > get(current, path) ? prev : current));\r\n  }\r\n\r\n  /**\r\n   * float math issues https://stackoverflow.com/questions/12511057/float-sum-with-javascript\r\n   */\r\n  reduce(callback: (sum: number, item: Model) => number, init = 0): number {\r\n    return +this.items.reduce(callback, init).toFixed(10);\r\n  }\r\n\r\n  slice(from: number, to: number): this {\r\n    this.items.slice(from, to);\r\n\r\n    return this;\r\n  }\r\n}\r\n"]}
|
|
@@ -10,8 +10,8 @@ export class VehicleExpenseCollection extends Collection {
|
|
|
10
10
|
const transactionsByChartAccounts = transactions.groupBy('chartAccounts.name');
|
|
11
11
|
const transactionExpenses = transactionsByChartAccounts.keys.map((chartAccountsName) => new VehicleExpense(transactionsByChartAccounts.get(chartAccountsName).amount, transactionsByChartAccounts.get(chartAccountsName).first.claimPercent, chartAccountsName));
|
|
12
12
|
// group all depreciations into one expense item
|
|
13
|
-
const depreciationExpense = new VehicleExpense(-depreciations.getCurrentYearForecastAmount(), depreciations.first?.claimPercent ?? 0, 'Depreciation');
|
|
13
|
+
const depreciationExpense = new VehicleExpense(-depreciations.getCurrentYearForecastAmount(), depreciations.first?.currentYearForecast?.claimPercent ?? 0, 'Depreciation');
|
|
14
14
|
this.items.push(...[depreciationExpense, ...transactionExpenses]);
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVoaWNsZS1leHBlbnNlLmNvbGxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvY29sbGVjdGlvbnMvcmVwb3J0L3ZlaGljbGUtZXhwZW5zZS92ZWhpY2xlLWV4cGVuc2UuY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBSXhELE1BQU0sT0FBTyx3QkFBeUIsU0FBUSxVQUEwQjtJQUN0RSxZQUFZLFlBQW1DLEVBQUUsYUFBcUM7UUFDcEYsS0FBSyxFQUFFLENBQUM7UUFDUixJQUFJLENBQUMsUUFBUSxDQUFDLFlBQVksRUFBRSxhQUFhLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRU8sUUFBUSxDQUFDLFlBQW1DLEVBQUUsYUFBcUM7UUFDekYsSUFBSSxDQUFDLEtBQUssR0FBRyxFQUFFLENBQUM7UUFFaEIsTUFBTSwyQkFBMkIsR0FBRyxZQUFZLENBQUMsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFFL0UsTUFBTSxtQkFBbUIsR0FBcUIsMkJBQTJCLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLGlCQUF5QixFQUFFLEVBQUUsQ0FBQyxJQUFJLGNBQWMsQ0FDbEksMkJBQTJCLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDLENBQUMsTUFBTSxFQUN6RCwyQkFBMkIsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxLQUFLLENBQUMsWUFBWSxFQUNyRSxpQkFBaUIsQ0FDbEIsQ0FBQyxDQUFDO1FBRUgsZ0RBQWdEO1FBQ2hELE1BQU0sbUJBQW1CLEdBQW1CLElBQUksY0FBYyxDQUM1RCxDQUFDLGFBQWEsQ0FBQyw0QkFBNEIsRUFBRSxFQUM3QyxhQUFhLENBQUMsS0FBSyxFQUFFLG1CQUFtQixFQUFFLFlBQVksSUFBSSxDQUFDLEVBQzNELGNBQWMsQ0FDZixDQUFDO1FBRUYsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLG1CQUFtQixFQUFFLEdBQUcsbUJBQW1CLENBQUMsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi9jb2xsZWN0aW9uJztcbmltcG9ydCB7IFZlaGljbGVFeHBlbnNlIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzL3JlcG9ydCc7XG5pbXBvcnQgeyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi90cmFuc2FjdGlvbic7XG5pbXBvcnQgeyBEZXByZWNpYXRpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vZGVwcmVjaWF0aW9uLmNvbGxlY3Rpb24nO1xuXG5leHBvcnQgY2xhc3MgVmVoaWNsZUV4cGVuc2VDb2xsZWN0aW9uIGV4dGVuZHMgQ29sbGVjdGlvbjxWZWhpY2xlRXhwZW5zZT4ge1xuICBjb25zdHJ1Y3Rvcih0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbiwgZGVwcmVjaWF0aW9uczogRGVwcmVjaWF0aW9uQ29sbGVjdGlvbikge1xuICAgIHN1cGVyKCk7XG4gICAgdGhpcy5zZXRJdGVtcyh0cmFuc2FjdGlvbnMsIGRlcHJlY2lhdGlvbnMpO1xuICB9XG5cbiAgcHJpdmF0ZSBzZXRJdGVtcyh0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbiwgZGVwcmVjaWF0aW9uczogRGVwcmVjaWF0aW9uQ29sbGVjdGlvbik6IHZvaWQge1xuICAgIHRoaXMuaXRlbXMgPSBbXTtcblxuICAgIGNvbnN0IHRyYW5zYWN0aW9uc0J5Q2hhcnRBY2NvdW50cyA9IHRyYW5zYWN0aW9ucy5ncm91cEJ5KCdjaGFydEFjY291bnRzLm5hbWUnKTtcblxuICAgIGNvbnN0IHRyYW5zYWN0aW9uRXhwZW5zZXM6IFZlaGljbGVFeHBlbnNlW10gPSB0cmFuc2FjdGlvbnNCeUNoYXJ0QWNjb3VudHMua2V5cy5tYXAoKGNoYXJ0QWNjb3VudHNOYW1lOiBzdHJpbmcpID0+IG5ldyBWZWhpY2xlRXhwZW5zZShcbiAgICAgIHRyYW5zYWN0aW9uc0J5Q2hhcnRBY2NvdW50cy5nZXQoY2hhcnRBY2NvdW50c05hbWUpLmFtb3VudCxcbiAgICAgIHRyYW5zYWN0aW9uc0J5Q2hhcnRBY2NvdW50cy5nZXQoY2hhcnRBY2NvdW50c05hbWUpLmZpcnN0LmNsYWltUGVyY2VudCxcbiAgICAgIGNoYXJ0QWNjb3VudHNOYW1lXG4gICAgKSk7XG5cbiAgICAvLyBncm91cCBhbGwgZGVwcmVjaWF0aW9ucyBpbnRvIG9uZSBleHBlbnNlIGl0ZW1cbiAgICBjb25zdCBkZXByZWNpYXRpb25FeHBlbnNlOiBWZWhpY2xlRXhwZW5zZSA9IG5ldyBWZWhpY2xlRXhwZW5zZShcbiAgICAgIC1kZXByZWNpYXRpb25zLmdldEN1cnJlbnRZZWFyRm9yZWNhc3RBbW91bnQoKSxcbiAgICAgIGRlcHJlY2lhdGlvbnMuZmlyc3Q/LmN1cnJlbnRZZWFyRm9yZWNhc3Q/LmNsYWltUGVyY2VudCA/PyAwLFxuICAgICAgJ0RlcHJlY2lhdGlvbidcbiAgICApO1xuXG4gICAgdGhpcy5pdGVtcy5wdXNoKC4uLltkZXByZWNpYXRpb25FeHBlbnNlLCAuLi50cmFuc2FjdGlvbkV4cGVuc2VzXSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -12,6 +12,7 @@ export class AbstractForm extends UntypedFormGroup {
|
|
|
12
12
|
// @TODO vik required, otherwise modelClass won't exist
|
|
13
13
|
model, validatorOrOpts, asyncValidator) {
|
|
14
14
|
super(controls, validatorOrOpts, asyncValidator);
|
|
15
|
+
this.excludeExtraneousValues = false;
|
|
15
16
|
/**
|
|
16
17
|
* @TODO Alex bad name, it's also about unchanged
|
|
17
18
|
* Flag display if some form values changed
|
|
@@ -71,7 +72,7 @@ export class AbstractForm extends UntypedFormGroup {
|
|
|
71
72
|
* @param data
|
|
72
73
|
*/
|
|
73
74
|
createModelInstance(data = {}) {
|
|
74
|
-
return plainToClass(this.modelClass, data);
|
|
75
|
+
return plainToClass(this.modelClass, data, { excludeExtraneousValues: this.excludeExtraneousValues });
|
|
75
76
|
}
|
|
76
77
|
/**
|
|
77
78
|
* emit current form values
|
|
@@ -103,4 +104,4 @@ export class AbstractForm extends UntypedFormGroup {
|
|
|
103
104
|
return this.get(name).value !== this.initialValue[name];
|
|
104
105
|
}
|
|
105
106
|
}
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"abstract.form.js","sourceRoot":"","sources":["../../../../../projects/tt-core/src/lib/forms/abstract.form.ts"],"names":[],"mappings":"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","sourcesContent":["import { AbstractControl, AbstractControlOptions, AsyncValidatorFn, UntypedFormGroup, ValidatorFn } from '@angular/forms';\nimport { EventEmitter, Type } from '@angular/core';\nimport { plainToClass } from 'class-transformer';\nimport isEqual from 'lodash/isEqual';\n\n/**\n * Abstract form class\n * @TODO rename to AbstractFormGroup\n * @TODO Alex TT-2190: refactor: check and improve logic\n */\nexport abstract class AbstractForm<Model> extends UntypedFormGroup {\n  /**\n   * Initial form value for comparison with changes to check saved/unsaved state\n   */\n  initialValue: Model;\n  protected excludeExtraneousValues = false;\n  protected modelClass: Type<Model>;\n  model: Model;\n  submitted: boolean;\n\n  /**\n   * @TODO Alex bad name, it's also about unchanged\n   * Flag display if some form values changed\n   */\n  unsaved = false;\n\n  onSubmit: EventEmitter<Model> = new EventEmitter();\n\n  protected constructor(\n    controls: {[key: string]: AbstractControl},\n    // @TODO vik required, otherwise modelClass won't exist\n    model?: Model,\n    validatorOrOpts?: ValidatorFn | ValidatorFn[] | AbstractControlOptions | null,\n    asyncValidator?: AsyncValidatorFn | AsyncValidatorFn[] | null\n  ) {\n    super(controls, validatorOrOpts, asyncValidator);\n    this.model = model || this.createModelInstance();\n    // @TODO Alex no idea how it works, since modelClass used in createModelInstance\n    this.modelClass = this.model.constructor as new () => Model;\n    this.initialValue = this.value;\n\n    if (model && !model['id']) {\n      this.markAsUnsaved();\n    }\n\n    this.listenValueChanges();\n  }\n\n  get saved(): boolean {\n    return !this.unsaved;\n  }\n\n  get currentValue(): Model {\n    return this.createModelInstance(Object.assign({}, this.model, this.getRawValue()));\n  }\n\n  /**\n   * Check validation and return a new instance of generic model.\n   * Merge form value to initial object\n   * @param data Additional data object which be merged to form value\n   * @param includeDisabledFields ignore disabled fields\n   */\n  submit(data: object = {}, includeDisabledFields = false): Model {\n    this.submitted = true;\n    this.markAllAsTouched();\n\n    if (!this.disabled && !this.valid) {\n      return null;\n    }\n\n    const value = includeDisabledFields ? this.getRawValue() : this.value;\n    const model: Model = this.createModelInstance(Object.assign({}, this.model, value, data));\n\n    this.onSubmit.emit(model);\n    return model;\n  }\n\n  addControl(name: string, control: AbstractControl, options?: { emitEvent?: boolean }): this {\n    // keep form state (enabled/disabled).\n    // addControl enables form when added enabled form control\n    // https://github.com/angular/angular/issues/23236\n    if (this.disabled) {\n      control.disable();\n    }\n\n    super.addControl(name, control, options);\n\n    return this;\n  }\n\n  markAsUnsaved(): void {\n    this.unsaved = true;\n  }\n\n  markAsSaved(): void {\n    this.unsaved = false;\n  }\n\n  /**\n   * @TODO use excludeExtraneousValues when all models refactored (exposed all needed properties)\n   * @param data\n   */\n  createModelInstance(data: object = {}): Model {\n    return plainToClass(this.modelClass, data, { excludeExtraneousValues: this.excludeExtraneousValues });\n  }\n\n  /**\n   * emit current form values\n   */\n  emitValues(): void {\n    Object.values(this.controls).forEach((control: AbstractControl) => {\n      if ([null, undefined].includes(control.value)) {\n        return;\n      }\n\n      control.updateValueAndValidity({ onlySelf: false, emitEvent: true });\n    });\n  }\n\n  private listenValueChanges(): void {\n    this.valueChanges.subscribe(() => {\n      !!this.model && !!this.model['id'] && isEqual(this.value, this.initialValue) ? this.markAsSaved() : this.markAsUnsaved();\n    })\n  }\n\n  /**\n   * upgraded version of patchValue to skip duplicated changes\n   */\n  patchField(name: string, value: any, distinctUntilChanged = true): void {\n    const control = this.get(name);\n    if (distinctUntilChanged && control.value === value) {\n      return;\n    }\n\n    control.patchValue(value);\n  }\n\n  fieldChanged(name: string): boolean {\n    return this.get(name).value !== this.initialValue[name];\n  }\n}\n"]}
|
|
@@ -2,20 +2,33 @@ import { UntypedFormArray, UntypedFormControl, UntypedFormGroup, Validators } fr
|
|
|
2
2
|
import { BudgetRule } from '../../models';
|
|
3
3
|
import { AbstractForm } from '../abstract.form';
|
|
4
4
|
import { plainToClass } from 'class-transformer';
|
|
5
|
+
import { RxwebValidators } from '@rxweb/reactive-form-validators';
|
|
6
|
+
import { combineLatest } from 'rxjs';
|
|
7
|
+
import { startWith } from 'rxjs/operators';
|
|
8
|
+
import { Collection } from '../../collections';
|
|
5
9
|
export class BudgetForm extends AbstractForm {
|
|
6
10
|
constructor(budget) {
|
|
7
11
|
super({
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
})))
|
|
12
|
+
category: new UntypedFormControl(),
|
|
13
|
+
searchQuery: new UntypedFormControl(''),
|
|
14
|
+
rules: new UntypedFormArray((budget.rules || [plainToClass(BudgetRule, {})]).map((budgetRule) => BudgetForm.createRuleFormGroup(budgetRule))),
|
|
12
15
|
}, budget);
|
|
13
|
-
this.
|
|
16
|
+
this.excludeExtraneousValues = true;
|
|
17
|
+
combineLatest([
|
|
18
|
+
this.get('category').valueChanges.pipe(startWith(null)),
|
|
19
|
+
this.get('searchQuery').valueChanges.pipe(startWith(null))
|
|
20
|
+
]).subscribe(() => this.filterRules());
|
|
21
|
+
this.total = budget.rulesCollection.sumBy('amount');
|
|
22
|
+
this.get('rules').valueChanges.subscribe((rules) => {
|
|
23
|
+
this.total = new Collection(rules).sumBy('amount');
|
|
24
|
+
});
|
|
14
25
|
}
|
|
15
26
|
get rulesArray() {
|
|
16
27
|
return this.get('rules');
|
|
17
28
|
}
|
|
18
|
-
filterRules(
|
|
29
|
+
filterRules() {
|
|
30
|
+
const category = this.get('category').value;
|
|
31
|
+
const searchQuery = this.get('searchQuery').value;
|
|
19
32
|
let filteredRules = this.rulesArray.controls;
|
|
20
33
|
if (searchQuery) {
|
|
21
34
|
filteredRules = filteredRules.filter((ruleGroup) => {
|
|
@@ -27,24 +40,31 @@ export class BudgetForm extends AbstractForm {
|
|
|
27
40
|
return chartAccountsName.includes(searchQuery) || ruleAmount.includes(searchQuery);
|
|
28
41
|
});
|
|
29
42
|
}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
43
|
+
if (category) {
|
|
44
|
+
filteredRules = filteredRules.filter((ruleGroup) => {
|
|
45
|
+
const chartAccounts = ruleGroup.get('chartAccounts').value;
|
|
46
|
+
if (!chartAccounts) {
|
|
47
|
+
return true;
|
|
48
|
+
}
|
|
49
|
+
return chartAccounts.category === category;
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
this.filteredRules = new Map(filteredRules.map((rule) => [this.rulesArray.controls.indexOf(rule), rule]));
|
|
38
53
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
chartAccounts: new UntypedFormControl(
|
|
42
|
-
amount: new UntypedFormControl(
|
|
54
|
+
static createRuleFormGroup(budgetRule) {
|
|
55
|
+
return new UntypedFormGroup({
|
|
56
|
+
chartAccounts: new UntypedFormControl(budgetRule.chartAccounts, [Validators.required, RxwebValidators.unique()]),
|
|
57
|
+
amount: new UntypedFormControl(budgetRule.amount, Validators.required)
|
|
43
58
|
});
|
|
44
|
-
|
|
59
|
+
}
|
|
60
|
+
addRule(budgetRule = plainToClass(BudgetRule, {})) {
|
|
61
|
+
const rule = BudgetForm.createRuleFormGroup(budgetRule);
|
|
62
|
+
this.rulesArray.push(rule);
|
|
63
|
+
this.filteredRules.set(this.rulesArray.controls.indexOf(rule), rule);
|
|
45
64
|
}
|
|
46
65
|
deleteRule(index) {
|
|
47
66
|
this.rulesArray.removeAt(index);
|
|
67
|
+
this.filteredRules.delete(index);
|
|
48
68
|
}
|
|
49
69
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"budget.form.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/forms/budget/budget.form.ts"],"names":[],"mappings":"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","sourcesContent":["import { UntypedFormArray, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';\nimport { Budget, BudgetRule, ChartAccounts } from '../../models';\nimport { AbstractForm } from '../abstract.form';\nimport { plainToClass } from 'class-transformer';\nimport { ChartAccountsCategoryEnum } from '../../db/Enums';\nimport { RxwebValidators } from '@rxweb/reactive-form-validators';\nimport { combineLatest } from 'rxjs';\nimport { startWith } from 'rxjs/operators';\nimport { Collection } from '../../collections';\n\nexport class BudgetForm extends AbstractForm<Budget> {\n  protected excludeExtraneousValues = true;\n  filteredRules: Map<number, UntypedFormGroup>;\n  total: number;\n\n  constructor(budget: Budget) {\n    super({\n      category: new UntypedFormControl(),\n      searchQuery: new UntypedFormControl(''),\n      rules: new UntypedFormArray((budget.rules || [plainToClass(BudgetRule, {})]).map(\n        (budgetRule: BudgetRule) => BudgetForm.createRuleFormGroup(budgetRule))\n      ),\n    }, budget);\n\n    combineLatest([\n      this.get('category').valueChanges.pipe(startWith(null)),\n      this.get('searchQuery').valueChanges.pipe(startWith(null))\n    ]).subscribe(() => this.filterRules());\n\n    this.total = budget.rulesCollection.sumBy('amount');\n    this.get('rules').valueChanges.subscribe((rules) => {\n      this.total = new Collection(rules).sumBy('amount');\n    });\n  }\n\n  get rulesArray(): UntypedFormArray {\n    return this.get('rules') as UntypedFormArray;\n  }\n\n  filterRules(): void {\n    const category: ChartAccountsCategoryEnum = this.get('category').value;\n    const searchQuery: string = this.get('searchQuery').value;\n    let filteredRules: UntypedFormGroup[] = this.rulesArray.controls as UntypedFormGroup[];\n\n    if (searchQuery) {\n      filteredRules = filteredRules.filter((ruleGroup: UntypedFormGroup) => {\n        if (ruleGroup.invalid) {\n          return true;\n        }\n\n        const ruleAmount: string = ruleGroup.get('amount').value?.toString();\n        const chartAccountsName: string = ruleGroup.get('chartAccounts').value?.name.toLowerCase();\n\n        return chartAccountsName.includes(searchQuery) || ruleAmount.includes(searchQuery);\n      });\n    }\n\n    if (category) {\n      filteredRules = filteredRules.filter((ruleGroup: UntypedFormGroup) => {\n        const chartAccounts: ChartAccounts = ruleGroup.get('chartAccounts').value;\n\n        if (!chartAccounts) {\n          return true;\n        }\n\n        return chartAccounts.category === category;\n      });\n    }\n\n    this.filteredRules = new Map(filteredRules.map((rule) => [this.rulesArray.controls.indexOf(rule), rule]));\n  }\n\n  static createRuleFormGroup(budgetRule: BudgetRule): UntypedFormGroup {\n    return new UntypedFormGroup({\n      chartAccounts: new UntypedFormControl(budgetRule.chartAccounts, [Validators.required, RxwebValidators.unique()]),\n      amount: new UntypedFormControl(budgetRule.amount, Validators.required)\n    });\n  }\n\n  addRule(budgetRule: BudgetRule = plainToClass(BudgetRule, {})): void {\n    const rule = BudgetForm.createRuleFormGroup(budgetRule);\n    this.rulesArray.push(rule);\n    this.filteredRules.set(this.rulesArray.controls.indexOf(rule), rule);\n  }\n\n  deleteRule(index: number): void {\n    this.rulesArray.removeAt(index);\n    this.filteredRules.delete(index);\n  }\n}\n"]}
|
|
@@ -10,7 +10,7 @@ export class AnnualClientDetailsForm extends AbstractForm {
|
|
|
10
10
|
privateHealthCare: new UntypedFormControl(annualClientDetails.privateHealthCare, Validators.required),
|
|
11
11
|
spouse: new UntypedFormControl(annualClientDetails.spouse, Validators.required),
|
|
12
12
|
spouseAnnualIncome: new UntypedFormControl(annualClientDetails.spouseAnnualIncome, conditionalValidator(() => this.get('spouse').value, Validators.required)),
|
|
13
|
-
hasDependants: new UntypedFormControl(!!annualClientDetails.
|
|
13
|
+
hasDependants: new UntypedFormControl(!!annualClientDetails.dependants, Validators.required),
|
|
14
14
|
dependants: new UntypedFormControl(annualClientDetails.dependants, conditionalValidator(() => this.get('hasDependants').value, Validators.required)),
|
|
15
15
|
hasStudentLoan: new UntypedFormControl(!!annualClientDetails.studentLoanAmount, Validators.required),
|
|
16
16
|
studentLoanAmount: new UntypedFormControl(annualClientDetails.studentLoanAmount, conditionalValidator(() => this.get('hasStudentLoan').value, Validators.required)),
|
|
@@ -36,4 +36,4 @@ export class AnnualClientDetailsForm extends AbstractForm {
|
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW5udWFsLWNsaWVudC1kZXRhaWxzLmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvY2xpZW50L2FubnVhbC1jbGllbnQtZGV0YWlscy5mb3JtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsVUFBVSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ25ELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUV4RCxNQUFNLE9BQU8sdUJBQXdCLFNBQVEsWUFBaUM7SUFDNUUsWUFBb0Isc0JBQTJDLFlBQVksQ0FBQyxtQkFBbUIsRUFBRSxFQUFFLENBQUM7UUFDbEcsS0FBSyxDQUFDO1lBQ0osV0FBVyxFQUFFLElBQUksa0JBQWtCLENBQUMsbUJBQW1CLENBQUMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUM7WUFDekYsaUJBQWlCLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxtQkFBbUIsQ0FBQyxpQkFBaUIsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQ3JHLE1BQU0sRUFBRSxJQUFJLGtCQUFrQixDQUFDLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQy9FLGtCQUFrQixFQUFFLElBQUksa0JBQWtCLENBQUMsbUJBQW1CLENBQUMsa0JBQWtCLEVBQUUsb0JBQW9CLENBQ3JHLEdBQVksRUFBRSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsS0FBSyxFQUN2QyxVQUFVLENBQUMsUUFBUSxDQUNwQixDQUFDO1lBQ0YsYUFBYSxFQUFFLElBQUksa0JBQWtCLENBQUMsQ0FBQyxDQUFDLG1CQUFtQixDQUFDLFVBQVUsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQzVGLFVBQVUsRUFBRSxJQUFJLGtCQUFrQixDQUFDLG1CQUFtQixDQUFDLFVBQVUsRUFBRSxvQkFBb0IsQ0FDckYsR0FBWSxFQUFFLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxLQUFLLEVBQzlDLFVBQVUsQ0FBQyxRQUFRLENBQ3BCLENBQUM7WUFDRixjQUFjLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsbUJBQW1CLENBQUMsaUJBQWlCLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQztZQUNwRyxpQkFBaUIsRUFBRSxJQUFJLGtCQUFrQixDQUFDLG1CQUFtQixDQUFDLGlCQUFpQixFQUFFLG9CQUFvQixDQUNuRyxHQUFZLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUMsS0FBSyxFQUMvQyxVQUFVLENBQUMsUUFBUSxDQUNwQixDQUFDO1lBQ0Ysd0JBQXdCLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxtQkFBbUIsQ0FBQyx3QkFBd0IsSUFBSSxDQUFDLENBQUM7WUFDbkcsNkJBQTZCLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxtQkFBbUIsQ0FBQyw2QkFBNkIsSUFBSSxDQUFDLENBQUM7U0FDOUcsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO1FBckJOLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBNkQ7UUF1QmxHLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsbUJBQW1CLENBQUMsZUFBZSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQ3hELElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxnQkFBZ0IsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO1FBQ2hFLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNwQixDQUFDO0lBRU8sbUJBQW1CLENBQUMsS0FBYSxFQUFFLGNBQXNCO1FBQy9ELElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQWMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxjQUFjLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUE7SUFDdkcsQ0FBQztJQUVPLFdBQVcsQ0FBQyxLQUFhLEVBQUUsTUFBZTtRQUNoRCxJQUFJLE1BQU0sRUFBRTtZQUNWLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUM7U0FDMUI7YUFBTTtZQUNMLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzVCLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7U0FDM0I7SUFDSCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdEZvcm0gfSBmcm9tICcuLi9hYnN0cmFjdC5mb3JtJztcbmltcG9ydCB7IFVudHlwZWRGb3JtQ29udHJvbCwgVmFsaWRhdG9ycyB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IEFubnVhbENsaWVudERldGFpbHMgfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgcGxhaW5Ub0NsYXNzIH0gZnJvbSAnY2xhc3MtdHJhbnNmb3JtZXInO1xuaW1wb3J0IHsgY29uZGl0aW9uYWxWYWxpZGF0b3IgfSBmcm9tICcuLi8uLi92YWxpZGF0b3JzJztcblxuZXhwb3J0IGNsYXNzIEFubnVhbENsaWVudERldGFpbHNGb3JtIGV4dGVuZHMgQWJzdHJhY3RGb3JtPEFubnVhbENsaWVudERldGFpbHM+IHtcbiAgY29uc3RydWN0b3IocHJpdmF0ZSBhbm51YWxDbGllbnREZXRhaWxzOiBBbm51YWxDbGllbnREZXRhaWxzID0gcGxhaW5Ub0NsYXNzKEFubnVhbENsaWVudERldGFpbHMsIHt9KSkge1xuICAgIHN1cGVyKHtcbiAgICAgIGNhcGl0YWxMb3NzOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKGFubnVhbENsaWVudERldGFpbHMuY2FwaXRhbExvc3MsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgcHJpdmF0ZUhlYWx0aENhcmU6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woYW5udWFsQ2xpZW50RGV0YWlscy5wcml2YXRlSGVhbHRoQ2FyZSwgVmFsaWRhdG9ycy5yZXF1aXJlZCksXG4gICAgICBzcG91c2U6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woYW5udWFsQ2xpZW50RGV0YWlscy5zcG91c2UsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgc3BvdXNlQW5udWFsSW5jb21lOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKGFubnVhbENsaWVudERldGFpbHMuc3BvdXNlQW5udWFsSW5jb21lLCBjb25kaXRpb25hbFZhbGlkYXRvcihcbiAgICAgICAgKCk6IGJvb2xlYW4gPT4gdGhpcy5nZXQoJ3Nwb3VzZScpLnZhbHVlLFxuICAgICAgICBWYWxpZGF0b3JzLnJlcXVpcmVkXG4gICAgICApKSxcbiAgICAgIGhhc0RlcGVuZGFudHM6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woISFhbm51YWxDbGllbnREZXRhaWxzLmRlcGVuZGFudHMsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgZGVwZW5kYW50czogbmV3IFVudHlwZWRGb3JtQ29udHJvbChhbm51YWxDbGllbnREZXRhaWxzLmRlcGVuZGFudHMsIGNvbmRpdGlvbmFsVmFsaWRhdG9yKFxuICAgICAgICAoKTogYm9vbGVhbiA9PiB0aGlzLmdldCgnaGFzRGVwZW5kYW50cycpLnZhbHVlLFxuICAgICAgICBWYWxpZGF0b3JzLnJlcXVpcmVkXG4gICAgICApKSxcbiAgICAgIGhhc1N0dWRlbnRMb2FuOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKCEhYW5udWFsQ2xpZW50RGV0YWlscy5zdHVkZW50TG9hbkFtb3VudCwgVmFsaWRhdG9ycy5yZXF1aXJlZCksXG4gICAgICBzdHVkZW50TG9hbkFtb3VudDogbmV3IFVudHlwZWRGb3JtQ29udHJvbChhbm51YWxDbGllbnREZXRhaWxzLnN0dWRlbnRMb2FuQW1vdW50LCBjb25kaXRpb25hbFZhbGlkYXRvcihcbiAgICAgICAgKCk6IGJvb2xlYW4gPT4gdGhpcy5nZXQoJ2hhc1N0dWRlbnRMb2FuJykudmFsdWUsXG4gICAgICAgIFZhbGlkYXRvcnMucmVxdWlyZWRcbiAgICAgICkpLFxuICAgICAgcmVwb3J0YWJsZUZyaW5nZUJlbmVmaXRzOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKGFubnVhbENsaWVudERldGFpbHMucmVwb3J0YWJsZUZyaW5nZUJlbmVmaXRzIHx8IDApLFxuICAgICAgZXhlbXB0Rm9yZWlnbkVtcGxveW1lbnRJbmNvbWU6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woYW5udWFsQ2xpZW50RGV0YWlscy5leGVtcHRGb3JlaWduRW1wbG95bWVudEluY29tZSB8fCAwKSxcbiAgICB9LCBhbm51YWxDbGllbnREZXRhaWxzKTtcblxuICAgIHRoaXMud2F0Y2hGaWVsZEZvclRvZ2dsZSgnc3BvdXNlJywgJ3Nwb3VzZUFubnVhbEluY29tZScpO1xuICAgIHRoaXMud2F0Y2hGaWVsZEZvclRvZ2dsZSgnaGFzRGVwZW5kYW50cycsICdkZXBlbmRhbnRzJyk7XG4gICAgdGhpcy53YXRjaEZpZWxkRm9yVG9nZ2xlKCdoYXNTdHVkZW50TG9hbicsICdzdHVkZW50TG9hbkFtb3VudCcpO1xuICAgIHRoaXMuZW1pdFZhbHVlcygpO1xuICB9XG5cbiAgcHJpdmF0ZSB3YXRjaEZpZWxkRm9yVG9nZ2xlKGZpZWxkOiBzdHJpbmcsIGRlcGVuZGFudEZpZWxkOiBzdHJpbmcpOiB2b2lkIHtcbiAgICB0aGlzLmdldChmaWVsZCkudmFsdWVDaGFuZ2VzLnN1YnNjcmliZSgodmFsdWU6IGJvb2xlYW4pID0+IHRoaXMudG9nZ2xlRmllbGQoZGVwZW5kYW50RmllbGQsICEhdmFsdWUpKVxuICB9XG5cbiAgcHJpdmF0ZSB0b2dnbGVGaWVsZChmaWVsZDogc3RyaW5nLCBlbmFibGU6IGJvb2xlYW4pOiB2b2lkIHtcbiAgICBpZiAoZW5hYmxlKSB7XG4gICAgICB0aGlzLmdldChmaWVsZCkuZW5hYmxlKCk7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRoaXMuZ2V0KGZpZWxkKS5zZXRWYWx1ZSgwKTtcbiAgICAgIHRoaXMuZ2V0KGZpZWxkKS5kaXNhYmxlKCk7XG4gICAgfVxuICB9XG59XG4iXX0=
|
|
@@ -59,4 +59,4 @@ export class BasReportForm extends AbstractForm {
|
|
|
59
59
|
return super.submit(data, true);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bas-report.form.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/forms/sole/bas-report.form.ts"],"names":[],"mappings":"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","sourcesContent":["import { AbstractForm } from '../abstract.form';\nimport { BasReport } from '../../models';\nimport { UntypedFormControl, Validators } from '@angular/forms';\nimport { combineLatest } from 'rxjs';\nimport { DepreciationCollection, TransactionAllocationCollection, TransactionCollection } from '../../collections';\n\n/**\n * business activity statement report\n * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/268533936/BAS+Report\n */\nexport class BasReportForm extends AbstractForm<BasReport> {\n  constructor(private report: BasReport, transactions: TransactionCollection, allocations: TransactionAllocationCollection, depreciations: DepreciationCollection) {\n    super({\n      dateFrom: new UntypedFormControl(report.dateFrom, Validators.required),\n      dateTo: new UntypedFormControl(report.dateTo, Validators.required),\n      income: new UntypedFormControl({ value: report.income, disabled: true }),\n      incomeGST: new UntypedFormControl({ value: report.incomeGST, disabled: true }, Validators.required),\n      expenseGST: new UntypedFormControl({ value: report.expenseGST, disabled: true }, Validators.required),\n      salary: new UntypedFormControl(report.salary, Validators.required),\n      taxWithheldSalary: new UntypedFormControl(report.taxWithheldSalary, Validators.required),\n      taxWithheldNoABN: new UntypedFormControl(report.taxWithheldNoABN, Validators.required),\n      taxWithheldTotal: new UntypedFormControl({ value: report.taxWithheldTotal || 0, disabled: true }),\n      paygTaxInstalment: new UntypedFormControl(report.paygTaxInstalment, Validators.required),\n      fuelTaxCredit: new UntypedFormControl(report.fuelTaxCredit, Validators.required),\n      gst: new UntypedFormControl({ value: report.gst, disabled: true }),\n    }, report);\n\n    // prefill income/expense data based on transactions/depreciations filtered by specified date\n    combineLatest([this.get('dateFrom').valueChanges, this.get('dateTo').valueChanges])\n      .subscribe(([dateFrom, dateTo]) => {\n        const filteredTransactions = transactions.filterByRange('date', dateFrom, dateTo);\n        const filteredDepreciations = depreciations.filterByRange('date', dateFrom, dateTo);\n\n        const incomeTransactions = filteredTransactions.getIncomeTransactions();\n        const expenseTransactions = new TransactionCollection(\n          filteredTransactions.getExpenseTransactions().toArray(),\n          filteredDepreciations.toArray()\n        );\n\n        // all sole income claimed as 100%\n        this.get('income').setValue(incomeTransactions.getAllocatedAmount(allocations));\n        this.get('incomeGST').setValue(incomeTransactions.calculateAllocatedGST(allocations));\n        this.get('expenseGST').setValue(expenseTransactions.filterBy('isGST', true).sumBy('gstClaimAmount'));\n      });\n\n    // calculate taxWithheldTotal\n    combineLatest([this.get('taxWithheldSalary').valueChanges, this.get('taxWithheldNoABN').valueChanges])\n      .subscribe(([taxWithheldSalary, taxWithheldNoABN]) => {\n        this.get('taxWithheldTotal').setValue(taxWithheldSalary + taxWithheldNoABN);\n      });\n\n    // calculate gst payable/refundable\n    combineLatest([\n      this.get('incomeGST').valueChanges,\n      this.get('expenseGST').valueChanges,\n      this.get('taxWithheldTotal').valueChanges,\n      this.get('paygTaxInstalment').valueChanges,\n      this.get('fuelTaxCredit').valueChanges,\n    ]).subscribe(([incomeGST, expenseGST, taxWithheldTotal, paygTaxInstalment, fuelTaxCredit]) => {\n      this.get('gst').setValue(incomeGST - expenseGST + taxWithheldTotal + paygTaxInstalment - fuelTaxCredit);\n    });\n\n    // emit init values to calculate dynamic fields\n    if (report.id) {\n      this.emitValues();\n    }\n  }\n\n  submit(data: object = {}): BasReport {\n    return super.submit(data, true);\n  }\n}\n"]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
2
|
import { Budget as BudgetBase } from '../../db/Models/budget/budget';
|
|
3
|
-
import { Type } from 'class-transformer';
|
|
3
|
+
import { Expose, Type } from 'class-transformer';
|
|
4
4
|
import { BudgetRule } from './budget-rule';
|
|
5
5
|
import { User } from '../user';
|
|
6
6
|
import { Collection } from '../../collections';
|
|
@@ -13,9 +13,11 @@ export class Budget extends BudgetBase {
|
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
__decorate([
|
|
16
|
-
Type(() => BudgetRule)
|
|
16
|
+
Type(() => BudgetRule),
|
|
17
|
+
Expose()
|
|
17
18
|
], Budget.prototype, "rules", void 0);
|
|
18
19
|
__decorate([
|
|
19
|
-
Type(() => User)
|
|
20
|
+
Type(() => User),
|
|
21
|
+
Expose()
|
|
20
22
|
], Budget.prototype, "user", void 0);
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVkZ2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL21vZGVscy9idWRnZXQvYnVkZ2V0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsTUFBTSxJQUFJLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQy9CLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUcvQyxNQUFNLE9BQU8sTUFBTyxTQUFRLFVBQVU7SUFTcEMsSUFBSSxlQUFlO1FBQ2pCLE9BQU8sSUFBSSxVQUFVLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFFRCxTQUFTO1FBQ1AsT0FBTyxFQUFFLENBQUM7SUFDWixDQUFDO0NBQ0Y7QUFiQztJQUZDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUM7SUFDdEIsTUFBTSxFQUFFO3FDQUNXO0FBSXBCO0lBRkMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQztJQUNoQixNQUFNLEVBQUU7b0NBQ0UiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBCdWRnZXQgYXMgQnVkZ2V0QmFzZSB9IGZyb20gJy4uLy4uL2RiL01vZGVscy9idWRnZXQvYnVkZ2V0JztcbmltcG9ydCB7IEV4cG9zZSwgVHlwZSB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IEJ1ZGdldFJ1bGUgfSBmcm9tICcuL2J1ZGdldC1ydWxlJztcbmltcG9ydCB7IFVzZXIgfSBmcm9tICcuLi91c2VyJztcbmltcG9ydCB7IENvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi9jb2xsZWN0aW9ucyc7XG5pbXBvcnQgeyBNcFRyYWNrYWJsZUludGVyZmFjZSB9IGZyb20gJy4uLy4uL2ludGVyZmFjZXMnO1xuXG5leHBvcnQgY2xhc3MgQnVkZ2V0IGV4dGVuZHMgQnVkZ2V0QmFzZSBpbXBsZW1lbnRzIE1wVHJhY2thYmxlSW50ZXJmYWNlIHtcbiAgQFR5cGUoKCkgPT4gQnVkZ2V0UnVsZSlcbiAgQEV4cG9zZSgpXG4gIHJ1bGVzOiBCdWRnZXRSdWxlW107XG5cbiAgQFR5cGUoKCkgPT4gVXNlcilcbiAgQEV4cG9zZSgpXG4gIHVzZXI6IFVzZXI7XG5cbiAgZ2V0IHJ1bGVzQ29sbGVjdGlvbigpOiBDb2xsZWN0aW9uPEJ1ZGdldFJ1bGU+IHtcbiAgICByZXR1cm4gbmV3IENvbGxlY3Rpb24odGhpcy5ydWxlcyk7XG4gIH1cblxuICBnZXRNcERhdGEoKSB7XG4gICAgcmV0dXJuIHt9O1xuICB9XG59XG4iXX0=
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import get from 'lodash/get';
|
|
2
2
|
import hasIn from 'lodash/hasIn';
|
|
3
3
|
/**
|
|
4
|
+
* @TODO refactor with Map
|
|
4
5
|
* List of objects grouped by passed property
|
|
5
6
|
*/
|
|
6
7
|
export class Dictionary {
|
|
@@ -9,10 +10,6 @@ export class Dictionary {
|
|
|
9
10
|
if (!items.length) {
|
|
10
11
|
return;
|
|
11
12
|
}
|
|
12
|
-
// Do nothing if provided path was not found in the 1st item
|
|
13
|
-
if (!hasIn(items[0], path.split('.')[0])) {
|
|
14
|
-
return;
|
|
15
|
-
}
|
|
16
13
|
this.groupItems(items, path);
|
|
17
14
|
}
|
|
18
15
|
add(key, value) {
|
|
@@ -29,6 +26,10 @@ export class Dictionary {
|
|
|
29
26
|
return Object.values(this.items);
|
|
30
27
|
}
|
|
31
28
|
groupItems(items, path) {
|
|
29
|
+
// Do nothing if provided path was not found in the 1st item
|
|
30
|
+
if (!hasIn(items[0], path.split('.')[0])) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
32
33
|
items.forEach((item) => {
|
|
33
34
|
let key = get(item, path);
|
|
34
35
|
// if object does not have property for grouping it will be grouped as 'other'
|
|
@@ -41,5 +42,8 @@ export class Dictionary {
|
|
|
41
42
|
get keys() {
|
|
42
43
|
return Object.keys(this.items);
|
|
43
44
|
}
|
|
45
|
+
get length() {
|
|
46
|
+
return this.keys.length;
|
|
47
|
+
}
|
|
44
48
|
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGljdGlvbmFyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvZGljdGlvbmFyeS9kaWN0aW9uYXJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sR0FBRyxNQUFNLFlBQVksQ0FBQztBQUM3QixPQUFPLEtBQUssTUFBTSxjQUFjLENBQUM7QUFFakM7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFVBQVU7SUFHckIsWUFBWSxLQUFjLEVBQUUsSUFBSSxHQUFHLElBQUk7UUFGdkMsVUFBSyxHQUE2QixFQUFFLENBQUM7UUFHbkMsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUU7WUFDakIsT0FBTztTQUNSO1FBRUQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVELEdBQUcsQ0FBQyxHQUFvQixFQUFFLEtBQVk7UUFDcEMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxLQUFLLENBQUM7SUFDMUIsQ0FBQztJQUVELEdBQUcsQ0FBQyxHQUFvQjtRQUN0QixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7SUFDaEUsQ0FBQztJQUVELEtBQUssQ0FBQyxVQUE2QjtRQUNqQyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRTVDLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELE9BQU87UUFDTCxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ25DLENBQUM7SUFFTyxVQUFVLENBQUMsS0FBYyxFQUFFLElBQVk7UUFDN0MsNERBQTREO1FBQzVELElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRTtZQUN4QyxPQUFPO1NBQ1I7UUFFRCxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBVyxFQUFRLEVBQUU7WUFDbEMsSUFBSSxHQUFHLEdBQVcsR0FBRyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztZQUVsQyw4RUFBOEU7WUFDOUUsSUFBSSxHQUFHLEtBQUssU0FBUyxFQUFFO2dCQUNyQixHQUFHLEdBQUcsT0FBTyxDQUFDO2FBQ2Y7WUFFRCxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQztRQUN6QixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLElBQUk7UUFDTixPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFFRCxJQUFJLE1BQU07UUFDUixPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQzFCLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBnZXQgZnJvbSAnbG9kYXNoL2dldCc7XG5pbXBvcnQgaGFzSW4gZnJvbSAnbG9kYXNoL2hhc0luJztcblxuLyoqXG4gKiBAVE9ETyByZWZhY3RvciB3aXRoIE1hcFxuICogTGlzdCBvZiBvYmplY3RzIGdyb3VwZWQgYnkgcGFzc2VkIHByb3BlcnR5XG4gKi9cbmV4cG9ydCBjbGFzcyBEaWN0aW9uYXJ5PE1vZGVsPiB7XG4gIGl0ZW1zOiB7IFtrZXk6IHN0cmluZ106IE1vZGVsIH0gPSB7fTtcblxuICBjb25zdHJ1Y3RvcihpdGVtczogTW9kZWxbXSwgcGF0aCA9ICdpZCcpIHtcbiAgICBpZiAoIWl0ZW1zLmxlbmd0aCkge1xuICAgICAgcmV0dXJuO1xuICAgIH1cblxuICAgIHRoaXMuZ3JvdXBJdGVtcyhpdGVtcywgcGF0aCk7XG4gIH1cblxuICBhZGQoa2V5OiBzdHJpbmcgfCBudW1iZXIsIHZhbHVlOiBNb2RlbCk6IHZvaWQge1xuICAgIHRoaXMuaXRlbXNba2V5XSA9IHZhbHVlO1xuICB9XG5cbiAgZ2V0KGtleTogc3RyaW5nIHwgbnVtYmVyKTogTW9kZWwge1xuICAgIHJldHVybiB0aGlzLml0ZW1zW2tleV0gIT09IHVuZGVmaW5lZCA/IHRoaXMuaXRlbXNba2V5XSA6IG51bGw7XG4gIH1cblxuICBtZXJnZShkaWN0aW9uYXJ5OiBEaWN0aW9uYXJ5PE1vZGVsPik6IHRoaXMge1xuICAgIE9iamVjdC5hc3NpZ24odGhpcy5pdGVtcywgZGljdGlvbmFyeS5pdGVtcyk7XG5cbiAgICByZXR1cm4gdGhpcztcbiAgfVxuXG4gIHRvQXJyYXkoKTogTW9kZWxbXSB7XG4gICAgcmV0dXJuIE9iamVjdC52YWx1ZXModGhpcy5pdGVtcyk7XG4gIH1cblxuICBwcml2YXRlIGdyb3VwSXRlbXMoaXRlbXM6IE1vZGVsW10sIHBhdGg6IHN0cmluZyk6IHZvaWQge1xuICAgIC8vIERvIG5vdGhpbmcgaWYgcHJvdmlkZWQgcGF0aCB3YXMgbm90IGZvdW5kIGluIHRoZSAxc3QgaXRlbVxuICAgIGlmICghaGFzSW4oaXRlbXNbMF0sIHBhdGguc3BsaXQoJy4nKVswXSkpIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICBpdGVtcy5mb3JFYWNoKChpdGVtOiBNb2RlbCk6IHZvaWQgPT4ge1xuICAgICAgbGV0IGtleTogc3RyaW5nID0gZ2V0KGl0ZW0sIHBhdGgpO1xuXG4gICAgICAvLyBpZiBvYmplY3QgZG9lcyBub3QgaGF2ZSBwcm9wZXJ0eSBmb3IgZ3JvdXBpbmcgaXQgd2lsbCBiZSBncm91cGVkIGFzICdvdGhlcidcbiAgICAgIGlmIChrZXkgPT09IHVuZGVmaW5lZCkge1xuICAgICAgICBrZXkgPSAnb3RoZXInO1xuICAgICAgfVxuXG4gICAgICB0aGlzLml0ZW1zW2tleV0gPSBpdGVtO1xuICAgIH0pO1xuICB9XG5cbiAgZ2V0IGtleXMoKTogc3RyaW5nW10ge1xuICAgIHJldHVybiBPYmplY3Qua2V5cyh0aGlzLml0ZW1zKTtcbiAgfVxuXG4gIGdldCBsZW5ndGgoKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5rZXlzLmxlbmd0aDtcbiAgfVxufVxuIl19
|
|
@@ -11,7 +11,7 @@ export class PropertyReportItem extends AbstractModel {
|
|
|
11
11
|
this.propertyId = property.id;
|
|
12
12
|
this.claimPercent = property.claimPercent;
|
|
13
13
|
this.sharePercent = property.sharePercent;
|
|
14
|
-
this.subCode = chartAccounts.taxReturnItem
|
|
14
|
+
this.subCode = chartAccounts.taxReturnItem?.subCode;
|
|
15
15
|
this.description = chartAccounts.name;
|
|
16
16
|
}
|
|
17
17
|
get claimAmount() {
|
|
@@ -27,4 +27,4 @@ export class PropertyReportItem extends AbstractModel {
|
|
|
27
27
|
return CHART_ACCOUNTS_CATEGORIES.expense.includes(this.chartAccounts.category);
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktcmVwb3J0LWl0ZW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3JlcG9ydC9wcm9wZXJ0eS9wcm9wZXJ0eS1yZXBvcnQtaXRlbS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUseUJBQXlCLEVBQWlCLE1BQU0sc0JBQXNCLENBQUM7QUFDaEYsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxNQUFNLGNBQWMsQ0FBQztBQUVqQzs7R0FFRztBQUNILE1BQU0sT0FBTyxrQkFBbUIsU0FBUSxhQUFhO0lBYW5ELFlBQ0UsUUFBa0IsRUFDbEIsYUFBNEI7UUFFNUIsS0FBSyxFQUFFLENBQUM7UUFDUixJQUFJLENBQUMsYUFBYSxHQUFHLGFBQWEsQ0FBQztRQUNuQyxJQUFJLENBQUMsVUFBVSxHQUFHLFFBQVEsQ0FBQyxFQUFFLENBQUM7UUFDOUIsSUFBSSxDQUFDLFlBQVksR0FBRyxRQUFRLENBQUMsWUFBWSxDQUFDO1FBQzFDLElBQUksQ0FBQyxZQUFZLEdBQUcsUUFBUSxDQUFDLFlBQVksQ0FBQztRQUMxQyxJQUFJLENBQUMsT0FBTyxHQUFHLGFBQWEsQ0FBQyxhQUFhLEVBQUUsT0FBTyxDQUFDO1FBQ3BELElBQUksQ0FBQyxXQUFXLEdBQUcsYUFBYSxDQUFDLElBQUksQ0FBQTtJQUN2QyxDQUFDO0lBRUQsSUFBSSxXQUFXO1FBQ2IsT0FBTyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLElBQUksQ0FBQyxZQUFZLEdBQUcsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDM0QsQ0FBQztJQUVELElBQUksZ0JBQWdCO1FBQ2xCLE9BQU8sSUFBSSxDQUFDLFdBQVcsR0FBRyxDQUFDLElBQUksQ0FBQyxZQUFZLEdBQUcsR0FBRyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUVELFFBQVE7UUFDTixPQUFPLHlCQUF5QixDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNoRixDQUFDO0lBRUQsU0FBUztRQUNQLE9BQU8seUJBQXlCLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2pGLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFByb3BlcnR5IH0gZnJvbSAnLi4vLi4vcHJvcGVydHknO1xuaW1wb3J0IHsgQ0hBUlRfQUNDT1VOVFNfQ0FURUdPUklFUywgQ2hhcnRBY2NvdW50cyB9IGZyb20gJy4uLy4uL2NoYXJ0LWFjY291bnRzJztcbmltcG9ydCB7IEFic3RyYWN0TW9kZWwgfSBmcm9tICcuLi8uLi8uLi9kYi9Nb2RlbHMnO1xuaW1wb3J0IHJvdW5kIGZyb20gJ2xvZGFzaC9yb3VuZCc7XG5cbi8qKlxuICogQ2xhc3Mgd2l0aCBwcm9wZXJ0eSB0cmFuc2FjdGlvbnMgcmVwb3J0IGVudGl0aWVzXG4gKi9cbmV4cG9ydCBjbGFzcyBQcm9wZXJ0eVJlcG9ydEl0ZW0gZXh0ZW5kcyBBYnN0cmFjdE1vZGVsIHtcbiAgYW1vdW50OiBudW1iZXI7XG4gIGRlc2NyaXB0aW9uOiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIFRheCByZXR1cm4gaXRlbSBzdWItY29kZVxuICAgKi9cbiAgc3ViQ29kZTogc3RyaW5nO1xuICBzaGFyZVBlcmNlbnQ6IG51bWJlcjtcbiAgY2xhaW1QZXJjZW50OiBudW1iZXI7XG4gIHByb3BlcnR5SWQ6IG51bWJlcjtcbiAgY2hhcnRBY2NvdW50czogQ2hhcnRBY2NvdW50cztcblxuICBjb25zdHJ1Y3RvcihcbiAgICBwcm9wZXJ0eTogUHJvcGVydHksXG4gICAgY2hhcnRBY2NvdW50czogQ2hhcnRBY2NvdW50c1xuICApIHtcbiAgICBzdXBlcigpO1xuICAgIHRoaXMuY2hhcnRBY2NvdW50cyA9IGNoYXJ0QWNjb3VudHM7XG4gICAgdGhpcy5wcm9wZXJ0eUlkID0gcHJvcGVydHkuaWQ7XG4gICAgdGhpcy5jbGFpbVBlcmNlbnQgPSBwcm9wZXJ0eS5jbGFpbVBlcmNlbnQ7XG4gICAgdGhpcy5zaGFyZVBlcmNlbnQgPSBwcm9wZXJ0eS5zaGFyZVBlcmNlbnQ7XG4gICAgdGhpcy5zdWJDb2RlID0gY2hhcnRBY2NvdW50cy50YXhSZXR1cm5JdGVtPy5zdWJDb2RlO1xuICAgIHRoaXMuZGVzY3JpcHRpb24gPSBjaGFydEFjY291bnRzLm5hbWVcbiAgfVxuXG4gIGdldCBjbGFpbUFtb3VudCgpOiBudW1iZXIge1xuICAgIHJldHVybiByb3VuZCh0aGlzLmFtb3VudCAqICh0aGlzLmNsYWltUGVyY2VudCAvIDEwMCksIDIpO1xuICB9XG5cbiAgZ2V0IHNoYXJlQ2xhaW1BbW91bnQoKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5jbGFpbUFtb3VudCAqICh0aGlzLnNoYXJlUGVyY2VudCAvIDEwMCk7XG4gIH1cblxuICBpc0luY29tZSgpOiBib29sZWFuIHtcbiAgICByZXR1cm4gQ0hBUlRfQUNDT1VOVFNfQ0FURUdPUklFUy5pbmNvbWUuaW5jbHVkZXModGhpcy5jaGFydEFjY291bnRzLmNhdGVnb3J5KTtcbiAgfVxuXG4gIGlzRXhwZW5zZSgpOiBib29sZWFuIHtcbiAgICByZXR1cm4gQ0hBUlRfQUNDT1VOVFNfQ0FURUdPUklFUy5leHBlbnNlLmluY2x1ZGVzKHRoaXMuY2hhcnRBY2NvdW50cy5jYXRlZ29yeSk7XG4gIH1cbn1cbiJdfQ==
|