diff --git a/src/app/Rules/despacho-md.service.ts b/src/app/Rules/despacho-md.service.ts index ca065d75d..e4d9b9448 100644 --- a/src/app/Rules/despacho-md.service.ts +++ b/src/app/Rules/despacho-md.service.ts @@ -64,7 +64,7 @@ export class DespachoMdService { return this.processes.CompleteTask(body) } - + sendExpedienteToPending(serialnumber) { return this.processes.SetTaskToPending(serialnumber) diff --git a/src/app/Rules/document.service.spec.ts b/src/app/Rules/document.service.spec.ts new file mode 100644 index 000000000..49475199d --- /dev/null +++ b/src/app/Rules/document.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { DocumentService } from './document.service'; + +describe('DocumentService', () => { + let service: DocumentService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(DocumentService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/Rules/document.service.ts b/src/app/Rules/document.service.ts new file mode 100644 index 000000000..f40393ea0 --- /dev/null +++ b/src/app/Rules/document.service.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; +import { DocumentSetUpMeeting } from '../models/CallMeeting'; +import { ProcessesService } from '../services/processes.service'; + +@Injectable({ + providedIn: 'root' +}) +export class DocumentService { + + constructor( + private processes: ProcessesService + ) { } + + setUpMeeting(data: DocumentSetUpMeeting) { + + return this.processes.documentSetUpMeeting(data) + } + +} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 95fbf960e..8a18893b1 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -151,9 +151,13 @@ const routes = [ { path: 'eliminate-event', loadChildren: () => import('./modals/eliminate-event/eliminate-event.module').then( m => m.EliminateEventPageModule) + }, + { + path: 'inactivity', + loadChildren: () => import('./pages/inactivity/inactivity.module').then( m => m.InactivityPageModule) }, { - path: 'inactivity', - loadChildren: () => import('./pages/inactivity/inactivity.module').then( m => m.InactivityPageModule) + path: 'document-set-up-meeting', + loadChildren: () => import('./modals/document-set-up-meeting/document-set-up-meeting.module').then( m => m.DocumentSetUpMeetingPageModule) }, { path: 'profile', @@ -162,6 +166,7 @@ const routes = [ + /* path: 'chat', component: ChatPage diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index 0a7790cfe..658e7d63f 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -5,6 +5,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; +import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page'; @Component({ selector: 'app-document-detail', @@ -37,7 +38,6 @@ export class DocumentDetailPage implements OnInit { ngOnInit() { this.LoadDocumentDetails(); - } async LoadDocumentDetails() { @@ -163,9 +163,10 @@ export class DocumentDetailPage implements OnInit { classs = 'modal modal-desktop showAsideOptions' } const modal = await this.modalController.create({ - component: BookMeetingModalPage, + component: DocumentSetUpMeetingPage, componentProps: { task: task, + document: this.LoadedDocument }, cssClass: classs, backdropDismiss: false diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting-routing.module.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting-routing.module.ts new file mode 100644 index 000000000..9bec79f58 --- /dev/null +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { DocumentSetUpMeetingPage } from './document-set-up-meeting.page'; + +const routes: Routes = [ + { + path: '', + component: DocumentSetUpMeetingPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class DocumentSetUpMeetingPageRoutingModule {} diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.module.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.module.ts new file mode 100644 index 000000000..7e872039d --- /dev/null +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.module.ts @@ -0,0 +1,57 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { IonicModule } from '@ionic/angular'; + +import { DocumentSetUpMeetingPageRoutingModule } from './document-set-up-meeting-routing.module'; +import { DocumentSetUpMeetingPage } from './document-set-up-meeting.page'; +import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; +import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; + + +import { MatNativeDateModule } from '@angular/material/core'; +import { + NgxMatDateFormats, + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule, + NGX_MAT_DATE_FORMATS +} from '@angular-material-components/datetime-picker'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatSelectModule } from '@angular/material/select'; +import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { MAT_DATE_LOCALE } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatInputModule } from '@angular/material/input'; + + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + DocumentSetUpMeetingPageRoutingModule, + // + + EmptyContainerPageModule, + + AttendeeModalPageModule, + EmptyContainerPageModule, + BtnModalDismissPageModule, + // Angular material + MatDatepickerModule, + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, + ReactiveFormsModule + ], + declarations: [DocumentSetUpMeetingPage] +}) +export class DocumentSetUpMeetingPageModule {} diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html new file mode 100644 index 000000000..a2a03a0ca --- /dev/null +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html @@ -0,0 +1,355 @@ + +
+ +
+
+
+ + + + + +
+
+
+ +
+ +
+ +
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + + +
+
+
+ +
+
+ + Oficial + Pessoal + + + + + + + Oficial + + + Pessoal + + + + +
+
+
+ + +
+
+
+ +
+
+ + + Reunião + Viagem + Conferência + Encontro + + + + + + + + Reunião + + + Viagem + + + Conferência + + + Encontro + + + + + +
+
+
+ +
+
+
+ +
+
+ + + + + + + + + + +
+
+
+ +
+
+
+ +
+
+ + + + + + + + + +
+
+
+ +
+
+
+ +
+
+ + Não se repete + Repete + + + + + + + + Não se repete + + + Repete + + + + +
+
+
+ + + + +
+
+
+ +
+
+
+ + + Adicionar intervenientes* + {{participant.Name}} + + +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ + + Com conhecimento + {{participant.Name}} + + +
+
+ +
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+ +
+ +
+
+ Anexar Documentos +
+ +
+ +
+ + + +

+ {{document.Assunto}} + {{document.appName}} + + + +

+

{{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}

+ + + +
+
+
+ +
+ + + + +
+
+ + +
+ + +
+ + diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss new file mode 100644 index 000000000..637cd24d1 --- /dev/null +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss @@ -0,0 +1,209 @@ +.content{ + margin: 0; + float: left; + + .header-content{ + } + .header-title{ + font-family: Roboto; + font-size: 25px; + padding: 0; + color:#000; + float: left; + } + + .ion-item-container{ + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 10px; + + } + .ion-item-container-no-border{ + margin: 0px auto; + padding: 0 !important; + overflow: auto; + } + .container-div{ + margin-bottom: 15px; + overflow: hidden; + } + .ion-item-class-2{ + margin: 0px auto; + } + .ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; + } + ion-select{ + padding-left: 5px; + margin-left: 0; + } + .ion-input-class{ + width: calc(100% - 45px); + height: 45px; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; + } + .ion-input-class-no-height{ + border: 1px solid #ebebeb; + border-radius: 5px; + overflow: auto; + } + .list-people{ + width: 256px; + float: left; + + } + .add-people{ + width: 45px; + float: right; + overflow: auto; + font-size: 25px; + padding: 10px; + } + .list-people-title{ + /* font-size: 13px; */ + color: #a3a3a3; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + width: 100%; + font-size: 15px; + color:#0d89d1; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; + float: right; + font-size: 13px; + } + } + .container-footer{ + margin:0 auto; + overflow: auto; + } + .button-cancel { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color: #061b52; + margin:10px; + } + .button-save { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #42b9fe; + --color:#ffffff; + margin:10px; + } + + .text-input{ + width: 100%; + border: 1px solid #ebebeb; + margin: 0px 15px 15px 0px; + padding: 0 !important; + border-radius: 5px; + } + + /* Error Messages */ + .error{ + color:red; + font-size: 12px; + font-weight: bold; + padding-bottom: 20px; + } + .span-color{ + color:red; + } + .buttons{ + display: flex; + justify-content: space-between; + padding: 20px; + overflow: auto; + } + + + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + width: 100%; + font-size: 15px; + color:#0d89d1; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; + float: right; + font-size: 13px; + } + + + + + + + .app-name{ + background: #42b9f2; + border-radius: 18px; + text-align: center; + display: flex; + align-items: center; + padding: 0px 5px; + color: white; + font-size: 9pt; + font-weight: 500; + height: 19px; + -webkit-border-radius: 18px; + -moz-border-radius: 18px; + -ms-border-radius: 18px; + -o-border-radius: 18px; + } + + + .close-button { + display: none; + } + + + .list:hover { + + .app-name { + display: none; + } + + .close-button { + display: block !important; + } + } + \ No newline at end of file diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.spec.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.spec.ts new file mode 100644 index 000000000..6ae6182e2 --- /dev/null +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { DocumentSetUpMeetingPage } from './document-set-up-meeting.page'; + +describe('DocumentSetUpMeetingPage', () => { + let component: DocumentSetUpMeetingPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DocumentSetUpMeetingPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(DocumentSetUpMeetingPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts new file mode 100644 index 000000000..bf00a69a0 --- /dev/null +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -0,0 +1,379 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { ModalController, NavParams } from '@ionic/angular'; +import { Event } from 'src/app/models/event.model' +import { ProcessesService } from 'src/app/services/processes.service'; +import { EventPerson } from 'src/app/models/eventperson.model'; +import { SearchPage } from 'src/app/pages/search/search.page'; +import { SearchDocument } from 'src/app/models/search-document'; +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, FormGroup, Validators } from '@angular/forms'; +import * as _moment from 'moment'; +import * as _rollupMoment from 'moment'; +import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; +import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { MAT_DATE_LOCALE } from '@angular/material/core'; +import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; +import { DocumentService } from 'src/app/Rules/document.service'; +import { DocumentSetUpMeeting, Attachments } from 'src/app/models/CallMeeting'; + +const moment = _rollupMoment || _moment; + +const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { + parse: { + dateInput: "YYYY-MMMM-DD HH:mm" + }, + display: { + dateInput: "DD MMM YYYY H:mm", + monthYearLabel: "MMM YYYY", + dateA11yLabel: "LL", + monthYearA11yLabel: "MMMM YYYY" + } +} + +@Component({ + selector: 'app-document-set-up-meeting', + templateUrl: './document-set-up-meeting.page.html', + styleUrls: ['./document-set-up-meeting.page.scss'], +}) +export class DocumentSetUpMeetingPage implements OnInit { + + public date: any; + public disabled = false; + public showSpinners = true; + public showSeconds = false; + public touchUi = false; + public enableMeridian = false; + public minDate = new Date(); + + public stepHour = 1; + public stepMinute = 5; + public stepSecond = 5; + + public dateControlStart = new FormControl(moment("DD MM YYYY hh")); + public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); + + p: any = {} + + Form: FormGroup; + validateFrom = false + + showLoader = false + + get dateStart () { + if( window.innerWidth < 801) { + return this.postData.StartDate; + } + else{ + return this.dateControlStart.value; + } + } + + get dateEnd () { + if( window.innerWidth < 801) { + return this.postData.EndDate; + } + else{ + return this.dateControlEnd.value; + } + } + + @ViewChild('picker') picker: any; + @ViewChild('fim') fim: any; + @ViewChild('inicio') inicio: any; + @ViewChild('picker1') picker1: any; + + task: any; + + taskParticipants: EventPerson[] = []; + taskParticipantsCc: EventPerson[] = []; + + taskDocId:string; + loadedAttachments:any; + documents: SearchDocument[] = []; + + attachments:SearchDocument[] = []; + + adding: "intervenient" | "CC" = "intervenient"; + + postData: Event; + + formLocationSatus: boolean = false; + showAttendees= false; + loggeduser: User; + emptyTextDescription = "Sem intervenientes selecionados"; + + document: any; + + constructor( + private modalController: ModalController, + private router:Router, + private navParams: NavParams, + private processes:ProcessesService, + authService: AuthService, + private toastService: ToastService, + private documentService: DocumentService + ) { + + this.loggeduser = authService.ValidatedUser; + this.task = this.navParams.get('task'); + this.document = this.navParams.get('document') + + this.postData = new Event(); + this.postData.Body ={ BodyType : "1", Text : ""}; + + this.postData.Subject = this.task.Folio; + this.postData.CalendarName = "Oficial"; + + this.postData.Category = 'Reunião' + } + + ngOnInit() { + this.adding = "intervenient"; + console.log(this.task); + this.setDefaultTime() + } + + setDefaultTime() { + this.postData.StartDate = new Date() + this.postData.EndDate = (new Date(new Date().getTime() + 15 * 60000)) + } + + close() { + this.modalController.dismiss(null); + } + + goBack() { + this.modalController.dismiss(null); + } + + 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.taskParticipants, [ + // Validators.required + ]), + Categories: new FormControl(this.postData.Category, [ + // Validators.required + ]), + + }) + } + + async saveTask() { + + if(this.loggeduser.Profile == 'MDGPR') { + this.injectValidation() + this.runValidation() + } + + let Attendees = this.taskParticipants.concat(this.taskParticipantsCc); + + let data: DocumentSetUpMeeting = { + EventProcess: { + Body: this.postData.Body.Text, + Location: this.postData.Location, + StartDate: this.dateStart, + EndDate: this.dateEnd, + EventType: 'Reunião', + ParticipantsList: Attendees, + EventRecurrence: null, + Subject: this.postData.Subject, + IsRecurring: this.postData.IsRecurring, + Message: this.postData.Subject, + IsAllDayEvent: this.postData.IsRecurring, + }, + + Attachments: [] + } + + if(this.document.Documents) { + this.document.Documents.forEach( (ele) => { + console.log(ele) + data.Attachments.push({ + ApplicationId: 361, + Source: 1, + SourceId: ele.docID || ele.docId || ele.DocId, + SourceName: ele.Assunto + }) + }); + } else { + data.Attachments.push({ + ApplicationId: 8, + Source: 1, + SourceId: this.document.docID || this.document.docId || this.document.DocId, + SourceName: this.document.Assunto + }) + } + + this.attachments.forEach((e)=> { + console.log('e', e) + data.Attachments.push({ + ApplicationId: e.ApplicationType, + Source: 1, + SourceId: e.Id, + SourceName: e.Assunto + }) + }) + + + const loader = this.toastService.loading() + try { + await this.documentService.setUpMeeting(data).toPromise() + this.toastService.successMessage('Processo criado') + this.close() + } catch(e) { + this.toastService.badRequest("Processo não criado") + } finally { + loader.remove() + } + + } + + async addParticipants() { + + this.adding = "intervenient"; + + if(window.innerWidth <= 801){ + const modal = await this.modalController.create({ + component: AttendeesPageModal, + componentProps: { + adding: this.adding, + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc + }, + cssClass: 'modal modal-desktop', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then((data) => { + + if(data) { + data = data['data']; + + const newAttendees: EventPerson[] = data['taskParticipants']; + const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; + + this.setIntervenient(newAttendees); + this.setIntervenientCC(newAttendeesCC); + } + }); + + } else { + this.showAttendees = true; + } + } + + async addParticipantsCc() { + + this.adding = "CC"; + + if(window.innerWidth <= 800) { + const modal = await this.modalController.create({ + component: AttendeesPageModal, + componentProps: { + adding: this.adding, + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc + }, + cssClass: 'modal modal-desktop', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then((data) => { + + if(data){ + data = data['data']; + + const newAttendees: EventPerson[] = data['taskParticipants']; + const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; + + this.setIntervenient(newAttendees); + this.setIntervenientCC(newAttendeesCC); + } + }); + } else { + this.showAttendees = true; + } + } + + async getDoc() { + const modal = await this.modalController.create({ + component: SearchPage, + cssClass: 'modal modal-desktop modal-width-100-width-background', + componentProps: { + type: 'AccoesPresidenciais & ArquivoDespachoElect', + showSearchInput: true, + select: true + } + }); + await modal.present(); + modal.onDidDismiss().then((res)=> { + if(res){ + const data = res.data; + this.attachments.push(data.selected); + } + }); + } + + removeAttachment(index: number) { + this.attachments = this.attachments.filter( (e, i) => index != i); + } + + validateFormInputs(){ + let formLocation = this.postData.Location.trim(); + if(!this.postData.Location && formLocation.length <= 0){ + this.formLocationSatus = true; + } + } + + dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) { + this.taskParticipants = taskParticipants; + this.taskParticipantsCc = taskParticipantsCc; + } + + goToGabinete() { + this.router.navigate(['/home/gabinete-digital']); + } + + setIntervenient(data) { + this.taskParticipants = data; + } + + setIntervenientCC(data) { + this.taskParticipantsCc = data; + } + +} diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index a80695759..a485b69c5 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -1,63 +1,91 @@ -
- -
- -
- -
-
-
Perfil
+
+
+ - - -
- -
-
-
+
+
+
+
Dados do perfil
+
-
-
Dados Perfil
-
{{loggeduser.RoleDescription}}
- -
+ +
-