diff --git a/src/app/app.module.ts b/src/app/app.module.ts index caa421c4d..34aae5a53 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -79,9 +79,7 @@ import { BrowserTracing } from '@sentry/tracing'; import { AngularFireModule } from '@angular/fire'; import { AngularFireMessagingModule } from '@angular/fire/messaging'; import { firebaseConfig } from '../firebase-config'; -import { EditorModule } from '@tinymce/tinymce-angular'; -import { DeplomaOptionsPageModule } from './shared/popover/desktop/deploma-options/deploma-options.module'; -import { DiplomaOptionsPage } from './shared/popover/desktop/deploma-options/deploma-options.page'; +import { EditorModule } from '@tinymce/tinymce-angular';; import { CreateProcessPageModule } from './modals/create-process/create-process.module'; import { CreateProcessPage } from './modals/create-process/create-process.page'; import { LoggingInterceptorService } from './services/logging-interceptor.service'; @@ -91,6 +89,8 @@ import { tokenInterceptor } from './interceptors/token.interceptors'; import { InputFilterDirective } from './services/directives/input-filter.directive'; import { VisibilityDirective } from './services/directives/visibility.directive'; +import { DeplomaOptionsPageModule } from './shared/popover/deploma-options/deploma-options.module'; +import { DiplomaOptionsPage } from './shared/popover/deploma-options/deploma-options.page'; // import { ServiceWorkerModule } from '@angular/service-worker'; // import { AngularFireModule } from '@angular/fire'; // import { AngularFireMessagingModule } from '@angular/fire/messaging'; diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index aa2c261c1..53b16aa2f 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -314,7 +314,7 @@ const routes: Routes = [ }, { path: 'request-options', - loadChildren: () => import('../shared/popover/desktop/request-options/request-options.module').then( m => m.RequestOptionsPageModule) + loadChildren: () => import('../shared/popover/request-options/request-options.module').then( m => m.RequestOptionsPageModule) }, ], diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 4a8e06453..9f1754db3 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -62,7 +62,7 @@ export class CreateProcessPage implements OnInit { taskDescription: string; loadedAttachments: any; subjectTypes: any; - selectedTypes: string[] = []; + selectedTypes: string = ''; placeholderSubject: string; postData: Despacho; @@ -127,7 +127,7 @@ export class CreateProcessPage implements OnInit { this.participants = this.participants = new Array(); //Initialize SubjectTypes Array with the value "Indefinido" if(this.loggeduser.Profile == 'PR') { - this.selectedTypes = ['99999850']; + this.selectedTypes = '99999850'; this.placeholderSubject = 'Indefinido' } else { this.placeholderSubject = 'Selecione o tipo de assunto*' @@ -199,7 +199,7 @@ export class CreateProcessPage implements OnInit { this.selectedTypes = ev.filter(data => data != '99999850'); } if (ev.length == 0) { - this.selectedTypes = ["99999850"]; + this.selectedTypes = "99999850"; } } @@ -211,6 +211,8 @@ export class CreateProcessPage implements OnInit { this.processes.GetSubjectType().subscribe(res => { // console.log('subjectTypes',res) this.subjectTypes = res; + this.placeholderSubject = 'Selecione o tipo de assunto*' + this.selectedTypes = '99999844'; }); } diff --git a/src/app/models/agenda/AgendaEventList.ts b/src/app/models/agenda/AgendaEventList.ts index 5698c013d..2e9711cd9 100644 --- a/src/app/models/agenda/AgendaEventList.ts +++ b/src/app/models/agenda/AgendaEventList.ts @@ -40,4 +40,4 @@ export interface days { activeEvent: number events: CustomCalendarEvent[] } -} \ No newline at end of file +} diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts index fb1e5b581..bd5079888 100644 --- a/src/app/models/event.model.ts +++ b/src/app/models/event.model.ts @@ -33,9 +33,29 @@ export class Event{ EventRecurrence: EventRecurrence; Name?: string Attachments?: Attachment[]; + HumanDate?: string; + IsAllDayEvent?: boolean; } +interface EventList { + HasAttachments: boolean; + IsAllDayEvent: boolean; + EventId: string; + Subject: string; + Location: string; + CalendarId: string; + CalendarName: string; + StartDate: string; + EndDate: string; + Schedule: string; + RequiredAttendees: any; // Adjust type as per your data + OptionalAttendees: any; // Adjust type as per your data + HumanDate: string; + TimeZone: string; + IsPrivate: boolean; +} + // event to approve details ================================================ export interface Originator { email: string; diff --git a/src/app/models/folder.model.ts b/src/app/models/folder.model.ts index da5aab8bf..2fdae71d3 100644 --- a/src/app/models/folder.model.ts +++ b/src/app/models/folder.model.ts @@ -6,6 +6,6 @@ export class Folder{ SourceType:string; SourceId:string; DeadlineType: string; - SubjectTypes: string[]; + SubjectTypes: string; NumberPDPP:string; -} \ No newline at end of file +} diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index f4ceae277..a06bfde06 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -260,7 +260,8 @@

{{event.event.Subject}}

