mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
Improve attendies
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
## Requirements
|
## 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
|
## Installation
|
||||||
|
|
||||||
@@ -22,7 +22,6 @@ npm install -g @angular/cli
|
|||||||
ionic serve
|
ionic serve
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
## build for production and launch server
|
## build for production and launch server
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -176,6 +176,7 @@
|
|||||||
(setIntervenient)="setIntervenient($event)"
|
(setIntervenient)="setIntervenient($event)"
|
||||||
(setIntervenientCC)="setIntervenientCC($event)"
|
(setIntervenientCC)="setIntervenientCC($event)"
|
||||||
(setContact)="setContact($event)"
|
(setContact)="setContact($event)"
|
||||||
|
(dynamicSetIntervenient)="dynamicSetIntervenient($event)"
|
||||||
></app-attendee-modal>
|
></app-attendee-modal>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -647,6 +647,12 @@ export class CreateProcessPage implements OnInit {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){
|
||||||
|
this.taskParticipants = taskParticipants;
|
||||||
|
this.taskParticipantsCc = taskParticipantsCc;
|
||||||
|
}
|
||||||
|
|
||||||
async setIntervenient(data) {
|
async setIntervenient(data) {
|
||||||
this.taskParticipants = data;
|
this.taskParticipants = data;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ export class EditEventPage implements OnInit {
|
|||||||
|
|
||||||
Form: FormGroup;
|
Form: FormGroup;
|
||||||
validateFrom = false
|
validateFrom = false
|
||||||
|
public endMinDate = new Date(new Date().getTime() + 15 * 60000);
|
||||||
|
public minDate = new Date().toISOString().slice(0,10)
|
||||||
|
|
||||||
postEvent: Event;
|
postEvent: Event;
|
||||||
isRecurring:string;
|
isRecurring:string;
|
||||||
@@ -32,7 +34,6 @@ export class EditEventPage implements OnInit {
|
|||||||
eventAttendees: EventPerson[];
|
eventAttendees: EventPerson[];
|
||||||
selectedSegment: string;
|
selectedSegment: string;
|
||||||
selectedDate: Date;
|
selectedDate: Date;
|
||||||
minDate: string;
|
|
||||||
initCalendarName: string;
|
initCalendarName: string;
|
||||||
caller:string;
|
caller:string;
|
||||||
recurringTypes: any;
|
recurringTypes: any;
|
||||||
@@ -44,6 +45,8 @@ export class EditEventPage implements OnInit {
|
|||||||
taskParticipantsCc: any = [];
|
taskParticipantsCc: any = [];
|
||||||
adding: "intervenient" | "CC" = "intervenient";
|
adding: "intervenient" | "CC" = "intervenient";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
showAttendees = false;
|
showAttendees = false;
|
||||||
|
|
||||||
@@ -165,6 +168,7 @@ export class EditEventPage implements OnInit {
|
|||||||
IsRecurring: new FormControl(this.postEvent.IsRecurring, [
|
IsRecurring: new FormControl(this.postEvent.IsRecurring, [
|
||||||
Validators.required
|
Validators.required
|
||||||
]),
|
]),
|
||||||
|
|
||||||
// participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
|
// participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
|
||||||
// Validators.required
|
// Validators.required
|
||||||
// ]),
|
// ]),
|
||||||
|
|||||||
+2
-2
@@ -48,7 +48,7 @@ export class ExpedienteDetailPage implements OnInit {
|
|||||||
public popoverController: PopoverController,
|
public popoverController: PopoverController,
|
||||||
private activatedRoute: ActivatedRoute,
|
private activatedRoute: ActivatedRoute,
|
||||||
private toastService: ToastService,
|
private toastService: ToastService,
|
||||||
) {
|
) {
|
||||||
this.activatedRoute.paramMap.subscribe(params => {
|
this.activatedRoute.paramMap.subscribe(params => {
|
||||||
if(params["params"].SerialNumber) {
|
if(params["params"].SerialNumber) {
|
||||||
this.serialnumber = params["params"].SerialNumber;
|
this.serialnumber = params["params"].SerialNumber;
|
||||||
@@ -57,7 +57,7 @@ export class ExpedienteDetailPage implements OnInit {
|
|||||||
this.caller = params["params"].caller;
|
this.caller = params["params"].caller;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.LoadTaskDetail(this.serialnumber);
|
this.LoadTaskDetail(this.serialnumber);
|
||||||
|
|||||||
@@ -112,7 +112,7 @@
|
|||||||
<div class="ion-icon-class">
|
<div class="ion-icon-class">
|
||||||
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
|
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="ion-input-class flex-grow-1">
|
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
|
||||||
|
|
||||||
<mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker">
|
<mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker">
|
||||||
<input matInput [ngxMatDatetimePicker]="picker1"
|
<input matInput [ngxMatDatetimePicker]="picker1"
|
||||||
@@ -127,6 +127,7 @@
|
|||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
[stepHour]="stepHour" [stepMinute]="stepMinute"
|
[stepHour]="stepHour" [stepMinute]="stepMinute"
|
||||||
[stepSecond]="stepSecond"
|
[stepSecond]="stepSecond"
|
||||||
|
[min]="endMinDate"
|
||||||
[touchUi]="touchUi">
|
[touchUi]="touchUi">
|
||||||
</ngx-mat-datetime-picker>
|
</ngx-mat-datetime-picker>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
@@ -140,7 +141,7 @@
|
|||||||
<div class="ion-icon-class">
|
<div class="ion-icon-class">
|
||||||
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
|
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="ion-input-class flex-grow-1">
|
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
|
||||||
|
|
||||||
<mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker">
|
<mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker">
|
||||||
<input matInput [ngxMatDatetimePicker]="fim"
|
<input matInput [ngxMatDatetimePicker]="fim"
|
||||||
|
|||||||
@@ -183,6 +183,9 @@ export class EditEventPage implements OnInit {
|
|||||||
participantes: new FormControl(this.taskParticipants, [
|
participantes: new FormControl(this.taskParticipants, [
|
||||||
Validators.required
|
Validators.required
|
||||||
]),
|
]),
|
||||||
|
Date: new FormControl(this.dateControlStart.toLocaleString() > this.dateControlEnd.toLocaleString()? 'ok': null,[
|
||||||
|
Validators.required
|
||||||
|
]),
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -254,6 +254,9 @@ export class NewEventPage implements OnInit {
|
|||||||
participantes: new FormControl(this.taskParticipants, [
|
participantes: new FormControl(this.taskParticipants, [
|
||||||
Validators.required
|
Validators.required
|
||||||
]),
|
]),
|
||||||
|
Date: new FormControl(this.dateControlStart.toLocaleString() > this.dateControlEnd.toLocaleString()? 'ok': null,[
|
||||||
|
Validators.required
|
||||||
|
]),
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user