Remark Loan product attributes that uses default values from global configurations (#1783)
Co-authored-by: Jose Alberto Hernandez <alberto@blue-daemon.local>
This commit is contained in:
co-authored by
Jose Alberto Hernandez
parent
9f2c644877
commit
e1e3429b66
@@ -11,7 +11,6 @@ import { AuthenticationService } from './authentication/authentication.service';
|
||||
import { HttpService } from './http/http.service';
|
||||
import { HttpCacheService } from './http/http-cache.service';
|
||||
import { ProgressBarService } from './progress-bar/progress-bar.service';
|
||||
import { I18nService } from './i18n/i18n.service';
|
||||
|
||||
/** Custom Guards */
|
||||
import { AuthenticationGuard } from './authentication/authentication.guard';
|
||||
@@ -68,7 +67,6 @@ import { ContentComponent } from './shell/content/content.component';
|
||||
useClass: AuthenticationInterceptor,
|
||||
multi: true
|
||||
},
|
||||
I18nService,
|
||||
HttpCacheService,
|
||||
ApiPrefixInterceptor,
|
||||
ErrorHandlerInterceptor,
|
||||
|
||||
@@ -1,153 +0,0 @@
|
||||
// import { TestBed, inject } from '@angular/core/testing';
|
||||
|
||||
// import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
|
||||
// import { Subject } from 'rxjs';
|
||||
|
||||
// import { extract, I18nService } from './i18n.service';
|
||||
|
||||
// const defaultLanguage = 'en-US';
|
||||
// const supportedLanguages = ['eo', 'en-US', 'fr-FR'];
|
||||
|
||||
// class MockTranslateService {
|
||||
|
||||
// currentLang: string;
|
||||
// onLangChange = new Subject();
|
||||
|
||||
// use(language: string) {
|
||||
// this.currentLang = language;
|
||||
// this.onLangChange.next({
|
||||
// lang: this.currentLang,
|
||||
// translations: {}
|
||||
// });
|
||||
// }
|
||||
|
||||
// getBrowserCultureLang() {
|
||||
// return 'en-US';
|
||||
// }
|
||||
|
||||
// setTranslation(lang: string, translations: Object, shouldMerge?: boolean) { }
|
||||
|
||||
// }
|
||||
|
||||
// describe('I18nService', () => {
|
||||
// let i18nService: I18nService;
|
||||
// let translateService: TranslateService;
|
||||
// let onLangChangeSpy: jasmine.Spy;
|
||||
|
||||
// beforeEach(() => {
|
||||
// TestBed.configureTestingModule({
|
||||
// providers: [
|
||||
// I18nService,
|
||||
// { provide: TranslateService, useClass: MockTranslateService },
|
||||
// ]
|
||||
// });
|
||||
// });
|
||||
|
||||
// beforeEach(inject([
|
||||
// I18nService,
|
||||
// TranslateService
|
||||
// ], (_i18nService: I18nService,
|
||||
// _translateService: TranslateService) => {
|
||||
|
||||
// i18nService = _i18nService;
|
||||
// translateService = _translateService;
|
||||
|
||||
// // Create spies
|
||||
// onLangChangeSpy = jasmine.createSpy('onLangChangeSpy');
|
||||
// translateService.onLangChange
|
||||
// .subscribe((event: LangChangeEvent) => {
|
||||
// onLangChangeSpy(event.lang);
|
||||
// });
|
||||
// spyOn(translateService, 'use').and.callThrough();
|
||||
// }));
|
||||
|
||||
// afterEach(() => {
|
||||
// // Cleanup
|
||||
// localStorage.removeItem('language');
|
||||
// });
|
||||
|
||||
// describe('extract', () => {
|
||||
// it('should not modify string', () => {
|
||||
// expect(extract('Hello world !')).toEqual('Hello world !');
|
||||
// });
|
||||
// });
|
||||
|
||||
// describe('init', () => {
|
||||
// it('should init with default language', () => {
|
||||
// // Act
|
||||
// i18nService.init(defaultLanguage, supportedLanguages);
|
||||
|
||||
// // Assert
|
||||
// expect(translateService.use).toHaveBeenCalledWith(defaultLanguage);
|
||||
// expect(onLangChangeSpy).toHaveBeenCalledWith(defaultLanguage);
|
||||
// });
|
||||
|
||||
// it('should init with save language', () => {
|
||||
// // Arrange
|
||||
// const savedLanguage = 'eo';
|
||||
// localStorage.setItem('language', savedLanguage);
|
||||
|
||||
// // Act
|
||||
// i18nService.init(defaultLanguage, supportedLanguages);
|
||||
|
||||
// // Assert
|
||||
// expect(translateService.use).toHaveBeenCalledWith(savedLanguage);
|
||||
// expect(onLangChangeSpy).toHaveBeenCalledWith(savedLanguage);
|
||||
// });
|
||||
// });
|
||||
|
||||
// describe('set language', () => {
|
||||
// it('should change current language', () => {
|
||||
// // Arrange
|
||||
// const newLanguage = 'eo';
|
||||
// i18nService.init(defaultLanguage, supportedLanguages);
|
||||
|
||||
// // Act
|
||||
// i18nService.language = newLanguage;
|
||||
|
||||
// // Assert
|
||||
// expect(translateService.use).toHaveBeenCalledWith(newLanguage);
|
||||
// expect(onLangChangeSpy).toHaveBeenCalledWith(newLanguage);
|
||||
// });
|
||||
|
||||
// it('should change current language without a region match', () => {
|
||||
// // Arrange
|
||||
// const newLanguage = 'fr-CA';
|
||||
// i18nService.init(defaultLanguage, supportedLanguages);
|
||||
|
||||
// // Act
|
||||
// i18nService.language = newLanguage;
|
||||
|
||||
// // Assert
|
||||
// expect(translateService.use).toHaveBeenCalledWith('fr-FR');
|
||||
// expect(onLangChangeSpy).toHaveBeenCalledWith('fr-FR');
|
||||
// });
|
||||
|
||||
// it('should change current language to default if unsupported', () => {
|
||||
// // Arrange
|
||||
// const newLanguage = 'es';
|
||||
// i18nService.init(defaultLanguage, supportedLanguages);
|
||||
|
||||
// // Act
|
||||
// i18nService.language = newLanguage;
|
||||
|
||||
// // Assert
|
||||
// expect(translateService.use).toHaveBeenCalledWith(defaultLanguage);
|
||||
// expect(onLangChangeSpy).toHaveBeenCalledWith(defaultLanguage);
|
||||
// });
|
||||
// });
|
||||
|
||||
// describe('get language', () => {
|
||||
// it('should return current language', () => {
|
||||
// // Arrange
|
||||
// i18nService.init(defaultLanguage, supportedLanguages);
|
||||
|
||||
// // Act
|
||||
// const currentLanguage = i18nService.language;
|
||||
|
||||
// // Assert
|
||||
// expect(currentLanguage).toEqual(defaultLanguage);
|
||||
// });
|
||||
// });
|
||||
|
||||
// });
|
||||
@@ -1,2 +1,9 @@
|
||||
mifosx-content { min-height: 100%; height: auto !important; height: 100%; margin: 0 auto -30px; }
|
||||
#push { height:30px;}
|
||||
mifosx-content {
|
||||
min-height: 100%;
|
||||
height: auto !important;
|
||||
height: 100%;
|
||||
margin: 0 auto -30px;
|
||||
}
|
||||
#push {
|
||||
height: 30px;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user