[EDIT] CAMBIOS MULTIPLE PERSONAL, SIN PASAJE

parent 7d433371
...@@ -11,47 +11,71 @@ ...@@ -11,47 +11,71 @@
<mat-card-header class="flex flex-col items-start w-full"> <mat-card-header class="flex flex-col items-start w-full">
<label class="text-base md:text-lg font-bold">DATOS PERSONALES</label> <label class="text-base md:text-lg font-bold">DATOS PERSONALES</label>
</mat-card-header> </mat-card-header>
<mat-card-content class="w-full my-2.5"> <mat-card-content class="w-full my-2.5" [formGroup]="datos_personal">
<div class="flex flex-col md:flex-row gap-x-4" [formGroup]="datos_personal"> <!------------------------------------------------------------------------- DATOS GENERALES ------------------------------------------------------------------------------>
<mat-form-field class="w-full md:w-1/4" appearance="outline" floatLabel="always"> <div class="flex flex-row gap-4 mb-4">
<mat-label>Técnico responsable</mat-label> <div class="basis-2/4">
<mat-select formControlName="tecnicoPersonal" placeholder="[Seleccionar técnico]" (selectionChange)="onEventoSeleccionTecnico($event)" required> <div class="flex flex-row gap-x-2" *ngFor="let personal of listPersonal">
<mat-option *ngFor="let option of this.personal_list" [value]="option?.codper"> <mat-form-field class="w-full" appearance="outline" floatLabel="always">
{{option?.personal}} <mat-label>Técnico responsable</mat-label>
</mat-option> <mat-select formControlName="tecnicoPersonal{{personal.index}}" placeholder="[Seleccionar técnico]" (selectionChange)="onEventoSeleccionTecnico($event,personal)" required>
</mat-select> <mat-option *ngFor="let option of this.personal_list" [value]="option?.codper">
</mat-form-field> {{option?.personal}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field class="w-full" appearance="outline" floatLabel="always">
<mat-label>Especialidad</mat-label>
<input formControlName="areaPersonal{{personal.index}}" matInput placeholder="[Área designada]" value="" readonly>
</mat-form-field>
</div>
<mat-form-field class="w-full md:w-1/4" appearance="outline" floatLabel="always"> <!-- agregar botones de agregar o disminuir Tecnico responsable -->
<mat-label>Especialidad</mat-label> <div class="flex flex-row gap-x-2">
<input formControlName="areaPersonal" matInput placeholder="[Área designada]" value="" readonly> <div class="example-button-container">
</mat-form-field> <button (click)="onEventoAgregarPersonal()" mat-fab aria-label="Example icon button with a delete icon">
<mat-icon>add</mat-icon>
</button>
</div>
<div class="example-button-container">
<button (click)="onEventoQuitarPersonal()" mat-fab aria-label="Example icon button with a heart icon">
<mat-icon>delete</mat-icon>
</button>
</div>
<mat-label class="font-bold text-blue-600 text-lg" [ngClass]="{'fade-out': personalFading}" [innerText]="personalText"></mat-label>
</div>
</div>
<mat-form-field class="w-full md:w-1/4" appearance="outline" floatLabel="always"> <div class="basis-2/4">
<mat-label>Sede designada : </mat-label> <div class="flex flex-row gap-x-2">
<mat-select formControlName="sedePersonal" placeholder="[Seleccionar sede]" required> <mat-form-field class="w-full" appearance="outline" floatLabel="always">
<mat-option *ngFor="let option of this.sede_list" [value]="option?.value"> <mat-label>Sede designada</mat-label>
{{option?.viewValue}} <mat-select formControlName="sedePersonal" placeholder="[Seleccionar sede]" required>
</mat-option> <mat-option *ngFor="let option of this.sede_list" [value]="option?.value">
<!-- <mat-option *ngFor="let option of this.sede_list" [value]="option?.codlocal"> {{option?.viewValue}}
{{option?.deslocal}} </mat-option>
</mat-option> --> </mat-select>
</mat-select> </mat-form-field>
</mat-form-field>
<mat-form-field class="w-full md:w-1/4" appearance="outline" floatLabel="always"> <mat-form-field class="w-full" appearance="outline" floatLabel="always">
<mat-label>Rango de fechas : </mat-label> <mat-label>Rango de fechas</mat-label>
<mat-date-range-input [rangePicker]="picker"> <mat-date-range-input [rangePicker]="picker">
<input matStartDate formControlName="minFechaTrabajo" placeholder="Fecha inicial" readonly > <input matStartDate formControlName="minFechaTrabajo" placeholder="Fecha inicial" readonly >
<input matEndDate formControlName="maxFechaTrabajo" placeholder="Fecha Fin" readonly> <input matEndDate formControlName="maxFechaTrabajo" placeholder="Fecha Fin" readonly>
</mat-date-range-input> </mat-date-range-input>
<mat-datepicker-toggle matIconSuffix [for]="picker" [disabled]="datos_personal.controls['minFechaTrabajo'].disabled"></mat-datepicker-toggle> <mat-datepicker-toggle matIconSuffix [for]="picker" [disabled]="datos_personal.controls['minFechaTrabajo'].disabled"></mat-datepicker-toggle>
<mat-date-range-picker #picker></mat-date-range-picker> <mat-date-range-picker #picker></mat-date-range-picker>
</mat-form-field> </mat-form-field>
</div>
</div>
</div> </div>
<div class="flex flex-col sm:flex-row gap-4"> <!------------------------------------------------------------------------- DATOS GENERALES ------------------------------------------------------------------------------>
<!------------------------------------------------------------------------- LISTADO DE PASAJES ---------------------------------------------------------------------------->
<!-- <div class="flex flex-row gap-4">
<div class="sm:basis-3/12 w-full"> <div class="sm:basis-3/12 w-full">
<mat-form-field [formGroup]="datos_personal" class="w-full sm:w-[20rem]" appearance="outline" floatLabel="always"> <mat-form-field class="w-full sm:w-[20rem]" appearance="outline" floatLabel="always">
<mat-label>Pasaje designado : </mat-label> <mat-label>Pasaje designado : </mat-label>
<input matInput formControlName="pasajeTotal" placeholder="Calculo final del pasaje" value="" readonly> <input matInput formControlName="pasajeTotal" placeholder="Calculo final del pasaje" value="" readonly>
</mat-form-field> </mat-form-field>
...@@ -79,9 +103,6 @@ ...@@ -79,9 +103,6 @@
<mat-option *ngFor="let option of this.sede_list" [value]="option?.value"> <mat-option *ngFor="let option of this.sede_list" [value]="option?.value">
{{option?.viewValue}} {{option?.viewValue}}
</mat-option> </mat-option>
<!--<mat-option *ngFor="let option of this.sede_list" [value]="option?.codlocal">
{{option?.deslocal}}
</mat-option> -->
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</ng-container> </ng-container>
...@@ -166,7 +187,9 @@ ...@@ -166,7 +187,9 @@
</table> </table>
</div> </div>
</div> </div>
</div> </div> -->
<!------------------------------------------------------------------------- LISTADO DE PASAJES ---------------------------------------------------------------------------->
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
</div> </div>
...@@ -191,7 +214,7 @@ ...@@ -191,7 +214,7 @@
</mat-option> </mat-option>
</mat-autocomplete> </mat-autocomplete>
</mat-form-field> </mat-form-field>
<mat-label [ngClass]="{'fade-out': isFading}" [innerText]="labelText"></mat-label> <mat-label class="font-bold text-blue-600 text-lg" [ngClass]="{'fade-out': isFading}" [innerText]="labelText"></mat-label>
</div> </div>
<div class="grid grid-cols-2 md:grid-cols-5 gap-4 w-full md:w-4/5"> <div class="grid grid-cols-2 md:grid-cols-5 gap-4 w-full md:w-4/5">
......
...@@ -277,7 +277,6 @@ export class ConformidadService { ...@@ -277,7 +277,6 @@ export class ConformidadService {
const parametros = { const parametros = {
accion : json.accion || 0, accion : json.accion || 0,
codOrdenSalida : json.codOrdenSalida || 0, codOrdenSalida : json.codOrdenSalida || 0,
codper : json.codper || 0,
codlocal : json.codlocal || '', codlocal : json.codlocal || '',
descripcion: json.descripcion || '', descripcion: json.descripcion || '',
fechaRegistro : json.fechaRegistro || '', fechaRegistro : json.fechaRegistro || '',
......
Markdown is supported
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