Improve responsiveness and add doc to task

2026-04-20 13:26:08 +00:00 · 2021-04-29 15:25:14 +01:00
parent 4a33f8c4c6
commit 63f1e09fea
35 changed files with 1919 additions and 241 deletions
@@ -155,7 +155,7 @@
          </div>
        </div>

-        <div hidden class="ion-item-container-no-border">
+        <div class="ion-item-container-no-border">
          <ion-label>
            <div class="attach-icon">
              <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
@@ -145,4 +145,26 @@
  justify-content: space-between;
  padding: 20px;
  overflow: auto;
-}
+}
+
+
+ .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;
+    }
@@ -10,6 +10,7 @@ import { EventPerson } from 'src/app/models/eventperson.model';
 import { EventsService } from 'src/app/services/events.service';
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { AttachmentsService } from 'src/app/services/attachments.service';
+import { SearchPage } from 'src/app/pages/search/search.page';

@Component({
  selector: 'app-book-meeting-modal',
@@ -220,6 +221,38 @@ export class BookMeetingModalPage implements OnInit {

    modal.onDidDismiss();
  }
+
+
+  async getDoc(){
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'modal-width-100-width-background modal',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true 
+      }
+    });
+    await modal.present();
+      modal.onDidDismiss().then((res)=> {
+        const data = res.data;
+        //data.selected
+        const DocumentToSave = {
+          SourceTitle: data.selected.Assunto,
+          ParentId: 'this.postEvent.EventId',
+          Source: '1',
+          SourceId: data.selected.Id,
+          ApplicationId: data.selected.ApplicationType.toString(),
+          Id: '0',
+          Link: '',
+          SerialNumber: '',
+        };
+
+        this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(  ()=>{
+          this.getAttachments();
+        });
+    });
+  }
+
  
  validateFormInputs(){
    let formLocation = this.postData.Location.trim();
@@ -89,8 +89,8 @@
        </div>
      </div>

-      <div hidden class="ion-item-container-no-border">
-        <ion-label>
+      <div class="ion-item-container-no-border" (click)="getDoc()">
+        <ion-label class="d-flex ">
          <div class="attach-icon">
            <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
          </div>
@@ -125,4 +125,27 @@
  .aside-content{
    display: block;
  }
+}
+
+
+
+.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;
 }
@@ -14,6 +14,7 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { ExpedienteDetailPage } from '../expediente-detail/expediente-detail.page';
 import { AlertService } from 'src/app/services/alert.service';
+import { SearchPage } from 'src/app/pages/search/search.page';

