-
+
{{ obj[name] | agoDate: hideAgo() }}
|
diff --git a/src/app/common/table/columns/ago-date/ago-date-column.component.ts b/src/app/common/table/columns/ago-date/ago-date-column.component.ts
index f8c7cdc9..712aac45 100644
--- a/src/app/common/table/columns/ago-date/ago-date-column.component.ts
+++ b/src/app/common/table/columns/ago-date/ago-date-column.component.ts
@@ -2,10 +2,9 @@ import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { Component, booleanAttribute, input } from '@angular/core';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
-import { AgoDatePipe } from '../../../pipes/ago-date.pipe';
-import { UtcDatePipe } from '../../../pipes/utc-date-pipe/utc-date.pipe';
+import { AgoDatePipe, UtcDatePipe } from '../../../pipes';
import { AsySortHeaderComponent } from '../../sort/asy-sort-header/asy-sort-header.component';
import { DateColumnComponent } from '../date/date-column.component';
@@ -18,7 +17,7 @@ import { DateColumnComponent } from '../date/date-column.component';
UtcDatePipe,
AsySortHeaderComponent,
AgoDatePipe,
- TooltipModule
+ NgbTooltip
],
templateUrl: './ago-date-column.component.html',
styleUrls: ['./ago-date-column.component.scss']
diff --git a/src/app/common/table/filter/asy-header-date-filter/asy-header-date-filter.component.html b/src/app/common/table/filter/asy-header-date-filter/asy-header-date-filter.component.html
index de9c2bff..c3755150 100644
--- a/src/app/common/table/filter/asy-header-date-filter/asy-header-date-filter.component.html
+++ b/src/app/common/table/filter/asy-header-date-filter/asy-header-date-filter.component.html
@@ -8,15 +8,15 @@
+
-
diff --git a/src/app/common/table/filter/asy-header-date-filter/asy-header-date-filter.component.scss b/src/app/common/table/filter/asy-header-date-filter/asy-header-date-filter.component.scss
index 118434c5..348ec692 100644
--- a/src/app/common/table/filter/asy-header-date-filter/asy-header-date-filter.component.scss
+++ b/src/app/common/table/filter/asy-header-date-filter/asy-header-date-filter.component.scss
@@ -3,7 +3,7 @@
@import '../shared';
.dropdown-menu {
- width: 244px;
+ width: 325px;
> .form-check {
margin-left: $spacer * .5;
diff --git a/src/app/common/table/filter/asy-header-date-filter/asy-header-date-filter.component.ts b/src/app/common/table/filter/asy-header-date-filter/asy-header-date-filter.component.ts
index ef9f079b..1412a983 100644
--- a/src/app/common/table/filter/asy-header-date-filter/asy-header-date-filter.component.ts
+++ b/src/app/common/table/filter/asy-header-date-filter/asy-header-date-filter.component.ts
@@ -4,11 +4,11 @@ import { TitleCasePipe } from '@angular/common';
import { ChangeDetectionStrategy, Component, Inject, Optional, signal } from '@angular/core';
import { FormsModule } from '@angular/forms';
+import { NgbInputDatepicker, NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import { NgSelectModule } from '@ng-select/ng-select';
import { DateTime } from 'luxon';
-import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
+import { DatepickerRangePopupComponent } from '../../../datepicker';
import {
AsyAbstractHeaderFilterComponent,
AsyFilterHeaderColumnDef
@@ -23,13 +23,14 @@ import {
imports: [
FormsModule,
NgSelectModule,
- BsDatepickerModule,
TitleCasePipe,
- TooltipModule,
CdkOverlayOrigin,
CdkConnectedOverlay,
A11yModule,
- OverlayModule
+ OverlayModule,
+ NgbTooltip,
+ NgbInputDatepicker,
+ DatepickerRangePopupComponent
]
})
export class AsyHeaderDateFilterComponent extends AsyAbstractHeaderFilterComponent {
@@ -131,4 +132,8 @@ export class AsyHeaderDateFilterComponent extends AsyAbstractHeaderFilterCompone
return { ...($gte.isValid && $lte.isValid && { [this.id]: { $gte, $lte } }) };
}
+
+ test(input: unknown) {
+ console.log(input);
+ }
}
diff --git a/src/app/common/table/filter/asy-header-list-filter/asy-header-list-filter.component.html b/src/app/common/table/filter/asy-header-list-filter/asy-header-list-filter.component.html
index 241ec43e..1977bf34 100644
--- a/src/app/common/table/filter/asy-header-list-filter/asy-header-list-filter.component.html
+++ b/src/app/common/table/filter/asy-header-list-filter/asy-header-list-filter.component.html
@@ -8,15 +8,15 @@
diff --git a/src/app/common/table/filter/asy-header-list-filter/asy-header-list-filter.component.ts b/src/app/common/table/filter/asy-header-list-filter/asy-header-list-filter.component.ts
index 8cdddc88..fc8d4ba8 100644
--- a/src/app/common/table/filter/asy-header-list-filter/asy-header-list-filter.component.ts
+++ b/src/app/common/table/filter/asy-header-list-filter/asy-header-list-filter.component.ts
@@ -17,7 +17,7 @@ import {
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormsModule } from '@angular/forms';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import { Observable } from 'rxjs';
import { first } from 'rxjs/operators';
@@ -49,11 +49,11 @@ export type ListFilterOption = {
SearchInputComponent,
FormsModule,
TitleCasePipe,
- TooltipModule,
CdkOverlayOrigin,
CdkConnectedOverlay,
A11yModule,
- OverlayModule
+ OverlayModule,
+ NgbTooltip
],
providers: [TitleCasePipe]
})
diff --git a/src/app/common/table/filter/asy-header-text-filter/asy-header-text-filter.component.html b/src/app/common/table/filter/asy-header-text-filter/asy-header-text-filter.component.html
index 4fa3f44a..eb1e0a35 100644
--- a/src/app/common/table/filter/asy-header-text-filter/asy-header-text-filter.component.html
+++ b/src/app/common/table/filter/asy-header-text-filter/asy-header-text-filter.component.html
@@ -8,15 +8,15 @@
diff --git a/src/app/common/table/filter/asy-header-text-filter/asy-header-text-filter.component.ts b/src/app/common/table/filter/asy-header-text-filter/asy-header-text-filter.component.ts
index aa5469d3..dc02ee1b 100644
--- a/src/app/common/table/filter/asy-header-text-filter/asy-header-text-filter.component.ts
+++ b/src/app/common/table/filter/asy-header-text-filter/asy-header-text-filter.component.ts
@@ -4,9 +4,9 @@ import { NgClass } from '@angular/common';
import { ChangeDetectionStrategy, Component, Inject, Optional, signal } from '@angular/core';
import { FormsModule } from '@angular/forms';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import { NgSelectModule } from '@ng-select/ng-select';
import escapeRegExp from 'lodash/escapeRegExp';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { SearchInputComponent } from '../../../search-input/search-input.component';
import {
@@ -29,11 +29,11 @@ type BuildFilterFunction = (search: string, option: TextFilterOption) => any;
NgSelectModule,
FormsModule,
SearchInputComponent,
- TooltipModule,
A11yModule,
OverlayModule,
CdkConnectedOverlay,
- CdkOverlayOrigin
+ CdkOverlayOrigin,
+ NgbTooltip
]
})
export class AsyHeaderTextFilterComponent extends AsyAbstractHeaderFilterComponent {
diff --git a/src/app/common/table/filter/asy-header-typeahead-filter/asy-header-typeahead-filter.component.html b/src/app/common/table/filter/asy-header-typeahead-filter/asy-header-typeahead-filter.component.html
index a28064b6..377eb3e3 100644
--- a/src/app/common/table/filter/asy-header-typeahead-filter/asy-header-typeahead-filter.component.html
+++ b/src/app/common/table/filter/asy-header-typeahead-filter/asy-header-typeahead-filter.component.html
@@ -8,15 +8,15 @@
diff --git a/src/app/common/table/filter/asy-header-typeahead-filter/asy-header-typeahead-filter.component.ts b/src/app/common/table/filter/asy-header-typeahead-filter/asy-header-typeahead-filter.component.ts
index fe1fe613..a12c6cbf 100644
--- a/src/app/common/table/filter/asy-header-typeahead-filter/asy-header-typeahead-filter.component.ts
+++ b/src/app/common/table/filter/asy-header-typeahead-filter/asy-header-typeahead-filter.component.ts
@@ -5,8 +5,8 @@ import { Component, DestroyRef, Inject, OnInit, Optional, inject, signal } from
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormsModule } from '@angular/forms';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import { NgSelectModule } from '@ng-select/ng-select';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { Observable, Subject, concat, of } from 'rxjs';
import { debounceTime, distinctUntilChanged, switchMap, tap } from 'rxjs/operators';
@@ -28,11 +28,11 @@ type BuildFilterFunction = (selectedValue: any | null) => any;
NgSelectModule,
FormsModule,
AsyncPipe,
- TooltipModule,
CdkOverlayOrigin,
A11yModule,
OverlayModule,
- CdkConnectedOverlay
+ CdkConnectedOverlay,
+ NgbTooltip
]
})
export class AsyHeaderTypeaheadFilterComponent
diff --git a/src/app/common/table/sidebar/sidebar.component.html b/src/app/common/table/sidebar/sidebar.component.html
index 26e74c21..10204563 100644
--- a/src/app/common/table/sidebar/sidebar.component.html
+++ b/src/app/common/table/sidebar/sidebar.component.html
@@ -5,8 +5,8 @@
{{ headerText() }}
type="button"
aria-label="Close"
container="body"
+ ngbTooltip="Close"
placement="bottom"
- tooltip="Close"
(click)="open.set(false)"
>