@colijnit/catalog 12.1.36 → 12.1.39

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.
Files changed (31) hide show
  1. package/bundles/colijnit-catalog.umd.js +199 -258
  2. package/bundles/colijnit-catalog.umd.js.map +1 -1
  3. package/colijnit-catalog.metadata.json +1 -1
  4. package/esm2015/lib/catalog-version.js +3 -3
  5. package/esm2015/lib/component/catalog-filter/catalog-filter.component.js +73 -30
  6. package/esm2015/lib/component/catalog-filter/catalog-filter.module.js +9 -4
  7. package/esm2015/lib/component/catalog-filter-content/catalog-filter-content-general/catalog-filter-content-general.component.js +63 -217
  8. package/esm2015/lib/component/catalog-filter-content/catalog-filter-content-logistics/catalog-filter-content-logistics.component.js +43 -85
  9. package/esm2015/lib/component/catalog-filter-content/catalog-filter-content-purchase/catalog-filter-content-purchase.component.js +13 -25
  10. package/esm2015/lib/component/catalog-navigation/catalog-navigation.component.js +1 -1
  11. package/esm2015/lib/component/catalog-search/catalog-search.component.js +1 -5
  12. package/esm2015/lib/model/settings.js +5 -5
  13. package/esm2015/lib/service/catalog-connector-adapter.service.js +61 -4
  14. package/esm2015/lib/service/catalog-connector.service.js +26 -1
  15. package/esm2015/lib/service/catalog-filter.service.js +1 -1
  16. package/esm2015/lib/service/catalog-search.service.js +1 -68
  17. package/esm2015/lib/service/catalog-settings.service.js +9 -53
  18. package/fesm2015/colijnit-catalog.js +280 -473
  19. package/fesm2015/colijnit-catalog.js.map +1 -1
  20. package/lib/component/catalog-filter/catalog-filter.component.d.ts +14 -2
  21. package/lib/component/catalog-filter/style/_layout.scss +29 -0
  22. package/lib/component/catalog-filter-content/catalog-filter-content-general/catalog-filter-content-general.component.d.ts +9 -22
  23. package/lib/component/catalog-filter-content/catalog-filter-content-logistics/catalog-filter-content-logistics.component.d.ts +2 -2
  24. package/lib/component/catalog-filter-content/catalog-filter-content-purchase/catalog-filter-content-purchase.component.d.ts +2 -6
  25. package/lib/component/catalog-search/catalog-search.component.d.ts +0 -1
  26. package/lib/model/settings.d.ts +3 -13
  27. package/lib/service/catalog-connector-adapter.service.d.ts +7 -0
  28. package/lib/service/catalog-connector.service.d.ts +8 -0
  29. package/lib/service/catalog-search.service.d.ts +0 -9
  30. package/lib/service/catalog-settings.service.d.ts +3 -3
  31. package/package.json +1 -1
@@ -3,6 +3,7 @@ import { Injectable, EventEmitter, Component, ViewEncapsulation, Input, Output,
3
3
  import { CommonModule } from '@angular/common';
4
4
  import { __awaiter } from 'tslib';
5
5
  import { Subject, BehaviorSubject } from 'rxjs';
6
+ import { Options } from '@colijnit/ioneconnector/build/model/options';
6
7
  import { StringUtils } from '@colijnit/ioneconnector/build/utils/string-utils';
7
8
  import { ArticleCategory } from '@colijnit/articleapi/build/model/article-category';
8
9
  import { CatalogDefinition } from '@colijnit/articleapi/build/model/catalog-definition.bo';
@@ -23,26 +24,29 @@ import { RelationKind } from '@colijnit/relationapi/build/enum/relation-kind.enu
23
24
  import { CoRVDomainValue } from '@colijnit/mainapi/build/model/co-rv-domain-value.bo';
24
25
  import { Category } from '@colijnit/mainapi/build/model/category.bo';
25
26
  import { BusinessObjectFactory } from '@colijnit/ioneconnector/build/service/business-object-factory';
27
+ import { Preset } from '@colijnit/mainapi/build/model/preset.bo';
28
+ import { UserGroup } from '@colijnit/mainapi/build/model/user-group.bo';
26
29
  import { PriceList } from '@colijnit/transactionapi/build/model/price-list';
27
30
  import { Transaction } from '@colijnit/transactionapi/build/transaction';
28
31
  import { ObjectUtils } from '@colijnit/ioneconnector/build/utils/object-utils';
29
32
  import { FileUtils } from '@colijnit/ioneconnector/build/utils/file-utils';
30
- import { FilterViewmodel, FilterItemViewmodel, FilterItemMode, FilterItemModule, InputTextModule, ButtonModule, IconModule, InputDatePickerModule, IconCollapseHandleModule, ImageModule, OverlayModule, OverlayService, InputSearchModule, PaginationBarModule } from '@colijnit/corecomponents_v12';
33
+ import { FilterViewmodel, FilterItemViewmodel, FilterItemModule, InputTextModule, ButtonModule, IconModule, FilterItemMode as FilterItemMode$1, InputDatePickerModule, IconCollapseHandleModule, CoDialogModule, ListOfValuesModule, CheckmarkOverlayModule, ImageModule, OverlayModule, OverlayService, InputSearchModule, PaginationBarModule } from '@colijnit/corecomponents_v12';
31
34
  import { ArticleExtendedRequest } from '@colijnit/articleapi/build/model/article-extended-request';
32
35
  import { PagingParameters } from '@colijnit/ioneconnector/build/model/paging-parameters';
33
36
  import { trigger, state, style, transition, animate } from '@angular/animations';
34
37
  import * as i1 from '@angular/platform-browser';
35
38
  import { DomSanitizer } from '@angular/platform-browser';
36
- import { SliderComponent, InputCheckboxModule, IconModule as IconModule$1, PriceDisplayPipeModule, ButtonModule as ButtonModule$1, ImageModule as ImageModule$1 } from '@colijnit/corecomponents';
39
+ import { InputCheckboxModule, SliderComponent, IconModule as IconModule$1, CheckboxSelectModule, PriceDisplayPipeModule, ButtonModule as ButtonModule$1, ImageModule as ImageModule$1 } from '@colijnit/corecomponents';
37
40
  import { DomainName } from '@colijnit/mainapi/build/enum/domain-name.enum';
41
+ import { FilterItemMode } from '@colijnit/corecomponents_v12/';
38
42
 
39
43
  // this file is dynamically created, do not change this
40
44
  class Version {
41
45
  constructor() {
42
46
  this.name = "@colijnit/catalog";
43
47
  this.description = "iOne Catalog module based on Angular 12";
44
- this.symVer = "12.1.36";
45
- this.publishDate = "28-7-2023 10:59:06";
48
+ this.symVer = "12.1.39";
49
+ this.publishDate = "28-7-2023 14:33:31";
46
50
  }
47
51
  }
48
52
 
@@ -66,13 +70,12 @@ class SettingsOptions {
66
70
  }
67
71
  }
68
72
 
