diff --git a/projects/common/src/fm/common.module.ts b/projects/common/src/fm/common.module.ts index acade3b..3884af7 100644 --- a/projects/common/src/fm/common.module.ts +++ b/projects/common/src/fm/common.module.ts @@ -1,26 +1,26 @@ // angular modules -import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector,Optional,SkipSelf } from '@angular/core'; +import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf } from '@angular/core'; import { CommonModule, DatePipe } from '@angular/common'; import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http'; import { FormsModule } from '@angular/forms'; // external modules -import { OAuthModule,AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc'; -import { StoreModule,Store } from '@ngrx/store'; +import { OAuthModule, AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc'; +import { StoreModule, Store } from '@ngrx/store'; import { EffectsModule } from '@ngrx/effects'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import {UploadxModule } from 'ngx-uploadx'; +import { UploadxModule } from 'ngx-uploadx'; // routing module import { AppCommonRoutingModule } from './common-routing.module'; -import { MODULE_NAME } from './module-name'; +import { MODULE_NAME } from './module-name'; //components import { SafePipe } from './shared/safe.pipe'; -import { AuthConfigFactory,IAuthconfigFactory} from './shared/authconfigFactory'; -import { AppComponent} from './components/app/app.component'; +import { AuthConfigFactory, IAuthconfigFactory } from './shared/authconfigFactory'; +import { AppComponent } from './components/app/app.component'; import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component'; import { SessionClearedComponent } from './components/session-cleared/session-cleared.component'; import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component'; @@ -29,15 +29,16 @@ import { NotImplementedComponent } from './components/not-implemented/not-implem import { SidePanelComponent } from './components/side-panel/side-panel.component'; import { TimespanComponent } from './components/timespan/timespan.component'; import { TagInputComponent } from './components/tag-input/tag-input.component'; -import {MenuBackgroundComponent} from './components/menu-background/menu-background.component'; -import {IEventMessage } from './models/event.message'; +import { MenuBackgroundComponent } from './components/menu-background/menu-background.component'; +import { IEventMessage } from './models/event.message'; import { IItem, Item } from './models/item'; -import {IItemType} from './models/item.type'; -import {IItemTypes} from './models/item.types'; -import {IItemTask,ItemTask} from './models/itemTask'; -import {IListItem} from './models/list.item'; -import {ITypeaheadItem} from './models/typeahead.item'; -import {IUser} from './models/user'; +import { IItemType } from './models/item.type'; +import { IItemTypes } from './models/item.types'; +import { IItemTask, ItemTask } from './models/itemTask'; +import { IListItem } from './models/list.item'; +import { ITypeaheadItem } from './models/typeahead.item'; +import { IUser } from './models/user'; +import { ICodeListItem } from './models/code.list.item'; import * as commonActions from './actions/app-common.actions'; import * as commonReducers from './reducers/app-common.reducer'; import * as commonEffects from './effects/app-common.effects'; @@ -64,6 +65,7 @@ export { IListItem, ITypeaheadItem, IUser, + ICodeListItem, commonActions, commonReducers, IAuthconfigFactory, @@ -77,7 +79,7 @@ export { CommonModule, HttpClientModule, AppCommonRoutingModule, - StoreModule.forFeature(MODULE_NAME, commonReducers.reducer ), + StoreModule.forFeature(MODULE_NAME, commonReducers.reducer), EffectsModule.forFeature([commonEffects.AppCommonEffects]), OAuthModule.forRoot(), NgbModule, @@ -102,7 +104,7 @@ export { UploadxModule, CommonModule, AppComponent, - ResumableFileUploadComponent, + ResumableFileUploadComponent, AuthCallbackComponent, SidePanelComponent, SafePipe, @@ -113,7 +115,7 @@ export { TagInputComponent, SessionClearedComponent, MenuBackgroundComponent - ] + ] }) export class AppCommonModule { } diff --git a/projects/common/src/fm/services/codelistitem.service.ts b/projects/common/src/fm/services/codelistitem.service.ts index d75320c..33040d1 100644 --- a/projects/common/src/fm/services/codelistitem.service.ts +++ b/projects/common/src/fm/services/codelistitem.service.ts @@ -15,12 +15,11 @@ export class CodeListItemService { return this.appConfig.getConfig("apiEndPoint"); } - getCodeListItems(codelist: string[], codegroup?: string, dataFilter?: any, onlyBetweenValidFromAndTo: boolean = true): Observable { + getCodeListItems(codelist: string[], codegroup?: string, dataFilter?: any): Observable { var params = new HttpParams(); params = params.append("cl", codelist.join(",")); if (codegroup) params = params.append("g", codegroup); - if (onlyBetweenValidFromAndTo) params = params.append("v", onlyBetweenValidFromAndTo); if (dataFilter) params = params.append("df", dataFilter); - return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/codelistitems/`, { params: params }); + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/codelistitems/`, { params: params }); } }