-
{{event.event.Subject}}
+ +
{{event.event.Location}}
{{SessionStore.user.FullName}}
{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}} diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index fe79ac462..b1ddd9d2a 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -18,6 +18,7 @@ import { RouteService } from 'src/app/services/route.service'; import { SessionStore } from 'src/app/store/session.service'; import { HttpErrorHandle} from 'src/app/services/http-error-handle.service' import { AttachmentsService } from 'src/app/services/attachments.service'; +import { DateService } from 'src/app/services/date.service'; @Component({ selector: 'app-view-event', @@ -70,6 +71,7 @@ export class ViewEventPage implements OnInit { private RouteService: RouteService, private httpErrorHandle: HttpErrorHandle, private attachmentsService: AttachmentsService, + private dateService: DateService ) { @@ -191,6 +193,7 @@ export class ViewEventPage implements OnInit { if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { this.eventsService.getEvent(this.eventId).subscribe(res => { + res = this.dateService.fixDate(res as any) this.loadedEvent = res; this.setTimeZone() // this.addEventToDb(res); @@ -218,6 +221,7 @@ export class ViewEventPage implements OnInit { /* const div = document.createElement("div") div.innerHTML = res.Body.Text res.Body.Text = div.innerText */ + res = this.dateService.fixDate(res as any) this.loadedEvent = res; console.log('pass,',res) this.setTimeZone() diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts index 3c26a3120..1d1894d1f 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts @@ -8,8 +8,8 @@ import { DiplomaPageRoutingModule } from './diploma-routing.module'; import { DiplomaPage } from './diploma.page'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; -import { DiplomaOptionsPage } from 'src/app/shared/popover/desktop/deploma-options/deploma-options.page'; import { TaskDetailsPageModule } from 'src/app/shared/gabinete-digital/generic/task-details/task-details.module'; +import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page'; @NgModule({ imports: [ 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 c574062ca..53e554fea 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 @@ -11,11 +11,11 @@
- +
- +
O campo deve ter pelo menos 4 caracteres. @@ -40,7 +40,7 @@ - -
-
-
- - - - - - -
-
-
- -
-
- -
-
- -
-
- -
-
-
- - diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.scss b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.scss deleted file mode 100644 index 60dbe2483..000000000 --- a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.scss +++ /dev/null @@ -1,56 +0,0 @@ -@import '~src/function.scss'; - -.options-container{ - --padding-top:20px !important; - --padding-bottom:20px !important; - --padding-start:20px !important; - --padding-end:20px !important; -} -.arrow-right { - margin-bottom: 20px; - .arrow-right-icon { - width: 37px; - float: right; - font-size: rem(35); - overflow: hidden; - } -} -.buttons { - display: flex; - flex-wrap: wrap; - justify-content: space-around; -} -.solid { - width: 90%; - border-top: 1px solid #bbb; - margin: 0 auto !important; - } - .btn-ok, .btn-cancel, .btn-delete{ - width: 100% !important; - margin: 5px 5px 5px 5px !important; - } - -@media only screen and (max-width: 800px) { - .btn-ok, .btn-cancel, .btn-delete{ - width: 100% !important; - min-width: 300px; - } -} -@media only screen and (min-width: 1024px) { - .arrow-right{ - display: flex; - justify-content: flex-end; - } - .btn-cancel{ - width: 100% !important; - margin-bottom: 10px !important; - } - .btn-delete, .btn-ok{ - width: 100% !important; - margin-bottom: 10px !important; - margin-top: 10px !important; - } - /* .solid{ - display: block; - } */ -} diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.spec.ts b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.spec.ts deleted file mode 100644 index 46b0d3958..000000000 --- a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { DeplomaOptionsPage } from './deploma-options.page'; - -describe('DeplomaOptionsPage', () => { - let component: DeplomaOptionsPage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ DeplomaOptionsPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(DeplomaOptionsPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.ts b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.ts deleted file mode 100644 index e9ca3988c..000000000 --- a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.ts +++ /dev/null @@ -1,428 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ModalController, NavParams, PopoverController } from '@ionic/angular'; -import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; -import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { ToastService } from 'src/app/services/toast.service'; -import { RouteService } from 'src/app/services/route.service'; -import { PermissionService } from 'src/app/services/permission.service'; -import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; -import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; -import { AttachmentList } from 'src/app/models/Excludetask'; -import { DespachoService } from 'src/app/Rules/despacho.service'; -import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; -import { TaskService } from 'src/app/services/task.service' -import { PopupQuestionPage } from 'src/app/modals/popup-question/popup-question.page'; - -@Component({ - selector: 'app-deploma-options', - templateUrl: './deploma-options.page.html', - styleUrls: ['./deploma-options.page.scss'], -}) -export class DiplomaOptionsPage implements OnInit { - - - serialNumber: string; - profile: string; - task: any - fulltask: any - DraftIds = "" - DraftNames = "" - asDraft: boolean; - - - constructor( - public popoverController: PopoverController, - private modalController: ModalController, - private processes: ProcessesService, - private navParams: NavParams, - private toastService: ToastService, - private RouteService: RouteService, - public p: PermissionService, - private despachoService: DespachoService, - private httpErroHandle: HttpErrorHandle, - public TaskService: TaskService) { - this.serialNumber = this.navParams.get('serialNumber'); - this.task = this.navParams.get('task'); - this.fulltask = this.navParams.get('fulltask'); - - this.DraftIds = this.navParams.get("DraftIds"); - this.DraftNames = this.navParams.get("DraftNames"); - this.asDraft = this.navParams.get('asDraft'); - - - console.log('this.task', this.task) - - } - - ngOnInit() { - console.log(this.task.activityInstanceName) - - } - - async openAddNoteModal(actionName: string) { - // this.popoverController.dismiss(); - let classs; - if (window.innerWidth <= 800) { - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: AddNotePage, - componentProps: { - actionName: actionName - }, - cssClass: classs, - backdropDismiss: true - }); - - modal.onDidDismiss().then(async (res) => { - if (res.data) { - - - const DocumentToSave = res.data.documents.map((e) => { - return { - ApplicationId: e.ApplicationType, - SourceId: e.Id, - } - }); - - let docs = { - ProcessInstanceID: "", - Attachments: DocumentToSave, - } - - if (actionName == 'Solicitar assinatura') { - await this.askSignature(res.data.note, docs); - this.goBack(); - } else if (actionName == 'Solicitar alteração') { - await this.askToChange(res.data.note, docs); - this.goBack(); - } else if (actionName == 'Assinar Diploma') { - await this.sign(res.data.note, docs); - this.goBack(); - } else if (actionName == 'Concluir diploma') { - await this.finish(res.data.note, docs); - this.goBack(); - } else if (actionName == 'Arquivo') { - await this.arquivar(res.data.note, docs); - this.goBack(); - } else if (actionName == 'AssinarNew') { - await this.AssinarNew(res.data.note, docs) - } - } - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - async askToChange(note: string, documents: any) { - let body = { - "serialNumber": this.serialNumber, - "action": "Retificar", - "ActionTypeId": 99999841, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.close(); - this.toastService._successMessage() - } catch (error) { - if (error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest() - } - } finally { - loader.remove() - } - - } - - - async openBookMeetingModal(task: any) { - this.popoverController.dismiss(); - let classs; - if (window.innerWidth <= 800) { - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: BookMeetingModalPage, - componentProps: { - task: this.task, - fulltask: this.fulltask - }, - cssClass: classs, - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then( - () => { }, - (error) => { - console.log(error) - } - ) - } - - - async askSignature(note: string, documents: any) { - let body = { - "serialNumber": this.serialNumber, - "action": "Aprovar", - "ActionTypeId": 99999840, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.close(); - this.toastService._successMessage() - } catch (error) { - if (error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest() - } - } finally { - loader.remove() - } - - } - - - async sign(note?: string, documents?: any) { - let body = { - "serialNumber": this.serialNumber, - "action": "Assinado", - "ActionTypeId": 99999842, - "FolderId": this.task.FolderID, - "dataFields": { - "ReviewUserComment": note, - "InstanceIDNew": this.task.InstanceID, - "DraftIds": "", - }, - "AttachmentList": { - "ProcessInstanceID": this.task.InstanceID, - /* "DraftIds": null, */ - "Attachments": [] - }, - } - - - try { - await this.processes.CompleteTask(body).toPromise() - this.httpErroHandle.httpsSucessMessagge('Assinado') - } catch (error) { - if (error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - this.toastService._badRequest() - } - } finally { } - } - - async AssinarNew(note?, doc?) { - - if (this.asDraft) { - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: PopupQuestionPage, - componentProps: { - title: 'Deseja assinar este Diploma?', - /* message: 'Nota: Ao Efetuar esta operação, o tratamento deste diploma não poderá ser realizado a partir da caixa de correspondência' */ - - }, - cssClass: "popup-question discart-expedient-modal", - backdropDismiss: true - }); - - modal.onDidDismiss().then(async (res) => { - const data = res.data - if (data == "Yes") { - - console.log(' diploma options Draft draft',this.DraftIds) - let body = { - "InstanceId": this.task.InstanceID, - "FolderId": this.task.FolderID, - "DraftIds": this.task.DraftIds, - "OriginalFileName": this.DraftNames - } - const loader = this.toastService.loading() - - try { - await this.processes.presidentialActionsSignature(body).toPromise() - await this.sign() - this.TaskService.loadDiplomas() - this.goBack(); - } catch (error) { - this.httpErroHandle.httpStatusHandle(error) - } - finally { - loader.remove() - } - } - - }, (error) => { - console.log(error) - }); - - await modal.present(); - } else { - this.httpErroHandle.validationMessagge("diplomaAsDraft"); - } - - } - - - async finish(note: string, documents: any) { - - let body = { - "serialNumber": this.serialNumber, - "action": "Concluir", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise(); - this.toastService._successMessage('Processo concluído') - } catch (error) { - if (error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest() - } - } - finally { - loader.remove() - } - - } - - async arquivar(note: string, documents: AttachmentList) { - - const loader = this.toastService.loading() - - try { - await this.despachoService.arquivar(note, documents, this.serialNumber).toPromise() - this.httpErroHandle.httpsSucessMessagge('Arquivar') - this.close(); - } catch (error) { - this.httpErroHandle.httpStatusHandle(error) - } - finally { - loader.remove() - } - - } - - async openExpedientActionsModal(taskAction: any, task: any) { - - let classs; - if (window.innerWidth <= 800) { - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: CreateProcessPage, - componentProps: { - taskAction: taskAction, - task: task, - profile: this.profile, - fulltask: this.fulltask - }, - cssClass: classs, - }); - modal.onDidDismiss().then(async (res) => { - - - if (res['data'] == 'openDiscart') { - await this.distartExpedientModal(); - } - - this.goBack(); - }, (error) => { - console.log(error) - }).catch(e => { - console.log(e) - }) - - await modal.present(); - } - - async distartExpedientModal() { - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: DiscartExpedientModalPage, - componentProps: { - serialNumber: this.fulltask.serialNumber, - folderId: this.fulltask.workflowInstanceDataFields.FolderID, - action: 'complete', - }, - cssClass: 'discart-expedient-modal', - backdropDismiss: false - }); - - modal.onDidDismiss().then(res => { - if (res['data'] == 'close') { - this.close(); - /* - this.close(); - this.openMenu(); */ - } - - }, (error) => { - console.log(error) - }).catch(e => { - console.log(e) - }) - - await modal.present(); - - } - - goBack() { - this.RouteService.goBack() - this.TaskService.loadDiplomas() - } - - - close() { - this.popoverController.dismiss(); - } - -} diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options-routing.module.ts b/src/app/shared/popover/desktop/despachos-options/despachos-options-routing.module.ts deleted file mode 100644 index 247b1696e..000000000 --- a/src/app/shared/popover/desktop/despachos-options/despachos-options-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { DespachosOptionsPage } from './despachos-options.page'; - -const routes: Routes = [ - { - path: '', - component: DespachosOptionsPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class DespachosOptionsPageRoutingModule {} diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options.module.ts b/src/app/shared/popover/desktop/despachos-options/despachos-options.module.ts deleted file mode 100644 index 1819906f6..000000000 --- a/src/app/shared/popover/desktop/despachos-options/despachos-options.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { DespachosOptionsPageRoutingModule } from './despachos-options-routing.module'; - -import { DespachosOptionsPage } from './despachos-options.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - DespachosOptionsPageRoutingModule - ], - declarations: [DespachosOptionsPage] -}) -export class DespachosOptionsPageModule {} diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.html b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.html deleted file mode 100644 index 43eb6c605..000000000 --- a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.html +++ /dev/null @@ -1,69 +0,0 @@ - -
- -
- - -
-
-
- - - - - - -
-
- - - - -
-
-
-
- - - - -
-
-
- -
- - -
- - - -
- -
- -
- - -
- - - -
- -
-
- -
- - - -
- - -
- -
diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.scss b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.scss deleted file mode 100644 index 0fc2784b5..000000000 --- a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.scss +++ /dev/null @@ -1,40 +0,0 @@ -@import '~src/function.scss'; - -.options-container { - --padding-top:20px !important; - --padding-bottom:20px !important; - --padding-start:20px !important; - --padding-end:20px !important; - -} -.arrow-right { - display: none; - margin-bottom: 20px; - .arrow-right-icon { - width: 37px; - float: right; - font-size: rem(35); - overflow: hidden; - } -} -.buttons { - display: flex; - flex-wrap: wrap; - justify-content: space-around; -} -.solid { - display: none; - width: 90%; - border-top: 1px solid #bbb; - margin: 0 auto !important; - } - .btn-ok, .btn-cancel, .btn-delete{ - width: 100% !important; - margin: 5px 5px 5px 5px !important; - } - -.pr-options { - .btn-ok, .btn-cancel{ - width: 100% !important; - } -} diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.spec.ts b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.spec.ts deleted file mode 100644 index 80e0e3a7f..000000000 --- a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { DespachosOptionsPage } from './despachos-options.page'; - -describe('DespachosOptionsPage', () => { - let component: DespachosOptionsPage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ DespachosOptionsPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(DespachosOptionsPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.ts b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.ts deleted file mode 100644 index 5d918d424..000000000 --- a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.ts +++ /dev/null @@ -1,402 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { ModalController, NavParams, PopoverController } from '@ionic/angular'; -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 { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; -import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; -import { ToastService } from 'src/app/services/toast.service'; -import { customTask, fullTask } from 'src/app/models/dailyworktask.model'; -import { PermissionService } from 'src/app/services/permission.service'; -import { ThemeService } from 'src/app/services/theme.service' -import { RouteService } from 'src/app/services/route.service'; -import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; -import { environment } from 'src/environments/environment'; -import { TaskService } from 'src/app/services/task.service' - -@Component({ - selector: 'app-despachos-options', - templateUrl: './despachos-options.page.html', - styleUrls: ['./despachos-options.page.scss'], -}) -export class DespachosOptionsPage implements OnInit { - - task: customTask - fulltask: fullTask; - serialNumber: string; - environment = environment - - constructor( - private processes: ProcessesService, - private modalController: ModalController, - public popoverController: PopoverController, - private navParams: NavParams, - private toastService: ToastService, - public p: PermissionService, - public ThemeService: ThemeService, - private RouteService: RouteService, - private httpErrorHandle: HttpErrorHandle, - public TaskService: TaskService - ) { - - this.task = this.navParams.get('task') - this.fulltask = this.navParams.get('fulltask') - - - this.serialNumber = this.task.SerialNumber - } - - ngOnInit() { - } - - - async openTaskProcessModal(taskAction: any, task: any) { - - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: CreateProcessPage, - componentProps: { - taskAction: taskAction, - task: task, - fulltask: this.fulltask - }, - cssClass: classs, - }); - - modal.onDidDismiss().then( res => { - // this.goBack(); - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - sendExpedienteToPending() { - const loader = this.toastService.loading() - this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ - this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes') - loader.remove() - - this.goBack('back'); - },(error)=>{ - loader.remove() - this.httpErrorHandle.httpStatusHandle(error) - }); - } - - async distartExpedientModal() { - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: DiscartExpedientModalPage, - componentProps: { - serialNumber: this.fulltask.serialNumber, - folderId: this.fulltask.workflowInstanceDataFields.FolderID, - action: 'complete', - }, - cssClass: 'discart-expedient-modal', - backdropDismiss: false - }); - - - modal.onDidDismiss().then(res=>{ - if(res['data']=='close'){ - this.goBack('back'); - } - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - - async openBookMeetingModal(task: any) { - - let classs; - if( window.innerWidth <= 800){ - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: BookMeetingModalPage, - componentProps: { - task: this.task, - fulltask:this.fulltask - }, - cssClass: classs, - backdropDismiss: false - }); - - modal.onDidDismiss().then(() => { - this.goBack('no'); - }, (error) => { - console.log(error) - }) - - await modal.present(); - } - - async openDelegarModal(task: any) { - - let classs; - if( window.innerWidth <= 800){ - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: DelegarPage, - componentProps: { - task: this.task, - }, - cssClass: classs, - backdropDismiss: false - }); - modal.onDidDismiss().then(res => { - if(res){ - const data = res.data; - if(data == 'close') { - this.goBack('back'); - } - } - - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - async generateDiploma(note:string, documents:any){ - let body = { - "serialNumber": this.serialNumber, - "action": "Reencaminhar", - "ActionTypeId": 99999839, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.toastService._successMessage() - this.goBack('back'); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest() - } - } finally { - loader.remove() - } - - } - - async openAddNoteModal(actionName:string) { - - - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: AddNotePage, - componentProps: { - showAttachmentBtn: true, - actionName:actionName - }, - cssClass: classs, - backdropDismiss: true - }); - - await modal.present(); - - modal.onDidDismiss().then(async (res) => { - - if(res.data) { - - const DocumentToSave = res.data.documents.map((e) => { - return { - ApplicationId: e.ApplicationType, - SourceId: e.Id, - } - }); - - let docs = { - ProcessInstanceID: "", - Attachments: DocumentToSave, - } - - if(actionName == 'Executado') { - await this.executado(res.data.note, docs); - } - else if(actionName == 'Arquivar') { - await this.arquivar(res.data.note, docs); - } - else if(actionName == 'Gerar Diploma') { - await this.generateDiploma(res.data.note, docs); - } - else if(actionName == 'Concluido') { - this.concluir(res.data.note, docs); - } - else if(actionName == 'Reexecução') { - await this.reexecutar(res.data.note, docs); - } - - } - }, (error) => { - console.log(error) - }); - } - - - - async concluir(note: string, documents: any) { - let body = { - "serialNumber": this.serialNumber, - "action": "Arquivo", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.httpErrorHandle.httpsSucessMessagge('Concluir Despacho') - this.TaskService.loadDiplomas() - } catch (error) { - this.httpErrorHandle.httpStatusHandle(error) - } - finally { - loader.remove() - } - - } - - async arquivar(note:string, documents:any) { - let body = { - "serialNumber": this.serialNumber, - "action": "Arquivo", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.toastService._successMessage('Processo arquivado') - this.goBack('back'); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Processo não arquivado') - } - } finally { - loader.remove() - } - - - } - - - async executado(note:string, documents:any) { - let body = { - "serialNumber": this.serialNumber, - "action": "Conhecimento", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.goBack('back'); - this.toastService._successMessage() - } catch(error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest() - } - } finally { - loader.remove() - } - - } - - - - async reexecutar(note:string, documents:any){ - let body = { - "serialNumber": this.serialNumber, - "action": "Reexecução", - "ActionTypeId": 100000010, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.toastService._successMessage() - this.goBack('back'); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest() - } - } finally { - loader.remove() - } - - } - - goBack(params) { - this.popoverController.dismiss(params) - } - -} diff --git a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options-routing.module.ts b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options-routing.module.ts deleted file mode 100644 index ad795c4a1..000000000 --- a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { DespachosPrOptionsPage } from './despachos-pr-options.page'; - -const routes: Routes = [ - { - path: '', - component: DespachosPrOptionsPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class DespachosPrOptionsPageRoutingModule {} diff --git a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.module.ts b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.module.ts deleted file mode 100644 index 9d9d93f52..000000000 --- a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { DespachosPrOptionsPageRoutingModule } from './despachos-pr-options-routing.module'; - -import { DespachosPrOptionsPage } from './despachos-pr-options.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - DespachosPrOptionsPageRoutingModule - ], - declarations: [DespachosPrOptionsPage] -}) -export class DespachosPrOptionsPageModule {} diff --git a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.html b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.html deleted file mode 100644 index 56bd1cd09..000000000 --- a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.html +++ /dev/null @@ -1,41 +0,0 @@ - -
- -
- -
-
-
- - - - - - -
-
- - - - - -
-
-
-
- - - - - -
-
- - -
- -
diff --git a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.scss b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.scss deleted file mode 100644 index 1922fb246..000000000 --- a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.scss +++ /dev/null @@ -1,49 +0,0 @@ -@import '~src/function.scss'; - -:host { - height: 100% !important; - width: 100% !important; -} - -.options-container{ - --padding-top:20px !important; - --padding-bottom:20px !important; - --padding-start:20px !important; - --padding-end:20px !important; - width: 100%; -} -.arrow-right{ - display: none; - margin-bottom: 20px; - .arrow-right-icon{ - width: 37px; - float: right; - font-size: rem(35); - overflow: hidden; - } -} -.buttons{ - display: flex; - flex-wrap: wrap; - justify-content: space-around; -} -.solid { - display: none; - width: 90%; - border-top: 1px solid #bbb; - margin: 0 auto !important; - } - .btn-ok, .btn-cancel{ - //width: 50% !important; - margin-bottom: 5px !important; - margin-top: 5px !important; -} -.btn-ok, .btn-cancel, .btn-delete{ - width: 100% !important; -} - - -.desk{ - text-align: left; - background-color: white; -} diff --git a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.spec.ts b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.spec.ts deleted file mode 100644 index 4d505a9c7..000000000 --- a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { DespachosPrOptionsPage } from './despachos-pr-options.page'; - -describe('DespachosPrOptionsPage', () => { - let component: DespachosPrOptionsPage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ DespachosPrOptionsPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(DespachosPrOptionsPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.ts deleted file mode 100644 index c1f36ad52..000000000 --- a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.ts +++ /dev/null @@ -1,430 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { ActivatedRoute, Router } from '@angular/router'; -import { ModalController } from '@ionic/angular'; -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 { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; -import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; -import { ToastService } from 'src/app/services/toast.service'; -import { PermissionService } from 'src/app/services/permission.service'; -import { ThemeService } from 'src/app/services/theme.service' -import { RouteService } from 'src/app/services/route.service'; -import { environment } from 'src/environments/environment'; -import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; -import { TaskService } from 'src/app/services/task.service' - - -@Component({ - selector: 'app-despachos-pr-options', - templateUrl: './despachos-pr-options.page.html', - styleUrls: ['./despachos-pr-options.page.scss'], -}) -export class DespachosPrOptionsPage implements OnInit { - - - task: any; - fulltask: any; - serialNumber: string; - profile: string - environment = environment - - constructor(private activateRoute: ActivatedRoute, - private processes: ProcessesService, - private router: Router, - private modalController: ModalController, - private activatedRoute: ActivatedRoute, - private toastService: ToastService, - private RouteService: RouteService, - public p: PermissionService, - public ThemeService: ThemeService, - public TaskService: TaskService, - private httpErroHandle: HttpErrorHandle, - ) { } - - ngOnInit() { - - this.profile = "mdgpr"; - - this.activatedRoute.queryParams.subscribe(params => { - if(params["serialNumber"]) { - this.serialNumber = params["serialNumber"]; - - } - }); - - if(this.task.serialNumber) { - this.serialNumber = this.task.serialNumber - } else if(this.task.SerialNumber) { - this.serialNumber = this.task.SerialNumber - } - - } - - close () { - this.goBack() - } - - - async openExpedientActionsModal(taskAction: any, task: any) { - // this.modalController.dismiss(); - this.modalController.dismiss(); - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - const modal = await this.modalController.create({ - component: CreateProcessPage, - componentProps: { - taskAction: taskAction, - task: task, - profile: this.profile, - fulltask: this.fulltask - }, - cssClass: classs, - }); - - modal.onDidDismiss().then( (res)=> { - - if(res['data']=='openDiscart') { - - - this.distartExpedientModal(); - - } else { - this.goBack() - } - - this.modalController.dismiss('close') - - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - sendExpedienteToPending() { - const loader = this.toastService.loading() - this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{ - - this.httpErroHandle.httpsSucessMessagge('Enviar para Pendentes') - this.modalController.dismiss('close') - loader.remove() - },(error)=>{ - loader.remove() - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Processo não encontrado') - } - }); - } - - async distartExpedientModal() { - this.modalController.dismiss(); - - const modal = await this.modalController.create({ - component: DiscartExpedientModalPage, - componentProps: { - serialNumber: this.fulltask.serialNumber, - folderId: this.fulltask.workflowInstanceDataFields.FolderID, - action: 'complete', - }, - cssClass: 'discart-expedient-modal', - backdropDismiss: false - }); - - modal.onDidDismiss().then(res=>{ - if(res['data']=='close'){ - this.close(); - /* - this.close(); - this.openMenu(); */ - } - this.modalController.dismiss('close') - - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - - async openBookMeetingModal(task: any) { - this.modalController.dismiss(); - let classs; - if( window.innerWidth <= 800){ - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - const modal = await this.modalController.create({ - component: BookMeetingModalPage, - componentProps: { - task: this.task, - fulltask:this.fulltask - }, - cssClass: classs, - backdropDismiss: false - }); - - modal.onDidDismiss().then( - ()=> {}, - (error) => { - console.log(error) - } - ) - - await modal.present(); - - } - - async openDelegarModal(task: any) { - this.modalController.dismiss(); - let classs; - if( window.innerWidth <= 800){ - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - const modal = await this.modalController.create({ - component: DelegarPage, - componentProps: { - task: this.task, - }, - cssClass: classs, - backdropDismiss: false - }); - - modal.onDidDismiss().then(res => { - if(res) { - const data = res.data; - if(data == 'close') { - this.goBack(); - } - } - - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - async generateDiploma(note:string, documents:any) { - let body = { - "serialNumber": this.serialNumber, - "action": "Reencaminhar", - "ActionTypeId": 99999839, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.toastService._successMessage() - this.close(); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest() - } - } finally { - loader.remove() - } - - } - - async openAddNoteModal(actionName:string) { - this.modalController.dismiss(); - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop' - } - const modal = await this.modalController.create({ - component: AddNotePage, - componentProps: { - showAttachmentBtn: true, - actionName:actionName - }, - cssClass: classs, - backdropDismiss: true - }); - - modal.onDidDismiss().then(async (res) => { - - if(res.data){ - - - - const DocumentToSave = res.data.documents.map((e) => { - return { - ApplicationId: e.ApplicationType, - SourceId: e.Id, - } - }); - - let docs = { - ProcessInstanceID: "", - Attachments: DocumentToSave, - } - - if(actionName == 'Executado') { - await this.executado(res.data.note, docs); - } - else if(actionName == 'Arquivar') { - await this.arquivar(res.data.note, docs); - } - else if(actionName == 'Gerar Diploma') { - await this.generateDiploma(res.data.note, docs); - } - else if(actionName == 'Reexecução') { - await this.reexecutar(res.data.note, docs); - } - else if(actionName == 'Concluido') { - await this.concluir(res.data.note, docs); - } - - this.goBack(); - } - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - - async concluir(note:string, documents:any){ - let body = { - "serialNumber": this.serialNumber, - "action": "Arquivo", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.httpErroHandle.httpsSucessMessagge('Concluir Despacho') - this.close(); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest() - } - } - finally { - loader.remove() - } - - } - - async arquivar(note:string, documents:any){ - let body = { - "serialNumber": this.serialNumber, - "action": "Arquivo", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.toastService.successMessage('Processo arquivado') - this.close(); - } catch (error) { - this.toastService.badRequest('Processo não arquivado') - } finally { - loader.remove() - } - - } - - - async executado(note:string, documents:any){ - let body = { - "serialNumber": this.serialNumber, - "action": "Conhecimento", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.httpErroHandle.httpsSucessMessagge('Executado') - this.close(); - this.toastService.successMessage() - } catch(error) { - this.toastService.badRequest() - } finally { - loader.remove() - } - - } - - - async reexecutar(note:string, documents:any){ - let body = { - "serialNumber": this.serialNumber, - "action": "Reexecução", - "ActionTypeId": 100000010, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.httpErroHandle.httpsSucessMessagge('Reexecução') - this.toastService.successMessage() - this.close(); - } catch (error) { - this.toastService.badRequest() - } finally { - loader.remove() - } - } - - goBack() { - this.RouteService.goBack(); - this.TaskService.loadDiplomas() - } - - cancle() { - this.modalController.dismiss() - } - -} diff --git a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options-routing.module.ts b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options-routing.module.ts deleted file mode 100644 index 42c90e474..000000000 --- a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { DiplomasGerarOptionsPage } from './diplomas-gerar-options.page'; - -const routes: Routes = [ - { - path: '', - component: DiplomasGerarOptionsPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class DiplomasGerarOptionsPageRoutingModule {} diff --git a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.module.ts b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.module.ts deleted file mode 100644 index 3a64808ef..000000000 --- a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { DiplomasGerarOptionsPageRoutingModule } from './diplomas-gerar-options-routing.module'; - -import { DiplomasGerarOptionsPage } from './diplomas-gerar-options.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - DiplomasGerarOptionsPageRoutingModule - ], - declarations: [DiplomasGerarOptionsPage] -}) -export class DiplomasGerarOptionsPageModule {} diff --git a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.html b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.html deleted file mode 100644 index 5f0257527..000000000 --- a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.html +++ /dev/null @@ -1,12 +0,0 @@ -
-
-
- - -
- - -
- -
-
diff --git a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.scss b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.scss deleted file mode 100644 index 22c26e431..000000000 --- a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.scss +++ /dev/null @@ -1,67 +0,0 @@ -@import '~src/function.scss'; - -.wrapper{ - width: 100% !important; - padding-top:20px !important; - padding-bottom:20px !important; - } - .arrow-right{ - display: none; - margin-bottom: 20px; - .arrow-right-icon{ - width: 37px; - float: right; - font-size: rem(35); - overflow: hidden; - } - } - .buttons{ - width: 100% !important; - display: flex; - flex-wrap: wrap; - justify-content: space-around; - margin: 0 auto !important; - } - .solid { - display: none; - width: 90%; - border-top: 1px solid #bbb; - margin: 0 auto !important; - } - .btn-ok, .btn-cancel{ - //width: 50% !important; - margin-bottom: 5px !important; - margin-top: 5px !important; - } - @media only screen and (max-width: 800px) { - .container{ - width: 100% !important; - } - .btn-ok, .btn-cancel, .btn-delete{ - width: 47% !important; - } - } - @media only screen and (min-width: 1024px) { - .container{ - width: 100% !important; - - } - .arrow-right{ - display: flex; - justify-content: flex-end; - } - .btn-cancel{ - display: none; - width: 100% !important; - margin-bottom: 10px !important; - } - .btn-delete, .btn-ok{ - width: 100% !important; - margin-bottom: 10px !important; - margin-top: 10px !important; - } - /* .solid{ - display: block; - } */ - } - \ No newline at end of file diff --git a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.spec.ts b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.spec.ts deleted file mode 100644 index b22d013a1..000000000 --- a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { DiplomasGerarOptionsPage } from './diplomas-gerar-options.page'; - -describe('DiplomasGerarOptionsPage', () => { - let component: DiplomasGerarOptionsPage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ DiplomasGerarOptionsPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(DiplomasGerarOptionsPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.ts b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.ts deleted file mode 100644 index 8db44ef05..000000000 --- a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.ts +++ /dev/null @@ -1,208 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ModalController, NavParams, PopoverController } from '@ionic/angular'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { Router } from '@angular/router'; -import { ToastService } from 'src/app/services/toast.service'; -import { ThemeService } from 'src/app/services/theme.service' -import { DespachoService } from 'src/app/Rules/despacho.service' -import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; -import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; -import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; -import { customTask, fullTask } from 'src/app/models/dailyworktask.model'; -import { RouteService } from 'src/app/services/route.service'; -import { TaskService } from 'src/app/services/task.service' - -@Component({ - selector: 'app-diplomas-gerar-options', - templateUrl: './diplomas-gerar-options.page.html', - styleUrls: ['./diplomas-gerar-options.page.scss'], -}) -export class DiplomasGerarOptionsPage implements OnInit { - - task: customTask - fulltask: fullTask; - serialNumber: string; - - constructor( - private processes: ProcessesService, - public popoverController: PopoverController, - private modalController: ModalController, - private toastService: ToastService, - public ThemeService: ThemeService, - private despachoService: DespachoService, - private navParams: NavParams, - private router: Router, - private RouteService: RouteService, - public TaskService: TaskService - ) { } - - ngOnInit() { - this.task = this.navParams.get('task') - this.fulltask = this.navParams.get('fulltask') - this.serialNumber = this.navParams.get('serialNumber') - } - - - async enviarDiploma({note = '', documents = [], serialnumber}) { - - let classs; - if (window.innerWidth <= 800) { - classs = 'modal modal-desktop' - } else { - classs = 'add-note-modal-no-height' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: AddNotePage, - componentProps: { - showAttachmentBtn: true, - actionName:false - }, - cssClass: classs, - backdropDismiss: true - }); - - modal.onDidDismiss().then(async (res) => { - if (res.data) { - - const DocumentToSave = res.data.documents.map((e) => { - return { - ApplicationId: e.ApplicationType, - SourceId: e.Id, - } - }); - - let docs = { - ProcessInstanceID: "", - Attachments: DocumentToSave, - } - - let body = { - "serialNumber": serialnumber, - "action": "Enviar diploma", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": res.data.note, - }, - "AttachmentList" : docs, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise(); - this.modalController.dismiss('sucess'); - this.toastService._successMessage(); - this.goBack() - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest(); - } - } finally { - loader.remove() - } - - - } - }, (error) => { - console.log(error) - }); - - await modal.present(); - - } - - async sendExpedienteToPending() { - const loader = this.toastService.loading() - this.despachoService.sendExpedienteToPending(this.serialNumber).subscribe(res => { - this.goBack(); - this.toastService._badRequest("Processo enviado para Pendentes") - loader.remove() - }, - error => { - loader.remove() - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest("Processo não enviado para Pendentes") - } - }); - } - - - async openBookMeetingModal() { - let classs; - if (window.innerWidth <= 800) { - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: BookMeetingModalPage, - componentProps: { - task: this.task, - fulltask:this.fulltask - }, - cssClass: classs, - backdropDismiss: false - }); - - modal.onDidDismiss().then( - ()=>{}, - (error) => { - console.log(error) - } - ) - - await modal.present(); - } - - async openDelegarModal() { - let classs; - if (window.innerWidth <= 800) { - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: DelegarPage, - componentProps: { - task: this.task, - }, - cssClass: classs, - backdropDismiss: false - }); - - modal.onDidDismiss().then(res => { - if(res) { - const data = res.data; - if(data == 'close') { - this.goBack(); - } - } - - }, (error) => { - console.log(error) - }); - - - await modal.present(); - } - - - goBack() { - - this.popoverController.dismiss(); - this.RouteService.goBack(); - this.TaskService.loadDespachos(); - } - -} diff --git a/src/app/shared/popover/desktop/opts-expediente/opts-expediente-routing.module.ts b/src/app/shared/popover/desktop/opts-expediente/opts-expediente-routing.module.ts deleted file mode 100644 index b0ca6d569..000000000 --- a/src/app/shared/popover/desktop/opts-expediente/opts-expediente-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { OptsExpedientePage } from './opts-expediente.page'; - -const routes: Routes = [ - { - path: '', - component: OptsExpedientePage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class OptsExpedientePageRoutingModule {} diff --git a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.module.ts b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.module.ts deleted file mode 100644 index f2d9a571d..000000000 --- a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { OptsExpedientePageRoutingModule } from './opts-expediente-routing.module'; - -import { OptsExpedientePage } from './opts-expediente.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - OptsExpedientePageRoutingModule - ], - declarations: [OptsExpedientePage] -}) -export class OptsExpedientePageModule {} diff --git a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.html deleted file mode 100644 index 6568a3d28..000000000 --- a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.html +++ /dev/null @@ -1,24 +0,0 @@ - -
-
-
- - - - - - - - - - - - - - - -
-
- -
-
diff --git a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.scss b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.scss deleted file mode 100644 index 391fb1401..000000000 --- a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.scss +++ /dev/null @@ -1,66 +0,0 @@ -@import '~src/function.scss'; - -.options-container{ - --padding-top:20px !important; - --padding-bottom:20px !important; - --padding-start:20px !important; - --padding-end:20px !important; - width: 100%; -} -.arrow-right{ - display: none; - margin-bottom: 20px; - .arrow-right-icon{ - width: 37px; - float: right; - font-size: rem(35); - overflow: hidden; - } -} -.buttons{ - display: flex; - flex-wrap: wrap; - justify-content: space-around; -} -.solid { - display: none; - width: 90%; - border-top: 1px solid #bbb; - margin: 0 auto !important; - } - .btn-ok, .btn-cancel{ - //width: 50% !important; - margin-bottom: 5px !important; - margin-top: 5px !important; -} -@media only screen and (max-width: 800px) { - .btn-ok, .btn-cancel, .btn-delete{ - width: 100% !important; - } -} -@media only screen and (min-width: 1024px) { - .arrow-right{ - display: flex; - justify-content: flex-end; - } - .btn-cancel{ - // display: none; - width: 100% !important; - margin-bottom: 10px !important; - } - .btn-delete, .btn-ok{ - width: 100% !important; - margin-bottom: 10px !important; - margin-top: 10px !important; - } - /* .solid{ - display: block; - } */ -} - - -.desk{ - text-align: left; - background-color: white; - color: var(--profile-text-color); -} diff --git a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.spec.ts b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.spec.ts deleted file mode 100644 index 2db20e545..000000000 --- a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { OptsExpedientePage } from './opts-expediente.page'; - -describe('OptsExpedientePage', () => { - let component: OptsExpedientePage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ OptsExpedientePage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(OptsExpedientePage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.ts deleted file mode 100644 index 585c2c96f..000000000 --- a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.ts +++ /dev/null @@ -1,462 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { NavigationExtras, Router } from '@angular/router'; -import { ModalController, NavParams, PopoverController } from '@ionic/angular'; -import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; -import { expedienteTask } from 'src/app/models/dailyworktask.model'; -import { SearchList } from 'src/app/models/search-document'; -import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; -import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; -import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; -import { SearchPage } from 'src/app/pages/search/search.page'; -import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe'; -import { AttachmentsService } from 'src/app/services/attachments.service'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { ToastService } from 'src/app/services/toast.service'; -import { ExpedienteService } from 'src/app/Rules/expediente.service'; -import { PermissionService } from 'src/app/services/permission.service'; -import { ThemeService } from 'src/app/services/theme.service' -import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; -import { RouteService } from 'src/app/services/route.service'; -import { SessionStore } from 'src/app/store/session.service'; -import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; -import { environment } from 'src/environments/environment'; -import { TaskService } from 'src/app/services/task.service'; -import { DataService } from 'src/app/services/data.service'; - -@Component({ - selector: 'app-opts-expediente', - templateUrl: './opts-expediente.page.html', - styleUrls: ['./opts-expediente.page.scss'], -}) -export class OptsExpedientePage implements OnInit { - - task: expedienteTask - fulltask: any; - profile:string; - caller:string; - - showEnviarPendentes = false - searchDocumentPipe = new SearchDocumentPipe() - documents:SearchList[] = []; - - SessionStore = SessionStore; - environment = environment - - constructor( - private popoverController: PopoverController, - private modalController: ModalController, - private navParams: NavParams, - private processes: ProcessesService, - private toastService: ToastService, - private router: Router, - public p: PermissionService, - private attachmentsService: AttachmentsService, - private RouteService: RouteService, - private expedienteService: ExpedienteService, - public ThemeService: ThemeService, - private httpErrorHanlde: HttpErrorHandle, - public TaskService: TaskService, - private dataService: DataService, - ) { - - } - - ngOnInit() { - - } - - async openNewGroupPage() { - - // this.dataService.set("newGroup", true); - // this.dataService.set("task", this.task); - // this.dataService.set("newGroupName", this.task.Folio); - // this.dataService.set("documents", this.fulltask.Documents); - // this.dataService.set("link", window.location.pathname); - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: NewGroupPage, - cssClass: 'modal modal-desktop', - componentProps: { - name: this.task.Folio, - task: this.task, - documents: this.fulltask.Documents, - }, - }); - - modal.onDidDismiss().then( - ()=>{}, - (error) => { - console.log(error) - }) - - await modal.present(); - } - - close() { - if( window.innerWidth < 801) { - this.popoverController.dismiss(); - } - else{ - this.popoverController.dismiss(); - } - } - - goBack() { - this.TaskService.loadExpedientes() - this.RouteService.goBack() - } - - attachDocument(){ - this.getDoc(); - } - - async getDoc() { - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: SearchPage, - cssClass: 'modal-width-100-width-background modal', - componentProps: { - type: 'AccoesPresidenciais & ArquivoDespachoElect', - showSearchInput: true, - select: true - } - }); - - modal.onDidDismiss().then( async (res)=>{ - if(res){ - const data = res.data; - this.documents.push(data.selected); - this.documents.forEach((element: any) =>{ - - let body = { - "InstanceID": this.task.InstanceID, - "WorkflowDisplayName": this.task.WorkflowName, - "FolderID": this.task.FolderId, - "DispatchNumber": this.task.DispatchNumber, - "AttachmentsProcessLastInstanceID": this.task.AttachmentsProcessLastInstanceID, - "Attachments": [] - } - - const Attachments = this.searchDocumentPipe.transformToAttachment(element) - body.Attachments = Attachments; - - const loader = this.toastService.loading() - - this.attachmentsService.AddAttachment(body).subscribe((res)=> { - this.toastService._successMessage() - }, (error) => { - this.httpErrorHanlde.httpStatusHandle(error) - },()=> { - loader.remove() - }); - - }); - - this.popoverController.dismiss() - - } - }, (error) => { - console.log(error) - }); - - await modal.present(); - - } - - async openAddNoteModal(actionName:string) { - let classs; - if( window.innerWidth < 801) { - classs = 'modal modal-desktop' - } else { - classs = 'add-note-modal' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: AddNotePage, - componentProps:{ - showAttachmentBtn: false, - actionName:actionName - }, - cssClass: classs, - //backdropDismiss: true - }); - - modal.onDidDismiss().then( async (res) => { - - if(res.data){ - const DocumentToSave = res.data.documents.map((e) => { - return { - ApplicationId: e.ApplicationType, - SourceId: e.Id, - } - }); - - let docs = { - ProcessInstanceID: "", - Attachments: DocumentToSave, - } - - if(actionName == 'Aprovar') { - await this.approve(res.data.note, docs); - } - else if(actionName == 'Revisão') { - await this.sendToReview(res.data.note, docs); - } - this.popoverController.dismiss(); - this.goBack(); - } - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - async sendToReview(note:string, documents:any) { - let body = { - "serialNumber": this.task.SerialNumber, - "action": "Retificar", - "ActionTypeId": 99999877, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.TaskService.loadExpedientes() - this.close(); - this.toastService._successMessage() - } catch(error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest() - } - } finally { - loader.remove() - } - } - - sendExpedienteToPending() { - this.close(); - this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ - this.TaskService.loadExpedientes() - this.goBack(); - },(error) => { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Processo não encontrado') - } - }); - } - - async approve(note:string, documents:any){ - let body = { - "serialNumber": this.task.SerialNumber, - "action": "Aprovar", - "ActionTypeId": 100000004 , - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise(); - this.TaskService.loadExpedientes() - this.close(); - this.httpErrorHanlde.httpsSucessMessagge('Avaliação Superiror') - } catch(error) { - this.httpErrorHanlde.httpStatusHandle(error) - } finally { - loader.remove() - } - - } - - async openBookMeetingModal() { - this.close(); - let classs; - if( window.innerWidth <= 800){ - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: BookMeetingModalPage, - componentProps: { - task: this.task, - fulltask: this.fulltask - }, - cssClass: classs, - backdropDismiss: false - }); - - modal.onDidDismiss().then( - ()=>{}, - (error) => { - console.log(error) - } - ) - - await modal.present(); - } - - async openExpedientActionsModal(taskAction: any, task: any) { - - - - this.close(); - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: ExpedientTaskModalPage, - componentProps: { - taskAction: taskAction, - task: task, - }, - cssClass: classs, - }); - - modal.onDidDismiss().then(async res=>{ - - let body = res['data']; - if(res['data']){ - const loader = this.toastService.loading() - try { - await this.processes.CompleteTask(body).toPromise(); - this.TaskService.loadExpedientes() - this.goBack(); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Processo não descartado') - } - } finally { - loader.remove() - } - } - else{ - - } - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - async distartExpedientModal(body:any){ - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: DiscartExpedientModalPage, - componentProps: { - }, - cssClass: 'discart-expedient-modal', - backdropDismiss: false - }); - - - modal.onDidDismiss().then( async (res) => { - - - if(body == 'descartar') { - if(res['data']== 'Yes') { - - const loader = this.toastService.loading() - - try { - await this.expedienteService.discard({SerialNumber: this.task.SerialNumber}).toPromise() - this.TaskService.loadExpedientes() - this.toastService._successMessage('Processo descartado'); - this.goBack(); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Processo não descartado') - } - } finally { - loader.remove() - } - - - } - else if(res['data'] == 'No'){ - //Do nothing - } - } - else{ - if(res['data']== 'Yes') { - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise(); - this.toastService._successMessage('Processo descartado'); - this.TaskService.loadExpedientes() - this.goBack(); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Processo não descartado') - } - } finally { - loader.remove() - } - this.goBack(); - } - else if(res['data'] == 'No'){ - - const loader = this.toastService.loading() - - try { - await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise(); - this.TaskService.loadExpedientes() - this.toastService._successMessage(); - this.goBack(); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - this.toastService._badRequest() - } - } finally { - loader.remove() - } - } - } - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - -} diff --git a/src/app/shared/popover/desktop/request-options/request-options-routing.module.ts b/src/app/shared/popover/desktop/request-options/request-options-routing.module.ts deleted file mode 100644 index 59bb38c36..000000000 --- a/src/app/shared/popover/desktop/request-options/request-options-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { RequestOptionsPage } from './request-options.page'; - -const routes: Routes = [ - { - path: '', - component: RequestOptionsPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class RequestOptionsPageRoutingModule {} diff --git a/src/app/shared/popover/desktop/request-options/request-options.module.ts b/src/app/shared/popover/desktop/request-options/request-options.module.ts deleted file mode 100644 index fddddf01d..000000000 --- a/src/app/shared/popover/desktop/request-options/request-options.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { RequestOptionsPageRoutingModule } from './request-options-routing.module'; - -import { RequestOptionsPage } from './request-options.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - RequestOptionsPageRoutingModule - ], - declarations: [RequestOptionsPage] -}) -export class RequestOptionsPageModule {} diff --git a/src/app/shared/popover/desktop/request-options/request-options.page.html b/src/app/shared/popover/desktop/request-options/request-options.page.html deleted file mode 100644 index 593e95eae..000000000 --- a/src/app/shared/popover/desktop/request-options/request-options.page.html +++ /dev/null @@ -1,55 +0,0 @@ -
-
-
- - -
- - - - - -
-
- - -
- - - - - -
-
- - -
- - - - - - -
-
- -
-
- - - - - - -
-
- - - - - - - -
-
-
diff --git a/src/app/shared/popover/desktop/request-options/request-options.page.scss b/src/app/shared/popover/desktop/request-options/request-options.page.scss deleted file mode 100644 index fc0b2ccf2..000000000 --- a/src/app/shared/popover/desktop/request-options/request-options.page.scss +++ /dev/null @@ -1,66 +0,0 @@ -@import '~src/function.scss'; - -.wrapper{ - width: 100% !important; - padding-top:20px !important; - padding-bottom:20px !important; -} -.arrow-right{ - display: none; - margin-bottom: 20px; - .arrow-right-icon{ - width: 37px; - float: right; - font-size: rem(35); - overflow: hidden; - } -} -.buttons{ - width: 100% !important; - display: flex; - flex-wrap: wrap; - justify-content: space-around; - margin: 0 auto !important; -} -.solid { - display: none; - width: 90%; - border-top: 1px solid #bbb; - margin: 0 auto !important; - } - .btn-ok, .btn-cancel{ - //width: 50% !important; - margin-bottom: 5px !important; - margin-top: 5px !important; -} -@media only screen and (max-width: 800px) { - .container{ - width: 100% !important; - } - .btn-ok, .btn-cancel, .btn-delete{ - width: 47% !important; - } -} -@media only screen and (min-width: 1024px) { - .container{ - width: 100% !important; - - } - .arrow-right{ - display: flex; - justify-content: flex-end; - } - .btn-cancel{ - // display: none; - width: 100% !important; - margin-bottom: 10px !important; - } - .btn-delete, .btn-ok{ - width: 100% !important; - margin-bottom: 10px !important; - margin-top: 10px !important; - } - /* .solid{ - display: block; - } */ -} diff --git a/src/app/shared/popover/desktop/request-options/request-options.page.spec.ts b/src/app/shared/popover/desktop/request-options/request-options.page.spec.ts deleted file mode 100644 index 41c8cefda..000000000 --- a/src/app/shared/popover/desktop/request-options/request-options.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { RequestOptionsPage } from './request-options.page'; - -describe('RequestOptionsPage', () => { - let component: RequestOptionsPage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ RequestOptionsPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(RequestOptionsPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/popover/desktop/request-options/request-options.page.ts b/src/app/shared/popover/desktop/request-options/request-options.page.ts deleted file mode 100644 index 0296cee4d..000000000 --- a/src/app/shared/popover/desktop/request-options/request-options.page.ts +++ /dev/null @@ -1,398 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { ModalController, NavParams, PopoverController } from '@ionic/angular'; -import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; -import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; -import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page'; -import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; -import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { ToastService } from 'src/app/services/toast.service'; -import { PedidoService } from 'src/app/Rules/pedido.service'; -import { PermissionService } from 'src/app/services/permission.service'; -import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; -import { ForwardPage } from 'src/app/modals/forward/forward.page'; -import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; - - -@Component({ - selector: 'app-request-options', - templateUrl: './request-options.page.html', - styleUrls: ['./request-options.page.scss'], -}) -export class RequestOptionsPage implements OnInit { - - task:any; - fulltask: any; - profile:string; - serialNumber : string; - showEnviarPendentes = false; - taskActions = []; - - constructor( - private popoverController: PopoverController, - private modalController: ModalController, - private navParams: NavParams, - private processes: ProcessesService, - private activatedRoute: ActivatedRoute, - private toastService: ToastService, - public p: PermissionService, - private pedidoService: PedidoService, - private httpErrorHandle: HttpErrorHandle - ) { - this.task = this.navParams.get('task'); - this.fulltask = this.navParams.get('fulltask'); - this.serialNumber = this.navParams.get('serialNumber'); - this.taskActions = this.navParams.get('actions'); - - this.activatedRoute.queryParams.subscribe(params => { - if(params["serialNumber"]) { - this.serialNumber = params["serialNumber"]; - // - } - }); - - if(this.task.serialNumber) { - this.serialNumber = this.task.serialNumber - } else if (this.task.SerialNumber) { - this.serialNumber = this.task.SerialNumber - } - - this.showEnviarPendentes = this.navParams.get('showEnviarPendentes'); - - if(!this.showEnviarPendentes) this.showEnviarPendentes = false - - } - - ngOnInit() { - - this.profile = "mdgpr"; - - window.onresize = (event) => { - if( window.innerWidth >= 800){ - this.popoverController.dismiss(); - } - }; - } - - checkStringInArray(str) { - return this.taskActions.includes(str); - } - - close() { - this.popoverController.dismiss('close') - } - cancel(){ - this.popoverController.dismiss(); - } - - sendExpedienteToPending() { - const loader = this.toastService.loading() - this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ - - this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes') - this.close(); - loader.remove() - }, (error)=> { - loader.remove() - - this.httpErrorHandle.httpStatusHandle(error) - }); - - } - - async openBookMeetingModal(task: any) { - this.popoverController.dismiss(); - let classs; - if( window.innerWidth <= 800) { - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: BookMeetingModalPage, - componentProps: { - task: this.task, - fulltask: this.fulltask - }, - cssClass: classs, - backdropDismiss: false - }); - - modal.onDidDismiss().then( - ()=>{} - , (error) => { - console.log(error) - }) - - await modal.present(); - } - - async openNewGroupPage(){ - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: NewGroupPage, - cssClass: 'modal modal-desktop', - componentProps: { - name: this.task.Folio, - task: this.task, - documents: this.fulltask.Documents, - }, - }); - - modal.onDidDismiss().then( () => { - this.popoverController.dismiss('close'); - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - async newGroup(){ - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: NewGroupPage, - cssClass: 'modal modal-desktop', - componentProps: { - name: this.task.Folio, - }, - }); - await modal.present(); - modal.onDidDismiss().then( - ()=>{}, - (error) => { - console.log(error) - }) - } - - async openExpedientActionsModal(taskAction: any, task: any) { - - //this.modalController.dismiss(); - let classs; - if( window.innerWidth <= 800) { - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: CreateProcessPage, - componentProps: { - taskAction: taskAction, - task: task, - profile: this.profile, - fulltask: this.fulltask - }, - cssClass: classs, - }); - - modal.onDidDismiss().then(res=> { - - if(res['data']=='openDiscart') { - - - } else { - this.popoverController.dismiss('close') - } - - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - async repreciar(note:string, documents:any) { - let body = { - "serialNumber": this.serialNumber, - "action": "Reapreciação", - "ActionTypeId": 100000009, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - const loader = this.toastService.loading() - - try { - await this.processes.CompleteTask(body).toPromise() - this.close(); - this.httpErrorHandle.httpsSucessMessagge('Solicitar Reapreciação') - } catch (error) { - this.httpErrorHandle.httpStatusHandle(error); - } - finally { - loader.remove() - } - - } - - async openAddNoteModal(actionName:string) { - - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: AddNotePage, - componentProps:{ - showAttachmentBtn: true, - actionName:actionName - }, - cssClass: classs, - backdropDismiss: true - }); - - modal.onDidDismiss().then(async (res) => { - - - const DocumentToSave = res.data.documents.map((e) => { - return { - ApplicationId: e.ApplicationType, - SourceId: e.Id, - } - }); - - let docs = { - ProcessInstanceID: "", - Attachments: DocumentToSave, - } - - - if(res.data) { - if(actionName == 'Solicitar Reapreciação') { - - await this.repreciar(res.data.note, docs); - } - else if(actionName == 'Arquivar') { - await this.arquivar(res.data.note, docs); - this.popoverController.dismiss('close') - } - } - - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - async arquivar(note:string, documents:any) { - - const loader = this.toastService.loading() - - try { - await this.pedidoService.arquivar({serialNumber: this.serialNumber, - documents, - note - }).toPromise() - - this.httpErrorHandle.httpsSucessMessagge('Arquivar') - } catch (error) { - this.httpErrorHandle.httpStatusHandle(error) - } finally { - loader.remove() - } - - } - - async openDarParecer(task: any) { - - let classs; - if( window.innerWidth <= 800){ - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: DarParecerPage, - componentProps: { - serialNumber: this.task.SerialNumber, - ProcessInstanceID: this.task.ProcessInstanceID, - }, - cssClass: classs, - backdropDismiss: false - }); - - modal.onDidDismiss().then( () => { - this.popoverController.dismiss('close'); - }, (error) => { - console.log(error) - }); - - await modal.present(); - - } - - async openForwardModal(tasK: any) { - let classs; - if (window.innerWidth <= 800) { - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: ForwardPage, - componentProps: { - task: this.task, - }, - cssClass: classs, - backdropDismiss: false - }); - - modal.onDidDismiss().then(() => { - this.popoverController.dismiss('close'); - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - - async openDelegarModal(task: any) { - - - let classs; - if( window.innerWidth <= 800){ - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - this.modalController.dismiss() - const modal = await this.modalController.create({ - component: DelegarPage, - componentProps: { - task: this.task, - }, - cssClass: classs, - backdropDismiss: false - }); - - modal.onDidDismiss().then( async (res)=> { - - if(res['data']=='close') { - this.popoverController.dismiss('close'); - } - - }, (error) => { - console.log(error) - }) - - await modal.present(); - } - - -} diff --git a/src/style/ios.scss b/src/style/ios.scss index cb7af3340..c147f33e5 100644 --- a/src/style/ios.scss +++ b/src/style/ios.scss @@ -56,6 +56,14 @@ } +.aside-modal::part(content){ + + position: absolute; + right: 0px; + height: 100%; + width: 400px; + +} .modal-top-100-width-background::part(content),