merge angular-17 into dev to upgrade from Angular v16 to v17
This commit is contained in:
@@ -36,7 +36,7 @@ import { EntityDatatableTabComponent } from './tabs/entity-datatable-tab/entity-
|
||||
import { DatatableSingleRowComponent } from './tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component';
|
||||
import { DatatableMultiRowComponent } from './tabs/entity-datatable-tab/datatable-multi-row/datatable-multi-row.component';
|
||||
import { SvgIconComponent } from './svg-icon/svg-icon.component';
|
||||
import { NgxMatDatetimePickerModule, NgxMatNativeDateModule } from '@angular-material-components/datetime-picker';
|
||||
// import { NgxMatDatetimePickerModule, NgxMatNativeDateModule } from '@angular-material-components/datetime-picker';
|
||||
import { ViewJournalEntryComponent } from './accounting/view-journal-entry/view-journal-entry.component';
|
||||
import { ViewJournalEntryTransactionComponent } from './accounting/view-journal-entry-transaction/view-journal-entry-transaction.component';
|
||||
import { AccountNumberComponent } from './account-number/account-number.component';
|
||||
@@ -51,6 +51,7 @@ import { LongTextComponent } from './long-text/long-text.component';
|
||||
import { DropdownComponent } from './dropdown/dropdown.component';
|
||||
import { InputAmountComponent } from './input-amount/input-amount.component';
|
||||
import { InputPasswordComponent } from './input-password/input-password.component';
|
||||
import { DatetimePickerStubComponent } from './datetime-picker-stub/datetime-picker-stub.component'; // import Datetime Picker Stub
|
||||
|
||||
/**
|
||||
* Shared Module
|
||||
@@ -65,9 +66,9 @@ import { InputPasswordComponent } from './input-password/input-password.componen
|
||||
ReactiveFormsModule,
|
||||
TranslateModule,
|
||||
PipesModule,
|
||||
DirectivesModule,
|
||||
NgxMatDatetimePickerModule,
|
||||
NgxMatNativeDateModule
|
||||
DirectivesModule
|
||||
// NgxMatDatetimePickerModule,
|
||||
// NgxMatNativeDateModule
|
||||
],
|
||||
declarations: [
|
||||
FormfieldComponent,
|
||||
@@ -108,7 +109,9 @@ import { InputPasswordComponent } from './input-password/input-password.componen
|
||||
LongTextComponent,
|
||||
DropdownComponent,
|
||||
InputAmountComponent,
|
||||
InputPasswordComponent
|
||||
InputPasswordComponent,
|
||||
DatetimePickerStubComponent // temporarily added stub for datetime picker
|
||||
|
||||
],
|
||||
exports: [
|
||||
FileUploadComponent,
|
||||
@@ -143,7 +146,9 @@ import { InputPasswordComponent } from './input-password/input-password.componen
|
||||
ThemeToggleComponent,
|
||||
LongTextComponent,
|
||||
DropdownComponent,
|
||||
InputAmountComponent
|
||||
InputAmountComponent,
|
||||
DatetimePickerStubComponent // Export stub for datetime picker
|
||||
|
||||
]
|
||||
})
|
||||
export class SharedModule {}
|
||||
|
||||
Reference in New Issue
Block a user