Skip to content
Snippets Groups Projects
Commit e30bd18b authored by KASSEM Passam's avatar KASSEM Passam
Browse files

[VAS] BUG 7719 : Corrections bugs app utilisateur et app group

parent 481541b3
No related branches found
No related tags found
10 merge requests!51Merge mis a jour vitam-ui,!25Nouveau mis a jour Vitamui,!24Nouveau mis a jour Vitamui,!23Nouveau mis a jour Vitamui,!22WIP: nouveau mis a jour Vitamui,!21nouveau mis a jour Vitamui,!20nouveau mis à jour Vitamui,!19nouveau mis à jour Vitamui,!18New MAJ Vitamui,!16[VAS] BUG 7332 : Correction sur la position de la barre permettant de...
Showing
with 182 additions and 16 deletions
<div class="vitamui-autocomplete" [class.disabled]="control.disabled" [class.label-up]="labelUp"> <div class="vitamui-autocomplete" [class.disabled]="control.disabled" [class.label-up]="labelUp">
<label class="input-label">{{ placeholder }}</label> <label class="input-label">{{ placeholder }}</label>
<input <input
#input #input="matAutocompleteTrigger"
matInput
type="text" type="text"
[formControl]="control" [formControl]="control"
[matAutocomplete]="auto" [matAutocomplete]="auto"
[vitamuiAutocompletePosition]="input"
(blur)="onBlur()" (blur)="onBlur()"
(focus)="onFocus()" (focus)="onFocus()"
> >
......
...@@ -41,14 +41,18 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete'; ...@@ -41,14 +41,18 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete';
import { MatTooltipModule } from '@angular/material/tooltip'; import { MatTooltipModule } from '@angular/material/tooltip';
import { VitamUIAutocompleteComponent } from './vitamui-autocomplete.component'; import { VitamUIAutocompleteComponent } from './vitamui-autocomplete.component';
import {MatInputModule} from "@angular/material/input";
import {AutocompletePositionDirectiveModule} from "../../directives/autocomplete-position/autocomplete-position.directive.module";
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
MatAutocompleteModule, MatAutocompleteModule,
ReactiveFormsModule, ReactiveFormsModule,
MatTooltipModule, MatTooltipModule,
], MatInputModule,
AutocompletePositionDirectiveModule
],
declarations: [VitamUIAutocompleteComponent], declarations: [VitamUIAutocompleteComponent],
exports: [VitamUIAutocompleteComponent] exports: [VitamUIAutocompleteComponent]
}) })
......
/*
* Copyright French Prime minister Office/SGMAP/DINSIC/Vitam Program (2019-2020)
* and the signatories of the "VITAM - Accord du Contributeur" agreement.
*
* contact@programmevitam.fr
*
* This software is a computer program whose purpose is to implement
* implement a digital archiving front-office system for the secure and
* efficient high volumetry VITAM solution.
*
* This software is governed by the CeCILL-C license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL-C
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
*
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
* that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
*
* 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 {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
import {AutocompletePositionDirective} from "./autocomplete-position.directive";
@NgModule({
imports: [
CommonModule,
],
declarations: [
AutocompletePositionDirective
],
exports: [
AutocompletePositionDirective
]
})
export class AutocompletePositionDirectiveModule { }
/*
* Copyright French Prime minister Office/SGMAP/DINSIC/Vitam Program (2019-2020)
* and the signatories of the "VITAM - Accord du Contributeur" agreement.
*
* contact@programmevitam.fr
*
* This software is a computer program whose purpose is to implement
* implement a digital archiving front-office system for the secure and
* efficient high volumetry VITAM solution.
*
* This software is governed by the CeCILL-C license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL-C
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
*
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
* that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
*
* 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 {AutocompletePositionDirective} from "./autocomplete-position.directive";
describe('AutocompletePositionDirective', () => {
it('should create an instance', () => {
const directive = new AutocompletePositionDirective();
expect(directive).toBeTruthy();
});
});
/*
* Copyright French Prime minister Office/SGMAP/DINSIC/Vitam Program (2019-2020)
* and the signatories of the "VITAM - Accord du Contributeur" agreement.
*
* contact@programmevitam.fr
*
* This software is a computer program whose purpose is to implement
* implement a digital archiving front-office system for the secure and
* efficient high volumetry VITAM solution.
*
* This software is governed by the CeCILL-C license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL-C
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
*
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
* that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
*
* 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 { Directive, Input, OnDestroy } from '@angular/core';
import { MatAutocompleteTrigger } from '@angular/material/autocomplete';
@Directive({
selector: '[vitamuiAutocompletePosition]'
})
export class AutocompletePositionDirective implements OnDestroy {
private matAutocompleteTrigger: MatAutocompleteTrigger;
@Input('vitamuiAutocompletePosition') set autocompletePosition(value: MatAutocompleteTrigger) {
this.matAutocompleteTrigger = value;
window.addEventListener('scroll', this.scrollEvent, true);
}
private scrollEvent = (): void => {
if (this.matAutocompleteTrigger == null) {
return;
}
if (this.matAutocompleteTrigger.panelOpen) {
this.matAutocompleteTrigger.updatePosition();
}
};
ngOnDestroy() {
window.removeEventListener('scroll', this.scrollEvent, true);
}
}
...@@ -99,6 +99,7 @@ import { StartupService } from './startup.service'; ...@@ -99,6 +99,7 @@ import { StartupService } from './startup.service';
import { SubrogationModule } from './subrogation/subrogation.module'; import { SubrogationModule } from './subrogation/subrogation.module';
import { VitamUIHttpInterceptor } from './vitamui-http-interceptor'; import { VitamUIHttpInterceptor } from './vitamui-http-interceptor';
import {ResizeSidebarModule} from "./directives/resize-sidebar/resize-sidebar.module"; import {ResizeSidebarModule} from "./directives/resize-sidebar/resize-sidebar.module";
import {AutocompletePositionDirectiveModule} from "./directives/autocomplete-position/autocomplete-position.directive.module";
export function startupServiceFactory(startupService: StartupService) { export function startupServiceFactory(startupService: StartupService) {
// leave it like this due to run packagr issue : // leave it like this due to run packagr issue :
...@@ -166,7 +167,8 @@ export function startupServiceFactory(startupService: StartupService) { ...@@ -166,7 +167,8 @@ export function startupServiceFactory(startupService: StartupService) {
UserPhotoModule, UserPhotoModule,
VitamuiMenuButtonModule, VitamuiMenuButtonModule,
VitamuiSidenavHeaderModule, VitamuiSidenavHeaderModule,
ResizeSidebarModule ResizeSidebarModule,
AutocompletePositionDirectiveModule
], ],
entryComponents: [ entryComponents: [
ErrorDialogComponent ErrorDialogComponent
...@@ -221,7 +223,8 @@ export function startupServiceFactory(startupService: StartupService) { ...@@ -221,7 +223,8 @@ export function startupServiceFactory(startupService: StartupService) {
CommonTooltipModule, CommonTooltipModule,
VitamuiSidenavHeaderModule, VitamuiSidenavHeaderModule,
VitamuiMenuButtonModule, VitamuiMenuButtonModule,
ResizeSidebarModule ResizeSidebarModule,
AutocompletePositionDirectiveModule
], ],
providers: [ providers: [
{ provide: SUBROGRATION_REFRESH_RATE_MS, useValue: 10000 }, { provide: SUBROGRATION_REFRESH_RATE_MS, useValue: 10000 },
......
...@@ -15,11 +15,9 @@ ...@@ -15,11 +15,9 @@
height: 16px; height: 16px;
display: block; display: block;
position: absolute; position: absolute;
left: 100%; margin-left: 15px;
top: 100%; margin-top: -9px;
margin-left: -8px; padding: 0 3px 3px 4px;
margin-top: -8px;
padding: 2px 3px 3px 4px;
border-radius: 50%; border-radius: 50%;
background-color: var(--vitamui-grey-600); background-color: var(--vitamui-grey-600);
border: solid 2px $white; border: solid 2px $white;
...@@ -41,7 +39,7 @@ vitamui-common-table-filter-option .vitamui-icon { ...@@ -41,7 +39,7 @@ vitamui-common-table-filter-option .vitamui-icon {
.table-filter-icon { .table-filter-icon {
display: flex; display: flex;
align-items: center; align-items: center;
span.badge-state { span.badge-state {
color: var(--vitamui-grey-900); color: var(--vitamui-grey-900);
margin-left: 18px; margin-left: 18px;
......
<vitamui-common-sidenav-header <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' || user?.status === 'REMOVED') ? 'grey' : 'orange')"
[title]="user?.lastname.toUpperCase() + ' ' + user?.firstname" [title]="user?.lastname.toUpperCase() + ' ' + user?.firstname"
[subtitle]="'(' + user?.identifier + ')'" [subtitle]="'(' + user?.identifier + ')'"
[icon]="'vitamui-icon-user'" [icon]="'vitamui-icon-user'"
......
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