This commit is contained in:
tiago.kayaya
2021-07-05 13:49:33 +01:00
20 changed files with 281 additions and 79 deletions
@@ -70,7 +70,7 @@
</ion-select>
<mat-form-field class="d-none d-md-block width-100" >
<mat-form-field appearance="none" class="d-none d-md-block width-100" >
<mat-select placeholder="Selecione agenda" [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" >
<mat-option value="Oficial">
Oficial
@@ -111,7 +111,7 @@
>
</ion-datetime>
<mat-form-field class="width-100 date-hour-picker d-none d-md-block">
<mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block">
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date"
[formControl]="dateControlStart"
@@ -149,7 +149,7 @@
>
</ion-datetime>
<mat-form-field class="width-100 date-hour-picker d-none d-md-block">
<mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block">
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Choose a date"
[formControl]="dateControlEnd"
@@ -193,6 +193,7 @@
value="false"
interface="action-sheet"
required
appearance="none"
>
<mat-select [(value)]="eventProcess.workflowInstanceDataFields.IsRecurring">
<mat-option value="false">
@@ -179,7 +179,7 @@ export class EditEventPage implements OnInit {
Validators.required
]),
participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
Validators.required
// Validators.required
]),
})
@@ -134,7 +134,7 @@ export class NewEventPage implements OnInit {
this.loggeduser = userService.ValidatedUser;
this.dateControlStart = new FormControl(moment(new Date()));
this.dateControlEnd = new FormControl(moment(new Date()));
this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
}
ngOnInit() {
@@ -252,7 +252,7 @@ export class NewEventPage implements OnInit {
Validators.required
]),
participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
Validators.required
// Validators.required
]),
})
@@ -17,7 +17,7 @@ export class ContactsPage implements OnInit {
headers: HttpHeaders;
options:any;
contacts: Contact[] = [
contacts = [
{
first: 'Ana',
last: 'Manuel',
@@ -61,7 +61,6 @@ export class ContactsPage implements OnInit {
this.headers = this.headers.set('Accept','application/json');
this.headers = this.headers.set('content-type','application/json');
}
ngOnInit() {
@@ -1,19 +1,19 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { EditEventPage } from './edit-event.page';
import { EditEventToApproveComponent } from './edit-event.page';
describe('EditEventPage', () => {
let component: EditEventPage;
let fixture: ComponentFixture<EditEventPage>;
let component: EditEventToApproveComponent;
let fixture: ComponentFixture<EditEventToApproveComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ EditEventPage ],
declarations: [ EditEventToApproveComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(EditEventPage);
fixture = TestBed.createComponent(EditEventToApproveComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
@@ -110,6 +110,8 @@ export class ProfileComponent implements OnInit {
}
logout() {
// clear local storage
window.localStorage.clear();
this.router.navigate(['/']);
}