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

2026-04-19 04:57:52 +00:00 · 2021-10-09 21:13:26 +01:00
parent ced427729a aedf4afbaa
commit 3b8a8bdf5b
14 changed files with 249 additions and 245 deletions
@@ -15,9 +15,6 @@ import { Location } from '@angular/common'
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { synchro } from '../../../services/socket/synchro.service';
 import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage';
-import { SearchDocumentDetails, SearchFolderDetails } from 'src/app/models/search-document';
-import { EventDetailsDocumentsOptionsPage } from 'src/app/shared/popover/event-details-documents-options/event-details-documents-options.page';
-import { SearchedDocumentOptionsPage } from 'src/app/shared/popover/searched-document-options/searched-document-options.page';
 import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page';
 import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
@@ -297,70 +294,43 @@ export class ViewEventPage implements OnInit {
    
    const docId = this.loadedEvent.Attachments[ this.dicIndex].SourceId
    const applicationId: any = this.loadedEvent.Attachments[ this.dicIndex].ApplicationId
+    const selectedDoc = this.loadedEvent.Attachments[ this.dicIndex]

-    this.processes.GetDocumentDetails(docId, applicationId).subscribe( async(res)=> {
-      
-      this.LoadedDocument = res;
-      this.LoadedDocument.Subject = this.LoadedDocument.Assunto
+    console.log('selectedDoc', selectedDoc)

-      let thedate = new Date(this.LoadedDocument.DateDispatch || this.LoadedDocument.DocDate);
-      this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
-
-      let task: ExpedientTaskModalPageNavParamsTask
-      let document: SearchDocumentDetails = this.LoadedDocument
-      let folder: SearchFolderDetails = this.LoadedDocument
-
-      if(this.LoadedDocument.ApplicationID == 361 || this.LoadedDocument.ApplicationId == 361) {
-        task = {
-          serialNumber: folder.DispatchNumber,
-          taskStartDate: folder.DateDispatch,
-          isEvent: true,
-          workflowInstanceDataFields: {
-            FolderID: folder['FolderId'] || folder['FolderID'] || folder.folderId,
-            Subject: folder.Assunto,
-            SourceSecFsID: folder.ApplicationID || folder['ApplicationId'],
-            SourceType: 'FOLDER',
-            SourceID: folder.folderId,
-            DispatchNumber: folder.DispatchNumber
-          },
-        }
-      } else if (document.ApplicationID == 8 || document.ApplicationId == 8) {
-        task = {
-          serialNumber: document.DocId,
-          taskStartDate: document.DocDate,
-          isEvent: true,
-          workflowInstanceDataFields: {
-            FolderID: null,
-            Subject: document.Assunto,
-            DispatchNumber: null,
-            SourceSecFsID: document.ApplicationID || document.ApplicationId,
-            SourceType: 'DOC',
-            SourceID: document.DocId,
-          }
-        }
-      } else {
-        console.log('unexpected ApplicationID')
+    this.task = {
+      serialNumber: '',
+      taskStartDate: '',
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FolderID: '',
+        Subject: selectedDoc.SourceName,
+        SourceSecFsID: selectedDoc.ApplicationId || selectedDoc['ApplicationID'],
+        SourceType: 'DOC',
+        SourceID: selectedDoc.SourceId,
+        DispatchNumber: ''
      }
+    }


-      const modal = await this.modalController.create({
-        component: ViewDocumentPage,
-        componentProps: {
-          trustedUrl: '',
-          file: {
-            title: task.workflowInstanceDataFields.Subject,
-            url: '',
-            title_link: '',
-          },
-          Document: this.LoadedDocument,
-          applicationId: document.ApplicationID  || document.ApplicationId,
-          docId: document.ApplicationID || document.ApplicationId,
-          folderId: folder['FolderId'] || folder['FolderID'] || folder.folderId
+    const modal = await this.modalController.create({
+      component: ViewDocumentPage,
+      componentProps: {
+        trustedUrl: '',
+        file: {
+          title: this.task.workflowInstanceDataFields.Subject,
+          url: '',
+          title_link: '',
        },
-        cssClass: 'modal modal-desktop'
-      });
-      await modal.present();
+        Document: this.loadedEvent.Attachments[ this.dicIndex],
+        applicationId: this.task.workflowInstanceDataFields.SourceSecFsID,
+        docId: selectedDoc.SourceId,
+        folderId: '',
+        task: this.task
+      },
+      cssClass: 'modal modal-desktop'
    });
+    await modal.present();
  }

  async openBookMeetingModal() {
@@ -66,7 +66,7 @@
                <div>
                  <div class="file">
                    <!-- <canvas id="pdf_canvas"></canvas> -->
-                    <div (click)="viewDocument(file)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
+                    <div (click)="viewDocument(msg.file, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
                      <span *ngIf="msg.file.type">
                        <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
                        <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
@@ -365,28 +365,66 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
    };
  }

-  viewDocument(file:any){
-    if(file.type == "file"){
-      let fullUrl = "https://www.tabularium.pt" + file.title_link;
-      this.fileService.viewDocumentByUrl(fullUrl);
+  viewDocument(file:any, url?:string){
+
+   if(file.type == "application/webtrix") {
+      this.openViewDocumentModal(file);
    }
    else{
-      this.fileService.viewDocumentByUrl(file.title_link);
-      //this.openViewDocumentModal(file);
+      let fullUrl = "https://www.tabularium.pt" + url;
+      this.fileService.viewDocumentByUrl(fullUrl);
    }
  }

  async openViewDocumentModal(file:any){
+
+    let task = {
+      serialNumber: '',
+      taskStartDate: '',
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FolderID: '',
+        Subject: file.Assunto,
+        SourceSecFsID: file.ApplicationId,
+        SourceType: 'DOC',
+        SourceID: file.DocId,
+        DispatchNumber: ''
+      }
+    }
+
+    let doc = {
+        "Id": "",
+        "ParentId": "",
+        "Source": 1,
+        "ApplicationId": file.ApplicationId,
+        "CreateDate": "",
+        "Data": null,
+        "Description":"",
+        "Link": null,
+        "SourceId": file.DocId,
+        "SourceName": file.Assunto,
+        "Stakeholders": "",
+    }
+
    const modal = await this.modalController.create({
      component: ViewDocumentPage,
      componentProps: {
-        file: file,
+        trustedUrl: '',
+        file: {
+          title: file.Assunto,
+          url: '',
+          title_link: '',
+        },
+        Document: doc,
+        applicationId: file.ApplicationId,
+        docId: file.DocId,
+        folderId: '',
+        task: task
      },
-      cssClass: 'modal modal-desktop',
-      backdropDismiss: false
+      cssClass: 'modal modal-desktop'
    });
    await modal.present();
-    modal.onDidDismiss();
+
  }

  async bookMeeting() {
@@ -64,7 +64,7 @@
                <div>
                  <div class="file">
                    <!-- <canvas id="pdf_canvas"></canvas> -->
-                    <div (click)="docIndex(i); viewDocument(msg.file)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
+                    <div (click)="docIndex(i); viewDocument(msg.file, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
                      <span *ngIf="msg.file.type">
                        <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
                        <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
@@ -282,16 +282,15 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    })
  }

-  viewDocument(file:any){
+  viewDocument(file:any, url?:string){
    console.log(file);

-    if(file.type == "file"){
-      let fullUrl = "https://www.tabularium.pt" + file.title_link;
-      this.fileService.viewDocumentByUrl(fullUrl);
+   if(file.type == "application/webtrix") {
+      this.openViewDocumentModal(file);
    }
    else{
-      this.fileService.viewDocumentByUrl(file.title_link);
-      //this.openViewDocumentModal(file);
+      let fullUrl = "https://www.tabularium.pt" + url;
+      this.fileService.viewDocumentByUrl(fullUrl);
    }
  }

@@ -300,75 +299,53 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
  }

  async openViewDocumentModal(file:any){
-    console.log(file);
-    const docId = file.DocId;
-    const applicationId: any = file.ApplicationId;

-    this.processes.GetDocumentDetails(docId, applicationId).subscribe( async(res)=> {
-
-      this.LoadedDocument = res;
-      this.LoadedDocument.Subject = this.LoadedDocument.Assunto
-
-      let thedate = new Date(this.LoadedDocument.DateDispatch || this.LoadedDocument.DocDate);
-      //this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
-
-      let task: ExpedientTaskModalPageNavParamsTask
-      let document: SearchDocumentDetails = this.LoadedDocument
-      let folder: SearchFolderDetails = this.LoadedDocument
-
-      if(this.LoadedDocument.ApplicationID == 361 || this.LoadedDocument.ApplicationId == 361) {
-        task = {
-          serialNumber: folder.DispatchNumber,
-          taskStartDate: folder.DateDispatch,
-          isEvent: true,
-          workflowInstanceDataFields: {
-            FolderID: folder['FolderId'] || folder['FolderID'] || folder.folderId,
-            Subject: folder.Assunto,
-            SourceSecFsID: folder.ApplicationID || folder['ApplicationId'],
-            SourceType: 'FOLDER',
-            SourceID: folder.folderId,
-            DispatchNumber: folder.DispatchNumber
-          },
-        }
-      }
-      else if (document.ApplicationID == 8 || document.ApplicationId == 8)
-      {
-        task = {
-          serialNumber: document.DocId,
-          taskStartDate: document.DocDate,
-          isEvent: true,
-          workflowInstanceDataFields: {
-            FolderID: null,
-            Subject: document.Assunto,
-            DispatchNumber: null,
-            SourceSecFsID: document.ApplicationID || document.ApplicationId,
-            SourceType: 'DOC',
-            SourceID: document.DocId,
-          }
-        }
-      } else {
-        console.log('unexpected ApplicationID')
+    let task = {
+      serialNumber: '',
+      taskStartDate: '',
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FolderID: '',
+        Subject: file.Assunto,
+        SourceSecFsID: file.ApplicationId,
+        SourceType: 'DOC',
+        SourceID: file.DocId,
+        DispatchNumber: ''
      }
+    }

+    let doc = {
+        "Id": "",
+        "ParentId": "",
+        "Source": 1,
+        "ApplicationId": file.ApplicationId,
+        "CreateDate": "",
+        "Data": null,
+        "Description":"",
+        "Link": null,
+        "SourceId": file.DocId,
+        "SourceName": file.Assunto,
+        "Stakeholders": "",
+    }

-      const modal = await this.modalController.create({
-        component: ViewDocumentPage,
-        componentProps: {
-          trustedUrl: '',
-          file: {
-            title: task.workflowInstanceDataFields.Subject,
-            url: '',
-            title_link: '',
-          },
-          Document: this.LoadedDocument,
-          applicationId: document.ApplicationID  || document.ApplicationId,
-          docId: document.ApplicationID || document.ApplicationId,
-          folderId: folder['FolderId'] || folder['FolderID'] || folder.folderId
+    const modal = await this.modalController.create({
+      component: ViewDocumentPage,
+      componentProps: {
+        trustedUrl: '',
+        file: {
+          title: file.Assunto,
+          url: '',
+          title_link: '',
        },
-        cssClass: 'modal modal-desktop'
-      });
-      await modal.present();
+        Document: doc,
+        applicationId: file.ApplicationId,
+        docId: file.DocId,
+        folderId: '',
+        task: task
+      },
+      cssClass: 'modal modal-desktop'
    });
+    await modal.present();
  }

  getChatMembers() {