Skip to content
Snippets Groups Projects
Commit a2468d1b authored by Delphine's avatar Delphine Committed by pybelecalo
Browse files

[TECH] Fix rebase

parent fbdf0c9c
No related branches found
No related tags found
No related merge requests found
......@@ -5,11 +5,11 @@ import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { MatToolbarModule } from '@angular/material/toolbar';
import { RouterModule } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
import { HeaderComponent } from './header.component';
import { ItemSelectModule } from './item-select/item-select.module';
import { TranslateModule } from '@ngx-translate/core';
import { MenuModule } from './menu/menu.module';
import { SelectCustomerModule } from './select-customer/select-customer.module';
import { SelectLanguageModule } from './select-language/select-language.module';
import { SelectTenantDialogComponent } from './select-tenant-dialog/select-tenant-dialog.component';
import { UserPhotoModule } from './user-photo/user-photo.module';
......@@ -27,7 +27,8 @@ import { UserPhotoModule } from './user-photo/user-photo.module';
ItemSelectModule,
UserPhotoModule,
MenuModule.forRoot(),
TranslateModule
TranslateModule,
SelectLanguageModule
],
exports : [
HeaderComponent
......
......@@ -34,7 +34,6 @@
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL-C license and that you accept its terms.
*/
import {ThemeColors} from '../../utils';
import { Id } from '../id.interface';
import { Address } from './address.interface';
import { OtpState } from './otp-state.enum';
......
<vitamui-common-sidenav-header
[badge]="user?.status === 'ENABLED' ? 'green' : (user?.status === 'DISABLED' || user?.status === 'ANONYM' ? 'grey' : orange)"
[badge]="user?.status === 'ENABLED' ? 'green' : (user?.status === 'DISABLED' || user?.status === 'ANONYM' ? 'grey' : 'orange')"
[title]="user?.lastname.toUpperCase() + ' ' + user?.firstname"
[subtitle]="'(' + user?.identifier + ')'"
[icon]="'vitamui-icon-user'"
......
......@@ -22,10 +22,8 @@
<mat-card-subtitle>{{application.tooltip}}</mat-card-subtitle>
</mat-card-header>
</mat-card>
<mat-card-subtitle>{{application.tooltip}}</mat-card-subtitle>
</div>
</div>
</div>
</mat-tab>
</div>
</mat-tab-group>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment