From 716562e3570338ba5127288221b810f8ca25fb1b Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 17:07:29 +0100 Subject: [PATCH] fixed all production issues --- src/app/app.module.ts | 4 +- src/app/components/components.module.ts | 43 +------------------ .../document-detail/document-detail.module.ts | 4 +- src/app/models/user.model.ts | 2 +- src/app/pages/chat/chat.page.ts | 2 +- src/app/pages/chat/messages/messages.page.ts | 4 +- .../events/edit-event/edit-event.page.html | 15 +------ .../expediente/expediente.page.html | 2 +- .../expediente/expediente.page.ts | 3 +- .../gabinete-digital.page.html | 4 +- .../gabinete-digital/gabinete-digital.page.ts | 2 + 11 files changed, 16 insertions(+), 69 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 29a6ee156..642a4a317 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -35,8 +35,8 @@ import { ChatService } from './services/chat.service' @NgModule({ - declarations: [AppComponent,MessagesPage,], - entryComponents: [MessagesPage], + declarations: [AppComponent], + entryComponents: [], imports: [BrowserModule, CommonModule, FormsModule, diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 4c7831bdb..3cdff95ee 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -1,49 +1,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { BtnSeguintePage } from '../shared/btn-seguinte/btn-seguinte.page'; -import { BtnModalDismissPage } from '../shared/btn-modal-dismiss/btn-modal-dismiss.page'; -import { EmptyChatPage } from '../shared/chat/empty-chat/empty-chat.page'; -import { NewEventPage } from '../shared/agenda/new-event/new-event.page'; -import { EditEventPage } from '../shared/agenda/edit-event/edit-event.page'; -import { ViewEventPage } from '../shared/agenda/view-event/view-event.page'; -import { EventListPage } from '../shared/agenda/event-list/event-list.page'; -import { ApproveEventPage } from '../shared/agenda/approve-event/approve-event.page'; -import { AttendeesPage } from '../shared/event/attendees/attendees.page'; @NgModule({ - declarations: [ - /* BtnSeguintePage, */ - //BtnModalDismissPage, - - //NewEventPage, - //EditEventPage, - //ViewEventPage, - //ApproveEventPage, - //AttendeesPage, - //AttendeeModalPage, - - - //EventListPage, - //EmptyContainerPage, - //EventsToApprovePage, - - ], - exports: [ - /* BtnSeguintePage, */ - //BtnModalDismissPage, - - //NewEventPage, - //EditEventPage, - // ViewEventPage, - //EventListPage, - //ApproveEventPage, - //AttendeesPage, - //AttendeeModalPage, - //EventsToApprovePage, - //EmptyContainerPage, - - ], + declarations: [], + exports: [], imports: [ CommonModule, ] diff --git a/src/app/modals/document-detail/document-detail.module.ts b/src/app/modals/document-detail/document-detail.module.ts index 3ade9b0a4..809d618a0 100644 --- a/src/app/modals/document-detail/document-detail.module.ts +++ b/src/app/modals/document-detail/document-detail.module.ts @@ -20,8 +20,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- DocumentDetailPageRoutingModule, BtnModalDismissPageModule, ], - declarations: [ - DocumentDetailPage, - SharedModule,] + declarations: [DocumentDetailPage] }) export class DocumentDetailPageModule {} diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts index 997b9ddea..c8a464b2c 100644 --- a/src/app/models/user.model.ts +++ b/src/app/models/user.model.ts @@ -25,5 +25,5 @@ export class User { Id: 1 }[] UserName: string - Profile: "PR" | "MDGPR" + Profile: any; } \ No newline at end of file diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 0e09bac21..f4b9c3df0 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -37,7 +37,7 @@ export class ChatPage implements OnInit { X_User_Id:any; X_Auth_Token:any; - private loggedUser: any; + loggedUser: any; /* Set segment variable */ segment:string; allGroups: any[]; diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index a52e0bc3a..9dc8603b0 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -113,7 +113,7 @@ export class MessagesPage implements OnInit, AfterViewChecked { }); } - async openMessagesOptions(ev: any) { + async openMessagesOptions(ev?: any) { const popover = await this.popoverController.create({ component: MessagesOptionsPage, componentProps: { @@ -139,7 +139,7 @@ export class MessagesPage implements OnInit, AfterViewChecked { modal.onDidDismiss(); } - async openChatOptions(ev: any) { +async openChatOptions(ev?: any) { const popover = await this.popoverController.create({ component: ChatOptionsPopoverPage, cssClass: 'chat-options-popover', diff --git a/src/app/pages/events/edit-event/edit-event.page.html b/src/app/pages/events/edit-event/edit-event.page.html index 860adfe23..f789aaf58 100644 --- a/src/app/pages/events/edit-event/edit-event.page.html +++ b/src/app/pages/events/edit-event/edit-event.page.html @@ -16,16 +16,14 @@
-
Assunto - + Campo obrigatório -
Descrição @@ -117,17 +115,6 @@
- - - diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index d3241ec79..c56ae6304 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -2,7 +2,7 @@ - + diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 5a37081d6..7625f3fef 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -84,11 +84,10 @@ export class ExpedientePage implements OnInit { }); } - doRefresh(event) { + doRefresh() { this.LoadList(); setTimeout(() => { - event.target.complete(); }, 2000); } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 1ae0d674f..48d560d71 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -95,8 +95,8 @@
-

Expediente Presidente

-

Expediente

+

Expediente Presidente

+

Expediente

{{count_exp_pr}} Documentos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 4d9fbe02d..72577ea63 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -68,6 +68,8 @@ export class GabineteDigitalPage implements OnInit { serialNumber:string; loggeduser: User; + mdgpr = "MDGPR"; + pr = "PR" constructor( private processesbackend:ProcessesService,