fix duplicate attachment

This commit is contained in:
Peter Maquiran
2023-07-17 17:19:55 +01:00
parent c7d58f46a9
commit 880f154ea2
5 changed files with 24 additions and 34 deletions
@@ -66,15 +66,13 @@
<div class="bottom-content width-100">
<ion-list *ngIf="fulltask.Documents">
<h5 class="font-17-rem">Documentos Anexados</h5>
<ion-item *ngFor="let attachment of mergedArray"
class="ion-no-margin ion-no-padding cursor-pointer">
<ion-label
(click)="viewDocument(attachment.DocId, attachment, attachment.content)">
<p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
<p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
</ion-label>
</ion-item>
<ion-item *ngFor="let attachment of mergedArray" class="ion-no-margin ion-no-padding cursor-pointer">
<ion-label (click)="viewDocument(attachment.DocId, attachment, attachment.content)">
<p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
<p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"></span></p>
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
</ion-label>
</ion-item>
</ion-list>
</div>
</div>
@@ -76,14 +76,6 @@ export class DespachoPrPage implements OnInit {
this.profile = "mdgpr";
this.activateRoute.paramMap.subscribe(paramMap => {
if (!paramMap.has('SerialNumber')) {
return;
}
/* this.serialNumber = paramMap.get('SerialNumber'); */
this.LoadTaskDetail(this.serialNumber);
// this.LoadRelatedEvents(this.serialNumber);
});
this.LoadTaskDetail(this.serialNumber);
// this.LoadRelatedEvents(this.serialNumber);
@@ -610,6 +602,7 @@ export class DespachoPrPage implements OnInit {
}
getDocumentPdf(Documents: any) {
this.mergedArray = []
Documents.forEach(element => {
let docObject = {
"ApplicationId": element.ApplicationId,
@@ -79,6 +79,10 @@ export class EventListPage implements OnInit {
if(pr) {
this.segment = pr.OwnerUserId
}
this.dynamicSearch()
} else {
this.dynamicSearch()
}
})
@@ -21,8 +21,6 @@ import { ThemeService } from 'src/app/services/theme.service'
export class EventsToApprovePage implements OnInit {
showLoader: boolean;
eventsPRList: any = [];
eventsMDGPRList: any = [];
eventPerson: EventPerson;
eventBody: EventBody;
categories: string[];
@@ -76,7 +74,12 @@ export class EventsToApprovePage implements OnInit {
if(pr) {
this.segment = pr.OwnerUserId
}
this.dynamicSearch();
} else {
this.dynamicSearch();
}
})
this.LoadToApproveEvents()
@@ -210,15 +213,7 @@ export class EventsToApprovePage implements OnInit {
}
getFromDB() {
this.storage.get('event-to-aproveMD').then((events = []) => {
this.eventsMDGPRList = events
})
this.storage.get('event-to-aprovePR').then((events) => {
this.eventsPRList = events
})
}
getFromDB() {}
toDateString(e) {