mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
fix
This commit is contained in:
@@ -87,16 +87,15 @@
|
|||||||
<div class="line"></div>
|
<div class="line"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="loadedEvent.Documents" class="bottom-content width-100">
|
<div *ngIf="loadedAttachments" class="bottom-content width-100">
|
||||||
<ion-list>
|
<ion-list>
|
||||||
<h5 class="font-17-rem">Documentos Anexados</h5>
|
<h5 class="font-17-rem">Documentos Anexados</h5>
|
||||||
<ion-item class="ion-no-margin ion-no-padding cursor-pointer"
|
<ion-item class="ion-no-margin ion-no-padding cursor-pointer"
|
||||||
*ngFor="let attachment of loadedEvent.Documents"
|
*ngFor="let attachment of loadedAttachments"
|
||||||
(click)="viewDocument(attachment.DocId, attachment)">
|
(click)="viewDocument(attachment.DocId, attachment)">
|
||||||
<ion-label>
|
<ion-label>
|
||||||
<p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
|
<p class="attach-title-item d-block">{{attachment.Description}}</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.Stakeholders}}</span><span class="span-right">{{ attachment.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</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-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
</ion-list>
|
</ion-list>
|
||||||
@@ -104,7 +103,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="loadedEvent" class="aside-right flex-column height-100">
|
<div *ngIf="loadedAttachments" class="aside-right flex-column height-100">
|
||||||
<div class="aside-buttons" >
|
<div class="aside-buttons" >
|
||||||
<button (click)="editar(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Editar evento</button>
|
<button (click)="editar(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Editar evento</button>
|
||||||
<button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Aprovar</button>
|
<button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Aprovar</button>
|
||||||
|
|||||||
@@ -228,3 +228,41 @@ ion-menu{
|
|||||||
width: 25%;
|
width: 25%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.bottom-content{
|
||||||
|
margin: 0 auto;
|
||||||
|
|
||||||
|
.bottom-content h3{
|
||||||
|
font-size: rem(16);
|
||||||
|
margin: 0 0 0 10px;
|
||||||
|
}
|
||||||
|
.attach-document{
|
||||||
|
font-size: rem(15);
|
||||||
|
color: var(--title-text-color);
|
||||||
|
margin: 5px 5px 5px 10px;
|
||||||
|
padding: 5px;
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
.attach-icon{
|
||||||
|
width: 37px;
|
||||||
|
font-size: rem(35);
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
.attach-title-item{
|
||||||
|
width: 100%;
|
||||||
|
font-size: rem(15);
|
||||||
|
color:#0d89d1 !important;
|
||||||
|
}
|
||||||
|
/* SPAN */
|
||||||
|
.span-left{
|
||||||
|
float: left;
|
||||||
|
font-size: rem(15);
|
||||||
|
}
|
||||||
|
.span-right{
|
||||||
|
text-align: right;
|
||||||
|
float: right;
|
||||||
|
font-size: rem(13);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,7 +14,8 @@ import { ThemeService } from 'src/app/services/theme.service'
|
|||||||
import { OfflineManagerService } from 'src/app/services/offline-manager.service';
|
import { OfflineManagerService } from 'src/app/services/offline-manager.service';
|
||||||
import { RouteService } from 'src/app/services/route.service';
|
import { RouteService } from 'src/app/services/route.service';
|
||||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||||
import { TaskService } from 'src/app/services/task.service'
|
import { TaskService } from 'src/app/services/task.service';
|
||||||
|
import { AttachmentsService } from 'src/app/services/attachments.service';
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@@ -56,7 +57,8 @@ export class ApproveEventPage implements OnInit {
|
|||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
private offlineManager: OfflineManagerService,
|
private offlineManager: OfflineManagerService,
|
||||||
private httpErrorHandle: HttpErrorHandle,
|
private httpErrorHandle: HttpErrorHandle,
|
||||||
public TaskService: TaskService
|
public TaskService: TaskService,
|
||||||
|
private attachmentsService: AttachmentsService,
|
||||||
) {
|
) {
|
||||||
this.activatedRoute.paramMap.subscribe(params => {
|
this.activatedRoute.paramMap.subscribe(params => {
|
||||||
//
|
//
|
||||||
@@ -129,6 +131,7 @@ export class ApproveEventPage implements OnInit {
|
|||||||
this.processes.GetTask(this.serialNumber).subscribe(async res => {
|
this.processes.GetTask(this.serialNumber).subscribe(async res => {
|
||||||
|
|
||||||
this.loadedEvent = res
|
this.loadedEvent = res
|
||||||
|
this.getAttachments();
|
||||||
this.addProcessToDB(this.loadedEvent)
|
this.addProcessToDB(this.loadedEvent)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -375,4 +378,15 @@ export class ApproveEventPage implements OnInit {
|
|||||||
await modal.present();
|
await modal.present();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async getAttachments() {
|
||||||
|
|
||||||
|
try {
|
||||||
|
this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.loadedEvent.workflowInstanceDataFields.InstanceId).toPromise();
|
||||||
|
} catch (error) {
|
||||||
|
console.error('getAttchaments',error)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,22 +98,21 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="loadedEvent.Documents" class="bottom-content width-100">
|
<div *ngIf="loadedAttachments" class="bottom-content width-100">
|
||||||
<ion-list>
|
<ion-list>
|
||||||
<h5 class="font-17-rem">Documentos Anexados </h5>
|
<h5 class="font-17-rem">Documentos Anexados </h5>
|
||||||
<ion-item class="ion-no-margin ion-no-padding cursor-pointer"
|
<ion-item class="ion-no-margin ion-no-padding cursor-pointer"
|
||||||
*ngFor="let attachment of loadedEvent.Documents"
|
*ngFor="let attachment of loadedAttachments"
|
||||||
(click)="viewDocument(attachment.DocId, attachment)">
|
(click)="viewDocument(attachment.DocId, attachment)">
|
||||||
<ion-label>
|
<ion-label>
|
||||||
<p class="attach-title-item d-block">{{attachment.Assunto}}</p>
|
<p class="attach-title-item d-block">{{attachment.Description}}</p>
|
||||||
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
|
<p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right">{{ attachment.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
|
||||||
</ion-label>
|
</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
</ion-list>
|
</ion-list>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="showAside" class="aside-right flex-column height-100 cursor-pointer">
|
<div *ngIf="showAside" class="aside-right flex-column height-100 cursor-pointer">
|
||||||
<div class="aside-buttons">
|
<div class="aside-buttons">
|
||||||
<button full class="btn-ok" shape="round" >Editar evento</button>
|
<button full class="btn-ok" shape="round" >Editar evento</button>
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "64857d043",
|
"shortSHA": "9d1d4783d",
|
||||||
"SHA": "64857d043f55c9794a491192819bfe6e1f034caf",
|
"SHA": "9d1d4783dbfd793c980170a4ab4e0c0e00686d00",
|
||||||
"branch": "developer-catch-merge",
|
"branch": "developer",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Mon Jul 31 14:35:51 2023 +0100'",
|
"lastCommitTime": "'Mon Jul 31 14:54:10 2023 +0100'",
|
||||||
"lastCommitMessage": "fix",
|
"lastCommitMessage": "fix",
|
||||||
"lastCommitNumber": "5123",
|
"lastCommitNumber": "5124",
|
||||||
"change": "",
|
"change": "",
|
||||||
"changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts",
|
"changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user