-
+
+ + +
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
+
+
-
+
@@ -32,13 +45,24 @@ -->
+ +
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
+
-
+
+
+
+
+ Campo obrigatório. +
+
+
+
-
+
+ +
+
+ {{ postEvent.Categories[0] }} +
+ Campo obrigatório. +
+
+
-
+
@@ -96,15 +137,16 @@
-
+
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 9af991193..e02c6e206 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -12,6 +12,9 @@ import { ToastService } from 'src/app/services/toast.service'; import { Event } from '../../../models/event.model'; import { AttendeesPageModal } from '../../events/attendees/attendees.page'; import { SearchPage } from '../../search/search.page'; +import { ThemePalette } from '@angular/material/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; + @Component({ selector: 'app-new-event', @@ -20,6 +23,23 @@ import { SearchPage } from '../../search/search.page'; }) export class NewEventPage implements OnInit { + // date picker + public date: any; + public disabled = false; + public showSpinners = true; + public showSeconds = false; + public touchUi = false; + public enableMeridian = false; + public minDate = new Date().toISOString().slice(0,10) + public endMinDate = new Date(new Date().getTime() + 15 * 60000); + public stepHour = 1; + public stepMinute = 5; + public stepSecond = 5; + public color: ThemePalette = 'primary'; + + Form: FormGroup; + validateFrom = false + postEvent: Event; eventBody: EventBody; segment:string = "true"; @@ -27,7 +47,6 @@ export class NewEventPage implements OnInit { eventAttendees: EventPerson[]; selectedSegment: string; selectedDate: Date; - minDate: string; adding: "intervenient" | "CC"; @@ -65,7 +84,6 @@ export class NewEventPage implements OnInit { let selectedEndDate = new Date(this.selectedDate); /* Set + 30minutes to seleted datetime */ selectedEndDate.setMinutes(this.selectedDate.getMinutes() + 30) ; - this.minDate = this.selectedDate.toString(); if(this.selectedSegment != "Combinada"){ this.postEvent ={ @@ -122,9 +140,56 @@ export class NewEventPage implements OnInit { this.modalController.dismiss(); } + + runValidation() { + this.validateFrom = true + } + + + get dateValid() { + if (window.innerWidth <= 800) { + return this.postEvent.StartDate < this.postEvent.EndDate? ['ok']: [] + } else { + return ['ok'] + } + } + + injectValidation() { + + this.Form = new FormGroup({ + Subject: new FormControl(this.postEvent.Subject, [ + Validators.required, + // Validators.minLength(4) + ]), + Location: new FormControl(this.postEvent.Location, [ + Validators.required, + ]), + CalendarName: new FormControl(this.postEvent.CalendarName, [ + Validators.required + ]), + Date: new FormControl(this.dateValid, [ + Validators.required + ]), + Categories: new FormControl(this.postEvent.Categories[0], [ + Validators.required + ]), + IsRecurring: new FormControl(this.postEvent.IsRecurring, [ + Validators.required + ]), + // participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ + // Validators.required + // ]), + + }) + } + async save() { - /* console.log(this.postEvent); - console.log(this.profile); */ + this.injectValidation() + this.runValidation() + + if(this.Form.invalid) return false + + console.log('passed') if(this.documents.length >= 0) { this.postEvent.HasAttachments = true; diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.ts b/src/app/pages/chat/new-group/contacts/contacts.page.ts index b2d114651..850e1a4cf 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.ts +++ b/src/app/pages/chat/new-group/contacts/contacts.page.ts @@ -17,7 +17,7 @@ export class ContactsPage implements OnInit { headers: HttpHeaders; options:any; - contacts: Contact[] = [ + contacts = [ { first: 'Ana', last: 'Manuel', diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 2e21d36b6..eb134f400 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -3,23 +3,16 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; -import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; -import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { momentG } from 'src/plugin/momentG' import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; -import { ExpedientTaskModalPage } from '../../expediente/expedient-task-modal/expedient-task-modal.page'; import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page'; import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; -import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; -import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; -import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page'; import { ToastService } from 'src/app/services/toast.service'; @@ -58,25 +51,18 @@ export class DespachoPage implements OnInit { private animationController: AnimationController, private toastService: ToastService, ) { - this.activatedRoute.paramMap.subscribe(params => { - console.log(params["params"]); - if(params["params"].SerialNumber) { this.serialnumber = params["params"].SerialNumber; } if(params["params"].caller) { this.caller = params["params"].caller; } - }); - } ngOnInit() { this.profile = "mdgpr"; - console.log(this.serialnumber); - this.activateRoute.paramMap.subscribe(paramMap => { if (!paramMap.has('SerialNumber')) { return; @@ -95,7 +81,7 @@ export class DespachoPage implements OnInit { goBack() { if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){ - if (window.innerWidth <= 800) { + if (window.innerWidth < 801) { this.router.navigate(['/home/gabinete-digital/pendentes']); } else { @@ -108,7 +94,7 @@ export class DespachoPage implements OnInit { } } else{ - if (window.innerWidth <= 800) { + if (window.innerWidth < 801) { this.router.navigate(['/home/gabinete-digital/despachos']); } else { let navigationExtras: NavigationExtras = { @@ -121,7 +107,6 @@ export class DespachoPage implements OnInit { } } - async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe(res => { this.task = { @@ -141,14 +126,10 @@ export class DespachoPage implements OnInit { "Status": res.workflowInstanceDataFields.Status, } this.fulltask = res; - console.log(this.task); - - console.log('GetTask', res); let thedate = new Date(this.task.CreateDate); this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]); - this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{ this.intervenientes = users.filter(user=>{ return user.Type == 'I'; @@ -156,37 +137,26 @@ export class DespachoPage implements OnInit { this.cc = users.filter(user=>{ return user.Type == 'CC'; }); - console.log(users); - }); - console.log(this.task.FolderId); - this.getDocumentDetails(this.task.FolderId, '361'); - }); } getDocumentDetails(forlderId:string, applicationId:string) { - console.log(forlderId); - this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{ this.attachments = res.Documents; - console.log(res['Documents']); - console.log(this.attachments); }) } async LoadRelatedEvents(serial: string) { if (this.eventsList == null) { this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => { - console.log(res); res.forEach(att => { if (this.eventsList == null) { this.eventsList = new Array(); } this.events.getEvent(att.ParentId).subscribe(event => { this.eventsList.push(event); - console.log(this.eventsList); }); }); }); @@ -195,7 +165,6 @@ export class DespachoPage implements OnInit { viewDocument(docId:string){ this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{ - console.log(res); const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); const browser = this.iab.create(url,"_blank"); browser.show(); @@ -289,10 +258,7 @@ export class DespachoPage implements OnInit { } async sendExpedienteToPending() { - console.log(this.serialnumber); - this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ - console.log(res); this.close(); this.toastService.successMessage('Processo enviado para despacho') }, @@ -319,7 +285,6 @@ export class DespachoPage implements OnInit { await modal.present(); modal.onDidDismiss().then(res => { - console.log(res); if(res.data){ const DocumentToSave = res.data.documents.map((e) => { @@ -369,31 +334,11 @@ export class DespachoPage implements OnInit { modal.onDidDismiss().then(res=>{ console.log(res['data']); if(res['data']=='openDiscart'){ - console.log('open discart'); - this.distartExpedientModal(); - } - }); } - async distartExpedientModal2(task: any){ - const modal = await this.modalController.create({ - component: DiscartExpedientModalPage, - componentProps: { - serialNumber: task.serialNumber, - folderId: task.workflowInstanceDataFields.FolderID, - action: 'discart', - }, - cssClass: 'discart-expedient-modal', - backdropDismiss: false - }); - - await modal.present(); - modal.onDidDismiss(); - } - async openBookMeetingModal(task: any) { let classs; if( window.innerWidth <= 800){ diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts index b64833626..576d2efac 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts @@ -53,16 +53,12 @@ export class DespachosPage implements OnInit { private router: Router, ) { this.profile = 'mdgpr'; - // alert('nice!') } ngOnInit() { //Inicializar segment this.segment = "despachos"; this.LoadList(); - this.authService.userData$.subscribe((res:any)=>{ - console.log(res); - }); } segmentChanged(ev: any) { @@ -70,25 +66,15 @@ export class DespachosPage implements OnInit { } - - notImplemented() { - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - openExpedientDetailPage(data) { this.openExpedientDetail.emit(data); } async LoadList() { - console.log('HERE'); let result = await this.processes.GetTasksList("Despacho", false).toPromise(); //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); this.despachoList = new Array(); - - console.log(result); - console.log('OI'); - await result.forEach( (element, index) => { @@ -108,18 +94,11 @@ export class DespachosPage implements OnInit { "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, } - this.despachoList.push(task) - }); - - console.log(this.despachoList); - - this.despachoList = this.sortArrayISODate(this.despachoList).reverse() this.despachoList.forEach( (element, index) => { - console.log(element); // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; let FolderID = element['FolderID']; @@ -127,9 +106,7 @@ export class DespachosPage implements OnInit { this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{ element.DocumentsQty = res.DocumentsTotal }) - }); - } sortArrayISODate(myArray: any) { diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss index d9e363264..654570be5 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss @@ -11,7 +11,6 @@ ion-content, .header-2, .main-content{ padding: 30px 20px 0 20px !important; - background-color: white; } .main-content { diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 0a777b7d7..119aa88b7 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -5,6 +5,7 @@
+
Diplomas
-
+
+
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
+
+
-
+
- - - Campo obrigatório - +
+
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
@@ -34,7 +51,7 @@
-
+
- + Oficial @@ -66,7 +83,7 @@
-
+
- + @@ -105,7 +122,7 @@
-
+
- + @@ -168,6 +185,7 @@ value="false" interface="action-sheet" required + appearance="none" > @@ -263,9 +281,7 @@
-
-
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss index 7a4a2d624..24d21b73b 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss @@ -205,4 +205,4 @@ .close-button { display: block !important; } -} \ No newline at end of file +} diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 51a31a44f..b8df83005 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -14,7 +14,7 @@ import { User } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; 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 * as _moment from 'moment'; import * as _rollupMoment from 'moment'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; @@ -54,8 +54,12 @@ export class BookMeetingModalPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate: any; - public maxDate: any; + public minDate = new Date(); + public ionicMinDate = new Date().toISOString().slice(0,10) + + // curent timestamp + 15 minutes + public endMinDate = new Date(new Date().getTime() + 15 * 60000); + public stepHour = 1; public stepMinute = 5; public stepSecond = 5; @@ -63,6 +67,10 @@ export class BookMeetingModalPage implements OnInit { public dateControlStart = new FormControl(moment("DD MM YYYY hh")); public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); + Form: FormGroup; + validateFrom = false + + showLoader = false get dateStart () { @@ -134,6 +142,9 @@ export class BookMeetingModalPage implements OnInit { /* Set + 30minutes to seleted datetime */ let selectedEndDate = new Date(); /* this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */ + + this.dateControlStart = new FormControl(moment(new Date())); + this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000))); } ngOnInit() { @@ -157,8 +168,54 @@ export class BookMeetingModalPage implements OnInit { window.history.back(); } + + runValidation() { + this.validateFrom = true + } + + get dateValid() { + if (window.innerWidth <= 800) { + return this.postData.StartDate < this.postData.EndDate? ['ok']: [] + } else { + return ['ok'] + } + } + + injectValidation() { + + this.Form = new FormGroup({ + Subject: new FormControl(this.postData.Subject, [ + Validators.required, + // Validators.minLength(4) + ]), + Location: new FormControl(this.postData.Location, [ + Validators.required, + ]), + CalendarName: new FormControl(this.postData.CalendarName, [ + Validators.required + ]), + Date: new FormControl(this.dateValid, [ + Validators.required + ]), + // participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ + // Validators.required + // ]), + + }) + } + + async saveTask(){ - // issue12323423 + + if(this.loggeduser.Profile == 'MDGPR') { + this.injectValidation() + this.runValidation() + } + + + if(this.Form.invalid) return false + + let Attendees = this.taskParticipants.concat(this.taskParticipantsCc); this.eventBody={ diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 7983b307f..5660f3d45 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -4,10 +4,22 @@ {{modalTitle[taskType]}} -
+ +
+
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
+
+
@@ -16,25 +28,36 @@
-
+
+ +
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
+
-
+
Normal (4 dias para a execução da tarefa) Urgente (2 dias para a execução da tarefa) @@ -42,7 +65,7 @@ Urgentíssimo (8 horas para a execução da tarefa) - + Normal (4 dias para a execução da tarefa) Urgente (2 dias para a execução da tarefa) @@ -54,14 +77,26 @@
+ +
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
+
+
-
+
+ class="ion-no-border ion-no-padding ion-no-margin d-block d-md-none"> + class="width-100 d-none d-md-block" + appearance="none"> {{type.Description}} @@ -81,6 +117,18 @@
+ +
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
+
+
@@ -155,7 +203,6 @@
-
{ console.log(res); this.subjectTypes = res; @@ -178,8 +177,51 @@ export class ExpedientTaskModalPage implements OnInit { this.modalController.dismiss(null); } + runValidation() { + this.validateFrom = true + } + + injectValidation() { + + this.Form = new FormGroup({ + Subject: new FormControl(this.postData.DispatchFolder.Subject, [ + Validators.required, + // Validators.minLength(4) + ]), + Location: new FormControl(this.postData.DispatchFolder.Message, [ + Validators.required, + ]), + selectedTypes: new FormControl(this.toppingsValues, [ + Validators.required, + ]), + Priority: new FormControl(this.postData.Priority, [ + Validators.required, + ]), + // CalendarName: new FormControl(this.postEvent.CalendarName, [ + // Validators.required + // ]), + // Categories: new FormControl(this.postEvent.Categories[0], [ + // Validators.required + // ]), + // IsRecurring: new FormControl(this.postEvent.IsRecurring, [ + // Validators.required + // ]), + // participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ + // Validators.required + // ]), + + }) + } + async saveTask(){ + if(this.loggeduser.Profile == 'MDGPR') { + this.injectValidation() + this.runValidation() + } + + if(this.Form.invalid) return false + if(this.postData.Priority=='99999861'){ this.dispatchFolder.DeadlineType = 'Normal'; } 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 e5271162e..2f1abe4e9 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 @@ -3,20 +3,15 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; -import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; -import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular'; -import { AlertService } from 'src/app/services/alert.service'; +import { ModalController, PopoverController } from '@ionic/angular'; import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page'; import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { momentG } from 'src/plugin/momentG' import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; -import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; -import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; import { ToastService } from 'src/app/services/toast.service'; @Component({ @@ -43,20 +38,16 @@ export class ExpedienteDetailPage implements OnInit { hideSendToPendentes = true - constructor( private processes: ProcessesService, private iab: InAppBrowser, private attachments: AttachmentsService, private events: EventsService, - private menu: MenuController, private router: Router, private modalController: ModalController, - private alertService: AlertService, public popoverController: PopoverController, private activatedRoute: ActivatedRoute, private toastService: ToastService, - private animationController: AnimationController, ) { this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { @@ -164,6 +155,11 @@ export class ExpedienteDetailPage implements OnInit { }); }) + + + console.log('this.task', this.task) + console.log('this.task.DocumentURL', this.task.DocumentURL) + }); @@ -185,9 +181,10 @@ export class ExpedienteDetailPage implements OnInit { } } - viewDocument(){ + viewDocument() { this.processes.GetDocumentUrl(this.task.DocId, this.task.FsId).subscribe(res=>{ const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); + const browser = this.iab.create(url,"_blank"); browser.show(); diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index c033ff438..f75893690 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -124,7 +124,6 @@ export class ExpedientePrPage implements OnInit { this.router.navigate(['/home/gabinete-digital'], navigationExtras); } break; - } }); } @@ -263,7 +262,7 @@ export class ExpedientePrPage implements OnInit { async openAddNoteModal(actionName:string) { let classs; - if( window.innerWidth <= 800){ + if( window.innerWidth < 801){ classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop' diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index c12c8b06f..2c3a5143f 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -43,6 +43,7 @@ export class ExpedientesPrPage implements OnInit { this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { this.LoadList(); + console.log('not run'); } }); } @@ -102,7 +103,6 @@ export class ExpedientesPrPage implements OnInit { console.log(this.taskslist); this.showLoader = false; }); - break; } } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 7d6a6d3a1..9d96928d5 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -186,7 +186,7 @@ export class GabineteDigitalPage implements OnInit { this.selectedElement='DiplomasPorValidar'; } else if(this.router.url == '/home/gabinete-digital?diplomasassinar=true'){ - this.openDiplomasPage(''); + this. openDiplomasAssinarPage(); this.selectedElement='DiplomasAssinar'; } } @@ -276,7 +276,7 @@ export class GabineteDigitalPage implements OnInit { console.log(event); this.closeAllDesktopComponents(); - switch(this.loggeduser.Profile){ + /* switch(this.loggeduser.Profile){ case 'MDGPR': this.selectedElement='Correspondence'; this.showExpedients = true; @@ -286,7 +286,7 @@ export class GabineteDigitalPage implements OnInit { this.selectedElement='ExpedientesPr'; this.showExpedientesPr = true; break; - } + } */ this.LoadCounts(); //this.refreshExpedientes(); @@ -445,21 +445,8 @@ export class GabineteDigitalPage implements OnInit { openDiplomasAssinarPage() { this.closeAllDesktopComponents(); - - if (this.loggeduser.Profile == 'MDGPR') { if( window.innerWidth <= 801){ - let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}}; - this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras); - } - else{ - let navigationExtras: NavigationExtras = { queryParams: {"diplomasassinar": true,}}; - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - this.showDiplomasAssinar = true; - } - } else { - if( window.innerWidth <= 801){ - let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}}; - this.router.navigate(['/home/gabinete-digital/diplomas-assinar'], navigationExtras); + this.router.navigate(['/home/gabinete-digital/diplomas-assinar']); } else{ let navigationExtras: NavigationExtras = { queryParams: {"diplomasassinar": true,}}; @@ -467,6 +454,5 @@ export class GabineteDigitalPage implements OnInit { this.showDiplomasAssinar = true; } } - } } diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 60b0a4e80..ce1941007 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -137,7 +137,6 @@ export class PedidoPage implements OnInit { "activityInstanceName": res.activityInstanceName, "Status": res.workflowInstanceDataFields.Status, } - console.log(this.task); } let thedate = new Date(res.taskStartDate); @@ -150,7 +149,6 @@ export class PedidoPage implements OnInit { this.cc = users.filter(user=>{ return user.Type == 'CC'; }); - console.log(users); }); this.getDocumentDetails(res.workflowInstanceDataFields.FolderID, '361'); }); @@ -160,13 +158,11 @@ export class PedidoPage implements OnInit { this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{ this.attachments = res.Documents; // console.log(res['Documents']); - console.log(this.attachments); }) } viewDocument(docId:string){ this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{ - console.log(res); const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); const browser = this.iab.create(url,"_blank"); browser.show(); @@ -255,7 +251,6 @@ export class PedidoPage implements OnInit { sendExpedienteToPending() { this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ - console.log(res); this.goBack(); }); } diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index 12af1ddce..0681084a4 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -101,8 +101,6 @@ export class PedidosPage implements OnInit { let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise(); let allParecer = parecer.concat(parecerPr).reverse(); - console.log(allParecer); - this.parecerList = new Array(); allParecer.forEach(element => { @@ -125,7 +123,6 @@ export class PedidosPage implements OnInit { } this.parecerList.push(task); }); - console.log(this.parecerList); } else if(this.segment == 'deferimento') { @@ -156,11 +153,9 @@ export class PedidosPage implements OnInit { } this.deferimentoList.push(task); }); - console.log(this.deferimentoList); }); } - console.log(this.taskType); } doRefresh(event) { diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index 45065d2a9..ca7e4a003 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -71,7 +71,7 @@
-
+
Entrar com senha
diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html index 1b6d8c16a..c0c33141f 100644 --- a/src/app/pages/publications/new-action/new-action.page.html +++ b/src/app/pages/publications/new-action/new-action.page.html @@ -35,7 +35,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022"> + max="2025">
@@ -54,7 +54,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022"> + max="2025">
diff --git a/src/app/resolvers/processes-resolver.service.spec.ts b/src/app/resolvers/processes-resolver.service.spec.ts new file mode 100644 index 000000000..300778951 --- /dev/null +++ b/src/app/resolvers/processes-resolver.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ProcessesResolverService } from './processes-resolver.service'; + +describe('ProcessesResolverService', () => { + let service: ProcessesResolverService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ProcessesResolverService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/resolvers/processes-resolver.service.ts b/src/app/resolvers/processes-resolver.service.ts new file mode 100644 index 000000000..322839b3c --- /dev/null +++ b/src/app/resolvers/processes-resolver.service.ts @@ -0,0 +1,20 @@ +import { Injectable } from '@angular/core'; +import { ActivatedRoute, ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; +import { Observable } from 'rxjs'; +import { DailyWorkTask } from '../models/dailyworktask.model'; +import { ProcessesService } from '../services/processes.service'; + +@Injectable({ + providedIn: 'root' +}) +export class ProcessesResolverService implements Resolve { + + constructor( + private processesService: ProcessesService, + ) { } + + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): + Observable | Promise | any[] { + return this.processesService.GetTasksList("Despacho do Presidente da República", false); + } +} diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index aef08ebf8..740177c72 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -70,7 +70,7 @@ - + Oficial @@ -107,11 +107,11 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022" + max="2025" > - + - + diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 774c84205..d38c61290 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -220,7 +220,7 @@ export class EditEventToApprovePage implements OnInit { // Validators.required // ]), participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ - Validators.required + // Validators.required ]), }) diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 34e38c31d..f8217e43e 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -179,7 +179,7 @@ export class EditEventPage implements OnInit { Validators.required ]), participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ - Validators.required + // Validators.required ]), }) diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 55376a244..1ca114dfa 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -118,7 +118,7 @@ @@ -193,7 +193,7 @@
- Adicionar participant. + Adicionar participante.
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 681ac04e3..073538d0a 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -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 ]), }) diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.ts b/src/app/shared/chat/new-group/contacts/contacts.page.ts index b2d114651..da4de0c8a 100644 --- a/src/app/shared/chat/new-group/contacts/contacts.page.ts +++ b/src/app/shared/chat/new-group/contacts/contacts.page.ts @@ -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() { diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index 2e29c5ccd..bfbbb6d2f 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -62,14 +62,14 @@ export class DespachosPage implements OnInit { } ngOnInit() { - //Inicializar segment - this.segment = "despachos"; - this.LoadList(); - this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { - this.doRefresh(); - } - }); + //Inicializar segment + this.segment = "despachos"; + this.LoadList(); + this.router.events.forEach((event) => { + if(event instanceof NavigationEnd && event.url == this.router.url) { + this.doRefresh(); + } + }); } @@ -86,19 +86,14 @@ export class DespachosPage implements OnInit { } openExpedientDetailPage(data){ - console.log(data); this.openExpedientDetail.emit(data); } async LoadList(){ - console.log('HERE DESK'); - let result = await this.processes.GetTasksList("Despacho", false).toPromise(); //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); this.despachoList = new Array(); - - console.log(result); await result.forEach( (element, index) => { @@ -127,7 +122,6 @@ export class DespachosPage implements OnInit { this.despachoList = this.sortArrayISODate(this.despachoList).reverse() this.despachoList.forEach( (element, index) => { - console.log(element['FolderID']); // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; let FolderID = element['FolderID']; @@ -154,25 +148,6 @@ export class DespachosPage implements OnInit { }, 2000); } - async viewExpedientDetail(serialNumber:any) { - console.log(this.profile); - - const modal = await this.modalController.create({ - component: DespachoPage, - componentProps:{ - enterAnimation: "", - serialNumber: serialNumber, - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ - console.log('refresh list'); - this.LoadList(); - }); - } - // old async openExpedientActionsModal(taskAction: any, task: any) { //this.modalController.dismiss(); diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 0a61077ed..27ccb6ac5 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -43,12 +43,7 @@ constructor( } goToDiploma(serialNumber:any){ - let navigationExtras: NavigationExtras = { - queryParams: { - "serialNumber": serialNumber, - } - }; - this.router.navigate(['/home/gabinete-digital/diplomas/diploma'], navigationExtras); + this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']); } notImplemented(){ diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index a3a2551a3..a8f44e586 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -120,7 +120,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022" + max="2025" > diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.spec.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.spec.ts index 509415955..fe2cdeef9 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.spec.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.spec.ts @@ -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; + let component: EditEventToApproveComponent; + let fixture: ComponentFixture; 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(); })); diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index b709a7ceb..5508efaef 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -44,14 +44,12 @@ export class ExpedientsPage implements OnInit { this.LoadList(); this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { - this.doRefresh(); + this.LoadList(); } }); } segmentChanged(){ - console.log(this.segment); - this.LoadList(); } @@ -66,7 +64,6 @@ export class ExpedientsPage implements OnInit { LoadList(){ this.processes.GetTasksList("Expediente", false).subscribe(result => { - console.log(result); this.taskslist = new Array(); let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); res.forEach(element => { @@ -86,12 +83,10 @@ export class ExpedientsPage implements OnInit { } this.taskslist.push(task); }); - console.log(this.taskslist); }); } doRefresh() { - console.log('refresh expedientes1'); this.LoadList(); } diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 9c530c8fe..95267f4be 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -28,8 +28,8 @@ -
-
+
+
@@ -64,7 +64,7 @@
-
+
{ this.taskslist = result; - console.log(result); - this.deferimentoList = new Array(); let res = result.reverse(); res.forEach(element => { @@ -134,11 +131,9 @@ export class PedidosPage implements OnInit { } this.deferimentoList.push(task); }); - console.log(this.deferimentoList); }); } - console.log(this.taskType); } doRefresh() { @@ -152,7 +147,6 @@ export class PedidosPage implements OnInit { } async viewPedidoDetail(serialNumber:any) { - console.log(this.profile); const modal = await this.modalController.create({ component: PedidoPage, diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index 4f908b06f..66c9cb530 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -48,7 +48,7 @@ export class PendentesPage implements OnInit { this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { - this.doRefresh(); + this.LoadList(); } }); } @@ -57,10 +57,6 @@ export class PendentesPage implements OnInit { this.LoadList(); } - notImplemented(){ - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - openExpedientDetailPage(data){ console.log(data); this.openExpedientDetail.emit(data); @@ -69,9 +65,7 @@ export class PendentesPage implements OnInit { async LoadList(){ this.showLoader = true; this.pendentesList = []; - console.log('clear'); - let despachos = await this.processes.GetTasksList("Despacho", false).toPromise(); let pareceres = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise(); let deferimentos = await this.processes.GetTasksList("Pedido de Deferimento", false).toPromise(); @@ -85,7 +79,6 @@ export class PendentesPage implements OnInit { let ApplicationId = element.workflowInstanceDataFields.ApplicationId; this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{ this.totalDocs = res.DocumentsTotal; - console.log(res.DocumentsTotal); let date = new Date(element.taskStartDate); date.setMonth(date.getMonth() + 1); let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); @@ -132,12 +125,7 @@ export class PendentesPage implements OnInit { doRefresh() { - console.log('Refresh pendentes'); - this.LoadList(); - - setTimeout(() => { - }, 2000); } async viewTaskDetails(serialNumber:string, workflowName:string) { @@ -152,60 +140,6 @@ export class PendentesPage implements OnInit { this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); } } - - async openDespacho(serialNumber:string){ - - const modal = await this.modalController.create({ - component: DespachoPage, - componentProps:{ - enterAnimation: "", - serialNumber: serialNumber, - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ - console.log('refresh list'); - this.LoadList(); - }); - } - - async openPedido(serialNumber:string){ - - const modal = await this.modalController.create({ - component: PedidoPage, - componentProps:{ - enterAnimation: "", - serialNumber: serialNumber, - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ - console.log('refresh list'); - this.LoadList(); - }); - } - - async viewExpedientDetail(serialNumber:any) { - console.log(this.profile); - const modal = await this.modalController.create({ - component: ExpedienteDetailPage, - componentProps:{ - enterAnimation: "", - serialNumber: serialNumber, - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ - console.log('refresh list'); - this.LoadList(); - }); - } } \ No newline at end of file diff --git a/src/app/shared/headers/header-no-search/profile/profile.page.html b/src/app/shared/headers/header-no-search/profile/profile.page.html index 0d6d6415b..78759ad91 100644 --- a/src/app/shared/headers/header-no-search/profile/profile.page.html +++ b/src/app/shared/headers/header-no-search/profile/profile.page.html @@ -30,7 +30,6 @@
- PIN
diff --git a/src/app/shared/headers/header-no-search/profile/profile.page.ts b/src/app/shared/headers/header-no-search/profile/profile.page.ts index d578dba59..f2f905825 100644 --- a/src/app/shared/headers/header-no-search/profile/profile.page.ts +++ b/src/app/shared/headers/header-no-search/profile/profile.page.ts @@ -14,7 +14,7 @@ import { PinPage } from 'src/app/shared/pin/pin.page'; export class ProfileComponent implements OnInit { loggeduser: User; - userLoginPreference: boolean + userLoginPreference = '' constructor(private modalController:ModalController, private authService: AuthService, @@ -110,6 +110,8 @@ export class ProfileComponent implements OnInit { } logout() { + // clear local storage + window.localStorage.clear(); this.router.navigate(['/']); } @@ -140,7 +142,7 @@ export class ProfileComponent implements OnInit { if (userData.hasOwnProperty('loginPreference')) { this.userLoginPreference = userData.loginPreference } else { - this.userLoginPreference = false + this.userLoginPreference = '' } } diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 583cca30b..861784212 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -63,6 +63,8 @@ export class DespachosOptionsPage implements OnInit { } sendExpedienteToPending(){ + console.log(this.task.SerialNumber); + this.popoverController.dismiss(); this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ console.log(res); diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index 227b4626c..66d8df8af 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -119,7 +119,7 @@ export class OptsExpedientePrPage implements OnInit { async approve(note:string, documents:any){ this.popoverController.dismiss(); let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.task.SerialNumber, "action": "Aprovar", "ActionTypeId": 100000004 , "dataFields": { @@ -182,7 +182,7 @@ export class OptsExpedientePrPage implements OnInit { this.toastService.successMessage('Processo descartado'); this.goBack(); } catch (error) { - this.toastService.badRequest('Processo não descartado') + this.toastService.badRequest('Processo não descartado'); } this.goBack(); } @@ -193,7 +193,7 @@ export class OptsExpedientePrPage implements OnInit { this.toastService.successMessage(); this.goBack(); } catch (error) { - this.toastService.badRequest() + this.toastService.badRequest(); } } } @@ -203,7 +203,7 @@ export class OptsExpedientePrPage implements OnInit { async sendToReview(note:string, documents:any){ let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.task.SerialNumber, "action": "Retificar", "ActionTypeId": 99999877, "dataFields": { @@ -213,7 +213,7 @@ export class OptsExpedientePrPage implements OnInit { } try { - await this.processes.CompleteTask(body); + await this.processes.CompleteTask(body).toPromise(); this.close(); this.toastService.successMessage() } catch(error) { @@ -223,7 +223,7 @@ export class OptsExpedientePrPage implements OnInit { sendExpedienteToPending(){ this.popoverController.dismiss(); - this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ + this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ console.log(res); this.close(); }); @@ -285,15 +285,15 @@ export class OptsExpedientePrPage implements OnInit { } goBack() { - let navigationExtras: NavigationExtras = { - queryParams: { - "expedientes-pr": true, - } - }; - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - - // window.history.back(); - + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/expedientes-pr']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + "expedientes-pr": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } } - } diff --git a/src/app/shared/publication/edit-action/edit-action.page.html b/src/app/shared/publication/edit-action/edit-action.page.html index 21ceb8f32..ecf256aaa 100644 --- a/src/app/shared/publication/edit-action/edit-action.page.html +++ b/src/app/shared/publication/edit-action/edit-action.page.html @@ -37,7 +37,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022"> + max="2025">
diff --git a/src/app/shared/publication/new-action/new-action.page.html b/src/app/shared/publication/new-action/new-action.page.html index 40e9946b8..415ef17d5 100644 --- a/src/app/shared/publication/new-action/new-action.page.html +++ b/src/app/shared/publication/new-action/new-action.page.html @@ -37,7 +37,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022"> + max="2025">
@@ -57,7 +57,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022"> + max="2025">
diff --git a/src/global.scss b/src/global.scss index 5237adf0d..f63fca173 100644 --- a/src/global.scss +++ b/src/global.scss @@ -287,6 +287,10 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- .btn-refresh{ display: none; } + .attach-title-item{ + width: 200px !important; + border: 1px solid red; + } } .hideAsideOptions{ @@ -646,6 +650,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- // center +app-diploma-assinar ion-content .main-content, app-approve-event ion-content .main-content, app-view-event ion-content .main-content, app-expediente-pr .main-content{ @@ -955,11 +960,11 @@ background: rgb(92, 92, 92); .date-hour-picker { margin-top: -6px; - + label#mat-form-field-label-7 { display: none; } - + .span.ng-tns-c193-4, .ng-star-inserted { // display: none; } @@ -967,7 +972,7 @@ background: rgb(92, 92, 92); .ng-star-inserted{ // display: none; position: absolute; - width: 447px; + width: 100%; height: 43px; opacity: 0; button { @@ -975,7 +980,15 @@ background: rgb(92, 92, 92); height: 100%; } } -} + button { + width: 100%; + height: 100%; + } + + .mat-datepicker-toggle, mat-datepicker-toggle { + width: 100%; + } + } .mat-active span { color: #0d89d1 !important; @@ -1013,3 +1026,10 @@ ngx-mat-datetime-content{ } } + + +// angular material inputs + +.mat-form-field-infix, .mat-form-field-wrapper { + padding: 0px !important; +} \ No newline at end of file