dix bugs

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

@@ -16,22 +16,21 @@
       [fulltask]="fulltask"
     ></app-task-details>
 
-    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
 
 
       <div class="buttons px-20" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Responder ao PR</div> </div>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Executado')" class="btn-cancel mb-0" style="margin-bottom: 0px !important;" shape="round" >Executado</button>
-        <!-- <div class="solid"></div> -->
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Reencaminhar para Área Jurídica</div>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
-        <!-- <div class="solid"></div> -->
+
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Outras opções</div>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
         <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <!-- <div class="solid"></div> -->
+
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
       <div class="buttons px-20" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
@@ -42,7 +41,7 @@
       </div>
 
 
-    </div>
+    </div> -->
 
     <div *ngIf="!task">
       <ion-list>

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

@@ -7,6 +7,7 @@
 .content{
   margin: 0;
   float: left;
+  width: 100%;
 }
 
 ion-button{
@@ -52,42 +53,42 @@ ion-button{
   }
 }
 
-@media only screen and (max-width: 800px) {
-  .content{
-    width: 100% !important;
-  }
-  .aside-right{
-    display: none;
-  }
-}
-@media only screen and (min-width: 801px) {
-  .div-icon{
-    display: none !important;
-  }
-  .content{
-    width: 65%;
-    border-right: 1px solid #d8d8d8;
-  }
+// @media only screen and (max-width: 800px) {
+//   .content{
+//     width: 100% !important;
+//   }
+//   .aside-right{
+//     display: none;
+//   }
+// }
+// @media only screen and (min-width: 801px) {
+//   .div-icon{
+//     display: none !important;
+//   }
+//   .content{
+//     width: 65%;
+//     border-right: 1px solid #d8d8d8;
+//   }
 
-  .aside-right{
-    width: 35%;
-  }
-}
+//   .aside-right{
+//     width: 35%;
+//   }
+// }
 
-@media only screen and (min-width: 1024px){
-  .content{
-    width: 70%;
-  }
-  .aside-right{
-    width: 30%;
-  }
-}
+// @media only screen and (min-width: 1024px){
+//   .content{
+//     width: 70%;
+//   }
+//   .aside-right{
+//     width: 30%;
+//   }
+// }
 
-@media only screen and (min-width: 1140px){
-  .content{
-    width: 75%;
-  }
-  .aside-right{
-    width: 25%;
-  }
-}
+// @media only screen and (min-width: 1140px){
+//   .content{
+//     width: 75%;
+//   }
+//   .aside-right{
+//     width: 25%;
+//   }
+// }

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

