diff --git a/config/config.xml.default b/config/config.xml.default index ba2940d35a9328b3441125062241943f03225864..0b77d8d224833f473ca0d71f24cea115675654e6 100755 --- a/config/config.xml.default +++ b/config/config.xml.default @@ -72,5 +72,10 @@ <id>external</id> <color>#FF0000</color> </mode> + <mode> + <id>note</id> + <color>#473632</color> + <issuer></issuer> + </mode> </signatureModes> </ROOT> diff --git a/src/frontend/app/administration/user/user.component.ts b/src/frontend/app/administration/user/user.component.ts index c96cc21abd82f5eac0a4b5331dfee7785fe10bd9..de96d70c33310cbe0c5c329c07e83480e11b4dab 100644 --- a/src/frontend/app/administration/user/user.component.ts +++ b/src/frontend/app/administration/user/user.component.ts @@ -103,7 +103,7 @@ export class UserComponent implements OnInit { email: '', phone: '', picture: '', - signatureModes: ['stamp'], + signatureModes: ['stamp', 'note'], isRest: false, canSendActivationNotification: false }; @@ -187,23 +187,25 @@ export class UserComponent implements OnInit { createUser() { this.loading = true; - this.http.post('../rest/users', this.user) - .pipe( - finalize(() => this.loading = false), - tap((data: any) => { - if (this.user.isRest) { - this.user.id = data.id; - this.updateRestUser(); - } - this.router.navigate(['/administration/users']); - this.notificationService.success('lang.userAdded'); - }), - catchError((err: any) => { - this.notificationService.handleErrors(err); - return of(false); - }) - ) - .subscribe(); + console.log(this.user); + + // this.http.post('../rest/users', this.user) + // .pipe( + // finalize(() => this.loading = false), + // tap((data: any) => { + // if (this.user.isRest) { + // this.user.id = data.id; + // this.updateRestUser(); + // } + // this.router.navigate(['/administration/users']); + // this.notificationService.success('lang.userAdded'); + // }), + // catchError((err: any) => { + // this.notificationService.handleErrors(err); + // return of(false); + // }) + // ) + // .subscribe(); } delete() { diff --git a/src/frontend/app/document/document.component.html b/src/frontend/app/document/document.component.html index 3c866fa1be3217af2eb20c40cc1018fbeed9edad..b716b9a46e8c2647190474f0ca1d96fa4ed84bc3 100755 --- a/src/frontend/app/document/document.component.html +++ b/src/frontend/app/document/document.component.html @@ -133,7 +133,7 @@ </ng-container> </ion-content> -<ion-footer *ngIf="!loadingImage && currentDoc === 0" class="ion-no-border footer-buttons"> +<ion-footer *ngIf="!loadingImage && currentDoc === 0" class="ion-no-border footer-buttons" [ngStyle]="{'grid-template-columns': actionsList.length === 2 ? 'repeat(2, 1fr)' : 'repeat(3, 1fr)'}"> <ion-button [disabled]="mainDocument.status === 'CONVERTING'" *ngFor="let action of actionsList" [color]="action.color" shape="round" size="large" fill="outline" (click)="launchEvent(action)"> <ion-icon *ngIf="action.logo !== ''" [slot]="'start'" [name]="action.logo"></ion-icon> <ion-label style="font-size: 13px;">{{action.label | translate}}</ion-label> diff --git a/src/frontend/app/document/document.component.scss b/src/frontend/app/document/document.component.scss index 0583c6c979985b74392c287446e5e399d60a1d61..5719a22075e6f30b415b521a8942d1bbe251ce66 100644 --- a/src/frontend/app/document/document.component.scss +++ b/src/frontend/app/document/document.component.scss @@ -361,9 +361,7 @@ button.disabled { .footer-buttons { display: grid; - grid-template-columns: repeat(3, 1fr); padding: 10px; - ion-button { margin: auto; width: 150px;