diff --git a/readme.md b/readme.md index e28b15835..e291cf59b 100644 --- a/readme.md +++ b/readme.md @@ -2,7 +2,7 @@ ## Requirements -[node >= 14](https://nodejs.org/dist/v14.17.3/node-v14.17.3-x64.msi) +[node >= 14](https://nodejs.org/download/release/v14.15.0/node-v14.15.0-x86.msi) ## Installation @@ -22,7 +22,6 @@ npm install -g @angular/cli ionic serve ``` - ## build for production and launch server ```bash diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index d67a970cb..020ba12f2 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -176,6 +176,7 @@ (setIntervenient)="setIntervenient($event)" (setIntervenientCC)="setIntervenientCC($event)" (setContact)="setContact($event)" + (dynamicSetIntervenient)="dynamicSetIntervenient($event)" > diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index e8c0e21b6..0ac37d35d 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -647,6 +647,12 @@ export class CreateProcessPage implements OnInit { } + + dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){ + this.taskParticipants = taskParticipants; + this.taskParticipantsCc = taskParticipantsCc; + } + async setIntervenient(data) { this.taskParticipants = data; } diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 8de616f9b..72a42d8a7 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -21,6 +21,8 @@ export class EditEventPage implements OnInit { Form: FormGroup; validateFrom = false + public endMinDate = new Date(new Date().getTime() + 15 * 60000); + public minDate = new Date().toISOString().slice(0,10) postEvent: Event; isRecurring:string; @@ -32,7 +34,6 @@ export class EditEventPage implements OnInit { eventAttendees: EventPerson[]; selectedSegment: string; selectedDate: Date; - minDate: string; initCalendarName: string; caller:string; recurringTypes: any; @@ -44,6 +45,8 @@ export class EditEventPage implements OnInit { taskParticipantsCc: any = []; adding: "intervenient" | "CC" = "intervenient"; + + showAttendees = false; @@ -165,6 +168,7 @@ export class EditEventPage implements OnInit { IsRecurring: new FormControl(this.postEvent.IsRecurring, [ Validators.required ]), + // participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ // Validators.required // ]), diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index ee3e24783..0412ca6b1 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -48,7 +48,7 @@ export class ExpedienteDetailPage implements OnInit { public popoverController: PopoverController, private activatedRoute: ActivatedRoute, private toastService: ToastService, - ) { + ) { this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { this.serialnumber = params["params"].SerialNumber; @@ -57,7 +57,7 @@ export class ExpedienteDetailPage implements OnInit { this.caller = params["params"].caller; } }); - } + } ngOnInit() { this.LoadTaskDetail(this.serialnumber); diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index f60650c94..bb2ea8cee 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -112,7 +112,7 @@
-
+
@@ -140,7 +141,7 @@
-
+
this.dateControlEnd.toLocaleString()? 'ok': null,[ + Validators.required + ]), }) } diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 1bdd7e343..176e0f81a 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -254,6 +254,9 @@ export class NewEventPage implements OnInit { participantes: new FormControl(this.taskParticipants, [ Validators.required ]), + Date: new FormControl(this.dateControlStart.toLocaleString() > this.dateControlEnd.toLocaleString()? 'ok': null,[ + Validators.required + ]), }) }