diff --git a/config.xml b/config.xml
index 7f11e8df3..b76904bdd 100644
--- a/config.xml
+++ b/config.xml
@@ -3,7 +3,7 @@
gabinete digital
An awesome Ionic/Cordova app.
Ionic Framework Team
-
+
diff --git a/src/app/modals/document-viewer/document-viewer.page.scss b/src/app/modals/document-viewer/document-viewer.page.scss
index 1ee30f51c..381a88abe 100644
--- a/src/app/modals/document-viewer/document-viewer.page.scss
+++ b/src/app/modals/document-viewer/document-viewer.page.scss
@@ -1,14 +1,3 @@
ion-content {
background-color: #ececec;
-}
-
-.ng2-pdf-viewer-container {
- padding-top: 10px;
-}
-
-#pdf-container {
- canvas {
- width: 100%;
- height: 100%;
- }
}
\ No newline at end of file
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index e34659b09..d8f9059f1 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -92,7 +92,7 @@
{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}
-
-
+ {{ this.loadedEvent.Attachments | json }}
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts
index d492c0163..bde444ded 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -6,10 +6,13 @@ import { EventsService } from 'src/app/services/events.service';
import { Event } from 'src/app/models/event.model';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ProcessesService } from 'src/app/services/processes.service';
-import { OptsExpedientePage } from '../../popover/opts-expediente/opts-expediente.page';
import { ToastService } from 'src/app/services/toast.service';
import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page';
-import { AlertService } from 'src/app/services/alert.service';
+import { SearchDocumentDetails, SearchFolderDetails } from 'src/app/models/search-document';
+import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage';
+import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page';
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { SearchedDocumentOptionsPage } from '../../popover/searched-document-options/searched-document-options.page';
@Component({
selector: 'app-view-event',
@@ -18,14 +21,15 @@ import { AlertService } from 'src/app/services/alert.service';
})
export class ViewEventPage implements OnInit {
- loadedEvent: Event;
+ loadedEvent: any;
isEventEdited: boolean;
eventBody: EventBody;
loadedAttachments:any;
pageId: string;
showLoader: boolean;
-
+ task: ExpedientTaskModalPageNavParamsTask;
minDate: Date;
+ LoadedDocument:any = null;
customDate:any;
today:any;
@@ -48,10 +52,8 @@ export class ViewEventPage implements OnInit {
private processes: ProcessesService,
private modalController: ModalController,
public popoverController: PopoverController,
- private toastService: ToastService,
- private alertService: AlertService,
- )
- {
+ private toastService: ToastService
+ ) {
this.isEventEdited = false;
this.loadedEvent = new Event();
this.eventBody = { BodyType : "1", Text : ""};
@@ -59,19 +61,16 @@ export class ViewEventPage implements OnInit {
}
ngOnInit() {
-
- /* console.log(this.eventId); */
this.loadEvent();
- //this.getAttachments();
}
- doRefresh(ev){
+ doRefresh(ev) {
this.loadEvent();
ev.target.complete();
}
ngOnChanges(changes: any): void {
- this.loadedAttachments = null;
+ this.loadedEvent.Attachments = null;
this.loadEvent();
}
@@ -160,7 +159,6 @@ export class ViewEventPage implements OnInit {
}
-
async editEvent() {
this.viewEventDetailDismiss.emit({
type: 'edit',
@@ -178,51 +176,204 @@ export class ViewEventPage implements OnInit {
});
}
+ async LoadDocumentDetails() {
+
+
+ const docId = this.loadedEvent.Attachments[ this.dicIndex].Id
+ const applicationId = this.loadedEvent.Attachments[ this.dicIndex].ApplicationId
+
+ console.log(this.loadedEvent.Attachments[ this.dicIndex])
+
+
+ this.processes.GetDocumentDetails(docId, applicationId).subscribe( async(res)=> {
+ alert('loads')
+ console.log(res);
+
+ this.LoadedDocument = res;
+
+ this.LoadedDocument.Subject = this.LoadedDocument.Assunto
+
+ let thedate = new Date(this.LoadedDocument.DateDispatch || this.LoadedDocument.DocDate);
+
+ console.log(res)
+ 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 = task
+ console.log('this.task = task', this.task)
+
+
+ this.task = task
+
+ const popover = await this.popoverController.create({
+ component: SearchedDocumentOptionsPage,
+ cssClass: 'exp-options',
+ componentProps: {
+ task: this.task,
+ LoadedDocument: this.LoadedDocument
+ },
+ translucent: true
+ });
+ await popover.present()
+
+ popover.onDidDismiss().then((res:any) => {
+ if(res.data.component == 'openBookMeetingModal') {
+ this.openBookMeetingModal()
+ } else if(res.data.component == 'openExpedientActionsModal') {
+ this.openExpedientActionsModal(res.data.taskAction)
+ } else {
+ console.log(res.data)
+ console.log('component not found')
+ }
+ });
+
+
+ });
+
+ }
+
async openTaskOptions() {
- const doc = this.loadedAttachments[ this.dicIndex];
+ let task: ExpedientTaskModalPageNavParamsTask
+ let document: SearchDocumentDetails = this.loadedEvent.Attachments[ this.dicIndex];
+ let folder: SearchFolderDetails = this.loadedEvent.Attachments[ this.dicIndex];
- let customTask;
-
- if(doc.ApplicationID == 361 || doc.ApplicationId == 361) {
- customTask = {
- serialNumber: doc.DispatchNumber,
- taskStartDate: doc.DateDispatch,
+ if(this.loadedEvent.Attachments[this.dicIndex].ApplicationID == 361 || this.loadedEvent.Attachments[this.dicIndex].ApplicationId == 361) {
+ task = {
+ serialNumber: folder.DispatchNumber,
+ taskStartDate: folder.DateDispatch,
isEvent: true,
workflowInstanceDataFields: {
- FsId: doc.ApplicationID,
- FolderID: null,
- DocId: doc.DispatchNumber,
- Subject: doc.Assunto
+ 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 (doc.ApplicationID == 8 || doc.ApplicationId == 8) {
- customTask = {
- serialNumber: doc.DocId,
- taskStartDate: doc.DocDate,
+ } else if (document.ApplicationID == 8 || document.ApplicationId == 8) {
+ task = {
+ serialNumber: document.DocId,
+ taskStartDate: document.DocDate,
isEvent: true,
workflowInstanceDataFields: {
- FsId: doc.ApplicationID || doc.ApplicationId,
FolderID: null,
- DocId: doc.DocId,
- Subject: doc.Assunto
+ Subject: document.Assunto,
+ DispatchNumber: null,
+ SourceSecFsID: document.ApplicationID || document.ApplicationId,
+ SourceType: 'DOC',
+ SourceID: document.DocId,
}
}
}
- console.log(doc)
- customTask.Status = ''
+ this.task = task
- const popover = await this.modalController.create({
- component: OptsExpedientePage,
- cssClass: 'model aside-modal search-submodal',
+ const popover = await this.popoverController.create({
+ component: SearchedDocumentOptionsPage,
+ cssClass: 'exp-options',
componentProps: {
- fulltask: customTask,
- task: customTask
+ task: this.task,
+ LoadedDocument: this.LoadedDocument
},
- //translucent: true
+ translucent: true
});
- return await popover.present();
+ await popover.present()
+
+ popover.onDidDismiss().then((res:any) => {
+ if(res.data.component == 'openBookMeetingModal') {
+ this.openBookMeetingModal()
+ } else if(res.data.component == 'openExpedientActionsModal') {
+ this.openExpedientActionsModal(res.data.taskAction)
+ } else {
+ console.log(res.data)
+ console.log('component not found')
+ }
+ });
+
+ }
+
+ async openBookMeetingModal() {
+
+ let classs;
+ if( window.innerWidth < 701) {
+ classs = 'book-meeting-modal modal modal-desktop'
+ } else {
+ classs = 'modal modal-desktop showAsideOptions'
+ }
+ const modal = await this.modalController.create({
+ component: DocumentSetUpMeetingPage,
+ componentProps: {
+ subject: this.task.workflowInstanceDataFields.Subject,
+ document: this.loadedEvent,
+ },
+ cssClass: classs,
+ backdropDismiss: false
+ });
+ await modal.present();
+ modal.onDidDismiss().then(res=>{
+ //this.location.back();
+ });
+ }
+
+ // efetuar despacho
+ async openExpedientActionsModal( taskAction: any) {
+
+ let classs;
+ if( window.innerWidth < 701) {
+ classs = 'modal modal-desktop'
+ } else {
+ classs = 'modal modal-desktop showAsideOptions'
+ }
+ const modal = await this.modalController.create({
+ component: ExpedientTaskModalPage,
+ componentProps: {
+ taskAction: taskAction,
+ task: this.task,
+ seachDocuments: this.loadedEvent,
+ aplicationId: this.loadedEvent.ApplicationId || this.loadedEvent.ApplicationID
+ },
+ cssClass: classs,
+ });
+ await modal.present();
+ modal.onDidDismiss().then( async(res)=>{});
+
}
}