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

2026-04-19 21:06:06 +00:00 · 2021-05-04 23:06:58 +01:00
parent f48c462b02 a84bc7fb57
commit 31dc57d0f8
15 changed files with 327 additions and 51 deletions
@@ -67,6 +67,10 @@ const routes: Routes = [
  {
    path: 'add-note',
    loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule)
+  },
+  {
+    path: 'dar-parecer',
+    loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule)
  },

 /*  {
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DarParecerPage } from './dar-parecer.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DarParecerPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DarParecerPageRoutingModule {}
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DarParecerPageRoutingModule } from './dar-parecer-routing.module';
+
+import { DarParecerPage } from './dar-parecer.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DarParecerPageRoutingModule
+  ],
+  declarations: [DarParecerPage]
+})
+export class DarParecerPageModule {}
@@ -0,0 +1,44 @@
+
+<ion-content>
+  <div class="main-content d-flex height-100">
+
+    <div class="content-100 d-flex flex-column width-100">
+      <div class="header-content pb-20">
+        <div class="header-title">
+          <label>Dar parecer</label>
+        </div>
+      </div>
+      <div class="overflow-y-auto">
+        <div class="container-div">
+          <div class="ion-item-class-2 d-flex">
+            <div class="ion-icon-class">
+              <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
+            </div>
+            <div class="ion-input-class-no-height width-100">
+              <ion-textarea [(ngModel)]="note" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
+            </div>
+          </div>
+        </div>
+
+        <div class="ion-item-container-no-border cursor-pointer">
+          <ion-label>
+            <div class="attach-icon">
+              <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
+            </div>
+            <div class="attach-document">
+              <ion-label>Anexar Documentos</ion-label>
+            </div> 
+          </ion-label>
+        </div>
+      </div>
+      
+    </div>
+  </div>
+</ion-content>
+<ion-footer>
+  <div class="buttons">
+    <button class="btn-cancel" shape="round" (click)="cancel()">Cancelar</button>
+    <button class="btn-ok" shape="round" (click)="save()">Gravar</button>
+  </div>
+</ion-footer>
+
@@ -0,0 +1,150 @@
+.content-100{
+    padding: 30px 20px 0 20px !important;
+    margin: 0;
+    float: left;
+  
+    .header-content{
+        margin-bottom: 20px !important;
+    }
+    
+    .header-title{
+      font-family: Roboto;
+      font-size: 25px;
+      padding: 0;
+      color:#000;
+      float: left;
+    }
+  
+    .ion-item-container{
+      margin: 15px auto;
+      border: 1px solid #ebebeb;
+      border-radius: 5px;
+      padding-left: 10px;
+      
+    }
+    .ion-item-container-no-border{
+      margin: 0px auto;
+      padding: 0 !important;
+      overflow: auto;
+    }
+    .container-div{
+      margin-bottom: 15px;
+      overflow: hidden;
+    }
+    .ion-item-class-2{
+      margin: 0px auto;
+    }
+    .ion-icon-class{
+      width: 45px;
+      height: 45px;
+      float: left;
+      padding: 10px;
+      font-size: 25px;
+    }
+    ion-select{
+      padding-left: 5px;
+      margin-left: 0;
+    }
+    .ion-input-class{
+      width: calc(100% - 45px);
+      height: 45px;
+      border: 1px solid #ebebeb;
+      border-radius: 5px;
+      padding-left: 5px;
+      padding-right: 10px;
+      float: left;
+    }
+    .ion-input-class-no-height{
+      border: 1px solid #ebebeb;
+      border-radius: 5px;
+      overflow: auto;
+    }
+    .list-people{
+      width: 256px;
+      float: left;
+  
+    }
+    .add-people{
+      width: 45px;
+      float: right;
+      overflow: auto;
+      font-size: 25px;
+      padding: 10px;
+    }
+    .list-people-title{
+      /* font-size: 13px; */
+      color: #797979;
+    }
+    .attach-document{
+      font-size: 15px;
+      color: #0d89d1;
+      margin: 5px 5px 5px 10px;
+      padding: 5px;
+      float: left;
+    }
+    .attach-icon{
+      width: 37px;
+      font-size: 35px;
+      float: left;
+    }
+    .attach-title-item{
+      width: 100%;
+      font-size: 15px;
+      color:#0d89d1;
+    }
+    /* SPAN */
+    .span-left{
+      float: left;
+      font-size: 15x;
+    }
+    .span-right{
+    text-align: right;
+    float: right;
+    font-size: 13px;
+    }
+  }
+  .container-footer{
+      margin:0 auto;
+      overflow: auto;
+  }
+  .button-cancel {
+      width: 170px;
+      height: 44px;
+      border-radius: 22.5px;
+      --background: #e0e9ee;
+      --color: #061b52;
+      margin:10px;
+    }
+    .button-save {
+      width: 170px;
+      height: 44px;
+      border-radius: 22.5px;
+      --background: #42b9fe;
+      --color:#ffffff;
+      margin:10px;
+    }
+  
+  .text-input{
+    width: 100%;
+    border: 1px solid #ebebeb;
+    margin: 0px 15px 15px 0px;
+    padding: 0 !important;
+    border-radius: 5px;
+  }
+  
+  /* Error Messages */
+  .error{
+    color:red;
+    font-size: 12px;
+    font-weight: bold;
+    padding-bottom: 20px;
+  }
+  .span-color{
+    color:red;
+  }
+  .buttons{
+    display: flex;
+    justify-content: space-between;
+    padding: 20px;
+    overflow: auto;
+  }
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DarParecerPage } from './dar-parecer.page';
+
+describe('DarParecerPage', () => {
+  let component: DarParecerPage;
+  let fixture: ComponentFixture<DarParecerPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DarParecerPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DarParecerPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+
+@Component({
+  selector: 'app-dar-parecer',
+  templateUrl: './dar-parecer.page.html',
+  styleUrls: ['./dar-parecer.page.scss'],
+})
+export class DarParecerPage implements OnInit {
+  note:string;
+
+  constructor(
+    private modalController: ModalController,
+  ) { }
+
+  ngOnInit() {
+  }
+  
+  cancel(){
+    this.modalController.dismiss();
+  }
+  
+  save(){
+
+  }
+}
@@ -40,9 +40,12 @@
            <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
          </div>
          <div class="ion-input-class">
-            <ion-select placeholder="Tipo" [(ngModel)]="postData.SubjectTypeId" interface="action-sheet" Cancel-text="Cancelar" required>
+            <ion-item>
+            <ion-label *ngIf="!selectedTypes">Tipos de assunto</ion-label>
+            <ion-select [(ngModel)]="selectedTypes" multiple="true" interface="action-sheet" Cancel-text="Cancelar" required>
              <ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
            </ion-select>
+          </ion-item>
          </div>
        </div>
      </div>
@@ -41,17 +41,18 @@
    font-size: 25px;
  }
  ion-select{
-    padding-left: 5px;
+    //padding-left: 5px;
    margin-left: 0;
  }
  .ion-input-class{
    width: calc(100% - 45px);
-    height: 45px;
+    height: 51px;
    border: 1px solid #ebebeb;
    border-radius: 5px;
    padding-left: 5px;
    padding-right: 10px;
    float: left;
+    overflow: hidden;
  }
  .ion-input-class-no-height{
    border: 1px solid #ebebeb;
@@ -45,6 +45,7 @@ export class ExpedientTaskModalPage implements OnInit {
  documents:SearchDocument[] = [];

  subjectTypes:any;
+  selectedTypes: string[]=[];

  postData: Despacho;
  dispatchFolder: Folder;
@@ -142,6 +143,8 @@ export class ExpedientTaskModalPage implements OnInit {
  }

  async saveTask(){
+    console.log(this.selectedTypes);
+    

    if(this.postData.Priority=='99999861'){
      this.dispatchFolder.DeadlineType = 'Normal';
@@ -209,9 +212,9 @@ export class ExpedientTaskModalPage implements OnInit {
          this.postData = {
            DistributionType: "Paralelo",
            CountryCode: 'AO',
-            Priority: this.postData.Priority,
+            Priority: this.postData.Priority, 
            UserEmail: this.user,
-            SubjectTypeId: this.postData.SubjectTypeId,
+            SubjectTypeId: this.postData.SubjectTypeId, //this.selectedTypes
            UsersSelected: attendees,
            DispatchFolder: this.dispatchFolder,
            AttachmentList: DocumentToSave
@@ -220,11 +223,7 @@ export class ExpedientTaskModalPage implements OnInit {
          this.taskResult = await this.processes.postDeferimento(this.postData);
          break;
      }
-
-
    this.modalController.dismiss('openDiscart');
-    /* this.distartExpedientModal();
-    this.close(); */
  }
  else {
    this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
@@ -114,7 +114,7 @@
        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
      </div>
      <div class="buttons" *ngIf="task.WorkflowName == 'Pedido de Parecer'">
-        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+        <button (click)="openDarParecer()" class="btn-cancel" shape="round" >Dar meu Parecer</button>
        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
      </div>
@@ -16,6 +16,7 @@ import { ExpedientTaskModalPage } from '../../expediente/expedient-task-modal/ex
 import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
 import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
+import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';

@Component({
  selector: 'app-pedido',
@@ -70,6 +71,9 @@ export class PedidoPage implements OnInit {
  close(){
    this.modalController.dismiss();
  }
+  notImplemented(){
+    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+  }


  async LoadTaskDetail(serial: string) {
@@ -323,5 +327,26 @@ export class PedidoPage implements OnInit {
    await modal.present();
    modal.onDidDismiss();
  }
+
+  async openDarParecer(task: any) {
+    console.log(task);
+    
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: DarParecerPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
  
 }
@@ -11,10 +11,10 @@
  <ion-toolbar>
    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
      <ion-segment-button value="parecer">
-        Pedidos de Parecer
+        Parecer
      </ion-segment-button>
      <ion-segment-button value="deferimento">
-        Pedidos de Defereimento
+        Defereimento
      </ion-segment-button>
    </ion-segment>
  </ion-toolbar>
@@ -1,38 +1,3 @@
-<ion-menu autoHide="false" side="end" content-id="main-content" >
-  <ion-header>
-    <ion-toolbar translucent>
-      <ion-title>Menu</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item  (click)="openExpedientActionsModal('0',fulltask)">
-        <ion-icon name="documents" slot="start"></ion-icon>
-        <ion-label>Efectuar Despacho</ion-label>
-      </ion-item>
-      <ion-item  (click)="openExpedientActionsModal('1',fulltask)">
-        <ion-icon name="arrow-undo" slot="start"></ion-icon>
-        <ion-label>Pedido de Parecer</ion-label>
-      </ion-item>
-<!--       <ion-item  (click)="openExpedientActionsModal('2',fulltask)">
-        <ion-icon name="arrow-redo" slot="start"></ion-icon>
-        <ion-label>Pedido de Deferimento</ion-label>
-      </ion-item> -->
-      <!-- <ion-item  (click)="openBookMeetingModal(task)">
-        <ion-icon name="calendar" slot="start"></ion-icon>
-        <ion-label>Marcar reunião</ion-label>
-      </ion-item> -->
-      <ion-item (click)="distartExpedientModal()">
-        <ion-icon name="trash" slot="start"></ion-icon>
-        <ion-label>Descartar</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu>
-<div class="ion-page d-none" id="main-content">
-  <ion-menu-button></ion-menu-button>
-</div>
-
 <ion-header class="ion-no-border">
  <div class="title">
    <div class="thetitle"><ion-label >Despachos</ion-label></div>
@@ -88,7 +53,7 @@

    </div>
  </div>
-  <div *ngIf="!despachoList">
+  <div *ngIf="despachoList.length < 1">
  
    <ion-list>
      <ion-item>
@@ -74,14 +74,12 @@ export class DespachosPage implements OnInit {
 }

  async LoadList(){
+    this.despachoList = new Array();

-    
    let result = await this.processes.GetTasksList("Despacho", false).toPromise();
    
    console.log(result);

-    this.despachoList = new Array();
-
    await result.forEach( (element, index) => {
      
      let task = {