@@ -11,7 +11,7 @@ import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-m
 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 { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page';
+import { DkDespachosPrOptionsPage } from 'src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
@@ -24,6 +24,7 @@ import { TaskService } from 'src/app/services/task.service'
 import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page';
 import { DocumentViewerOptionService } from "src/app/services/document-viewer-option.service";
 import { DeviceService } from "src/app/services/device.service"
+import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page';
 
 @Component({
   selector: 'app-despacho-pr',
@@ -594,32 +595,63 @@ export class DespachoPrPage implements OnInit {
   }
 
   async openOptions(taskAction?: any) {
-    const popover = await this.popoverController.create({
-      component: DespachosPrOptionsPage,
-      cssClass: 'exp-options',
-      componentProps: {
-        task: this.task,
-        fulltask: this.fulltask,
-        taskAction: taskAction,
-        showEnviarPendentes: false
-      },
-      translucent: true
-    });
 
-    await popover.present();
+    if (window.innerWidth > 500) { 
+      const popover = await this.popoverController.create({
+        component: DkDespachosPrOptionsPage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          task: this.task,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+          showEnviarPendentes: false
+        }
+      });
+  
+      await popover.present();
+  
+      popover.onDidDismiss().then((res => {
+  
+        if (res['data'] == 'close') {
+          this.goBack()
+  
+        }
+  
+        this.TaskService.loadDiplomas()
+  
+      }), (error) => {
+        console.log(error)
+      })
+    } else {
+      const popover = await this.popoverController.create({
+        component: DespachosPrOptionsPage,
+        cssClass: 'exp-options',
+        componentProps: {
+          task: this.task,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+          showEnviarPendentes: false
+        },
+        translucent: true
+      });
+  
+      await popover.present();
+  
+      popover.onDidDismiss().then((res => {
+  
+        if (res['data'] == 'close') {
+          this.goBack()
+  
+        }
+  
+        this.TaskService.loadDiplomas()
+  
+      }), (error) => {
+        console.log(error)
+      })
+    }
 
-    popover.onDidDismiss().then((res => {
 
-      if (res['data'] == 'close') {
-        this.goBack()
-
-      }
-
-      this.TaskService.loadDiplomas()
-
-    }), (error) => {
-      console.log(error)
-    })
 
   }
 

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

@@ -16,7 +16,7 @@
       [fulltask]="fulltask"
     ></app-task-details>
 
-    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
 
 
         <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
@@ -55,7 +55,7 @@
         </div>
 
 
-    </div>
+    </div> -->
 
     <div *ngIf="!task">
       <ion-list>

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss

@@ -7,6 +7,7 @@
 .content{
   margin: 0;
   float: left;
+  width: 100%;
 }
 
 ion-button{
@@ -52,42 +53,43 @@ ion-button{
   }
 }
 
-@media only screen and (max-width: 800px) {
-  .content{
-    width: 100% !important;
-  }
-  .aside-right{
-    display: none;
-  }
-}
-@media only screen and (min-width: 801px) {
-  .div-icon{
-    display: none !important;
-  }
-  .content{
-    width: 65%;
-    border-right: 1px solid #d8d8d8;
-  }
 
-  .aside-right{
-    width: 35%;
-  }
-}
+// @media only screen and (max-width: 800px) {
+//   .content{
+//     width: 100% !important;
+//   }
+//   .aside-right{
+//     display: none;
+//   }
+// }
+// @media only screen and (min-width: 801px) {
+//   .div-icon{
+//     display: none !important;
+//   }
+//   .content{
+//     width: 65%;
+//     border-right: 1px solid #d8d8d8;
+//   }
 
-@media only screen and (min-width: 1024px){
-  .content{
-    width: 70%;
-  }
-  .aside-right{
-    width: 30%;
-  }
-}
+//   .aside-right{
+//     width: 35%;
+//   }
+// }
 
-@media only screen and (min-width: 1140px){
-  .content{
-    width: 75%;
-  }
-  .aside-right{
-    width: 25%;
-  }
-}
+// @media only screen and (min-width: 1024px){
+//   .content{
+//     width: 70%;
+//   }
+//   .aside-right{
+//     width: 30%;
+//   }
+// }
+
+// @media only screen and (min-width: 1140px){
+//   .content{
+//     width: 75%;
+//   }
+//   .aside-right{
+//     width: 25%;
+//   }
+// }

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

@@ -9,7 +9,7 @@ import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-m
 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 { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page';
+import { DkDespachosOptionsPage } from 'src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { DespachoService } from 'src/app/Rules/despacho.service'
 import { fullTask } from 'src/app/models/dailyworktask.model';
@@ -27,6 +27,7 @@ import { DocumentViewerOptionService } from "src/app/services/document-viewer-op
 
 import { fromEvent, merge, interval, Subscription } from 'rxjs';
 import { takeUntil, filter, switchMap, take } from 'rxjs/operators';
+import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page';
 
 @Component({
   selector: 'app-despacho',
@@ -606,31 +607,57 @@ export class DespachoPage implements OnInit {
 
   async openOptions(taskAction?: any) {
 
-    const popover = await this.popoverController.create({
-      component: DespachosOptionsPage,
-      cssClass: 'exp-options',
-      componentProps: {
-        task: this.task,
-        fulltask: this.fulltask,
-        taskAction: taskAction,
-        showEnviarPendentes: false
-      },
-      translucent: true
-    });
+    if (window.innerWidth > 500) { 
+      const model = await this.popoverController.create({
+        component: DkDespachosOptionsPage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          task: this.task,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+          showEnviarPendentes: false
+        }
+      });
+  
+      await model.present();
+  
+      model.onDidDismiss().then((res) => {
+        // console.log('res', res.data)
+        if (res.data == 'back') {
+          this.goBack();
+        }
+  
+      }, (error) => {
+        console.log(error)
+      })
+    } else {
+      const popover = await this.popoverController.create({
+        component: DespachosOptionsPage,
+        cssClass: 'exp-options',
+        componentProps: {
+          task: this.task,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+          showEnviarPendentes: false
+        },
+        translucent: true
+      });
+  
+  
+      popover.onDidDismiss().then((res) => {
+        // console.log('res', res.data)
+        if (res.data == 'back') {
+          this.goBack();
+        }
+  
+      }, (error) => {
+        console.log(error)
+      })
+  
+      await popover.present();
+    }
 
 
-    popover.onDidDismiss().then((res) => {
-      // console.log('res', res.data)
-      if (res.data == 'back') {
-        this.goBack();
-      }
-
-    }, (error) => {
-      console.log(error)
-    })
-
-    await popover.present();
-
   }
 
 

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

@@ -15,20 +15,17 @@
 
     ></app-task-details>
 
-    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons">
         <button *ngIf="p.userRole('PR')" (click)="AssinarDraft()" class="btn-cancel" shape="round" >Assinar</button>
         <div class="solid"></div>
       </div>
       <div class="buttons">
         <button class="btn-cancel" shape="round" (click)="openAddNoteModal('Arquivo')">Arquivar</button>
-       <!--  <div class="solid"></div> -->
       </div>
       <div class="buttons">
-        <!-- <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button> -->
-        <!-- <div class="solid"></div> -->
       </div>
-    </div>
+    </div> -->
 
     <div *ngIf="!task">
       <ion-list>

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

@@ -39,6 +39,7 @@ ion-content, .header-2{
 .content{
   margin: 0;
   float: left;
+  width: 100%;
 }
 .color-red{
   font-weight: 500;
@@ -230,42 +231,42 @@ ion-button{
   }
 }
 
-@media only screen and (max-width: 800px) {
-  .content{
-    width: 100% !important;
-  }
-  .aside-right{
-    display: none;
-  }
-}
-@media only screen and (min-width: 801px) {
-  .div-icon{
-    display: none !important;
-  }
-  .content{
-    width: 65%;
-    border-right: 1px solid #d8d8d8;
-  }
+// @media only screen and (max-width: 800px) {
+//   .content{
+//     width: 100% !important;
+//   }
+//   .aside-right{
+//     display: none;
+//   }
+// }
+// @media only screen and (min-width: 801px) {
+//   .div-icon{
+//     display: none !important;
+//   }
+//   .content{
+//     width: 65%;
+//     border-right: 1px solid #d8d8d8;
+//   }
 
-  .aside-right{
-    width: 35%;
-  }
-}
+//   .aside-right{
+//     width: 35%;
+//   }
+// }
 
-@media only screen and (min-width: 1024px){
-  .content{
-    width: 70%;
-  }
-  .aside-right{
-    width: 30%;
-  }
-}
+// @media only screen and (min-width: 1024px){
+//   .content{
+//     width: 70%;
+//   }
+//   .aside-right{
+//     width: 30%;
+//   }
+// }
 
-@media only screen and (min-width: 1140px){
-  .content{
-    width: 75%;
-  }
-  .aside-right{
-    width: 25%;
-  }
-}
+// @media only screen and (min-width: 1140px){
+//   .content{
+//     width: 75%;
+//   }
+//   .aside-right{
+//     width: 25%;
+//   }
+// }

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

@@ -4,7 +4,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { momentG } from 'src/plugin/momentG';
 
 import { ActivatedRoute } from '@angular/router';
-import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
+import { DkDiplomasGerarOptionsPage } from 'src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { ThemeService } from 'src/app/services/theme.service'
@@ -19,6 +19,7 @@ import { TaskService } from 'src/app/services/task.service'
 import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page';
 import { PopupQuestionPage } from 'src/app/modals/popup-question/popup-question.page';
 import { PermissionService } from 'src/app/services/permission.service';
+import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
 
 @Component({
   selector: 'app-diploma-assinar',
@@ -84,26 +85,50 @@ export class DiplomaAssinarPage implements OnInit {
   }
 
   async openOptions(taskAction?: any) {
-    const popover = await this.popoverController.create({
-      component: DiplomaOptionsPage,
-      cssClass: 'exp-options',
-      componentProps: {
-        serialNumber: this.task.SerialNumber,
-        task: this.task,
-        showEnviarPendentes: false,
-        fulltask: this.fulltask,
-        DraftNames: this.DraftNames,
-        DraftIds: this.DraftIds,
-        asDraft: this.asDraft
+    
+    if (window.innerWidth > 500) { 
+      const modalController = await this.popoverController.create({
+        component: DkDiplomasGerarOptionsPage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          serialNumber: this.task.SerialNumber,
+          task: this.task,
+          showEnviarPendentes: false,
+          fulltask: this.fulltask,
+          DraftNames: this.DraftNames,
+          DraftIds: this.DraftIds,
+          asDraft: this.asDraft
+  
+        }
+      });
+      return await modalController.present().then(() => {
+        this.TaskService.loadDiplomas()
+      }, (error) => {
+        console.log(error)
+      })
+    } else {
+      const popover = await this.popoverController.create({
+        component: DiplomaOptionsPage,
+        cssClass: 'exp-options',
+        componentProps: {
+          serialNumber: this.task.SerialNumber,
+          task: this.task,
+          showEnviarPendentes: false,
+          fulltask: this.fulltask,
+          DraftNames: this.DraftNames,
+          DraftIds: this.DraftIds,
+          asDraft: this.asDraft
+  
+        },
+        translucent: true
+      });
+      return await popover.present().then(() => {
+        this.TaskService.loadDiplomas()
+      }, (error) => {
+        console.log(error)
+      })
+    }
 
-      },
-      translucent: true
-    });
-    return await popover.present().then(() => {
-      this.TaskService.loadDiplomas()
-    }, (error) => {
-      console.log(error)
-    })
   }
 
   async LoadTaskDetail(serial: string) {

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

@@ -12,9 +12,10 @@ import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-m
 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 { DiplomasGerarOptionsPage } from 'src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page';
+import { DkDiplomasGerarOptionsPage } from 'src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
 import { TaskService } from 'src/app/services/task.service'
+import { DiplomasGerarOptionsPage } from 'src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page';
 
 
 @Component({
@@ -70,21 +71,43 @@ export class DiplomasGerarPage implements OnInit {
   }
 
   async openOptions(taskAction?: any) {
-    const popover = await this.popoverController.create({
-      component: DiplomasGerarOptionsPage,
-      cssClass: 'exp-options',
-      componentProps: {
-        serialNumber: this.task.SerialNumber,
-        task: this.task,
-        showEnviarPendentes: false
-      },
-      translucent: true
-    });
-    return await popover.present().then(() => {
-      this.TaskService.loadDiplomas()
-    }, (error) => {
-      console.log(error)
-    })
+
+    
+    if (window.innerWidth > 500) { 
+      const modal = await this.popoverController.create({
+        component: DkDiplomasGerarOptionsPage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          serialNumber: this.task.SerialNumber,
+          task: this.task,
+          showEnviarPendentes: false
+        }
+      });
+      return await modal.present().then(() => {
+        this.TaskService.loadDiplomas()
+      }, (error) => {
+        console.log(error)
+      })
+    } else {
+      const popover = await this.popoverController.create({
+        component: DiplomasGerarOptionsPage,
+        cssClass: 'exp-options',
+        componentProps: {
+          serialNumber: this.task.SerialNumber,
+          task: this.task,
+          showEnviarPendentes: false
+        },
+        translucent: true
+      });
+      return await popover.present().then(() => {
+        this.TaskService.loadDiplomas()
+      }, (error) => {
+        console.log(error)
+      })
+    }
+    
+
+
   }
 
   async LoadTaskDetail(serial: string) {
@@ -122,7 +145,7 @@ export class DiplomasGerarPage implements OnInit {
         this.cc = users.filter(user=>{
           return user.Type == 'CC';
         });
-        
+
 
       });
       this.getDocumentDetails(this.task.FolderId, '361');
@@ -143,7 +166,7 @@ export class DiplomasGerarPage implements OnInit {
   }
 
 
-  
+
   async openDelegarModal() {
     let classs;
     if (window.innerWidth <= 800) {
@@ -222,7 +245,7 @@ export class DiplomasGerarPage implements OnInit {
 
 
   async enviarDiploma({note = '', documents = [], serialnumber}) {
-    
+
     let classs;
     if (window.innerWidth <= 800) {
       classs = 'modal modal-desktop'
@@ -267,9 +290,9 @@ export class DiplomasGerarPage implements OnInit {
           },
           "AttachmentList" : docs,
         }
-        
+
         const loader = this.toastService.loading()
-    
+
         try {
           await this.processes.CompleteTask(body).toPromise();
           this.modalController.dismiss('sucess');
@@ -290,7 +313,7 @@ export class DiplomasGerarPage implements OnInit {
     await modal.present();
 
   }
-  
+
   async viewDocument(DocId:string, Document) {
 
     const modal = await this.modalController.create({
@@ -317,8 +340,8 @@ export class DiplomasGerarPage implements OnInit {
   getDocumentDetails(forlderId:string, applicationId:string) {
     this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
       this.attachments = res.Documents;
-      
-      
+
+
     })
   }
 
@@ -349,7 +372,7 @@ export class DiplomasGerarPage implements OnInit {
     }
 
   }
-  
+
 
   toDateString(e) {
     return new Date(e).toDateString()

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

@@ -8,7 +8,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 { 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';
 
 @NgModule({

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

@@ -16,7 +16,7 @@
       [fulltask]="fulltask"
     ></app-task-details>
 
-    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <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>
         <button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
@@ -30,7 +30,7 @@
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efectuar Despacho</button>
         <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
       </div>
-    </div>
+    </div> -->
 
     <div *ngIf="!task">
       <ion-list>

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

@@ -7,6 +7,7 @@
 .content{
   margin: 0;
   float: left;
+  width: 100%;
 }
 
 
@@ -53,42 +54,42 @@ ion-button{
   }
 }
 
-@media only screen and (max-width: 800px) {
-  .content{
-    width: 100% !important;
-  }
-  .aside-right{
-    display: none;
-  }
-}
-@media only screen and (min-width: 801px) {
-  .div-icon{
-    display: none !important;
-  }
-  .content{
-    width: 65%;
-    border-right: 1px solid #d8d8d8;
-  }
+// @media only screen and (max-width: 800px) {
+//   .content{
+//     width: 100% !important;
+//   }
+//   .aside-right{
+//     display: none;
+//   }
+// }
+// @media only screen and (min-width: 801px) {
+//   .div-icon{
+//     display: none !important;
+//   }
+//   .content{
+//     width: 65%;
+//     border-right: 1px solid #d8d8d8;
+//   }
 
-  .aside-right{
-    width: 35%;
-  }
-}
+//   .aside-right{
+//     width: 35%;
+//   }
+// }
 
-@media only screen and (min-width: 1024px){
-  .content{
-    width: 70%;
-  }
-  .aside-right{
-    width: 30%;
-  }
-}
+// @media only screen and (min-width: 1024px){
+//   .content{
+//     width: 70%;
+//   }
+//   .aside-right{
+//     width: 30%;
+//   }
+// }
 
-@media only screen and (min-width: 1140px){
-  .content{
-    width: 75%;
-  }
-  .aside-right{
-    width: 25%;
-  }
-}
+// @media only screen and (min-width: 1140px){
+//   .content{
+//     width: 75%;
+//   }
+//   .aside-right{
+//     width: 25%;
+//   }
+// }

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

@@ -7,7 +7,7 @@ import { momentG } from 'src/plugin/momentG';
 
 import { ActivatedRoute } from '@angular/router';
 import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
-import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
+import { DkDeplomasOptionsPage } from 'src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 
@@ -21,6 +21,8 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { TaskService } from 'src/app/services/task.service'
 import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page';
+import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page';
+import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
 
 
 @Component({
@@ -95,28 +97,56 @@ export class DiplomaPage implements OnInit {
 
   async openOptions() {
 
-    const popover = await this.popoverController.create({
-      component: DiplomaOptionsPage,
-      cssClass: 'exp-options',
-      componentProps: {
-        serialNumber: this.serialNumber,
-        task: this.task,
-        fulltask: this.fulltask,
-        showEnviarPendentes: false
-      },
-      translucent: true
-    });
+    
+    if (window.innerWidth > 500) { 
+    
+      const model = await this.popoverController.create({
+        component: DkDeplomasOptionsPage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          serialNumber: this.serialNumber,
+          task: this.task,
+          fulltask: this.fulltask,
+          showEnviarPendentes: false
+        }
+      });
+  
+      model.onDidDismiss().then(() => {
+        this.TaskService.loadDiplomas()
+      }, (error) => {
+        console.log(error)
+      }).catch((e) => {
+        console.log(e)
+      })
+  
+  
+      await model.present();
+    } else {
+      const popover = await this.popoverController.create({
+        component: DiplomaOptionsPage,
+        cssClass: 'exp-options',
+        componentProps: {
+          serialNumber: this.serialNumber,
+          task: this.task,
+          fulltask: this.fulltask,
+          showEnviarPendentes: false
+        },
+        translucent: true
+      });
+  
+      popover.onDidDismiss().then(() => {
+        this.TaskService.loadDiplomas()
+      }, (error) => {
+        console.log(error)
+      }).catch((e) => {
+        console.log(e)
+      })
+  
+  
+      let a = await popover.present();
+    }
+    
 
-    popover.onDidDismiss().then(() => {
-      this.TaskService.loadDiplomas()
-    }, (error) => {
-      console.log(error)
-    }).catch((e) => {
-      console.log(e)
-    })
-
-
-    let a = await popover.present();
   }
 
   async LoadTaskDetail(serial: string) {

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html

@@ -1,7 +1,7 @@
 <ion-content class="container-wrapper" >
   <div *ngIf="task" class="main-content  d-flex height-100 overflow-hidden">
     <div class="width-100 d-flex flex-column content" *ngIf="task">
-        <app-task-details 
+        <app-task-details
           *ngIf="task"
           [task]=task
           [intervenientes]=intervenientes
@@ -15,7 +15,7 @@
         ></app-task-details>
     </div>
 
-    <div class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <div class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons">
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Enviar para o PR</div> </div>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
@@ -32,7 +32,7 @@
         <button *ngIf="p.userPermission([p.permissionList.Chat.access])" (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
         <div class="solid"></div>
       </div>
-    </div>
+    </div> -->
 
   </div>
 

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss

@@ -8,6 +8,7 @@
   padding: 0px 0px 0 0px !important;
   margin: 0;
   float: left;
+  width: 100%;
 }
 .color-red{
   font-weight: 500;
@@ -277,45 +278,45 @@ ion-button{
 
 
 
-@media only screen and (max-width: 800px) {
-  .content{
-    width: 100% !important;
-  }
-  .aside-right{
-    display: none;
-  }
-}
-@media only screen and (min-width: 801px) {
-  .menu-ptions{
-    display: none !important;
-  }
-  .content{
-    width: 65%;
-    border-right: 1px solid #d8d8d8;
-  }
+// @media only screen and (max-width: 800px) {
+//   .content{
+//     width: 100% !important;
+//   }
+//   .aside-right{
+//     display: none;
+//   }
+// }
+// @media only screen and (min-width: 801px) {
+//   .menu-ptions{
+//     display: none !important;
+//   }
+//   .content{
+//     width: 65%;
+//     border-right: 1px solid #d8d8d8;
+//   }
 
-  .aside-right{
-    width: 35%;
-  }
-}
+//   .aside-right{
+//     width: 35%;
+//   }
+// }
 
-@media only screen and (min-width: 1024px){
-  .content{
-    width: 70%;
-  }
-  .aside-right{
-    width: 30%;
-  }
-}
+// @media only screen and (min-width: 1024px){
+//   .content{
+//     width: 70%;
+//   }
+//   .aside-right{
+//     width: 30%;
+//   }
+// }
 
-@media only screen and (min-width: 1140px){
-  .content{
-    width: 75%;
-  }
-  .aside-right{
-    width: 25%;
-  }
-}
+// @media only screen and (min-width: 1140px){
+//   .content{
+//     width: 75%;
+//   }
+//   .aside-right{
+//     width: 25%;
+//   }
+// }
 
 .option-desc {
   display: flex;

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

@@ -9,7 +9,7 @@ import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.p
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { momentG } from 'src/plugin/momentG'
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
-import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
+import { DKOptsExpedientePage } from 'src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { SearchList } from 'src/app/models/search-document';
@@ -31,6 +31,7 @@ import { LoginUserRespose } from 'src/app/models/user.model';
 import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { TaskService } from 'src/app/services/task.service';
+import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
 
 
 @Component({
@@ -591,21 +592,42 @@ export class ExpedienteDetailPage implements OnInit {
 
   async openOptions(taskAction?: any) {
 
-    const popover = await this.popoverController.create({
-      component: OptsExpedientePage,
-      cssClass: 'exp-options',
-      componentProps: {
-        task: this.task,
-        fulltask: this.fulltask,
-        taskAction: taskAction,
-      },
-      translucent: true
-    });
-    return await popover.present().then(() => {
-      this.TaskService.loadExpedientes()
-    }, (error) => {
-      console.log(error)
-    })
+    
+    if (window.innerWidth > 500) { 
+    
+      const model = await this.popoverController.create({
+        component: DKOptsExpedientePage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          task: this.task,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+        }
+      });
+      return await model.present().then(() => {
+        this.TaskService.loadExpedientes()
+      }, (error) => {
+        console.log(error)
+      })
+    } else {
+      const popover = await this.popoverController.create({
+        component: OptsExpedientePage,
+        cssClass: 'exp-options',
+        componentProps: {
+          task: this.task,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+        },
+        translucent: true
+      });
+      return await popover.present().then(() => {
+        this.TaskService.loadExpedientes()
+      }, (error) => {
+        console.log(error)
+      })
+  
+    }
+
   }
 
   openNewGroupPage() {

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html

@@ -55,7 +55,7 @@
       </ion-item>
     </div>
 
-    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
         <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
           <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
@@ -105,6 +105,6 @@
           <button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
         </div>
       </div>
-    </div>
+    </div> -->
   </div>
 </ion-content>

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss

@@ -8,6 +8,7 @@
   padding: 0px 0px 0 0px !important;
   margin: 0;
   float: left;
+  width: 100%;
 }
 .color-red{
   font-weight: 500;
@@ -162,21 +163,21 @@ ion-button{
 }
 
 @media only screen and (max-width: 800px) {
-  .content{
-    width: 100% !important;
-  }
-  .aside-right{
-    display: none;
-  }
+  // .content{
+  //   width: 100% !important;
+  // }
+  // .aside-right{
+  //   display: none;
+  // }
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
     display: none !important;
   }
-  .content{
-    width: 65%;
-    border-right: 1px solid #d8d8d8;
-  }
+  // .content{
+  //   width: 65%;
+  //   border-right: 1px solid #d8d8d8;
+  // }
 
   .aside-right{
     width: 35%;
@@ -184,19 +185,19 @@ ion-button{
 }
 
 @media only screen and (min-width: 1024px){
-  .content{
-    width: 70%;
-  }
-  .aside-right{
-    width: 30%;
-  }
+  // .content{
+  //   width: 70%;
+  // }
+  // .aside-right{
+  //   width: 30%;
+  // }
 }
 
 @media only screen and (min-width: 1140px){
-  .content{
-    width: 75%;
-  }
-  .aside-right{
-    width: 25%;
-  }
+  // .content{
+  //   width: 75%;
+  // }
+  // .aside-right{
+  //   width: 25%;
+  // }
 }

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

@@ -10,7 +10,7 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
 import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
-import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page';
+import { DKRequestOptionsPage } from 'src/app/shared/popover/desktop/dk-request-options/dk-request-options.page';
 import { LoginUserRespose } from 'src/app/models/user.model';
 import { ToastService } from 'src/app/services/toast.service';
 import { ForwardPage } from 'src/app/modals/forward/forward.page';
@@ -27,6 +27,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 { TaskService } from 'src/app/services/task.service'
+import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page';
 
 @Component({
   selector: 'app-pedido',
@@ -248,32 +249,64 @@ export class PedidoPage implements OnInit {
   }
 
   async openOptions(taskAction?: any) {
-    const popover = await this.popoverController.create({
-      component: RequestOptionsPage,
-      cssClass: 'exp-options',
-      componentProps: {
-        task: this.task,
-        serialNumber: this.task.SerialNumber,
-        fulltask: this.fulltask,
-        taskAction: taskAction,
-        showEnviarPendentes: false,
-        actions: this.taskArrayActions
-      },
-      translucent: true
-    });
-    await popover.present();
 
-    popover.onDidDismiss().then((res => {
-      this.TaskService.loadPedidos();
-      if (res['data'] == 'close') {
-        this.goBack()
-      }
-      this.TaskService.loadPedidos();
+    
+    if (window.innerWidth > 500) { 
+      const model = await this.popoverController.create({
+        component: DKRequestOptionsPage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          task: this.task,
+          serialNumber: this.task.SerialNumber,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+          showEnviarPendentes: false,
+          actions: this.taskArrayActions
+        }
+      });
+      await model.present();
+  
+      model.onDidDismiss().then((res => {
+        this.TaskService.loadPedidos();
+        if (res['data'] == 'close') {
+          this.goBack()
+        }
+        this.TaskService.loadPedidos();
+  
+  
+      }), (error) => {
+        console.log(error)
+      })
+    } else {
+      const popover = await this.popoverController.create({
+        component: RequestOptionsPage,
+        cssClass: 'exp-options',
+        componentProps: {
+          task: this.task,
+          serialNumber: this.task.SerialNumber,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+          showEnviarPendentes: false,
+          actions: this.taskArrayActions
+        },
+        translucent: true
+      });
+      await popover.present();
+  
+      popover.onDidDismiss().then((res => {
+        this.TaskService.loadPedidos();
+        if (res['data'] == 'close') {
+          this.goBack()
+        }
+        this.TaskService.loadPedidos();
+  
+  
+      }), (error) => {
+        console.log(error)
+      })
+    }
+    
 
-
-    }), (error) => {
-      console.log(error)
-    })
   }
 
   async repreciar(note: string, documents: any) {

src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html

@@ -1,52 +1,55 @@
 <div class="height-100 d-flex flex-column overflow-hidden width-100">
 
-  <div class="overflow-x-auto d-flex pa-10 attachment-list" style="background-color: #d9d9d9;"  *ngIf="showAttachmentList">
+  <div class="d-flex overflow-x-auto pa-10 width-100">
+    <div style="background-color: #d9d9d9;"  *ngIf="showAttachmentList">
 
-    <div *ngFor="let attachment of taskViewerAttachment; let i = index"
-      class="ion-no-margin ion-no-padding cursor-pointer attachment-list" class="pa-10 mx-10 card-text"
-      >
-      <div class="attachment"  (touchstart)="startHold($event, attachment, i)" (touchend)="endHold()" (click)="clickDocument(attachment, i )">
+      <div *ngFor="let attachment of taskViewerAttachment; let i = index"
+        class="ion-no-margin ion-no-padding cursor-pointer attachment-list" class="pa-10 mx-10 card-text"
+        >
+        <div class="attachment"  (touchstart)="startHold($event, attachment, i)" (touchend)="endHold()" (click)="clickDocument(attachment, i )">
+
+          <div class="attach-title-item tex-left">
+            {{ attachment.Assunto || "Sem assunto" }}
+            <br>
+            {{ attachment.Sender }}
+            <br>
+            <span class="document-type" *ngIf="isSelectedAttachmentIsDraft(attachment)">Rascunho</span>
+            <br *ngIf="isSelectedAttachmentIsDraft(attachment)">
+            {{ attachment.DocDate | date: 'dd/MM/yy' }}
+          </div>
+
+
+          <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu" style="
+              width: 0px;
+              height: 0px;
+              /* top: -40px; */
+              position: absolute;
+          "></button>
+          <mat-menu #menu="matMenu">
+            <button (click)="openExpedientActionsModal('0', attachment)" mat-menu-item>
+              <span>Efetuar Despacho</span>
+            </button>
+            <button (click)="openExpedientActionsModal('1', attachment)" mat-menu-item >
+              <span>Solicitar Parecer</span>
+            </button>
+            <button  *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('1', attachment)" mat-menu-item >
+              <span>Pedido de Deferimento</span>
+            </button>
+            <button (click)="openBookMeetingModal(attachment)" mat-menu-item>
+              <span>Marcar Reunião</span>
+            </button>
+            <button *ngIf="p.userRole('PR')" mat-menu-item>
+              <span>Assinar</span>
+            </button>
+          </mat-menu>
 
-        <div class="attach-title-item tex-left">
-          {{ attachment.Assunto || "Sem assunto" }}
-          <br>
-          {{ attachment.Sender }}
-          <br>
-          <span class="document-type" *ngIf="isSelectedAttachmentIsDraft(attachment)">Rascunho</span>
-          <br *ngIf="isSelectedAttachmentIsDraft(attachment)">
-          {{ attachment.DocDate | date: 'dd/MM/yy' }}
         </div>
-
-
-        <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu" style="
-            width: 0px;
-            height: 0px;
-            /* top: -40px; */
-            position: absolute;
-        "></button>
-        <mat-menu #menu="matMenu">
-          <button (click)="openExpedientActionsModal('0', attachment)" mat-menu-item>
-            <span>Efetuar Despacho</span>
-          </button>
-          <button (click)="openExpedientActionsModal('1', attachment)" mat-menu-item >
-            <span>Solicitar Parecer</span>
-          </button>
-          <button  *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('1', attachment)" mat-menu-item >
-            <span>Pedido de Deferimento</span>
-          </button>
-          <button (click)="openBookMeetingModal(attachment)" mat-menu-item>
-            <span>Marcar Reunião</span>
-          </button>
-          <button *ngIf="p.userRole('PR')" mat-menu-item>
-            <span>Assinar</span>
-          </button>
-        </mat-menu>
-
       </div>
-    </div>
 
+    </div>
   </div>
 
+
   <div [ngClass]="{'d-none': draft}" #iframeContainer class="height-100 flex-1" ></div>