|
|
@@ -738,6 +738,7 @@ export class ModalCirculares {
|
|
|
{ value: 'PF', audiencia: 'Padre de Familia' },
|
|
|
{ value: 'AD', audiencia: 'Administradores' },
|
|
|
{ value: 'PR', audiencia: 'Profesores' },
|
|
|
+ { value: 'TD', audiencia: 'Todos los usuarios' },
|
|
|
]
|
|
|
|
|
|
importancia = [
|
|
|
@@ -748,10 +749,22 @@ export class ModalCirculares {
|
|
|
public opciones: any;
|
|
|
public roles = ['Administradores', 'Padres'];
|
|
|
public originales: any;
|
|
|
- onAudienciaChange(value: string) {
|
|
|
+
|
|
|
+ public selectedAudiencia: string[] = [];
|
|
|
+
|
|
|
+ onAudienciaChange(value: string[]) {
|
|
|
let extra = {};
|
|
|
|
|
|
- switch (value) {
|
|
|
+ this.selectedAudiencia = value;
|
|
|
+ if (value.includes('TD')) {
|
|
|
+ // Si selecciona TD, solo deja TD seleccionado
|
|
|
+ this.form.get('audiencia')?.setValue(['TD']);
|
|
|
+ this.selectedAudiencia = ['TD'];
|
|
|
+ }
|
|
|
+
|
|
|
+ console.log('Valor seleccionado:', value);
|
|
|
+
|
|
|
+ switch (value[0]) {
|
|
|
case 'AL':
|
|
|
extra = {
|
|
|
name: 'Alumnos',
|
|
|
@@ -847,7 +860,7 @@ export class ModalCirculares {
|
|
|
|
|
|
public form = new FormGroup({
|
|
|
titulo: new FormControl<string>('', Validators.required),
|
|
|
- audiencia: new FormControl<string>('', Validators.required),
|
|
|
+ audiencia: new FormControl<string[]>([''], Validators.required),
|
|
|
destinos: new FormControl<string>('', Validators.required),
|
|
|
contenido: new FormControl<string>('', Validators.required),
|
|
|
importancia: new FormControl<string>('', Validators.required),
|
|
|
@@ -855,6 +868,7 @@ export class ModalCirculares {
|
|
|
horaInicio: new FormControl<any>(null, Validators.required),
|
|
|
fechaCaducidad: new FormControl<any>(null, [Validators.required, this.validatefechaCaducidad.bind(this)]),
|
|
|
horaCaducidad: new FormControl<any>(null, Validators.required),
|
|
|
+ link: new FormControl<string>('')
|
|
|
});
|
|
|
|
|
|
validateFechaInicio(control: AbstractControl): ValidationErrors | null {
|
|
|
@@ -896,6 +910,15 @@ export class ModalCirculares {
|
|
|
return control?.hasError(errorType) && control?.touched;
|
|
|
}
|
|
|
|
|
|
+ public urls: any = []
|
|
|
+
|
|
|
+ addUrl() {
|
|
|
+ const link = this.form.get('link')?.value;
|
|
|
+ this.urls.push(link);
|
|
|
+ this.form.get('link')?.setValue('');
|
|
|
+ console.log(this.urls);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
Evaluar(event: any) {
|
|
|
this.valoresCombinados = {
|
|
|
@@ -945,8 +968,11 @@ export class ModalCirculares {
|
|
|
fechaCreacion: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
|
|
|
fechaPublicacion: fechaHoraInicio,
|
|
|
fechaCaducidad: fechaHoraCaducidad,
|
|
|
- idUsuario: this.userData[0]
|
|
|
+ idUsuario: this.userData[0],
|
|
|
+ urls: this.urls.join('||')
|
|
|
};
|
|
|
+
|
|
|
+
|
|
|
this.valoresCombinados = {
|
|
|
Audiencia: this.form.get('audiencia')?.value,
|
|
|
...this.valoresCombinados
|
|
|
@@ -1042,6 +1068,12 @@ export class ModalCirculares {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ deleteUrl(i: number) {
|
|
|
+ if (i !== -1) {
|
|
|
+ this.urls.splice(i, 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1068,6 +1100,8 @@ export class ModalCirculares {
|
|
|
this.Evaluar(this.form.get('destinos')?.value)
|
|
|
this.convertToDatetime()
|
|
|
|
|
|
+ console.log(this.info);
|
|
|
+
|
|
|
Swal.fire({
|
|
|
title: 'Cargando...',
|
|
|
allowOutsideClick: false,
|