mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
fix duplicate attachment
This commit is contained in:
@@ -66,15 +66,13 @@
|
|||||||
<div class="bottom-content width-100">
|
<div class="bottom-content width-100">
|
||||||
<ion-list *ngIf="fulltask.Documents">
|
<ion-list *ngIf="fulltask.Documents">
|
||||||
<h5 class="font-17-rem">Documentos Anexados</h5>
|
<h5 class="font-17-rem">Documentos Anexados</h5>
|
||||||
<ion-item *ngFor="let attachment of mergedArray"
|
<ion-item *ngFor="let attachment of mergedArray" class="ion-no-margin ion-no-padding cursor-pointer">
|
||||||
class="ion-no-margin ion-no-padding cursor-pointer">
|
<ion-label (click)="viewDocument(attachment.DocId, attachment, attachment.content)">
|
||||||
<ion-label
|
<p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
|
||||||
(click)="viewDocument(attachment.DocId, attachment, attachment.content)">
|
<p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"></span></p>
|
||||||
<p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
|
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</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>
|
</ion-label>
|
||||||
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
|
</ion-item>
|
||||||
</ion-label>
|
|
||||||
</ion-item>
|
|
||||||
</ion-list>
|
</ion-list>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -76,14 +76,6 @@ export class DespachoPrPage implements OnInit {
|
|||||||
this.profile = "mdgpr";
|
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.LoadTaskDetail(this.serialNumber);
|
||||||
// this.LoadRelatedEvents(this.serialNumber);
|
// this.LoadRelatedEvents(this.serialNumber);
|
||||||
|
|
||||||
@@ -610,6 +602,7 @@ export class DespachoPrPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getDocumentPdf(Documents: any) {
|
getDocumentPdf(Documents: any) {
|
||||||
|
this.mergedArray = []
|
||||||
Documents.forEach(element => {
|
Documents.forEach(element => {
|
||||||
let docObject = {
|
let docObject = {
|
||||||
"ApplicationId": element.ApplicationId,
|
"ApplicationId": element.ApplicationId,
|
||||||
|
|||||||
@@ -79,6 +79,10 @@ export class EventListPage implements OnInit {
|
|||||||
if(pr) {
|
if(pr) {
|
||||||
this.segment = pr.OwnerUserId
|
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 {
|
export class EventsToApprovePage implements OnInit {
|
||||||
|
|
||||||
showLoader: boolean;
|
showLoader: boolean;
|
||||||
eventsPRList: any = [];
|
|
||||||
eventsMDGPRList: any = [];
|
|
||||||
eventPerson: EventPerson;
|
eventPerson: EventPerson;
|
||||||
eventBody: EventBody;
|
eventBody: EventBody;
|
||||||
categories: string[];
|
categories: string[];
|
||||||
@@ -76,7 +74,12 @@ export class EventsToApprovePage implements OnInit {
|
|||||||
if(pr) {
|
if(pr) {
|
||||||
this.segment = pr.OwnerUserId
|
this.segment = pr.OwnerUserId
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.dynamicSearch();
|
||||||
|
} else {
|
||||||
|
this.dynamicSearch();
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
this.LoadToApproveEvents()
|
this.LoadToApproveEvents()
|
||||||
@@ -210,15 +213,7 @@ export class EventsToApprovePage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
getFromDB() {
|
getFromDB() {}
|
||||||
this.storage.get('event-to-aproveMD').then((events = []) => {
|
|
||||||
this.eventsMDGPRList = events
|
|
||||||
})
|
|
||||||
|
|
||||||
this.storage.get('event-to-aprovePR').then((events) => {
|
|
||||||
this.eventsPRList = events
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
toDateString(e) {
|
toDateString(e) {
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "6812e4395",
|
"shortSHA": "c7d58f46a",
|
||||||
"SHA": "6812e43958c64ad6ed0f86944995b90c08142a45",
|
"SHA": "c7d58f46a9937d575b05904888447b5dcd5a4ee0",
|
||||||
"branch": "developer-catch-merge",
|
"branch": "developer-catch-merge",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Mon Jul 17 11:29:37 2023 +0100'",
|
"lastCommitTime": "'Mon Jul 17 15:07:08 2023 +0100'",
|
||||||
"lastCommitMessage": "fix chat",
|
"lastCommitMessage": "fix evento",
|
||||||
"lastCommitNumber": "5084",
|
"lastCommitNumber": "5085",
|
||||||
"change": "",
|
"change": "",
|
||||||
"changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html",
|
"changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user