Skip to content
Snippets Groups Projects
Verified Commit c744b03a authored by Florian Azizian's avatar Florian Azizian
Browse files

FEAT #15407 TIME 1:00 Translation + clean scss + fix remove admin group

parent 07734f07
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 21 additions and 218 deletions
lang/en.json
+ 4
− 0
View file @ c744b03a
......@@ -314,6 +314,10 @@
"alreadyUsedPassword": "The password has already been used",
"noAssociatedGroup": "The user does not belong to any group",
"thumbnailNotFound": "Thumbnail not found or not readable.<br>Check docservers or ImageMagick configuration",
"noUserInWorkflow": "No user found in workflow",
"newTemplate": "New template",
"newTemplateDesc": "Current workflow will be saved",
"deleteTemplate": "So you really want to delete this template ?",
"homePage": "Home page"
}
}
lang/fr.json
+ 4
− 0
View file @ c744b03a
......@@ -349,6 +349,10 @@
"refused": "Refusé",
"results": "résultat(s)",
"thumbnailNotFound": "Imagette non trouvée ou non accessible.<br>Vérifier les docservers ou la configuration de ImageMagick",
"noUserInWorkflow": "Aucune personne dans le circuit",
"newTemplate": "Nouveau modèle",
"newTemplateDesc": "Le circuit en cours sera sauvegardé.",
"deleteTemplate": "Voulez-vous supprimer le modèle ?",
"subjectMandatory": "Veuillez renseigner tous les objets des documents",
"mainDocumentMandatory": "Veuillez choisir un document à signer",
"workflowUserstMandatory": "Veuillez choisir des utilisateurs pour le circuit",
......
src/frontend/app/administration/group/group.component.html
+ 2
− 2
View file @ c744b03a
......@@ -19,9 +19,9 @@
<ion-grid *ngIf="!creationMode">
<ion-row>
<ion-col size="4" *ngFor="let privilege of group.privileges">
<ion-item>
<ion-item (click)="$event.preventDefault();togglePrivilege(privilege)" style="cursor: pointer">
<ion-toggle slot="start" [name]="privilege.id" color="primary" [checked]="privilege.checked"
[(ngModel)]="privilege.checked" (ngModelChange)="togglePrivilege(privilege)"></ion-toggle>
[(ngModel)]="privilege.checked"></ion-toggle>
<ion-label>{{'lang.' + privilege.id + 'Admin' | translate}}</ion-label>
</ion-item>
</ion-col>
......
src/frontend/app/administration/group/group.component.scss
+ 0
− 1
View file @ c744b03a
@import '../../../css/vars.scss';
.privilegesList {
padding-top: 10px;
......
src/frontend/app/administration/group/group.component.ts
+ 4
− 4
View file @ c744b03a
......@@ -242,7 +242,7 @@ export class GroupComponent implements OnInit {
}
async togglePrivilege(privilege: any) {
if (privilege.id === 'manage_groups') {
if (privilege.id === 'manage_groups' && privilege.checked) {
const alert = await this.alertController.create({
// cssClass: 'custom-alert-danger',
header: this.translate.instant('lang.confirmMsg'),
......@@ -252,13 +252,12 @@ export class GroupComponent implements OnInit {
text: this.translate.instant('lang.no'),
role: 'cancel',
cssClass: 'secondary',
handler: () => {
privilege.checked = !privilege.checked;
}
handler: () => {}
},
{
text: this.translate.instant('lang.yes'),
handler: () => {
privilege.checked = !privilege.checked;
this.updatePrivilege(privilege);
}
}
......@@ -267,6 +266,7 @@ export class GroupComponent implements OnInit {
await alert.present();
} else {
privilege.checked = !privilege.checked;
this.updatePrivilege(privilege);
}
}
......
src/frontend/app/administration/home/administration.component.scss
+ 0
− 2
View file @ c744b03a
@import '../../../css/vars.scss';
.container {
flex: 1;
......
src/frontend/app/administration/user/user.component.scss
+ 0
− 1
View file @ c744b03a
@import '../../../css/vars.scss';
.avatarProfile {
width: 65px;
......
src/frontend/app/document/associated-documents/associated-documents.component.scss
+ 0
− 77
View file @ c744b03a
@import '../../../css/vars.scss';
.mat-list-item {
height: auto !important;
......@@ -10,86 +9,10 @@
border: solid 1px #E0E0E0;
}
.infosPj {
background: #F9F9F9;
border-top: solid 1px rgba(0, 0, 0, 0.12);
position: absolute;
width: 100%;
bottom: 0;
padding: 5px;
::ng-deep.mat-expansion-panel-body {
padding: 0px;
}
::ng-deep.mat-form-field-label {
color: $primary;
}
}
.subInfos {
display: block;
font-size: 12px;
color: $primary;
font-weight: bold;
}
.subInfosBottom {
font-size: 12px;
color: #666;
}
.mat-icon {
height: auto;
}
.pjToolsContent {
position: absolute;
border: solid 1px #E0E0E0;
border-bottom-left-radius: 5px;
background: white;
padding: 10px;
font-weight: 600;
color: #135F7F;
font-size: 14px;
top: 10px;
}
.current {
box-shadow: 0px 0px 20px 0px #656565;
}
.panel-header {
box-shadow: 0px 0px 10px 0px #656565;
color: white;
background: $primary;
height: 65px;
display: flex;
justify-content: center;
position: relative;
font-size: 20px;
align-items: center;
}
.pjListContent {
padding-left: 30px;
padding-right: 30px;
flex: 1;
overflow: auto;
}
.panel-content {
display: flex;
flex-direction: column;
position: relative;
height: 100%;
overflow: hidden;
}
.closePanel {
position: absolute;
left: 0px;
font-size: 24px;
}
img {
pointer-events: none;
}
......
src/frontend/app/document/document-list/document-list.component.scss
+ 1
− 41
View file @ c744b03a
......@@ -10,35 +10,6 @@
border: solid 1px #E0E0E0;
}
.infosPj {
background: #F9F9F9;
border-top: solid 1px rgba(0, 0, 0, 0.12);
position: absolute;
width: 100%;
bottom: 0;
padding: 5px;
::ng-deep.mat-expansion-panel-body {
padding: 0px;
}
::ng-deep.mat-form-field-label {
color: $primary;
}
}
.subInfos {
display: block;
font-size: 12px;
color: $primary;
font-weight: bold;
}
.subInfosBottom {
font-size: 12px;
color: #666;
}
.mat-icon {
height: auto;
}
......@@ -70,12 +41,7 @@
font-size: 20px;
align-items: center;
}
.pjListContent {
padding-left: 30px;
padding-right: 30px;
flex: 1;
overflow: auto;
}
.panel-content {
display: flex;
flex-direction: column;
......@@ -84,12 +50,6 @@
overflow: hidden;
}
.closePanel {
position: absolute;
left: 0px;
font-size: 24px;
}
img {
pointer-events: none;
}
......
src/frontend/app/document/main-document-detail/main-document-detail.component.scss
+ 1
− 45
View file @ c744b03a
......@@ -10,49 +10,10 @@
border: solid 1px #E0E0E0;
}
.infosPj {
background: #F9F9F9;
border-top: solid 1px rgba(0, 0, 0, 0.12);
position: absolute;
width: 100%;
bottom: 0;
padding: 5px;
::ng-deep.mat-expansion-panel-body {
padding: 0px;
}
::ng-deep.mat-form-field-label {
color: $primary;
}
}
.subInfos {
display: block;
font-size: 12px;
color: $primary;
font-weight: bold;
}
.subInfosBottom {
font-size: 12px;
color: #666;
}
.mat-icon {
height: auto;
}
.pjToolsContent {
position: absolute;
right: 0px;
border-bottom: solid 1px #E0E0E0;
border-left: solid 1px #E0E0E0;
border-bottom-left-radius: 5px;
background: white;
padding: 10px;
}
.current {
box-shadow: 0px 0px 20px 0px #656565;
}
......@@ -68,12 +29,7 @@
font-size: 20px;
align-items: center;
}
.pjListContent {
padding-left: 30px;
padding-right: 30px;
flex: 1;
overflow: auto;
}
.panel-content {
display: flex;
flex-direction: column;
......
src/frontend/app/document/visa-workflow/models/visa-workflow-models.component.ts
+ 4
− 4
View file @ c744b03a
......@@ -33,8 +33,8 @@ export class VisaWorkflowModelsComponent implements OnInit {
async createModel() {
const alert = await this.alertController.create({
header: 'Nouveau modèle',
message: 'Le circuit en cours sera sauvegardé.',
header: this.translate.instant('lang.newTemplate'),
message: this.translate.instant('lang.newTemplateDesc'),
inputs: [
{
name: 'title',
......@@ -90,8 +90,8 @@ export class VisaWorkflowModelsComponent implements OnInit {
async removeModel(model: any) {
const alert = await this.alertController.create({
header: 'Supprimer',
message: 'Supprimer le modèle ?',
header: this.translate.instant('lang.delete'),
message: this.translate.instant('lang.deleteTemplate'),
buttons: [
{
text: this.translate.instant('lang.no'),
......
src/frontend/app/document/visa-workflow/visa-workflow.component.html
+ 1
− 1
View file @ c744b03a
......@@ -32,7 +32,7 @@
</ng-container>
<ion-list *ngIf="visaWorkflow.length === 0">
<ion-item lines="none">
<ion-label class="ion-text-center" color="medium">Aucune personne dans le circuit</ion-label>
<ion-label class="ion-text-center" color="medium">{{'lang.noUserInWorkflow' | translate}}</ion-label>
</ion-item>
</ion-list>
<ion-reorder-group (ionItemReorder)="doReorder($event)" [disabled]="!editMode">
......
src/frontend/app/document/visa-workflow/visa-workflow.component.ts
+ 0
− 3
View file @ c744b03a
......@@ -39,7 +39,6 @@ export class VisaWorkflowComponent implements OnInit {
public popoverController: PopoverController
) { }
ngOnInit(): void {
this.visaWorkflow.forEach((element: any, index: number) => {
this.getAvatarUser(index);
......@@ -140,8 +139,6 @@ export class VisaWorkflowComponent implements OnInit {
}
loadWorkflow(workflow: any) {
console.log('loadWorkflow', workflow);
this.visaWorkflow = workflow;
}
}
src/frontend/app/login/passwordModification/password-modification.scss
+ 0
− 1
View file @ c744b03a
@import '../../../css/vars.scss';
.alert-warning {
text-align: center;
......
src/frontend/app/sidebar/sidebar.component.scss
+ 0
− 36
View file @ c744b03a
......@@ -122,18 +122,6 @@
}
}
.loadList {
position: absolute;
width: 100%;
height: 100%;
left: 0;
background-color: #ffffffb3;
z-index: 1;
display: flex;
align-items: baseline;
justify-content: center;
}
.profile-header {
background: $primary;
height: 95px;
......@@ -174,30 +162,6 @@
padding-right: 10px;
}
.logout-button {
font-size: 24px;
color: white;
position: absolute;
left: 10px;
bottom: 10px;
}
.admin-button {
font-size: 24px;
color: white;
position: absolute;
left: 50px;
bottom: 10px;
}
.closePanel {
color: white;
position: absolute;
right: 10px;
font-size: 24px;
bottom: 10px;
}
.filter {
font-size: 10px;
width: 95px;
......
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