Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

This commit is contained in:
Peter Maquiran
2021-07-13 13:41:37 +01:00
14 changed files with 282 additions and 271 deletions
@@ -127,7 +127,6 @@
[showSeconds]="showSeconds"
[stepHour]="stepHour" [stepMinute]="stepMinute"
[stepSecond]="stepSecond"
[min]="endMinDate"
[touchUi]="touchUi">
</ngx-mat-datetime-picker>
</mat-form-field>
@@ -198,7 +197,6 @@
<input matInput [ngxMatDatetimePicker]="occurrrence"
placeholder="Choose a date"
[formControl]="dateControlOccurrence"
[min]="endMinDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
@@ -20,7 +20,7 @@ import * as moment from 'moment';
})
export class EditEventPage implements OnInit {
stEvent: Event;
isRecurring:string;
isEventEdited: boolean;
@@ -213,9 +213,9 @@ export class EditEventPage implements OnInit {
dateEnd: new FormControl(this.dateEnd, [
Validators.required
]),
/* IsRecurring: new FormControl(this.postEvent.IsRecurring, [
dateOccurrence: new FormControl(this.dateOccurrence, [
Validators.required
]), */
]),
participantes: new FormControl(this.taskParticipants, [
Validators.required
]),
@@ -226,6 +226,28 @@ export class EditEventPage implements OnInit {
})
}
openInicio() {
let input: any = document.querySelector('#new-inicio')
if(input) {
console.log(input)
input.click()
}
}
openFim() {
let input: any = document.querySelector('#new-fim')
if(input) {
input.click()
}
}
openLastOccurrence() {
let input: any = document.querySelector('#last-occurrence')
if(input) {
input.click()
}
}
async save() {
@@ -374,7 +374,7 @@ export class NewEventPage implements OnInit {
this.postEvent.HasAttachments = true;
}
if(this.selectedRecurringType != '-1'){
/* this.postEvent.EventRecurrence.Type = this.selectedRecurringType; */
this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
}
if(this.loggeduser.Profile == 'MDGPR') {