mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
commit version change
This commit is contained in:
@@ -191,6 +191,6 @@
|
||||
<button *ngIf="taskType == '1'" class="btn-ok" shape="round" (click)="saveTask()">Solicitar</button>
|
||||
<button *ngIf="taskType == '2'" class="btn-ok" shape="round" (click)="saveTask()">Solicitar</button>
|
||||
<button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
|
||||
|
||||
|
||||
</div>
|
||||
</ion-footer>
|
||||
|
||||
@@ -223,7 +223,7 @@ export class DocumentDetailPage implements OnInit {
|
||||
backdropDismiss: false
|
||||
});
|
||||
|
||||
modal.onDidDismiss().then(res=>{
|
||||
modal.onDidDismiss().then(res => {
|
||||
//this.RouteService.goBack();
|
||||
}, (error) => {
|
||||
console.log(error)
|
||||
|
||||
@@ -117,14 +117,45 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
||||
this.document = this.navParams.get('document')
|
||||
|
||||
if(Array.isArray(this.document)) {
|
||||
this.attachments = this.document
|
||||
const E = this.document
|
||||
this.document = []
|
||||
E.forEach((e)=> {
|
||||
this.document.push({
|
||||
ApplicationId: e.ApplicationId || e.ApplicationType,
|
||||
Source: 1,
|
||||
SourceId: e.DocId || e.docID || e.docId || e.SourceId || e.Id,
|
||||
SourceName: e.Assunto || e.attachments,
|
||||
DocDate: e.CreateDate,
|
||||
Data: e.Data,
|
||||
Assunto: e.Description,
|
||||
...e
|
||||
})
|
||||
})
|
||||
} else if (this.document) {
|
||||
|
||||
const E = this.document
|
||||
this.document = []
|
||||
this.document.push({
|
||||
ApplicationId: E.ApplicationId || E.ApplicationType,
|
||||
Source: 1,
|
||||
SourceId: E.DocId || E.docID || E.docId || E.SourceId || E.Id,
|
||||
SourceName: E.Assunto || E.attachments,
|
||||
DocDate: E.CreateDate,
|
||||
Data: E.Data,
|
||||
Assunto: E.Description,
|
||||
...E
|
||||
})
|
||||
} else {
|
||||
this.attachments = [this.document]
|
||||
this.document = []
|
||||
}
|
||||
|
||||
|
||||
|
||||
this.document = []
|
||||
if(Array.isArray(this.document)) {
|
||||
this.attachments = this.document
|
||||
} else {
|
||||
this.attachments = [this.document]
|
||||
}
|
||||
|
||||
this.subject = this.navParams.get('subject')
|
||||
|
||||
@@ -277,25 +308,6 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
||||
|
||||
let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
|
||||
|
||||
if(this.document.Documents) {
|
||||
this.document.Documents.forEach((e)=> {
|
||||
this.docs.push({
|
||||
ApplicationId: e.ApplicationId || e.ApplicationType,
|
||||
Source: 1,
|
||||
SourceId: e.DocId || e.docID || e.docId || e.SourceId || e.Id,
|
||||
SourceName: e.Assunto
|
||||
})
|
||||
})
|
||||
}
|
||||
else{
|
||||
this.docs.push({
|
||||
ApplicationId: this.document.ApplicationId || this.document.ApplicationType,
|
||||
Source: 1,
|
||||
SourceId: this.document.DocId || this.document.docID || this.document.docId || this.document.SourceId || this.document.Id,
|
||||
SourceName: this.document.Assunto
|
||||
})
|
||||
}
|
||||
|
||||
let postEvent = {
|
||||
EventId: '',
|
||||
Subject: this.postData.Subject,
|
||||
@@ -318,10 +330,11 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
||||
Type: this.EventRecurrenceType,
|
||||
LastOccurrence: this.Occurrence,
|
||||
},
|
||||
// Attachments: this.docs,
|
||||
Attachments: this.attachments,
|
||||
}
|
||||
|
||||
const laoder = this.toastService.loading()
|
||||
const laoder = this.toastService.loading();
|
||||
|
||||
|
||||
this.eventService.create({ body: postEvent, calendar: this.postData.CalendarName }).subscribe(async (respose) => {
|
||||
laoder.remove();
|
||||
|
||||
@@ -58,7 +58,7 @@ export class ViewDocumentPage implements OnInit {
|
||||
ngOnInit() {
|
||||
|
||||
this.processes.GetViewer(this.docId, this.applicationId).subscribe(async(res)=> {
|
||||
|
||||
|
||||
const link: string = res.replace('//pdfjs/web/', '/pdfjs/web/')
|
||||
this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link);
|
||||
|
||||
@@ -125,7 +125,7 @@ export class ViewDocumentPage implements OnInit {
|
||||
}
|
||||
|
||||
async openBookMeetingModal() {
|
||||
console.log('this.Document', this.Document)
|
||||
console.log('this.Document----------', this.Document)
|
||||
let classs;
|
||||
if( window.innerWidth < 701) {
|
||||
classs = 'book-meeting-modal modal modal-desktop'
|
||||
@@ -164,6 +164,8 @@ export class ViewDocumentPage implements OnInit {
|
||||
classs = 'modal modal-desktop showAsideOptions'
|
||||
}
|
||||
// check passing
|
||||
|
||||
console.log('this.Document----------openExpedientActionsModal', this.Document)
|
||||
const modal = await this.modalController.create({
|
||||
component: ExpedientTaskModalPage,
|
||||
componentProps: {
|
||||
@@ -175,7 +177,7 @@ export class ViewDocumentPage implements OnInit {
|
||||
cssClass: classs,
|
||||
});
|
||||
|
||||
modal.onDidDismiss().then(
|
||||
modal.onDidDismiss().then(
|
||||
async(res)=>{}
|
||||
, (error) => {
|
||||
console.log(error)
|
||||
|
||||
Reference in New Issue
Block a user