diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 229c9aaf2..8e85112c0 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -4,7 +4,7 @@ {{modalTitle[taskType]}} -
+
@@ -13,7 +13,7 @@
-
+
@@ -27,26 +27,17 @@
-
+
- + Normal (4 dias para a execução da tarefa) Urgente (2 dias para a execução da tarefa) Muito Urgente (1 dia para a execução da tarefa) Urgentíssimo (8 horas para a execução da tarefa) -
-
-
-
-
-
- -
-
- - + + Normal Urgente Muito Urgente @@ -57,7 +48,6 @@
-
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 3d70e3e03..7bb21986e 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -14,7 +14,7 @@ import { SearchPage } from 'src/app/pages/search/search.page'; import { User } from 'src/app/models/user.model'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { ToastService } from 'src/app/services/toast.service'; -import { FormControl } from '@angular/forms'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; @@ -69,6 +69,9 @@ export class CreateProcessPage implements OnInit { adding: "intervenient" | "CC" = "intervenient"; profile: string; + Form: FormGroup; + validateFrom = false + emptyTextDescription = "Sem intervenientes selecionados"; showEmptyContainer = true; @@ -162,8 +165,40 @@ export class CreateProcessPage implements OnInit { this.modalController.dismiss(null); } - async saveTask(){ + + runValidation() { + this.validateFrom = true + } + + injectValidation() { + + this.Form = new FormGroup({ + Subject: new FormControl(this.postData.DispatchFolder.Subject, [ + Validators.required, + // Validators.minLength(4) + ]), + Message: new FormControl(this.postData.DispatchFolder.Message, [ + Validators.required, + ]), + Priority: new FormControl(this.postData.Priority, [ + Validators.required, + ]), + participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ + // Validators.required + ]), + + }) + } + + async saveTask() { + + this.injectValidation() + this.runValidation() + + if(this.Form.invalid) return false + + if(this.postData.Priority=='99999861') { this.dispatchFolder.DeadlineType = 'Normal'; } diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 2d82d4b0d..89fca4e37 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -13,11 +13,6 @@ import { PhotoService } from 'src/app/services/photo.service'; //Cordova import { Camera, CameraOptions } from '@ionic-native/camera/ngx'; -import { PublicationFolder } from 'src/app/models/publicationfolder'; -import { ViewPublicationsPage } from '../view-publications/view-publications.page'; -import { LoadingService } from 'src/app/services/loading.service'; -import { BadRequestPage } from '../../popover/bad-request/bad-request.page'; -import { SuccessMessagePage} from '../../popover/success-message/success-message.page'; import { ToastService } from 'src/app/services/toast.service'; @Component({