tiny changes

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html

@@ -66,15 +66,13 @@
         <div class="bottom-content width-100">
           <ion-list *ngIf="fulltask.Documents">
             <h5 class="font-17-rem">Documentos Anexados</h5>
-            <ion-item *ngFor="let attachment of mergedArray"
-            class="ion-no-margin ion-no-padding cursor-pointer">
-            <ion-label
-            (click)="viewDocument(attachment.DocId, attachment, attachment.content)">
-              <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
-              <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
-              <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
-            </ion-label>
-          </ion-item>
+            <ion-item *ngFor="let attachment of mergedArray" class="ion-no-margin ion-no-padding cursor-pointer">
+              <ion-label (click)="viewDocument(attachment.DocId, attachment, attachment.content)">
+                <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
+                <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"></span></p>
+                <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
+              </ion-label>
+            </ion-item>
           </ion-list>
         </div>
       </div>

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts

@@ -76,14 +76,6 @@ export class DespachoPrPage implements OnInit {
     this.profile = "mdgpr";
     
 
-    this.activateRoute.paramMap.subscribe(paramMap => {
-      if (!paramMap.has('SerialNumber')) {
-        return;
-      }
-      /* this.serialNumber = paramMap.get('SerialNumber'); */
-      this.LoadTaskDetail(this.serialNumber);
-      // this.LoadRelatedEvents(this.serialNumber);
-    });
     this.LoadTaskDetail(this.serialNumber);
     // this.LoadRelatedEvents(this.serialNumber);
 
@@ -610,6 +602,7 @@ export class DespachoPrPage implements OnInit {
   }
 
   getDocumentPdf(Documents: any) {
+    this.mergedArray = []
     Documents.forEach(element => {
       let docObject = {
         "ApplicationId": element.ApplicationId,

src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts

@@ -9,6 +9,7 @@ import { DiplomaAssinarPageRoutingModule } from './diploma-assinar-routing.modul
 import { DiplomaAssinarPage } from './diploma-assinar.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
+import { TaskDetailsPageModule } from 'src/app/shared/gabinete-digital/generic/task-details/task-details.module';
 
 @NgModule({
   imports: [
@@ -18,6 +19,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
 
     DiplomaAssinarPageRoutingModule,
     BtnModalDismissPageModule,
+    TaskDetailsPageModule
   ],
   declarations: [DiplomaAssinarPage]
 })

src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html

@@ -86,6 +86,10 @@
         <button (click)="Assinar()" class="btn-cancel" shape="round" >Assinado</button>
         <div class="solid"></div>
       </div>
+      <div class="buttons">
+        <button (click)="AssinarNew()" class="btn-cancel" shape="round" >Assinar</button>
+        <div class="solid"></div>
+      </div>
       <div class="buttons">
         <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
         <div class="solid"></div>

src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts

@@ -203,9 +203,13 @@ export class DiplomaAssinarPage implements OnInit {
       "action": "Assinado",
       "ActionTypeId": 99999842,
       "dataFields": {
+        "DraftIds": "",
         "ReviewUserComment": '',
+        "InstanceIDNew": this.task.InstanceID,
+      },
+      "AttachmentList": {
+        "ProcessInstanceID": this.task.InstanceID
       },
-      "AttachmentList": {},
     }
 
     const loader = this.toastService.loading()
@@ -225,6 +229,31 @@ export class DiplomaAssinarPage implements OnInit {
 
   }
 
+  async AssinarNew() {
+    let body = {
+      "InstanceId": this.task.InstanceID,
+      "FolderId": this.task.FolderID,
+      "DraftIds": "163;164;77",
+      "OriginalFileName": "Doc1;Doc2;Doc3"
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.presidentialActionsSignature(body).toPromise()
+
+      this.httpErroHandle.httpsSucessMessagge('Assinado')
+      this.TaskService.loadDiplomas()
+      this.goBack();
+    } catch (error) {
+    this.httpErroHandle.httpStatusHandle(error)
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
   async openAddNoteModal(actionName: string) {
     
     let classs;

src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts

@@ -9,6 +9,7 @@ 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/deploma-options/deploma-options.page';
+import { TaskDetailsPageModule } from 'src/app/shared/gabinete-digital/generic/task-details/task-details.module';
 
 @NgModule({
   imports: [
@@ -17,6 +18,7 @@ import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deplo
     IonicModule,
     DiplomaPageRoutingModule,
     BtnModalDismissPageModule,
+    TaskDetailsPageModule
   ],
   entryComponents: [
     DiplomaPage,

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html

@@ -1,82 +1,20 @@
 <ion-content class="container-wrapper">
+  
   <div class="main-content d-flex height-100 overflow-hidden">
-    <div class="content d-flex flex-column" *ngIf="task">
-      <div class="main-header">
-        <div class="title-content width-100 d-flex align-center justify-space-between">
-          <div class="font-30-rem cursor-pointer d-flex align-center" (click)="goBack()" defaultHref="#">
-            <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
-            <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
-            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
-          </div>
-          <div class=" d-flex align-center flex-grow-1 ">
-            <ion-label class="title">{{ task.Folio}}</ion-label>
-          </div>
-          <div class="div-icon" (click)="openOptions()">
-              <!-- <ion-menu-button autoHide="false">
-                <ion-icon name="ellipsis-vertical-outline"></ion-icon>
-              </ion-menu-button> -->
-              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
-              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-25 cursor-pointer" src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
-              <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-25 cursor-pointer" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-menu.svg"></ion-icon>
-          </div>
-        </div>
-      </div>
-      <div class="upper-content">
-        <div class="content-details">
-          <ion-label>
-            <p><span class="date">{{customDate}}</span></p>
-          </ion-label>
-          <ion-label>
-            <p><span class="color-red">{{ task.DeadlineType }}</span></p>
-          </ion-label>
-          <ion-label>
-            <p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
-          </ion-label>
-        </div>
-      </div>
-      <div class="line"></div>
-      <div class="middle-content">
-        <h5 *ngIf="intervenientes">Intervenientes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label>
-            <div *ngFor="let interveniente of intervenientes">
-              <p>{{interveniente.Name}}</p>
-            </div>
-          </ion-label>
-        </ion-item>
-        <div *ngIf="cc.length > 0">
-          <h5 class="font-17-rem">Com conhecimento</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-            <ion-label>
-              <div *ngFor="let c of cc">
-                <p>{{c.Name}}</p>
-              </div>
-            </ion-label>
-          </ion-item>
-        </div>
-        <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
-          <h5 class="font-17-rem">Detalhes</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-              <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
-          </ion-item>
-        </div>
-      </div>
-      <div class="bottom-content width-100">
-        <ion-list>
-          <h5 >Documentos Anexados</h5>
-          <ion-item *ngFor="let attachment of mergedArray"
-            class="ion-no-margin ion-no-padding cursor-pointer"
-          >
-            <ion-label
-            (click)="viewDocument(attachment.DocId, attachment, attachment.content)">
-                <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }} <span *ngIf="attachment.content != ''" class="document-type" >Rascunho</span> </p>
-              <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
-              <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
-            </ion-label>
-        </ion-item>
-        </ion-list>
-      </div>
-    </div>
+
+    <app-task-details 
+      *ngIf="task"
+      [task]=task
+      [intervenientes]=intervenientes
+      [cc]=cc
+      [customDate]=customDate
+      [mergedArray]="mergedArray"
+      (openOptions)= openOptions()
+      (goBack)= goBack()
+      (viewDocument)=viewDocument($event)
+      class="d-flex height-100 flex-column content"
+    ></app-task-details>
+
     <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
         <button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss

@@ -5,171 +5,17 @@
   border-top-right-radius: 25px;
 }
 .content{
-  padding: 30px 20px 0 20px !important;
   margin: 0;
   float: left;
 }
-.color-red{
-  font-weight: 500;
-  color:#d30a0a !important;
-}
-.btn-size{
-  font-size: rem(18) !important;
-}
-.document-type{
-  border-radius: 20px;
-  background: var(--label-bg-color);
-  float: right;
-  padding: 5px 13.5px 5px 13.5px;
-  color: #fff;
-}
-.main-header{
-  overflow: inherit !important;
-  overflow: inherit;
-  font-family: Roboto;
-  border-top-left-radius: 25px;
-  border-top-right-radius: 25px;
-  background-color: #fff;
-  overflow:auto;
-  color:#000;
-  transform: translate3d(0, 1px, 0);
-    .header-top{
-      margin: 0px auto;
-      overflow: auto;
-      padding: 0 !important;
-      background: #fff;
-      .middle{
-        padding: 0!important;
-        float: left;
-        width: 280px;
-        margin: 2.5px 0 0 5px;
-        display: flex;
-        align-items: center;
 
-        }
-        .right{
-          padding: 0!important;
-          float: right;
-          font-size: rem(25);
-          color: #0782c9;
-          margin: 5px 0 0 0;
-        }
-      }
-      .header-bottom{
-         width: 310px;
-        overflow: auto;
-        margin: 0 auto;
 
-        .header-bottom-icon{
-          width: rem(30);
-          font-size: rem(25);
-          float: left;
-          padding: 2px;
-        }
-        .header-bottom-contacts{
-          width: 275px;
-          font-size: rem(15);
-          color: #797979;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          float: left;
-            padding: 5px;
-          margin: 1px;
-        }
-      }
-
-        .title{
-          font-size: rem(25);
-          overflow: auto;
-          float: left;
-          padding-top: 4px;
-          padding-left: 5px;
-        }
-        .div-icon{
-          width: rem(40);
-          float: right;
-          font-size: rem(35);
-          overflow: auto;
-          padding: 1px;
-        }
-}
-ion-item-group{
-    margin: 15px;
-}
 ion-button{
     display: block;
     width: 80%;
     margin: 20px auto;
 }
 
-
-.upper-content{
-  font-family: Roboto;
-  margin-left: 36px;
-  font-size: rem(18);
-
-  .label{
-      border-radius: 20px;
-      background: var(--label-bg-color);
-      float: right;
-      padding: 5px 13.5px 5px 13.5px;
-      color: #fff;
-      font-size: rem(14);
-  }
-
-  .button-calendar-type ion-button{
-    height: rem(25);
-  }
-  .content-details{
-    font-size: rem(17);
-    .date{
-      color: #797979;
-    }
-  }
-}
-.middle-conten{
- .middle-content p{
-    font-size: rem(16);
-  }
-}
-.bottom-content{
-  //width: 360px;
-  margin: 0 auto;
-
-  .bottom-content h3{
-    font-size: rem(16);
-    margin: 0 0 0 10px;
-  }
-  .attach-document{
-    font-size: rem(15);
-    color: var(--title-text-color);
-    margin: 5px 5px 5px 10px;
-    padding: 5px;
-    float: left;
-  }
-  .attach-icon{
-    width: 37px;
-    font-size: rem(35);
-    float: left;
-  }
-  .attach-title-item{
-    font-size: rem(18);
-    width: 100%;
-    color:#0d89d1;
-    padding-bottom: 5px;
-  }
-  /* SPAN */
-  .span-left{
-    float: left;
-    font-size: rem(15);
-  }
-  .span-right{
-  text-align: right;
-  float: right;
-  font-size: rem(13);
-  }
-}
 .aside-right{
   padding: 30px 20px 0 20px !important;
 

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts

@@ -84,7 +84,8 @@ export class DiplomaPage implements OnInit {
 
   }
 
-  async openOptions(taskAction?: any) {
+  async openOptions() {
+
     const popover = await this.popoverController.create({
       component: DiplomaOptionsPage,
       cssClass: 'exp-options',
@@ -92,7 +93,6 @@ export class DiplomaPage implements OnInit {
         serialNumber: this.serialNumber,
         task: this.task,
         fulltask: this.fulltask,
-        taskAction: taskAction,
         showEnviarPendentes: false
       },
       translucent: true
@@ -190,7 +190,7 @@ export class DiplomaPage implements OnInit {
   
   }
 
-  async viewDocument(DocId: string, Document, content) {
+  async viewDocument({Document, content}) {
 
     if (Document.content == "") {
     const modal = await this.modalController.create({

src/app/pages/gabinete-digital/diplomas/diplomas.page.html

@@ -1,7 +1,4 @@
 <ion-header class="ion-no-border header-2">
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-    <ion-refresher-content></ion-refresher-content>
-  </ion-refresher>
 
   <app-task-list-header
     [goBackButton] = true
@@ -27,6 +24,9 @@
 </ion-header>
 
 <ion-content>
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-refresher-content></ion-refresher-content>
+  </ion-refresher>
 
   <div class="main-content width-100 overflow-y-auto height-100">
 

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -79,6 +79,10 @@ export class EventListPage implements OnInit {
         if(pr) {
           this.segment = pr.OwnerUserId
         }
+
+        this.dynamicSearch()
+      } else {
+        this.dynamicSearch()
       }
     })
 

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -100,7 +100,6 @@ export class GabineteDigitalPage implements OnInit {
   @ViewChild('scroll') scroll: ElementRef;
 
   constructor(
-    private modalController: ModalController,
     private router: Router,
     public waitForDomService: WaitForDomService,
     public ThemeService: ThemeService,
@@ -112,7 +111,6 @@ export class GabineteDigitalPage implements OnInit {
 
     window.onresize = (event) => {
       if (window.innerWidth < 701) {
-        this.modalController.dismiss();
         this.hideRefreshBtn = false;
         this.hideInMobile = false;
         this.segmentVista = "listview";
@@ -197,54 +195,63 @@ export class GabineteDigitalPage implements OnInit {
 
 
     this.hideRefreshButton();
+
+
+
+
+     
+     (async () => {
+       await this.loadAllProcesses()
+       this.TaskService.registerCallback({
+         id: import.meta.url,
+         funx:() => {
+           this.dynamicSearch()
+         }
+       })
+     })();
+ 
+     this.checkFilter();
+     this.checkRoutes();
+     this.dynamicSearch()
+ 
+ 
+     const pathname = '/home/gabinete-digital'
+     this.router.events.forEach((event) => {
+       if (event instanceof NavigationEnd && event.url.includes(pathname) && !event.url.includes('/home/gabinete-digital/')) {
+         this.waitForDomService.selector({
+           selector: 'app-gabinete-digital ion-content .aside-wrapper',
+           callback: () => {
+             if(this.NotificationsService.active === false) {
+               this.checkRoutes();
+               // this.LoadCounts();
+               this.checkFilter()
+             } else {
+               this.checkRoutes();
+               // this.LoadCounts();
+               this.checkFilter()
+             }
+ 
+             this.mobile()
+           }
+         })
+       }
+     });
     
   }
 
   ngAfterViewInit(): void {
-    // We can access the TestComponent now that this portion of the view tree has been initiated.
-    const element = this.scroll.nativeElement
-    this.scroll.nativeElement.addEventListener("scroll", (e)=> {
-      this.changeTab()
-    });
 
+    try {
+      // We can access the TestComponent now that this portion of the view tree has been initiated.
+      const element = this.scroll.nativeElement
+      this.scroll.nativeElement.addEventListener("scroll", (e)=> {
+        this.changeTab()
+      });
+      
+    } catch(error) {
+
+    }
     
-    (async () => {
-      await this.loadAllProcesses()
-      this.TaskService.registerCallback({
-        id: import.meta.url,
-        funx:() => {
-          this.dynamicSearch()
-        }
-      })
-    })();
-
-    this.checkFilter();
-    this.checkRoutes();
-    this.dynamicSearch()
-
-
-    const pathname = '/home/gabinete-digital'
-    this.router.events.forEach((event) => {
-      if (event instanceof NavigationEnd && event.url.includes(pathname) && !event.url.includes('/home/gabinete-digital/')) {
-        this.waitForDomService.selector({
-          selector: 'app-gabinete-digital ion-content .aside-wrapper',
-          callback: () => {
-            if(this.NotificationsService.active === false) {
-              this.checkRoutes();
-              // this.LoadCounts();
-              this.checkFilter()
-            } else {
-              this.checkRoutes();
-              // this.LoadCounts();
-              this.checkFilter()
-            }
-
-            this.mobile()
-          }
-        })
-      }
-    });
-
 
   }