Merge freight/develop into Warehouses

apps/edr-freight-api/src/app.module.ts

@@ -8,17 +8,19 @@ import { SharedAuthModule } from "@tria-plc/api-common/modules/auth/shared-auth.
 
 import appConfig from "./config/app.config";
 import databaseConfig from "./config/database.config";
+import telebirrConfig from "./config/telebirr.config";
 
 import { BookingsModule } from "./modules/bookings/bookings.module";
 import { FilesModule } from "./modules/files/files.module";
 import { ConsignmentsModule } from "./modules/consignments/consignments.module";
 
-//import { TrainsModule } from "./modules/trains/trains.module";
+// import { TrainsModule } from "./modules/trains/trains.module";
 import { LocomotivesModule } from "./modules/locomotives/locomotives.module";
 import { WagonTypesModule } from "./modules/wagon-types/wagon-types.module";
 import { TrainSetsModule } from "./modules/train-sets/train-sets.module";
 import { TrainSchedulesModule } from "./modules/train-schedules/train-schedules.module";
 import { TrainSchedulingModule } from "./modules/train-scheduling/train-scheduling.module";
+import { SchedulingRescheduleModule } from "./modules/scheduling-reschedule/scheduling-reschedule.module";
 import { CustomersModule } from "./modules/customers/customers.module";
 import { CompaniesModule } from "./modules/companies/companies.module";
 import { TrackingModule } from "./modules/tracking/tracking.module";
@@ -48,14 +50,19 @@ import { WagonsModule } from './modules/wagons/wagons.module';
 import { ContainersModule } from './modules/container-management/containers.module';
 import { CargoesModule } from './modules/cargoes/cargoes.module';
 import { RoutesModule } from './modules/routes/routes.module';
+<<<<<<< HEAD
 import { WarehousesModule } from './modules/warehouses/warehouses.module';
+=======
+import { OverviewModule } from './modules/overview/overview.module';
+>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
 
 @Module({
   imports: [
     ConfigModule.forRoot({
       isGlobal: true,
-      load: [appConfig, databaseConfig],
+      load: [appConfig, databaseConfig, telebirrConfig],
     }),
+    // EventEmitterModule.forRoot(),
     TypeOrmModule.forRootAsync({
       inject: [ConfigService],
       useFactory: (config: ConfigService): TypeOrmModuleOptions =>
@@ -82,6 +89,7 @@ import { WarehousesModule } from './modules/warehouses/warehouses.module';
     TrainSetsModule,
     TrainSchedulesModule,
     TrainSchedulingModule,
+    SchedulingRescheduleModule,
     CustomersModule,
     CompaniesModule,
     TrackingModule,
@@ -101,7 +109,11 @@ import { WarehousesModule } from './modules/warehouses/warehouses.module';
     ContainersModule,
     CargoesModule,
     RoutesModule,
+<<<<<<< HEAD
     WarehousesModule,
+=======
+    OverviewModule,
+>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
   ],
   providers: [EdrOrgSeeder, DemoUsersSeeder,FreightStaffUsersSeeder, DemoBookingsSeeder, PricingDataSeeder, FileUploadSettingsSeeder],
 })