refs #1376 Extend adding multiple client option to OU's tree
testing/ogGui-multibranch/pipeline/head This commit looks good Details

pull/12/head
Lucas Lara García 2025-01-24 14:24:48 +01:00
parent c063e0f50f
commit 37460cb01d
7 changed files with 22 additions and 8 deletions

View File

@ -3,7 +3,7 @@
display: flex;
justify-content: space-between;
align-items: center;
padding: 0px 10px;
padding: 10px 10px;
border-bottom: 1px solid #ddd;
}

View File

@ -15,8 +15,8 @@
</button>
<button mat-flat-button color="primary" [matMenuTriggerFor]="menuClients">{{ 'newClientButton' | translate }}</button>
<mat-menu #menuClients="matMenu">
<button mat-menu-item (click)="addClient($event)" >Añadir cliente unitario</button>
<button mat-menu-item (click)="addMultipleClients($event)">Añadir clientes masivamente</button>
<button mat-menu-item (click)="addClient($event)">{{ 'newSingleClientButton' | translate }}</button>
<button mat-menu-item (click)="addMultipleClients($event)">{{ 'newMultipleClientButton' | translate }}</button>
</mat-menu>
<button mat-flat-button (click)="openBottomSheet()" joyrideStep="keyStep" text="{{ 'keyStepText' | translate }}"
@ -122,10 +122,14 @@
</button>
<button mat-menu-item (click)="addClient($event, selectedNode)">
<mat-icon>add</mat-icon>
<span>{{ 'addClientMenu' | translate }}</span>
<span>{{ 'newSingleClientButton' | translate }}</span>
</button>
<button mat-menu-item (click)="addMultipleClients($event, selectedNode)">
<mat-icon>playlist_add</mat-icon>
<span>{{ 'newMultipleClientButton' | translate }}</span>
</button>
<button mat-menu-item (click)="addOU($event, selectedNode)">
<mat-icon>playlist_add</mat-icon>
<mat-icon>account_tree</mat-icon>
<span>{{ 'addOrganizationalUnit' | translate }}</span>
</button>
<button mat-menu-item (click)="onEditNode($event, selectedNode)">

View File

@ -6,7 +6,7 @@
<form class="client-form grid-form" *ngIf="!loading">
<mat-form-field class="form-field">
<mat-label>{{ 'organizationalUnitLabel' | translate }}</mat-label>
<mat-select (selectionChange)="setOrganizationalUnit($event)">
<mat-select (selectionChange)="setOrganizationalUnit($event)" [value]="organizationalUnit">
<mat-option *ngFor="let unit of parentUnits" [value]="unit['@id']">
<div class="unit-name">{{ unit.name }}</div>
</mat-option>

View File

@ -3,6 +3,7 @@ import {MatDialogRef} from "@angular/material/dialog";
import {HttpClient} from "@angular/common/http";
import {MatSnackBar} from "@angular/material/snack-bar";
import {ToastrService} from "ngx-toastr";
import {MAT_DIALOG_DATA} from "@angular/material/dialog";
@Component({
selector: 'app-create-multiple-client',
@ -21,6 +22,7 @@ export class CreateMultipleClientComponent implements OnInit{
constructor(
@Optional() private dialogRef: MatDialogRef<CreateMultipleClientComponent>,
@Inject(MAT_DIALOG_DATA) private data: any,
private http: HttpClient,
private snackBar: MatSnackBar,
private toastService: ToastrService
@ -28,6 +30,10 @@ export class CreateMultipleClientComponent implements OnInit{
ngOnInit(): void {
this.loadParentUnits();
if (this.data?.organizationalUnit) {
this.organizationalUnit = this.data.organizationalUnit['@id'];
}
}
loadParentUnits(): void {

View File

@ -12,7 +12,7 @@
}
.content {
margin: 10px;
padding: 10px;
margin: 0px 10px 10px 10px;
padding: 0px 10px 10px 10px;
box-sizing: border-box;
}

View File

@ -156,6 +156,8 @@
"newOrganizationalUnitTooltip": "Open modal to create organizational units of any type (Center, Classroom, Classroom Group, or Client Group)",
"newOrganizationalUnitButton": "New Organizational Unit",
"newClientButton": "New Client",
"newSingleClientButton": "Add single client",
"newMultipleClientButton": "Add numerous clients",
"keyStepText": "The legend will show you the types of organizational units and their corresponding icons",
"legendButton": "Legend",
"unitStepText": "This is the section where 'Center' type organizational units will be displayed",

View File

@ -157,6 +157,8 @@
"newOrganizationalUnitTooltip": "Abrir modal para crear unidades organizativas de cualquier tipo (Centro, Aula, Grupo de aulas o Grupo de clientes)",
"newOrganizationalUnitButton": "Nueva Unidad Organizativa",
"newClientButton": "Nuevo Cliente",
"newSingleClientButton": "Añadir cliente unitario",
"newMultipleClientButton": "Añadir clientes masivamente",
"keyStepText": "La leyenda te mostrará los tipos de unidades organizativas y sus iconos correspondientes",
"legendButton": "Leyenda",
"unitStepText": "Esta es la sección donde se mostrarán las unidades organizativas de tipo 'Centro'",