69
- class Settings {
73
+ class CatalogSettings extends Options {
70
74
  constructor() {
71
- this.session = undefined;
72
- this.useLoginEncryption = true;
75
+ super(...arguments);
73
76
  this.type = "V";
74
77
  this.options = new SettingsOptions();
75
- this.jwtEnabled = false;
78
+ this.useLoginEncryption = true;
76
79
  }
77
80
  }
78
81
 
@@ -192,7 +195,7 @@ class CatalogSettingsService {
192
195
  constructor(_dictionaryService) {
193
196
  this._dictionaryService = _dictionaryService;
194
197
  this.settingsLoaded = new BehaviorSubject(false);
195
- this._settings = new Settings();
198
+ this._settings = new CatalogSettings();
196
199
  }
197
200
  set settings(value) {
198
201
  this._settings = value;
@@ -206,13 +209,13 @@ class CatalogSettingsService {
206
209
  if (typeof settings === 'undefined') {
207
210
  const jsonSettings = yield JsonUtils.ReadJsonFile('catalog-settings.json');
208
211
  if (jsonSettings) {
209
- this.settings = Object.assign(new Settings(), jsonSettings);
212
+ this.settings = Object.assign(new CatalogSettings(), jsonSettings);
210
213
  this.settings.options = Object.assign(new SettingsOptions(), this.settings.options);
211
214
  this.settingsFinished();
212
215
  }
213
216
  }
214
217
  else {
215
- this.settings = Object.assign(new Settings(), settings);
218
+ this.settings = Object.assign(new CatalogSettings(), settings);
216
219
  this.settings.options = Object.assign(new SettingsOptions(), this.settings.options);
217
220
  this.settingsFinished();
218
221
  }
@@ -221,55 +224,11 @@ class CatalogSettingsService {
221
224
  createSettingsFromObject(obj) {
222
225
  return __awaiter(this, void 0, void 0, function* () {
223
226
  if (!this.settings) {
224
- this.settings = new Settings();
225
- }
226
- if (obj.hasOwnProperty('url')) {
227
- this.settings.url = obj['url'];
228
- }
229
- if (obj.hasOwnProperty('schema')) {
230
- this.settings.schema = obj['schema'];
231
- }
232
- if (obj.hasOwnProperty('version')) {
233
- this.settings.version = obj['version'];
234
- }
235
- if (obj.hasOwnProperty('branch')) {
236
- this.settings.branch = obj['branch'];
237
- }
238
- if (obj.hasOwnProperty('currency')) {
239
- this.settings.currency = obj['currency'];
240
- }
241
- if (obj.hasOwnProperty('languageCode')) {
242
- this.settings.languageCode = obj['languageCode'];
243
- }
244
- if (obj.hasOwnProperty('username')) {
245
- this.settings.username = obj['username'];
246
- }
247
- if (obj.hasOwnProperty('password')) {
248
- this.settings.password = obj['password'];
249
- }
250
- if (obj.hasOwnProperty('timeoutInMs')) {
251
- this.settings.timeoutInMs = obj['timeoutInMs'];
252
- }
253
- if (obj.hasOwnProperty('session')) {
254
- this.settings.session = obj['session'];
255
- }
256
- if (obj.hasOwnProperty('useEncryption')) {
257
- this.settings.useLoginEncryption = obj['useEncryption'];
227
+ this.settings = new CatalogSettings();
258
228
  }
259
- if (obj.hasOwnProperty('useLoginEncryption')) {
260
- this.settings.useLoginEncryption = obj['useLoginEncryption'];
261
- }
262
- if (obj.hasOwnProperty('additionalTranslationFile')) {
263
- this.settings.additionalTranslationFile = obj['additionalTranslationFile'];
264
- }
265
- if (obj.hasOwnProperty('type')) {
266
- this.settings.type = obj['type'];
267
- }
268
- if (obj.hasOwnProperty('options')) {
269
- Object.assign(this.settings.options, obj['options']);
270
- }
271
- if (obj.hasOwnProperty('catalogParameters')) {
272
- this.settings.catalogParameters = obj['catalogParameters'];
229
+ this.settings = Object.assign(this.settings, obj);
230
+ if (obj.options) {
231
+ this.settings.options = Object.assign(new SettingsOptions(), obj.options);
273
232
  }
274
233
  this.settingsFinished();
275
234
  });
@@ -318,7 +277,7 @@ class CatalogConnectorAdapterService {
318
277
  }
319
278
  this._initializing = true;
320
279
  try {
321
- this.connectorOptions = Object.assign(new Settings(), settings);
280
+ this.connectorOptions = Object.assign(new CatalogSettings(), settings);
322
281
  this.connectorOptions.options = Object.assign(new SettingsOptions(), this.connectorOptions.options);
323
282
  this.assetPath = settings.assetPath;
324
283
  this.connector = new Articles(this.connectorOptions);
@@ -338,7 +297,7 @@ class CatalogConnectorAdapterService {
338
297
  }
339
298
  getCatalogBundleSettings(url, upId) {
340
299
  return __awaiter(this, void 0, void 0, function* () {
341
- const tempSettings = new Settings();
300
+ const tempSettings = new CatalogSettings();
342
301
  tempSettings.url = url;
343
302
  tempSettings.schema = upId.toString();
344
303
  const tempMainConnector = new MainApi(tempSettings);
@@ -583,6 +542,17 @@ class CatalogConnectorAdapterService {
583
542
  }
584
543
  });
585
544
  }
545
+ getUserGroups() {
546
+ return __awaiter(this, void 0, void 0, function* () {
547
+ const response = yield this.mainConnector.getUserGroups();
548
+ if (response && response.validationResult && response.validationResult.success) {
549
+ return this._boFactory.makeBOArrayFromRawBackendDataArray(UserGroup, response.resultObjects);
550
+ }
551
+ else {
552
+ console.error(response.validationMessagesAsString);
553
+ }
554
+ });
555
+ }
586
556
  getSuppliers() {
587
557
  return __awaiter(this, void 0, void 0, function* () {
588
558
  let request = new RelationRequest;
@@ -596,6 +566,50 @@ class CatalogConnectorAdapterService {
596
566
  }
597
567
  });
598
568
  }
569
+ getPresets(module, user) {
570
+ return __awaiter(this, void 0, void 0, function* () {
571
+ const response = yield this.mainConnector.getPresets(module, user);
572
+ if (response && response.validationResult && response.validationResult.success) {
573
+ return this._boFactory.makeBOArrayFromRawBackendDataArray(Preset, response.resultObjects);
574
+ }
575
+ else {
576
+ console.error(response.validationMessagesAsString);
577
+ }
578
+ });
579
+ }
580
+ getPreset(presetId) {
581
+ return __awaiter(this, void 0, void 0, function* () {
582
+ const response = yield this.mainConnector.getPreset(presetId);
583
+ if (response && response.validationResult && response.validationResult.success) {
584
+ return this._boFactory.makeWithRawBackendData(Preset, response.resultObjects);
585
+ }
586
+ else {
587
+ console.error(response.validationMessagesAsString);
588
+ }
589
+ });
590
+ }
591
+ savePreset(preset) {
592
+ return __awaiter(this, void 0, void 0, function* () {
593
+ const response = yield this.mainConnector.savePreset(preset);
594
+ if (response && response.validationResult && response.validationResult.success) {
595
+ return true;
596
+ }
597
+ else {
598
+ console.error(response.validationMessagesAsString);
599
+ }
600
+ });
601
+ }
602
+ updatePreset(presetName) {
603
+ return __awaiter(this, void 0, void 0, function* () {
604
+ const response = yield this.mainConnector.updatePreset(presetName);
605
+ if (response && response.validationResult && response.validationResult.success) {
606
+ return true;
607
+ }
608
+ else {
609
+ console.error(response.validationMessagesAsString);
610
+ }
611
+ });
612
+ }
599
613
  // will be called in future
600
614
  // public getArticleGroupImages(): Promise<ArticleGroupImage[]> {
601
615
  // return this.connector.getArticleGroupImages();
@@ -1227,11 +1241,36 @@ class CatalogConnectorService {
1227
1241
  return this._adapterService.getPriceLists();
1228
1242
  });
1229
1243
  }
1244
+ getUserGroups() {
1245
+ return __awaiter(this, void 0, void 0, function* () {
1246
+ return this._adapterService.getUserGroups();
1247
+ });
1248
+ }
1230
1249
  getSuppliers() {
1231
1250
  return __awaiter(this, void 0, void 0, function* () {
1232
1251
  return this._adapterService.getSuppliers();
1233
1252
  });
1234
1253
  }
1254
+ getPresets(module, user) {
1255
+ return __awaiter(this, void 0, void 0, function* () {
1256
+ return this._adapterService.getPresets(module, user);
1257
+ });
1258
+ }
1259
+ getPreset(presetId) {
1260
+ return __awaiter(this, void 0, void 0, function* () {
1261
+ return this._adapterService.getPreset(presetId);
1262
+ });
1263
+ }
1264
+ savePreset(preset) {
1265
+ return __awaiter(this, void 0, void 0, function* () {
1266
+ return this._adapterService.savePreset(preset);
1267
+ });
1268
+ }
1269
+ updatePreset(presetName) {
1270
+ return __awaiter(this, void 0, void 0, function* () {
1271
+ return this._adapterService.updatePreset(presetName);
1272
+ });
1273
+ }
1235
1274
  getDocumentContent(docId, thumbnail = true) {
1236
1275
  return __awaiter(this, void 0, void 0, function* () {
1237
1276
  return this._selectSingleParameterizedCacheService.requestCache(String, (docId, thumbnail) => {
@@ -1591,8 +1630,6 @@ class CatalogSearchService {
1591
1630
  this._settingsService = _settingsService;
1592
1631
  this._optionService = _optionService;
1593
1632
  this.searchRequest = new ArticleExtendedRequest();
1594
- // public activeSearchViewMode: SearchViewMode = SearchViewMode.FullScreen;
1595
- // public activeSearchBarViewMode: SearchbarViewMode = SearchbarViewMode.Expanded;
1596
1633
  this.showFilterSidebar = false;
1597
1634
  this.articles = [];
1598
1635
  this.articlesPerPage = 20;
@@ -1610,14 +1647,6 @@ class CatalogSearchService {
1610
1647
  }
1611
1648
  }));
1612
1649
  }
1613
- set filterText(value) {
1614
- this._setRequestParametersAndProps(null, null, value);
1615
- // this.searchTextChanged.next(this.filterText);
1616
- this.searchArticles();
1617
- }
1618
- get filterText() {
1619
- return this._filterText;
1620
- }
1621
1650
  set turnoverGroup(value) {
1622
1651
  this._setRequestParametersAndProps(null, value, null);
1623
1652
  // this.turnoverGroupChanged.next(this.turnoverGroup);
@@ -1644,60 +1673,6 @@ class CatalogSearchService {
1644
1673
  ngOnDestroy() {
1645
1674
  this._subs.forEach(s => s.unsubscribe());
1646
1675
  }
1647
- filterOnCollection(filterName, collection) {
1648
- if (!collection || collection.length === 0) {
1649
- return;
1650
- }
1651
- const searchFilterProp = this._filterService.getFilterItemMap(filterName);
1652
- if (searchFilterProp) {
1653
- this.searchRequest[searchFilterProp] = this.createFilterString(collection, searchFilterProp);
1654
- this.searchArticles();
1655
- }
1656
- }
1657
- createFilterString(collection, searchFilterProp) {
1658
- let cleared = false;
1659
- let filterRange = [];
1660
- collection.forEach((viewModel) => {
1661
- if (!cleared) {
1662
- this.searchRequest[searchFilterProp] = '';
1663
- cleared = true;
1664
- }
1665
- if (viewModel.checked) {
1666
- filterRange.push(`?='${viewModel.code}'`);
1667
- }
1668
- });
1669
- return filterRange.join(',');
1670
- }
1671
- createFilterStringCollection(collection) {
1672
- let filterRange = [];
1673
- collection.forEach((viewModel) => {
1674
- if (viewModel.checked) {
1675
- filterRange.push(viewModel.code.toString());
1676
- }
1677
- });
1678
- return filterRange;
1679
- }
1680
- createSingleSelectString(collection) {
1681
- let filterString = "";
1682
- collection.forEach((viewModel) => {
1683
- if (viewModel.checked) {
1684
- filterString = viewModel.code.toString();
1685
- }
1686
- });
1687
- return filterString;
1688
- }
1689
- createFilterNumber(collection) {
1690
- let filterNumber = null;
1691
- collection.forEach((viewModel) => {
1692
- if (viewModel.checked) {
1693
- if (filterNumber == null) {
1694
- filterNumber = 0;
1695
- }
1696
- filterNumber += Number(viewModel.code);
1697
- }
1698
- });
1699
- return filterNumber;
1700
- }
1701
1676
  searchArticles(getFilters = true) {
1702
1677
  const lowerBound = ((this.currentPage - 1) * this.articlesPerPage) + 1;
1703
1678
  this.searchRequest.paging = new PagingParameters(lowerBound, lowerBound + this.articlesPerPage - 1, this.articlesPerPage);
@@ -1744,9 +1719,6 @@ class CatalogSearchService {
1744
1719
  this.searchRequest.category = category;
1745
1720
  this.searchRequest.turnoverGroup = turnoverGroup;
1746
1721
  this.searchRequest.general = searchText ? searchText.join(' ') : null;
1747
- // this._category = category;
1748
- // this._turnoverGroup = turnoverGroup;
1749
- // this._filterText = searchText;
1750
1722
  }
1751
1723
  }
1752
1724
  CatalogSearchService.decorators = [
@@ -2121,12 +2093,17 @@ IconCacheService.ctorParameters = () => [
2121
2093
  ];
2122
2094
 
2123
2095
  class CatalogFilterComponent {
2124
- constructor(iconCache, optionsService, changeDetector) {
2096
+ constructor(iconCache, optionsService, changeDetector, _catalogConnectorService, _adapterService, searchService) {
2125
2097
  this.iconCache = iconCache;
2126
2098
  this.optionsService = optionsService;
2127
2099
  this.changeDetector = changeDetector;
2100
+ this._catalogConnectorService = _catalogConnectorService;
2101
+ this._adapterService = _adapterService;
2102
+ this.searchService = searchService;
2128
2103
  this.icons = IconEnum;
2104
+ this.updatePreset = false;
2129
2105
  this.showResetFilter = true;
2106
+ this.showSavePopup = false;
2130
2107
  this.filterCategories = [
2131
2108
  'Algemeen',
2132
2109
  'Inkoop',
@@ -2134,12 +2111,11 @@ class CatalogFilterComponent {
2134
2111
  ];
2135
2112
  this.collapsed = false;
2136
2113
  this._subs = [];
2137
- // this._subs = [
2138
- // this.catalog.onPrepareFilters.subscribe(() => {
2139
- // this.setupFilters();
2140
- // this.detectChanges();
2141
- // })
2142
- // ];
2114
+ this._subs.push(this._adapterService.controllerInitialized.subscribe((initialized) => {
2115
+ if (initialized) {
2116
+ this.getUserGroups();
2117
+ }
2118
+ }));
2143
2119
  }
2144
2120
  showClass() {
2145
2121
  return true;
@@ -2153,6 +2129,17 @@ class CatalogFilterComponent {
2153
2129
  //this.initializePriceFilterMinMax();
2154
2130
  this.detectChanges();
2155
2131
  }
2132
+ ngOnDestroy() {
2133
+ this._destroyed = true;
2134
+ this._subs.forEach((x) => {
2135
+ x.unsubscribe();
2136
+ });
2137
+ }
2138
+ getUserGroups() {
2139
+ this._catalogConnectorService.getUserGroups().then((userGroups) => {
2140
+ this.userGroupCollection = userGroups;
2141
+ });
2142
+ }
2156
2143
  handleCategoryClick(cat) {
2157
2144
  if (cat === 'Algemeen') {
2158
2145
  this.filterItems.nativeElement.scrollLeft = this.generalFilter.nativeElement.offsetLeft - this.filterItems.nativeElement.offsetLeft;
@@ -2164,12 +2151,6 @@ class CatalogFilterComponent {
2164
2151
  this.filterItems.nativeElement.scrollLeft = this.logisticsFilter.nativeElement.offsetLeft - this.filterItems.nativeElement.offsetLeft;
2165
2152
  }
2166
2153
  }
2167
- ngOnDestroy() {
2168
- this._destroyed = true;
2169
- this._subs.forEach((x) => {
2170
- x.unsubscribe();
2171
- });
2172
- }
2173
2154
  detectChanges() {
2174
2155
  if (!this._destroyed) {
2175
2156
  this.changeDetector.detectChanges();
@@ -2180,6 +2161,14 @@ CatalogFilterComponent.decorators = [
2180
2161
  { type: Component, args: [{
2181
2162
  selector: 'co-catalog-filter',
2182
2163
  template: `
2164
+ <!--<div class="preset-button">
2165
+ <co-button [iconData]="iconCache.getIcon(icons.MagicWand)"
2166
+ (onClick)="loadSelectedPreset()">
2167
+ </co-button>
2168
+ <co-button [iconData]="iconCache.getIcon(icons.Check)"
2169
+ (onClick)="showSavePresetPopup()">
2170
+ </co-button>
2171
+ </div>-->
2183
2172
  <div class="catalog-filter-categories">
2184
2173
  <co-catalog-filter-categories [categories]="filterCategories"
2185
2174
  (categoryClick)="handleCategoryClick($event)"></co-catalog-filter-categories>
@@ -2194,23 +2183,43 @@ CatalogFilterComponent.decorators = [
2194
2183
  <div #logisticsFilter class="catalog-filter-category-content">
2195
2184
  <co-catalog-filter-content-logistics></co-catalog-filter-content-logistics>
2196
2185
  </div>
2197
- </div>
2198
-
2186
+ </div>
2199
2187
 
2200
- <!--<div class="catalog-filter-wrapper">
2201
- <div *ngIf="showResetFilter" class="reset-filter-wrapper">
2202
- <div class="reset-title-wrapper">
2203
- <div class="reset-title">
2204
- <div class="reset-filter-title" [textContent]="'FILTER' | localize"></div>
2205
- <co-icon class="reset-filter-icon" [iconData]="iconCache.getIcon(icons.SyncAlt)"></co-icon>
2206
- </div>
2207
- <co-icon-collapse-handle (click)="onHandleClick($event)"></co-icon-collapse-handle>
2208
- </div>
2209
- <div class="filter-reset" [textContent]="'RESET_FILTER' | localize" (click)="resetFilters($event)"></div>
2210
- </div>
2211
- <div class="filter-items-wrapper co-small-scrollbar">
2188
+ <!--<co-dialog *ngIf="showSavePopup" [headerTemplate]="headerTemplate" [footerTemplate]="footerTemplate" (closeClick)="cancelClicked()">
2189
+ <ng-template #headerTemplate>
2190
+ <span class="header" [textContent]="'SAVE_PRESET' | localize"></span>
2191
+ </ng-template>
2192
+
2193
+ <div class="save-dialog-contents">
2194
+ <co-input-text
2195
+ [hideArrowButtons]="true"
2196
+ [excludePlusMinus]="true"
2197
+ [(model)]="searchService.currentPreset.name"
2198
+ [label]="'PRESET_NAME' | localize"
2199
+ [placeholder]="'PRESET_NAME' | localize"
2200
+ ></co-input-text>
2201
+ <co-list-of-values [collection]="userGroupCollection"
2202
+ [displayField]="'description'"
2203
+ [label]="'USERGROUPS'| localize"
2204
+ [(model)]="userGroupsChosen"
2205
+ (modelChange)="userGroupsChanged()"
2206
+ [multiselect]="true"
2207
+ ></co-list-of-values>
2208
+ &lt;!&ndash;<co-input-checkbox *ngIf="updatePreset"
2209
+ [(model)]="searchService.currentPreset.default"
2210
+ [label]="'SAVE_AS_NEW' | localize"
2211
+ ></co-input-checkbox> &ndash;&gt;
2212
2212
  </div>
2213
- </div>-->
2213
+
2214
+ <ng-template #footerTemplate>
2215
+ <div class="co-dialog-footer-button-wrapper">
2216
+ <ng-container >
2217
+ <co-button [label]="'SAVE' | localize" (click)="saveClicked()"></co-button>
2218
+ <co-button [label]="'CANCEL' | localize" (click)="cancelClicked()"></co-button>
2219
+ </ng-container>
2220
+ </div>
2221
+ </ng-template>
2222
+ </co-dialog> -->
2214
2223
  `,
2215
2224
  animations: [
2216
2225
  trigger('showFilterItem', [
@@ -2225,7 +2234,10 @@ CatalogFilterComponent.decorators = [
2225
2234
  CatalogFilterComponent.ctorParameters = () => [
2226
2235
  { type: IconCacheService },
2227
2236
  { type: CatalogOptionsService },
2228
- { type: ChangeDetectorRef }
2237
+ { type: ChangeDetectorRef },
2238
+ { type: CatalogConnectorService },
2239
+ { type: CatalogConnectorAdapterService },
2240
+ { type: CatalogSearchService }
2229
2241
  ];
2230
2242
  CatalogFilterComponent.propDecorators = {
2231
2243
  filterItems: [{ type: ViewChild, args: ['filterItems', { read: ElementRef },] }],
@@ -2343,19 +2355,12 @@ class CatalogFilterContentGeneralComponent {
2343
2355
  this.iconCache = iconCache;
2344
2356
  this._catalogConnectorService = _catalogConnectorService;
2345
2357
  this._adapterService = _adapterService;
2346
- this.modes = FilterItemMode;
2347
2358
  this.icons = IconEnum;
2359
+ this.modes = FilterItemMode;
2348
2360
  this._min = 0;
2349
2361
  this._max = 100000;
2350
2362
  this._subs = [];
2351
2363
  this.supplierDropdownFields = { text: "description", value: "storeGroupId" };
2352
- this.getRetail = (barcodeFilter) => __awaiter(this, void 0, void 0, function* () {
2353
- const request = new ArticleExtendedRequest();
2354
- request.barcode = barcodeFilter;
2355
- return this._catalogConnectorService.getArticlesForCatalog(request).then((articleResult) => {
2356
- return new FilterViewmodel(articleResult.articles, { text: 'barcode', value: 'barcode' }).filterItems;
2357
- });
2358
- });
2359
2364
  }
2360
2365
  showClass() {
2361
2366
  return true;
@@ -2423,66 +2428,6 @@ class CatalogFilterContentGeneralComponent {
2423
2428
  this.priceListsSalesCollection = this.filterService.createFilterSelectionsCollection(tempPriceListsSalesCollection, "code", "description");
2424
2429
  });
2425
2430
  }
2426
- filterOnPrice() {
2427
- this.filterService.priceMinFilter = !!this.filterService.priceMinFilter ? this.filterService.priceMinFilter : this._min;
2428
- this.filterService.priceMaxFilter = !!this.filterService.priceMaxFilter ? this.filterService.priceMaxFilter : this._max;
2429
- // some user error protection
2430
- let trueLowerBound = Math.min(this.filterService.priceMinFilter, this.filterService.priceMaxFilter);
2431
- let trueUpperBound = Math.max(this.filterService.priceMinFilter, this.filterService.priceMaxFilter);
2432
- this.catalogSearchService.searchRequest.rangePrice = `${trueLowerBound} - ${trueUpperBound}`;
2433
- this.catalogSearchService.searchArticles();
2434
- }
2435
- updateLengthFilter() {
2436
- this.filterService.lengthMinFilter = !!this.filterService.lengthMinFilter ? this.filterService.lengthMinFilter : this._min;
2437
- this.filterService.lengthMaxFilter = !!this.filterService.lengthMaxFilter ? this.filterService.lengthMaxFilter : this._max;
2438
- this.catalogSearchService.searchRequest.length = this.getFromToFilter(this.filterService.lengthMinFilter, this.filterService.lengthMaxFilter);
2439
- }
2440
- updateWidthFilter() {
2441
- this.filterService.widthMinFilter = !!this.filterService.widthMinFilter ? this.filterService.widthMinFilter : this._min;
2442
- this.filterService.widthMaxFilter = !!this.filterService.widthMaxFilter ? this.filterService.widthMaxFilter : this._max;
2443
- this.catalogSearchService.searchRequest.width = this.getFromToFilter(this.filterService.widthMinFilter, this.filterService.widthMaxFilter);
2444
- }
2445
- updateHeightFilter() {
2446
- this.filterService.heightMinFilter = !!this.filterService.heightMinFilter ? this.filterService.heightMinFilter : this._min;
2447
- this.filterService.heightMaxFilter = !!this.filterService.heightMaxFilter ? this.filterService.heightMaxFilter : this._max;
2448
- this.catalogSearchService.searchRequest.height = this.getFromToFilter(this.filterService.heightMinFilter, this.filterService.heightMaxFilter);
2449
- }
2450
- updateDepthFilter() {
2451
- this.filterService.depthMinFilter = !!this.filterService.depthMinFilter ? this.filterService.depthMinFilter : this._min;
2452
- this.filterService.depthMaxFilter = !!this.filterService.depthMaxFilter ? this.filterService.depthMaxFilter : this._max;
2453
- this.catalogSearchService.searchRequest.depth = this.getFromToFilter(this.filterService.depthMinFilter, this.filterService.depthMaxFilter);
2454
- }
2455
- getFromToFilter(min, max) {
2456
- // some user error protection
2457
- let trueLowerBound = Math.min(min, max);
2458
- let trueUpperBound = Math.max(min, max);
2459
- return `${trueLowerBound} - ${trueUpperBound}`;
2460
- }
2461
- handleCollectionChange(filterName, collection) {
2462
- this.catalogSearchService.filterOnCollection(filterName, collection);
2463
- }
2464
- handleSeparateCollectionChange(filterName, collection) {
2465
- this.catalogSearchService.searchRequest[filterName] = this.catalogSearchService.createFilterString(collection, filterName);
2466
- }
2467
- handleArticleTypeChange(filterName, collection) {
2468
- this.catalogSearchService.searchRequest.articleKindList = this.catalogSearchService.createFilterStringCollection(collection);
2469
- }
2470
- handleSingleSelectChange(filterName, collection) {
2471
- this.catalogSearchService.searchRequest[filterName] = this.catalogSearchService.createSingleSelectString(collection);
2472
- }
2473
- handleNumberListChange(filterName, collection) {
2474
- this.catalogSearchService.searchRequest[filterName] = this.catalogSearchService.createFilterNumber(collection);
2475
- }
2476
- handleCollectionChangeForSingleSelect(collection, modelName) {
2477
- this.catalogSearchService.searchRequest[modelName] = this._getFilterRequestForSingleSelect(collection);
2478
- this.catalogSearchService.searchArticles();
2479
- }
2480
- _getFilterRequestForSingleSelect(collection) {
2481
- let filterRequest = '';
2482
- const selectedItem = collection === null || collection === void 0 ? void 0 : collection.find(item => item.checked);
2483
- filterRequest = selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.code.toString();
2484
- return filterRequest;
2485
- }
2486
2431
  }
2487
2432
  CatalogFilterContentGeneralComponent.decorators = [
2488
2433
  { type: Component, args: [{
@@ -2493,148 +2438,60 @@ CatalogFilterContentGeneralComponent.decorators = [
2493
2438
  <div class="catalog-filter-wrapper">
2494
2439
  <div class="filter-items-wrapper co-small-scrollbar">
2495
2440
  <div class="filter-item-wrapper">
2496
- <label class="temp">Price</label>
2497
- <div class="price-inputs">
2498
- <co-input-text
2499
- class="price-from"
2500
- [type]="'number'"
2501
- [digitsOnly]="true"
2502
- [hideArrowButtons]="true"
2503
- [excludePlusMinus]="true"
2504
- [label]="'BASELINE_PRICE' | localize"
2505
- [(model)]="filterService.priceMinFilter"
2506
- customWidth
2507
- ></co-input-text>
2508
- <co-input-text
2509
- class="price-to"
2510
- [type]="'number'"
2511
- [digitsOnly]="true"
2512
- [hideArrowButtons]="true"
2513
- [excludePlusMinus]="true"
2514
- [label]="'PRICE_TO' | localize"
2515
- [(model)]="filterService.priceMaxFilter"
2516
- customWidth
2517
- ></co-input-text>
2518
- <co-icon [iconData]="iconCache.getIcon(icons.Check)" (click)="filterOnPrice()"></co-icon>
2519
- </div>
2441
+ <co-filter-item [placeholder]="'PRICE' | localize"
2442
+ [expanded]="true"
2443
+ [mode]="modes.Slider"
2444
+ [sliderDefaultMin]="0"
2445
+ [sliderDefaultMax]="100000"
2446
+ [(model)]="catalogSearchService.searchRequest.rangePrice"
2447
+ >
2448
+ </co-filter-item>
2520
2449
  </div>
2521
2450
  <div class="filter-item-wrapper">
2522
- <label class="temp">Length</label>
2523
- <div class="price-inputs">
2524
- <co-input-text
2525
- class="price-from"
2526
- [type]="'number'"
2527
- [digitsOnly]="true"
2528
- [hideArrowButtons]="true"
2529
- [excludePlusMinus]="true"
2530
- [label]="'FROM' | localize"
2531
- [(model)]="filterService.lengthMinFilter"
2532
- (modelChange)="updateLengthFilter()"
2533
- customWidth
2534
- ></co-input-text>
2535
- <co-input-text
2536
- class="price-to"
2537
- [type]="'number'"
2538
- [digitsOnly]="true"
2539
- [hideArrowButtons]="true"
2540
- [excludePlusMinus]="true"
2541
- [label]="'FROM' | localize"
2542
- [(model)]="filterService.lengthMaxFilter"
2543
- (modelChange)="updateLengthFilter()"
2544
- customWidth
2545
- ></co-input-text>
2546
- <co-icon [iconData]="iconCache.getIcon(icons.Check)" (click)="filterOnPrice()"></co-icon>
2547
- </div>
2451
+ <co-filter-item [placeholder]="'LENGTH' | localize"
2452
+ [expanded]="true"
2453
+ [mode]="modes.Slider"
2454
+ [sliderDefaultMin]="0"
2455
+ [sliderDefaultMax]="5000"
2456
+ [(model)]="catalogSearchService.searchRequest.length"
2457
+ >
2458
+ </co-filter-item>
2548
2459
  </div>
2549
2460
  <div class="filter-item-wrapper">
2550
- <label class="temp">Width</label>
2551
- <div class="price-inputs">
2552
- <co-input-text
2553
- class="price-from"
2554
- [type]="'number'"
2555
- [digitsOnly]="true"
2556
- [hideArrowButtons]="true"
2557
- [excludePlusMinus]="true"
2558
- [label]="'FROM' | localize"
2559
- [(model)]="filterService.widthMinFilter"
2560
- (modelChange)="updateWidthFilter()"
2561
- customWidth
2562
- ></co-input-text>
2563
- <co-input-text
2564
- class="price-to"
2565
- [type]="'number'"
2566
- [digitsOnly]="true"
2567
- [hideArrowButtons]="true"
2568
- [excludePlusMinus]="true"
2569
- [label]="'TO' | localize"
2570
- [(model)]="filterService.widthMaxFilter"
2571
- (modelChange)="updateWidthFilter()"
2572
- customWidth
2573
- ></co-input-text>
2574
- <co-icon [iconData]="iconCache.getIcon(icons.Check)" (click)="filterOnPrice()"></co-icon>
2575
- </div>
2461
+ <co-filter-item [placeholder]="'WIDTH' | localize"
2462
+ [expanded]="true"
2463
+ [mode]="modes.Slider"
2464
+ [sliderDefaultMin]="0"
2465
+ [sliderDefaultMax]="5000"
2466
+ [(model)]="catalogSearchService.searchRequest.width"
2467
+ >
2468
+ </co-filter-item>
2576
2469
  </div>
2577
2470
  <div class="filter-item-wrapper">
2578
- <label class="temp">Height</label>
2579
- <div class="price-inputs">
2580
- <co-input-text
2581
- class="price-from"
2582
- [type]="'number'"
2583
- [digitsOnly]="true"
2584
- [hideArrowButtons]="true"
2585
- [excludePlusMinus]="true"
2586
- [label]="'FROM' | localize"
2587
- [(model)]="filterService.heightMinFilter"
2588
- (modelChange)="updateHeightFilter()"
2589
- customWidth
2590
- ></co-input-text>
2591
- <co-input-text
2592
- class="price-to"
2593
- [type]="'number'"
2594
- [digitsOnly]="true"
2595
- [hideArrowButtons]="true"
2596
- [excludePlusMinus]="true"
2597
- [label]="'TO' | localize"
2598
- [(model)]="filterService.heightMaxFilter"
2599
- (modelChange)="updateHeightFilter()"
2600
- customWidth
2601
- ></co-input-text>
2602
- <co-icon [iconData]="iconCache.getIcon(icons.Check)" (click)="filterOnPrice()"></co-icon>
2603
- </div>
2471
+ <co-filter-item [placeholder]="'HEIGHT' | localize"
2472
+ [expanded]="true"
2473
+ [mode]="modes.Slider"
2474
+ [sliderDefaultMin]="0"
2475
+ [sliderDefaultMax]="5000"
2476
+ [(model)]="catalogSearchService.searchRequest.height"
2477
+ >
2478
+ </co-filter-item>
2604
2479
  </div>
2605
2480
  <div class="filter-item-wrapper">
2606
- <label class="temp">Width</label>
2607
- <div class="price-inputs">
2608
- <co-input-text
2609
- class="price-from"
2610
- [type]="'number'"
2611
- [digitsOnly]="true"
2612
- [hideArrowButtons]="true"
2613
- [excludePlusMinus]="true"
2614
- [label]="'FROM' | localize"
2615
- [(model)]="filterService.depthMinFilter"
2616
- (modelChange)="updateDepthFilter()"
2617
- customWidth
2618
- ></co-input-text>
2619
- <co-input-text
2620
- class="price-to"
2621
- [type]="'number'"
2622
- [digitsOnly]="true"
2623
- [hideArrowButtons]="true"
2624
- [excludePlusMinus]="true"
2625
- [label]="'TO' | localize"
2626
- [(model)]="filterService.depthMaxFilter"
2627
- (modelChange)="updateDepthFilter()"
2628
- customWidth
2629
- ></co-input-text>
2630
- <co-icon [iconData]="iconCache.getIcon(icons.Check)" (click)="filterOnPrice()"></co-icon>
2631
- </div>
2481
+ <co-filter-item [placeholder]="'DEPTH' | localize"
2482
+ [expanded]="true"
2483
+ [mode]="modes.Slider"
2484
+ [sliderDefaultMin]="0"
2485
+ [sliderDefaultMax]="5000"
2486
+ [(model)]="catalogSearchService.searchRequest.depth"
2487
+ >
2488
+ </co-filter-item>
2632
2489
  </div>
2633
2490
  <div class="filter-item-wrapper">
2634
2491
  <co-filter-item [placeholder]="'RETAIL_FORMULA' | localize"
2635
2492
  [expanded]="true"
2636
2493
  [collection]="storeGroupCollection"
2637
- (collectionChange)="handleSeparateCollectionChange('rangeStoreGroup', $event)"
2494
+ [(model)]="catalogSearchService.searchRequest.rangeStoreGroup"
2638
2495
  >
2639
2496
  </co-filter-item>
2640
2497
  </div>
@@ -2642,7 +2499,7 @@ CatalogFilterContentGeneralComponent.decorators = [
2642
2499
  <co-filter-item [placeholder]="'IN_OUT_COLLECTION' | localize"
2643
2500
  [expanded]="true"
2644
2501
  [collection]="inOutCollectionCollection"
2645
- (collectionChange)="handleSeparateCollectionChange('collection', $event)"
2502
+ [(model)]="catalogSearchService.searchRequest.collection"
2646
2503
  >
2647
2504
  </co-filter-item>
2648
2505
  </div>
@@ -2650,7 +2507,8 @@ CatalogFilterContentGeneralComponent.decorators = [
2650
2507
  <co-filter-item [placeholder]="'ARTICLE_TYPE' | localize"
2651
2508
  [expanded]="true"
2652
2509
  [collection]="articleTypeCollection"
2653
- (collectionChange)="handleArticleTypeChange('rangeStoreGroup', $event)"
2510
+ [mode]="modes.SelectListWithStringCollectionOutput"
2511
+ [(model)]="catalogSearchService.searchRequest.articleKindList"
2654
2512
  >
2655
2513
  </co-filter-item>
2656
2514
  </div>
@@ -2658,7 +2516,8 @@ CatalogFilterContentGeneralComponent.decorators = [
2658
2516
  <co-filter-item [placeholder]="'PUBLISH_VIA' | localize"
2659
2517
  [expanded]="true"
2660
2518
  [collection]="artPublicationCollection"
2661
- (collectionChange)="handleNumberListChange('publicationCode', $event)"
2519
+ [(model)]="catalogSearchService.searchRequest.publicationCode"
2520
+ [mode]="modes.SelectListWithNumberOutput"
2662
2521
  >
2663
2522
  </co-filter-item>
2664
2523
  </div>
@@ -2666,25 +2525,26 @@ CatalogFilterContentGeneralComponent.decorators = [
2666
2525
  <co-filter-item [placeholder]="'SELL_VIA' | localize"
2667
2526
  [expanded]="true"
2668
2527
  [collection]="artPublicationSalesCollection"
2669
- (collectionChange)="handleNumberListChange('publicationWebshopSales', $event)"
2528
+ [(model)]="catalogSearchService.searchRequest.publicationWebshopSales"
2529
+ [mode]="modes.SelectListWithNumberOutput"
2670
2530
  >
2671
2531
  </co-filter-item>
2672
2532
  </div>
2673
2533
  <div class="filter-item-wrapper">
2674
2534
  <co-filter-item [placeholder]="'PRICELIST_SALES' | localize"
2675
2535
  [expanded]="true"
2536
+ [(model)]="catalogSearchService.searchRequest.pricelistRetail"
2676
2537
  [mode]="modes.SingleSelectList"
2677
2538
  [collection]="priceListsSalesCollection"
2678
- (collectionChange)="handleSingleSelectChange('pricelistRetail', $event)"
2679
2539
  >
2680
2540
  </co-filter-item>
2681
2541
  </div>
2682
2542
  <div class="filter-item-wrapper">
2683
2543
  <co-filter-item [placeholder]="'CATEGORY' | localize"
2684
2544
  [expanded]="true"
2545
+ [(model)]="catalogSearchService.searchRequest.category"
2685
2546
  [mode]="modes.SingleSelectList"
2686
2547
  [collection]="categoryCollection"
2687
- (collectionChange)="handleSingleSelectChange('category', $event)"
2688
2548
  >
2689
2549
  </co-filter-item>
2690
2550
  </div>
@@ -2692,13 +2552,13 @@ CatalogFilterContentGeneralComponent.decorators = [
2692
2552
  <co-filter-item
2693
2553
  [placeholder]="filter.filterName"
2694
2554
  [collection]="filter.filterItems"
2555
+ [(model)]="catalogSearchService.searchRequest[filterService.getFilterItemMap(filter.filterName)]"
2695
2556
  [showLessLabel]="'Bekijk minder...'"
2696
2557
  [showMoreLabel]="'Bekijk meer...'"
2697
2558
  [searchPlaceholder]="'Zoeken...'"
2698
2559
  [expanded]=true
2699
- [initialLimit]=5
2700
- (collectionChange)="handleCollectionChange(filter.filterName, $event)"
2701
- ></co-filter-item>
2560
+ [initialLimit]=5
2561
+ ></co-filter-item> <!--(collectionChange)="handleCollectionChange(filter.filterName, $event)"-->
2702
2562
  </div>
2703
2563
  </div>
2704
2564
  </div>
@@ -2745,8 +2605,8 @@ class CatalogFilterContentPurchaseComponent {
2745
2605
  this.filterService = filterService;
2746
2606
  this._catalogConnectorService = _catalogConnectorService;
2747
2607
  this._adapterService = _adapterService;
2748
- this.modes = FilterItemMode;
2749
2608
  this.icons = IconEnum;
2609
+ this.modes = FilterItemMode$1;
2750
2610
  this._subs = [];
2751
2611
  }
2752
2612
  showClass() {
@@ -2784,12 +2644,6 @@ class CatalogFilterContentPurchaseComponent {
2784
2644
  this.priceListsPurchCollection = this.filterService.createFilterSelectionsCollection(tempPriceListsPurchCollection, "code", "description");
2785
2645
  });
2786
2646
  }
2787
- handleSeparateCollectionChange(filterName, collection) {
2788
- this.catalogSearchService.searchRequest[filterName] = this.catalogSearchService.createFilterString(collection, filterName);
2789
- }
2790
- handleSingleSelectChange(filterName, collection) {
2791
- this.catalogSearchService.searchRequest[filterName] = this.catalogSearchService.createSingleSelectString(collection);
2792
- }
2793
2647
  }
2794
2648
  CatalogFilterContentPurchaseComponent.decorators = [
2795
2649
  { type: Component, args: [{
@@ -2803,30 +2657,26 @@ CatalogFilterContentPurchaseComponent.decorators = [
2803
2657
  <co-filter-item [placeholder]="'SUPPLIER' | localize"
2804
2658
  [expanded]="true"
2805
2659
  [collection]="suppliers"
2806
- (collectionChange)="handleSeparateCollectionChange('rangeSupplierNr', $event)"
2660
+ [(model)]="catalogSearchService.searchRequest.rangeSupplierNr"
2807
2661
  >
2808
2662
  </co-filter-item>
2809
- </div>
2663
+ </div>
2810
2664
  <co-filter-item [placeholder]="'ARTICLE_NR_SUPPLIER' | localize"
2811
2665
  [expanded]="true"
2812
- [customContent]="true"
2813
- >
2814
- <co-input-text [placeholder]="'ARTICLE_NR_SUPPLIER' | localize" [(model)]="catalogSearchService.searchRequest.artNrSupplier"
2815
- noValidation></co-input-text>
2666
+ [mode]="modes.TextField"
2667
+ [(model)]="catalogSearchService.searchRequest.artNrSupplier">
2816
2668
  </co-filter-item>
2817
2669
  <co-filter-item [placeholder]="'REFERENCE' | localize"
2818
2670
  [expanded]="true"
2819
- [customContent]="true"
2820
- >
2821
- <co-input-text [placeholder]="'REFERENCE' | localize" [(model)]="catalogSearchService.searchRequest.simpleReference"
2822
- noValidation></co-input-text>
2823
- </co-filter-item>
2671
+ [mode]="modes.TextField"
2672
+ [(model)]="catalogSearchService.searchRequest.simpleReference">
2673
+ </co-filter-item>
2824
2674
  <div class="filter-item-wrapper">
2825
2675
  <co-filter-item [placeholder]="'PRICELIST_PURCHASE' | localize"
2826
2676
  [expanded]="true"
2827
2677
  [collection]="priceListsPurchCollection"
2828
2678
  [mode]="modes.SingleSelectList"
2829
- (collectionChange)="handleSingleSelectChange('pricelistPurchase', $event)"
2679
+ [(model)]="catalogSearchService.searchRequest.pricelistPurchase"
2830
2680
  >
2831
2681
  </co-filter-item>
2832
2682
  </div>
@@ -2845,8 +2695,7 @@ CatalogFilterContentPurchaseComponent.ctorParameters = () => [
2845
2695
  { type: CatalogConnectorAdapterService }
2846
2696
  ];
2847
2697
  CatalogFilterContentPurchaseComponent.propDecorators = {
2848
- showClass: [{ type: HostBinding, args: ['class.co-catalog-filter',] }],
2849
- priceSlider: [{ type: ViewChild, args: [SliderComponent, { static: true },] }]
2698
+ showClass: [{ type: HostBinding, args: ['class.co-catalog-filter',] }]
2850
2699
  };
2851
2700
 
2852
2701
  class CatalogFilterContentPurchaseModule {
@@ -2874,6 +2723,7 @@ class CatalogFilterContentLogisticsComponent {
2874
2723
  constructor(catalogSearchService, iconCache) {
2875
2724
  this.catalogSearchService = catalogSearchService;
2876
2725
  this.iconCache = iconCache;
2726
+ this.modes = FilterItemMode$1;
2877
2727
  this.icons = IconEnum;
2878
2728
  }
2879
2729
  showClass() {
@@ -2882,7 +2732,7 @@ class CatalogFilterContentLogisticsComponent {
2882
2732
  ngOnInit() {
2883
2733
  }
2884
2734
  handleAllChanged(value) {
2885
- this.catalogSearchService.searchRequest["doSync"] = value ? 'J' : 'N';
2735
+ this.catalogSearchService.searchRequest["doSync"] = value ? "J" : "N";
2886
2736
  this.catalogSearchService.searchRequest["showRegularArticles"] = value;
2887
2737
  this.catalogSearchService.searchRequest["showConfiguredArticles"] = value;
2888
2738
  this.catalogSearchService.searchRequest["showConfigurableArticles"] = value;
@@ -2890,19 +2740,6 @@ class CatalogFilterContentLogisticsComponent {
2890
2740
  this.catalogSearchService.searchRequest["showCustomizedArticles"] = value;
2891
2741
  this.catalogSearchService.searchRequest["showInactiveArticles"] = value;
2892
2742
  }
2893
- handleCheckboxValueChangeForString(value, modelName) {
2894
- this.catalogSearchService.searchRequest[modelName] = this._getFilterRequestForBooleanToString(value);
2895
- }
2896
- _getFilterRequestForBooleanToString(value) {
2897
- let filterRequest = '';
2898
- if (value) {
2899
- filterRequest = "?='J'";
2900
- }
2901
- else {
2902
- filterRequest = "?='N'";
2903
- }
2904
- return filterRequest;
2905
- }
2906
2743
  }
2907
2744
  CatalogFilterContentLogisticsComponent.decorators = [
2908
2745
  { type: Component, args: [{
@@ -2916,30 +2753,22 @@ CatalogFilterContentLogisticsComponent.decorators = [
2916
2753
  <div class="filter-item-wrapper">
2917
2754
  <co-filter-item [placeholder]="'SERIALNUMBER' | localize"
2918
2755
  [expanded]="true"
2919
- [customContent]="true"
2920
- >
2921
- <co-input-text [placeholder]="'SERIALNUMBER' | localize" [(model)]="catalogSearchService.searchRequest.serialNumber"
2922
- noValidation></co-input-text>
2923
- </co-filter-item>
2756
+ [mode]="modes.TextField"
2757
+ [(model)]="catalogSearchService.searchRequest.serialNumber">
2758
+ </co-filter-item>
2924
2759
  </div>
2925
2760
  <div class="filter-item-wrapper">
2926
2761
  <co-filter-item [placeholder]="'BATCH_NUMBER' | localize"
2927
2762
  [expanded]="true"
2928
- [customContent]="true"
2929
- >
2930
- <co-input-text [placeholder]="'BATCH_NUMBER' | localize" [(model)]="catalogSearchService.searchRequest.batchNumber"
2931
- noValidation></co-input-text>
2763
+ [mode]="modes.TextField"
2764
+ [(model)]="catalogSearchService.searchRequest.batchNumber">
2932
2765
  </co-filter-item>
2933
- </div>
2934
- <div class="filter-item-wrapper">
2766
+ </div>
2767
+ <div class="filter-item-wrapper">
2935
2768
  <co-filter-item [placeholder]="'MUTATION_DATE' | localize"
2936
2769
  [expanded]="true"
2937
- [customContent]="true"
2938
- >
2939
- <co-input-date
2940
- [(model)]="catalogSearchService.searchRequest.dateModified"
2941
- (modelChange)="catalogSearchService.searchArticles()"
2942
- ></co-input-date>
2770
+ [mode]="modes.DateField"
2771
+ [(model)]="catalogSearchService.searchRequest.dateModified">
2943
2772
  </co-filter-item>
2944
2773
  </div>
2945
2774
 
@@ -2952,81 +2781,58 @@ CatalogFilterContentLogisticsComponent.decorators = [
2952
2781
  (modelChange)="this.handleAllChanged($event)"
2953
2782
  [label]="'ALL' | localize"></co-input-checkbox>
2954
2783
  </co-filter-item>
2955
- </div>
2784
+ </div>
2956
2785
  <div class="filter-item-wrapper">
2957
- <co-filter-item
2958
- [placeholder]="'AUTOMATICALLY_UPDATE'"
2959
- [expanded]="true"
2960
- [customContent]="true">
2961
- <co-input-checkbox
2962
- [model]="catalogSearchService.searchRequest.doSync === 'J'"
2963
- (modelChange)="this.handleCheckboxValueChangeForString($event, 'doSync')"
2964
- [label]="'AUTOMATICALLY_UPDATE' | localize"></co-input-checkbox>
2786
+ <co-filter-item [placeholder]="'AUTOMATICALLY_UPDATE'"
2787
+ [expanded]="true"
2788
+ [mode]="modes.CheckboxToText"
2789
+ [(model)]="catalogSearchService.searchRequest.doSync">
2965
2790
  </co-filter-item>
2966
2791
  </div>
2967
2792
  <div class="filter-item-wrapper">
2968
- <co-filter-item
2969
- [placeholder]="'SHOW_REGULAR_ARTICLES'"
2970
- [expanded]="true"
2971
- [customContent]="true">
2972
- <co-input-checkbox
2973
- [(model)]="catalogSearchService.searchRequest.showRegularArticles"
2974
- [label]="'SHOW_REGULAR_ARTICLES' | localize"></co-input-checkbox>
2793
+ <co-filter-item [placeholder]="'SHOW_REGULAR_ARTICLES'"
2794
+ [expanded]="true"
2795
+ [mode]="modes.Checkbox"
2796
+ [(model)]="catalogSearchService.searchRequest.showRegularArticles">
2975
2797
  </co-filter-item>
2976
2798
  </div>
2977
2799
  <div class="filter-item-wrapper">
2978
- <co-filter-item
2979
- [placeholder]="'SHOW_CONFIGURED_ARTICLES'"
2980
- [expanded]="true"
2981
- [customContent]="true">
2982
- <co-input-checkbox
2983
- [(model)]="catalogSearchService.searchRequest.showConfiguredArticles"
2984
- [label]="'SHOW_CONFIGURED_ARTICLES' | localize"></co-input-checkbox>
2800
+ <co-filter-item [placeholder]="'SHOW_CONFIGURED_ARTICLES'"
2801
+ [expanded]="true"
2802
+ [mode]="modes.Checkbox"
2803
+ [(model)]="catalogSearchService.searchRequest.showConfiguredArticles">
2985
2804
  </co-filter-item>
2986
2805
  </div>
2987
2806
  <div class="filter-item-wrapper">
2988
- <co-filter-item
2989
- [placeholder]="'BASE_ARTICLES'"
2990
- [expanded]="true"
2991
- [customContent]="true">
2992
- <co-input-checkbox
2993
- [(model)]="catalogSearchService.searchRequest.showConfigurableArticles"
2994
- [label]="'BASE_ARTICLES' | localize"></co-input-checkbox>
2807
+ <co-filter-item [placeholder]="'BASE_ARTICLES'"
2808
+ [expanded]="true"
2809
+ [mode]="modes.Checkbox"
2810
+ [(model)]="catalogSearchService.searchRequest.showConfigurableArticles">
2995
2811
  </co-filter-item>
2996
2812
  </div>
2997
2813
  <div class="filter-item-wrapper">
2998
- <co-filter-item
2999
- [placeholder]="'COMPOSITION_ARTICLES'"
3000
- [expanded]="true"
3001
- [customContent]="true">
3002
- <co-input-checkbox
3003
- [(model)]="catalogSearchService.searchRequest.showCompositionArticles"
3004
- [label]="'COMPOSITION_ARTICLES' | localize"></co-input-checkbox>
2814
+ <co-filter-item [placeholder]="'COMPOSITION_ARTICLES'"
2815
+ [expanded]="true"
2816
+ [mode]="modes.Checkbox"
2817
+ [(model)]="catalogSearchService.searchRequest.showCompositionArticles">
3005
2818
  </co-filter-item>
3006
2819
  </div>
3007
2820
  <div class="filter-item-wrapper">
3008
- <co-filter-item
3009
- [placeholder]="'SHOW_CUSTOMIZED_ARTICLES'"
3010
- [expanded]="true"
3011
- [customContent]="true">
3012
- <co-input-checkbox
3013
- [(model)]="catalogSearchService.searchRequest.showCustomizedArticles"
3014
- [label]="'SHOW_CUSTOMIZED_ARTICLES' | localize"></co-input-checkbox>
2821
+ <co-filter-item [placeholder]="'SHOW_CUSTOMIZED_ARTICLES'"
2822
+ [expanded]="true"
2823
+ [mode]="modes.Checkbox"
2824
+ [(model)]="catalogSearchService.searchRequest.showCustomizedArticles">
3015
2825
  </co-filter-item>
3016
2826
  </div>
3017
2827
  <div class="filter-item-wrapper">
3018
- <co-filter-item
3019
- [placeholder]="'SHOW_INACTIVE_ARTICLES'"
3020
- [expanded]="true"
3021
- [customContent]="true">
3022
- <co-input-checkbox
3023
- [(model)]="catalogSearchService.searchRequest.showInactiveArticles"
3024
- [label]="'SHOW_INACTIVE_ARTICLES' | localize"></co-input-checkbox>
2828
+ <co-filter-item [placeholder]="'SHOW_INACTIVE_ARTICLES'"
2829
+ [expanded]="true"
2830
+ [mode]="modes.Checkbox"
2831
+ [(model)]="catalogSearchService.searchRequest.showInactiveArticles">
3025
2832
  </co-filter-item>
3026
2833
  </div>
3027
2834
  </div>
3028
- </div>
3029
-
2835
+ </div>
3030
2836
  </div>
3031
2837
  `
3032
2838
  },] }
@@ -3078,7 +2884,12 @@ CatalogFilterModule.decorators = [
3078
2884
  CatalogFilterContentGeneralModule,
3079
2885
  CatalogFilterContentPurchaseModule,
3080
2886
  CatalogFilterContentLogisticsModule,
3081
- PipeModule
2887
+ PipeModule,
2888
+ ButtonModule,
2889
+ CoDialogModule,
2890
+ ListOfValuesModule,
2891
+ CheckboxSelectModule,
2892
+ CheckmarkOverlayModule
3082
2893
  ],
3083
2894
  declarations: [
3084
2895
  CatalogFilterComponent
@@ -3617,15 +3428,11 @@ class CatalogSearchComponent {
3617
3428
  handleResetButtonClick(event) {
3618
3429
  this._catalogSearchService.resetFilters();
3619
3430
  }
3620
- handleGetTransactionClick() {
3621
- this._catalogService.getWebTransaction();
3622
- }
3623
3431
  }
3624
3432
  CatalogSearchComponent.decorators = [
3625
3433
  { type: Component, args: [{
3626
3434
  selector: 'co-catalog-search',
3627
3435
  template: `
3628
- <button (click)="handleGetTransactionClick()">get transaction</button>
3629
3436
  <div class="catalog-search-wrapper">
3630
3437
  <ng-container *ngIf="showFilter">
3631
3438
  <div class="filter-content" @showHideFilter>