@annalib/anna-core 4.2.1 → 4.2.2
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/esm2020/lib/anna-core-shared-lib/services/anna-filter.service.mjs +11 -7
- package/esm2020/lib/anna-generic-table-lib/components/anna-non-editable-generic-table/anna-non-editable-generic-table.component.mjs +8 -8
- package/fesm2015/annalib-anna-core.mjs +17 -13
- package/fesm2015/annalib-anna-core.mjs.map +1 -1
- package/fesm2020/annalib-anna-core.mjs +17 -13
- package/fesm2020/annalib-anna-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -1186,14 +1186,18 @@ class AnnaFilterService {
|
|
|
1186
1186
|
return val;
|
|
1187
1187
|
};
|
|
1188
1188
|
this.currencyTranslateFunction = (data) => {
|
|
1189
|
-
if (data >= 1000) {
|
|
1190
|
-
|
|
1191
|
-
|
|
1189
|
+
if (Math.abs(data) >= 1000) {
|
|
1190
|
+
let isNegVal = data < 0;
|
|
1191
|
+
const val = "$" + (Math.abs(data) / 1000).toFixed(1);
|
|
1192
|
+
+"k";
|
|
1193
|
+
return isNegVal ? "-" + val : val;
|
|
1192
1194
|
}
|
|
1193
|
-
else
|
|
1194
|
-
|
|
1195
|
+
else {
|
|
1196
|
+
let isNegVal = data < 0;
|
|
1197
|
+
let isWholeNum = parseInt(data.toString()) == data;
|
|
1198
|
+
let val = isWholeNum ? Math.abs(data).toString() : Math.abs(data).toFixed(1);
|
|
1199
|
+
return isNegVal ? "-$" + val : "$" + val;
|
|
1195
1200
|
}
|
|
1196
|
-
return "$" + data;
|
|
1197
1201
|
};
|
|
1198
1202
|
this.normalTranslateFunction = (data) => {
|
|
1199
1203
|
if (data >= 1000) {
|
|
@@ -1748,7 +1752,7 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
1748
1752
|
this.isNoDataToDisplaySubject$.next(false);
|
|
1749
1753
|
this.annaFilterService.initialValueMap = new Map();
|
|
1750
1754
|
}
|
|
1751
|
-
else if (changes["percentDone"] || changes["downloadInProgress"] || changes["starredInProgress"]) {
|
|
1755
|
+
else if (changes["percentDone"] || changes["downloadInProgress"] || (changes["starredInProgress"] && changes["starredInProgress"].currentValue != undefined)) {
|
|
1752
1756
|
console.log("do nothing");
|
|
1753
1757
|
}
|
|
1754
1758
|
else {
|
|
@@ -2315,7 +2319,7 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2315
2319
|
this.sliderEnteredMinValue = parseInt(val);
|
|
2316
2320
|
this.isMinTextBoxEmpty = false;
|
|
2317
2321
|
if (this.isMaxTextBoxEmpty) {
|
|
2318
|
-
if (this.sliderEnteredMinValue > this.options.ceil) {
|
|
2322
|
+
if ((this.sliderEnteredMinValue > this.options.ceil) || (this.sliderEnteredMinValue < this.options.floor)) {
|
|
2319
2323
|
this.showSliderMinValueError = true;
|
|
2320
2324
|
this.disableSliderApplyButton = true;
|
|
2321
2325
|
this.incorrectSliderInput = true;
|
|
@@ -2369,7 +2373,7 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2369
2373
|
this.sliderEnteredMaxValue = parseInt(val);
|
|
2370
2374
|
this.isMaxTextBoxEmpty = false;
|
|
2371
2375
|
if (this.isMinTextBoxEmpty) {
|
|
2372
|
-
if (this.sliderEnteredMaxValue < this.options.floor) {
|
|
2376
|
+
if ((this.sliderEnteredMaxValue < this.options.floor) || (this.sliderEnteredMaxValue > this.options.ceil)) {
|
|
2373
2377
|
this.showSliderMaxValueError = true;
|
|
2374
2378
|
this.disableSliderApplyButton = true;
|
|
2375
2379
|
this.incorrectSliderInput = true;
|
|
@@ -2779,7 +2783,10 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2779
2783
|
}
|
|
2780
2784
|
else {
|
|
2781
2785
|
values = this.tableData.map((u) => u[key]);
|
|
2782
|
-
if (uniq(values).filter(n => n != null).length > 1) {
|
|
2786
|
+
if (item.filter == "CHECKBOX" && uniq(values).filter(n => n != null).length > 1) {
|
|
2787
|
+
item.disableTooltipIcon = false;
|
|
2788
|
+
}
|
|
2789
|
+
else if (item.filter != "CHECKBOX" && uniq(values).filter(n => n != null && n != "-").length > 1) {
|
|
2783
2790
|
item.disableTooltipIcon = false;
|
|
2784
2791
|
}
|
|
2785
2792
|
}
|
|
@@ -3280,10 +3287,7 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
3280
3287
|
}
|
|
3281
3288
|
setInitialRowsForTable() {
|
|
3282
3289
|
this.resetIndex();
|
|
3283
|
-
console.log(this.start);
|
|
3284
|
-
console.log(this.end);
|
|
3285
3290
|
this.renderedData = this.getTableData(this.start, this.end);
|
|
3286
|
-
console.log(this.renderedData);
|
|
3287
3291
|
this.updateIndex();
|
|
3288
3292
|
}
|
|
3289
3293
|
spotDetailsDownloadClicked(parentChildOrTotalRow, rowdata) {
|