Merge branch 'developer-c' of bitbucket.org:equilibriumito/gabinete-digital into feature/calendar

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",

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",

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)
   },
 
  /*  {

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 {}

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 {}

src/app/modals/document-detail/document-detail.page.html

@@ -0,0 +1,10 @@
+<ion-header>
+  <app-btn-modal-dismiss></app-btn-modal-dismiss>
+  <ion-toolbar>
+    <ion-title>document-detail</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+
+</ion-content>

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<DocumentDetailPage>;
+
+  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();
+  });
+});

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() {
+  }
+
+}

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

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){

src/app/pages/agenda/view-event/view-event.page.html

@@ -52,21 +52,22 @@
         <div class="line"></div>
         <div class="middle-content">
           <div *ngIf="loadedEvent.Attendees">
-          <h5>Intervenientes</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-            <ion-label>
-              <div *ngFor="let attendee of loadedEvent.Attendees">
-                <p>{{attendee.Name}}</p>
-              </div>
-            </ion-label>
-          </ion-item>
-        </div>
-        <div *ngIf="loadedEvent.Body.Text">
-          <h5>Detalhes</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-            <textarea disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></textarea>
-          </ion-item>
-        </div>
+            <h5>Intervenientes</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+              <ion-label>
+                <div *ngFor="let attendee of loadedEvent.Attendees">
+                  <p>{{attendee.Name}}</p>
+                </div>
+              </ion-label>
+            </ion-item>
+          </div>
+          <div *ngIf="loadedEvent.Body.Text">
+            <h5>Detalhes</h5>
+            <ion-item lines="none" class="ion-no-margin ion-no-padding">
+              <div disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></div>
+            </ion-item>
+          </div>
+          <div class="line"></div>
         </div>
       
         <div *ngIf="loadedAttachments" class="bottom-content width-100">

src/app/pages/chat/messages/messages.page.html

@@ -13,7 +13,7 @@
           <ion-icon  (click)="openMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
         </div>  
       </div>
-      <div class="header-bottom" (click)="addContacts()">
+      <div hidden class="header-bottom" (click)="addContacts()">
         <div class="header-bottom-icon">
           <ion-icon src="assets/icon/icons-user.svg"></ion-icon>
         </div>

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html

@@ -25,7 +25,7 @@
       </ion-item>
       <ion-item (click)="emendTask(loadedEvent.serialNumber)">
         <ion-icon name="create-outline"></ion-icon>
-        <ion-label>Emendar1</ion-label>
+        <ion-label>Emendar</ion-label>
       </ion-item>
       <ion-item (click)="rejectTask(loadedEvent.serialNumber)">
         <ion-icon name="close-sharp"></ion-icon>
@@ -56,11 +56,11 @@
   </div>
   <div class="middle-content">
     <h5>Intervenientes</h5>
-    <ion-item>
+    <ion-item class="ion-no-padding ion-no-margin">
       <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
     </ion-item>
     <h5>Detalhes</h5>
-    <ion-item>
+    <ion-item class="ion-no-padding ion-no-margin">
       <p>{{loadedEvent.workflowInstanceDataFields.Body}}</p>
     </ion-item>
   </div>
@@ -68,7 +68,7 @@
   <div *ngIf="loadedAttachments" class="bottom-content">
     <ion-list>
       <h3>Documentos Anexados</h3>
-      <ion-item>
+      <ion-item class="ion-no-padding ion-no-margin">
       <ion-label>
         <p class="attach-title-item">Receita por Natureza</p>
         <p><span class="span-left">{{loadedAttachments.Remetente}}</span><span class="span-right">{{loadedAttachments.CreateDate}}<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
@@ -78,11 +78,11 @@
   </div>
 </ion-content>
 <ion-footer>
-  <ion-toolbar>
+  <!-- <ion-toolbar>
     <div class="buttons">
     <ion-item lines="none">
       <p>
-        <ion-button class="button-edit-event" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</ion-button>
+        <ion-button class="button-edit-event" shape="round" (click)="emendTask(loadedEvent.serialNumber)">11Emendar</ion-button>
       </p>
       <p>
        <ion-menu-button autoHide="false">
@@ -99,5 +99,11 @@
       </p>
     </ion-item>
   </div>
-  </ion-toolbar>
+  </ion-toolbar> -->
+
+  <div class="buttons width-100">
+    <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</button>
+    <button class="btn-no-color" shape="round" (click)="openMenu()"> <ion-icon name="ellipsis-vertical-outline"></ion-icon></button>
+    <button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
+  </div>
 </ion-footer>

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;
+}

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'

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);

src/app/pages/publications/publications.page.html

@@ -22,6 +22,7 @@
             </div>
             <div class="div-icon">
               <ion-icon (click)="AddPublicationFolder()" slot="end" src='assets/images/icons-add.svg'></ion-icon>
+              <ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
             </div>
           </div>
         </div>

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{

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;

src/app/services/processes.service.ts

@@ -196,6 +196,20 @@ export class ProcessesService {
     return this.http.get<any>(`${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<any>(`${geturl}`, options);
+  }
+
   
 
 

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<any>(`${geturl}`, options);
+    return this.http.get<any>(`${geturl}`, options)
+      .pipe(catchError(this.handleError));
   }
 
   GetPublicationById( publicationId:any){
@@ -140,6 +142,12 @@ export class PublicationsService {
 
 
 
+  handleError(error){
+    return throwError(error || 'Server Error');
+  }
+
+
+
 }
 
 

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;

src/app/shared/agenda/view-event/view-event.page.html

@@ -44,10 +44,12 @@
           </ion-label>
         </ion-item>
       </div>
-      <h5>Detalhes</h5>
-      <ion-item lines="none" class="ion-no-margin ion-no-padding">
-          <ion-textarea [innerHTML]="loadedEvent.Body.Text"></ion-textarea>
-      </ion-item>
+      <div *ngIf="loadedEvent.Body.Text">
+        <h5>Detalhes</h5>
+        <ion-item lines="none" class="ion-no-margin ion-no-padding">
+          <div [innerHTML]="loadedEvent.Body.Text"></div>
+        </ion-item>
+      </div>
     </div>
     <div class="line"></div>
   

src/app/shared/publication/view-publications/view-publications.page.html

@@ -13,7 +13,8 @@
       </div>
       <div class="actions-icon">
        <!--  <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
-        <ion-icon (click)="AddPublication('2',item.ProcessId)" slot="end" src='assets/images/icons-add.svg'></ion-icon>
+        <ion-icon (click)="AddPublication('2',item.ProcessId)" src='assets/images/icons-add.svg'></ion-icon>
+        <ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
       </div>
     </div>
   </div>
@@ -49,7 +50,10 @@
           </div>
         </div>
       </div>
-      <div *ngIf="!publicationList" class="post-item">
+      <div *ngIf="!publicationList">
+        <p>{{error}}</p>
+      </div>
+      <div hidden *ngIf="!publicationList" class="post-item">
         <div class="post-img">
           <img src="/assets/icon/icon-no-image.svg" alt="image">
         </div>

src/app/shared/publication/view-publications/view-publications.page.scss

@@ -107,15 +107,21 @@
   }
   
   .actions-icon{
-    width: 92px;
-    float: right;
+    display: flex;
     overflow: auto;
+    align-items: top;
+    justify-content: flex-end;
+    padding: 0 !important;
   }
   .actions-icon ion-icon{
-      margin-left: 10px;
+      margin-left: 5px;
       font-size: 35px;
       float: right;
+      padding: 0 !important;
   }
+  /* .title-icon{
+    font-size: 40px !important;
+  } */
   .item-content-date{
     color: #797979;
     font-size: 13px;

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -19,6 +19,8 @@ export class ViewPublicationsPage implements OnInit {
   publicationList: Publication[];
   item: PublicationFolder;
 
+  error: any;
+
   @Input() folderId: string;
   @Output() addNewPublication =  new EventEmitter<any>();
   @Output() openPublicationDetails= new EventEmitter<any>();
@@ -95,6 +97,13 @@ export class ViewPublicationsPage implements OnInit {
       });
       console.log(this.publicationList);
       this.showLoader = false;
+    },
+    (error)=>{
+      if(error.status == '404'){
+        console.log('NOT FOUND');
+        this.error = 'Sem publicações disponíveis!';
+      }
+      
     });
     
   }

src/global.scss

@@ -568,4 +568,9 @@ border-top: 1px solid #d8d8d8;
     -moz-border-radius: 3px !important;
     -ms-border-radius: 3px !important;
     -o-border-radius: 3px !important;
+  }
+  .title-icon{
+    font-size: 40px !important;
+    color: #0782c9;
+    overflow: auto;
   }

src/theme/variables.scss

@@ -444,6 +444,9 @@
   color: #061b52 !important;
   margin: 0 auto !important;
 }
+.btn-no-color{
+  background-color: #fff;
+}
 .bg-blue{
   --background:#0782c9;
   background:#0782c9;