diff --git a/package-lock.json b/package-lock.json index 7e5f76dab..714e3288f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6479,6 +6479,11 @@ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" }, + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" + }, "default-gateway": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", @@ -7019,8 +7024,7 @@ "entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" }, "env-paths": { "version": "2.2.0", @@ -8248,6 +8252,11 @@ "minimalistic-assert": "^1.0.1" } }, + "he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" + }, "hex-color-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", @@ -8316,6 +8325,63 @@ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, + "html-to-text": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-7.0.0.tgz", + "integrity": "sha512-UR/WMSHRN8m+L7qQUhbSoxylwBovNPS+xURn/pHeJvbnemhyMiuPYBTBGqB6s8ajAARN5jzKfF0d3CY86VANpA==", + "requires": { + "deepmerge": "^4.2.2", + "he": "^1.2.0", + "htmlparser2": "^6.0.0", + "minimist": "^1.2.5" + }, + "dependencies": { + "dom-serializer": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz", + "integrity": "sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "entities": "^2.0.0" + } + }, + "domelementtype": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" + }, + "domhandler": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.1.0.tgz", + "integrity": "sha512-/6/kmsGlMY4Tup/nGVutdrK9yQi4YjWVcVeoQmixpzjOUK1U7pQkvAPHBJeUxOgxF0J8f8lwCJSlCfD0V4CMGQ==", + "requires": { + "domelementtype": "^2.2.0" + } + }, + "domutils": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.5.1.tgz", + "integrity": "sha512-hO1XwHMGAthA/1KL7c83oip/6UWo3FlUNIuWiWKltoiQ5oCOiqths8KknvY2jpOohUoUgnwa/+Rm7UpwpSbY/Q==", + "requires": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.1.0" + } + }, + "htmlparser2": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.1.tgz", + "integrity": "sha512-GDKPd+vk4jvSuvCbyuzx/unmXkk090Azec7LovXP8as1Hn8q9p3hbjmDGbUqqhknw0ajwit6LiiWqfiTUPMK7w==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.4.4", + "entities": "^2.0.0" + } + } + } + }, "htmlparser2": { "version": "3.10.1", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", diff --git a/package.json b/package.json index e96404a36..637a324f2 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "cordova-res": "^0.15.3", "cordova-sqlite-storage": "^5.1.0", "date-fns": "^2.17.0", + "html-to-text": "^7.0.0", "ionic-selectable": "^4.7.1", "ionic2-alpha-scroll": "^2.0.1", "ionic2-calendar": "^0.6.6", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 2d637573b..e4573a5ba 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -35,6 +35,10 @@ const routes: Routes = [ path: 'expedients', loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) }, + { + path: 'document-detail', + loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) + }, /* { path: 'chat', diff --git a/src/app/modals/document-detail/document-detail-routing.module.ts b/src/app/modals/document-detail/document-detail-routing.module.ts new file mode 100644 index 000000000..db1857b89 --- /dev/null +++ b/src/app/modals/document-detail/document-detail-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { DocumentDetailPage } from './document-detail.page'; + +const routes: Routes = [ + { + path: '', + component: DocumentDetailPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class DocumentDetailPageRoutingModule {} diff --git a/src/app/modals/document-detail/document-detail.module.ts b/src/app/modals/document-detail/document-detail.module.ts new file mode 100644 index 000000000..78eb44eb1 --- /dev/null +++ b/src/app/modals/document-detail/document-detail.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { DocumentDetailPageRoutingModule } from './document-detail-routing.module'; + +import { DocumentDetailPage } from './document-detail.page'; +import { SharedModule } from 'src/app/shared/shared.module'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + SharedModule, + DocumentDetailPageRoutingModule + ], + declarations: [ + DocumentDetailPage, + SharedModule,] +}) +export class DocumentDetailPageModule {} diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html new file mode 100644 index 000000000..91323eed8 --- /dev/null +++ b/src/app/modals/document-detail/document-detail.page.html @@ -0,0 +1,10 @@ + + + + document-detail + + + + + + diff --git a/src/app/modals/document-detail/document-detail.page.scss b/src/app/modals/document-detail/document-detail.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/modals/document-detail/document-detail.page.spec.ts b/src/app/modals/document-detail/document-detail.page.spec.ts new file mode 100644 index 000000000..d21f72d70 --- /dev/null +++ b/src/app/modals/document-detail/document-detail.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { DocumentDetailPage } from './document-detail.page'; + +describe('DocumentDetailPage', () => { + let component: DocumentDetailPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DocumentDetailPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(DocumentDetailPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts new file mode 100644 index 000000000..db679b63b --- /dev/null +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-document-detail', + templateUrl: './document-detail.page.html', + styleUrls: ['./document-detail.page.scss'], +}) +export class DocumentDetailPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index b32ffdcfd..a3fa15391 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -931,6 +931,7 @@ export class AgendaPage implements OnInit { const modal = await this.modalCtrl.create({ component: EventListPage, componentProps:{ + profile: this.profile, }, cssClass: 'modal modal-desktop', backdropDismiss: false diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 240c75cc7..7a23ad41b 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -40,6 +40,9 @@ export class EditEventPage implements OnInit { ) { this.isEventEdited = false; this.postEvent = this.navParams.get('event'); + if(this.postEvent){ + this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, ''); + } this.taskParticipants = []; this.taskParticipantsCc = []; @@ -62,7 +65,7 @@ export class EditEventPage implements OnInit { } ngOnInit() { - + window.onresize = (event) => { // if not mobile remove all component if( window.innerWidth >= 800){ diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index e5c8ab51b..744df111f 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -52,21 +52,22 @@
-
Intervenientes
- - -
-

{{attendee.Name}}

-
- - -
-
-
Detalhes
- - - -
+
Intervenientes
+ + +
+

{{attendee.Name}}

+
+ + +
+
+
Detalhes
+ +
+ +
+
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index c8802c92d..87175f7e1 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -13,7 +13,7 @@
-
+
Intervenientes
- +

{{loadedEvent.workflowInstanceDataFields.Participants}}
Detalhes
- +

{{loadedEvent.workflowInstanceDataFields.Body}}
@@ -68,7 +68,7 @@

Documentos Anexados

- +

Receita por Natureza

{{loadedAttachments.Remetente}}{{loadedAttachments.CreateDate}}

@@ -78,11 +78,11 @@
- + + +
+ + + +
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss index 1e8379f6c..b041fc18a 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss @@ -138,3 +138,10 @@ ion-menu{ border-radius: 22.5px; --background: #ffe0e0; } + +.buttons{ + display: flex; + justify-content: space-between; + padding: 20px; + overflow: auto; +} diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index e40105049..c4ff82d22 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -32,6 +32,8 @@ export class EventListPage implements OnInit { ngOnInit() { this.profile = this.navParams.get('profile'); + console.log(this.profile); + /* console.log(this.navParams.get('md')); */ if(this.profile == "mdgpr"){ this.profile = 'MDGPR' diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index be7cb9a58..e54eebe71 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -174,6 +174,8 @@ this.processesbackend.GetActionsList().subscribe(res=>{ } openEventsToApprovePage(profile:any){ + console.log(profile); + this.closeAllDesktopComponents(); if( window.innerWidth <= 1024){ this.openEventsToApproveList(profile); diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index b2c6e612f..0399a0937 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -22,6 +22,7 @@
+
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss index c89235c30..f59e569bf 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -67,15 +67,18 @@ ion-toolbar{ font-size: 25px; } .div-icon{ - width: 40px; - float: right; + display: flex; + /* width: 45px; + float: right; */ font-size: 35px; overflow: auto; - padding: 1px; + padding: 0 !important; + align-items: center; + justify-content: flex-end; } .div-icon ion-icon{ float: right; - padding-left: 20px; + padding-left: 10px; } } .main-content{ diff --git a/src/app/pages/publications/view-publications/view-publications.page.scss b/src/app/pages/publications/view-publications/view-publications.page.scss index 2da9c7ab9..361be3719 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.scss +++ b/src/app/pages/publications/view-publications/view-publications.page.scss @@ -113,6 +113,7 @@ width: 92px; float: right; overflow: auto; + border: 1px solid red; } .actions-icon ion-icon{ margin-left: 10px; diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 48750b8b0..e0a2ef32d 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -196,6 +196,20 @@ export class ProcessesService { return this.http.get(`${geturl}`, options); } + GetDocumentDetails(DocId:string, FsId:string){ + const geturl = environment.apiURL + 'ecm/document/viewrequestshort'; + let params = new HttpParams(); + + params = params.set("docId", DocId); + params = params.set("applicationid", FsId); + + let options = { + headers: this.headers, + params: params + }; + return this.http.get(`${geturl}`, options); + } + diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts index 3fe1ef0fd..05a782f9c 100644 --- a/src/app/services/publications.service.ts +++ b/src/app/services/publications.service.ts @@ -3,7 +3,8 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { environment } from 'src/environments/environment'; import { AuthService } from '../services/auth.service'; import { User } from '../models/user.model'; -import { Observable } from 'rxjs'; +import { Observable, throwError } from 'rxjs'; +import { catchError } from 'rxjs/operators' @Injectable({ providedIn: 'root' @@ -80,7 +81,8 @@ export class PublicationsService { headers: this.headers, params: params }; - return this.http.get(`${geturl}`, options); + return this.http.get(`${geturl}`, options) + .pipe(catchError(this.handleError)); } GetPublicationById( publicationId:any){ @@ -140,6 +142,12 @@ export class PublicationsService { + handleError(error){ + return throwError(error || 'Server Error'); + } + + + } diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts index 080323b92..d78d7d57e 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.component.ts @@ -39,14 +39,15 @@ export class EditEventComponent implements OnInit { private modalController: ModalController, private eventsService: EventsService, public alertController: AlertController, - ) { - - + ) + { + } ngOnInit() { - let innerHtml :string = this.postEvent.Body.Text; - this.postEvent.Body.Text = innerHtml; + if(this.postEvent){ + this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, ''); + } console.log(this.postEvent); this.isEventEdited = false; diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index e4349e261..e3378e3ca 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -44,10 +44,12 @@ -
Detalhes
- - - +
+
Detalhes
+ +
+ +
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 80f9080b6..366ba96ec 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -13,7 +13,8 @@
- + +
@@ -49,7 +50,10 @@ -
+
+

{{error}}

+
+