@Component({
  selector: 'app-expedient-task-modal',
@@ -53,6 +54,8 @@ export class ExpedientTaskModalPage implements OnInit {
  emptyTextDescription = "Sem intervenientes selecionados";
  showEmptyContainer = true;

+  taskResult: any = {}
+
  constructor(
    private modalController: ModalController,
    private router:Router,
@@ -124,7 +127,8 @@ export class ExpedientTaskModalPage implements OnInit {
    this.modalController.dismiss(null);
    
  }
-  saveTask(){
+
+  async saveTask(){

    if(this.postData.Priority=='99999861'){
      this.dispatchFolder.DeadlineType = 'Normal';
@@ -160,7 +164,7 @@ export class ExpedientTaskModalPage implements OnInit {
            DispatchFolder: this.dispatchFolder,
          }
          console.log('this.postData', this.postData, this.taskType);
-          this.processes.postDespatcho(this.postData);
+          this.taskResult = await this.processes.postDespatcho(this.postData);
          break;
        case '1':
          this.postData = {
@@ -173,7 +177,7 @@ export class ExpedientTaskModalPage implements OnInit {
            DispatchFolder: this.dispatchFolder,
          }
          console.log(this.postData);
-          this.processes.postParecer(this.postData);
+          this.taskResult = await this.processes.postParecer(this.postData);
          break;
        case '2':
          this.postData = {
@@ -186,7 +190,7 @@ export class ExpedientTaskModalPage implements OnInit {
            DispatchFolder: this.dispatchFolder,
          }
          console.log(this.postData);
-          this.processes.postDeferimento(this.postData);
+          this.taskResult = await this.processes.postDeferimento(this.postData);
          break;
      }

@@ -363,6 +367,35 @@ export class ExpedientTaskModalPage implements OnInit {
  }


+  async getDoc(){
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'modal-width-100-width-background modal',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true 
+      }
+    });
+    await modal.present();
+      modal.onDidDismiss().then((res)=>{
+        const data = res.data;
+        //data.selected
+        const DocumentToSave = {
+          SourceTitle: data.selected.Assunto,
+          ParentId: 'this.postEvent.EventId', // instance
+          Source: '1',
+          SourceId: data.selected.Id,
+          ApplicationId: data.selected.ApplicationType.toString(),
+          Id: '0',
+          Link: '',
+          SerialNumber: '',
+        };
+
+        this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(  ()=>{
+          this.getAttachments();
+        });
+    });
+  }


 }
@@ -58,10 +58,10 @@
 <ion-content>
  <div class="main-content d-flex height-100">
    <div class="content d-flex flex-column" *ngIf="task">
-      <div class="main-header">
-        <div class="title-content d-flex">
+      <div class="main-header" style="overflow: unset !important;">
+        <div class="title-content d-flex justify-between">
          <app-btn-modal-dismiss></app-btn-modal-dismiss>
-          <div class="middle">
+          <div class="middle flex-grow-1">
            <ion-label class="title">{{ task.Folio}}</ion-label>
          </div>
          <div class="div-icon">
@@ -71,7 +71,7 @@
          </div>
        </div>
      </div>
-      <div class="upper-content">
+      <div class="upper-content" style="overflow: unset !important;">
        <div class="content-details">
          <ion-label>
            <p><span class="date">{{customDate}}</span><span class="label">Expediente</span></p>
@@ -80,72 +80,75 @@
        </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>Com conhecimento</h5>
+
+      <div class="overflow-y-auto">
+        <div class="middle-content">
+          <h5 *ngIf="intervenientes">Intervenientes</h5>
          <ion-item class="ion-no-margin ion-no-padding">
            <ion-label>
-              <div *ngFor="let c of cc">
-                <p>{{c.Name}}</p>
+              <div *ngFor="let interveniente of intervenientes">
+                <p>{{interveniente.Name}}</p>
              </div>
            </ion-label>
          </ion-item>
-        </div>
-        <h5>Detalhes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-            <p [innerHTML]="task.Note"></p>
-        </ion-item>
-      </div>
-      <div class="bottom-content width-100">
-        <ion-list>
-          <h5>Documentos Anexados</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label
-          (click)="viewDocument()">
-            <p class="attach-title-item">{{ task.Folio }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
-            <p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd/MM/yy' }}</span></p>
-          </ion-label>
-        </ion-item>
-        </ion-list>
-      </div>
-
-      <div *ngIf="eventsList">
-        <h3 class="h3-event-title">Eventos Associados</h3>
-        <ion-list>
-          <div *ngIf="eventsList">
-            <ion-item-sliding>
-              <ion-item 
-                class="Rectangle" lines="none" 
-                *ngFor="let event of eventsList"
-                (click)="viewEventDetail(event.EventId)"
-              >
-                  <!-- [routerLink]="['/home/events', event.EventId, 'events']" -->
-                  <div class="content-{{profile}}-{{event.CalendarName}}">
-                    <div class="approve-event-time">
-                      <p>{{event.StartDate | date: 'hh:mm'}}</p>
-                      <p>{{event.EndDate | date: 'hh:mm'}}</p>
-                    </div>
-                    <div class="approve-event-detail">
-                      <p *ngIf="event.StartDate != event.EndDate">{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}}  |  {{event.Location}}</p>
-                      <p *ngIf="event.StartDate == event.EndDate">{{event.StartDate | date: 'd/M/yy' }}  |  {{event.Location}}</p>
-                      <h3>{{event.Subject}}</h3>
-                    </div>
-                  </div>
-                </ion-item>
-            </ion-item-sliding>
+          <div *ngIf="cc.length > 0">
+            <h5>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>
-        </ion-list>
+          <h5>Detalhes</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+              <p [innerHTML]="task.Note"></p>
+          </ion-item>
+        </div>
+        <div class="bottom-content width-100">
+          <ion-list>
+            <h5>Documentos Anexados</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+            <ion-label
+            (click)="viewDocument()">
+              <p class="attach-title-item">{{ task.Folio }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+              <p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd/MM/yy' }}</span></p>
+            </ion-label>
+          </ion-item>
+          </ion-list>
+        </div>
+  
+        <div *ngIf="eventsList">
+          <h3 class="h3-event-title">Eventos Associados</h3>
+          <ion-list>
+            <div *ngIf="eventsList">
+              <ion-item-sliding>
+                <ion-item 
+                  class="Rectangle" lines="none" 
+                  *ngFor="let event of eventsList"
+                  (click)="viewEventDetail(event.EventId)"
+                >
+                    <!-- [routerLink]="['/home/events', event.EventId, 'events']" -->
+                    <div class="content-{{profile}}-{{event.CalendarName}} width-100 ">
+                      <div class="approve-event-time">
+                        <p>{{event.StartDate | date: 'hh:mm'}}</p>
+                        <p>{{event.EndDate | date: 'hh:mm'}}</p>
+                      </div>
+                      <div class="approve-event-detail">
+                        <p *ngIf="event.StartDate != event.EndDate">{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}}  |  {{event.Location}}</p>
+                        <p *ngIf="event.StartDate == event.EndDate">{{event.StartDate | date: 'd/M/yy' }}  |  {{event.Location}}</p>
+                        <h3>{{event.Subject}}</h3>
+                      </div>
+                    </div>
+                  </ion-item>
+              </ion-item-sliding>
+            </div>
+          </ion-list>
+        </div>
      </div>
-
    </div>
+
    <div class="aside-right flex-column height-100">
      <div class="buttons">
        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
@@ -201,6 +204,7 @@
        </ion-button>
      </ion-list>
    </div>
+
  </div>
 </ion-content>