peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

pull made and remove time from notification erro

Browse Source
This commit is contained in:
Eudes Inácio
2023-07-31 16:58:36 +01:00
parent df8fbc373e 535c70f5bb
commit c96aad2136
6 changed files with 72 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/profile/profile.page.html
+1 -3
View File
@@ -90,9 +90,7 @@
<div class="notification-item">
<img class="notification-icon-error" slot="end" src="assets/images/exclamation_mark.svg" >
</div>
<div class="approve-event-time">
<p *ngIf = "item.Service == 'agenda'">{{item.dateInit}}</p>
</div>
<div class="approve-event-detail-error">
<p id="profile-title-error">Possivelmente esta tarefa não foi criada ou já foi executada. Deseja dar a notificação como lida?</p>
</div>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+5 -6
View File
@@ -87,16 +87,15 @@
<div class="line"></div>
</div>
</div>
<div *ngIf="loadedEvent.Documents" class="bottom-content width-100">
<div *ngIf="loadedAttachments" class="bottom-content width-100">
<ion-list>
<h5 class="font-17-rem">Documentos Anexados</h5>
<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)">
<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 *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>
<p class="attach-title-item d-block">{{attachment.Description}}</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-item>
</ion-list>
@@ -104,7 +103,7 @@
</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" >
<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>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss
+38
View File
@@ -228,3 +228,41 @@ ion-menu{
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);
}
}
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+16 -2
View File
@@ -14,7 +14,8 @@ import { ThemeService } from 'src/app/services/theme.service'
import { OfflineManagerService } from 'src/app/services/offline-manager.service';
import { RouteService } from 'src/app/services/route.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({
@@ -56,7 +57,8 @@ export class ApproveEventPage implements OnInit {
public ThemeService: ThemeService,
private offlineManager: OfflineManagerService,
private httpErrorHandle: HttpErrorHandle,
public TaskService: TaskService
public TaskService: TaskService,
private attachmentsService: AttachmentsService,
) {
this.activatedRoute.paramMap.subscribe(params => {
//
@@ -129,6 +131,7 @@ export class ApproveEventPage implements OnInit {
this.processes.GetTask(this.serialNumber).subscribe(async res => {
this.loadedEvent = res
this.getAttachments();
this.addProcessToDB(this.loadedEvent)
try {
@@ -375,4 +378,15 @@ export class ApproveEventPage implements OnInit {
await modal.present();
}
async getAttachments() {
try {
this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.loadedEvent.workflowInstanceDataFields.InstanceId).toPromise();
} catch (error) {
console.error('getAttchaments',error)
}
}
}
src/app/shared/agenda/approve-event/approve-event.page.html
+5 -6
View File
@@ -46,7 +46,7 @@
<span class="location">{{loadedEvent.workflowInstanceDataFields.Location}}</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial MDGPR' " style="background-color: #ffb703;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal MDGPR' " style="background-color: #f05d5e;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
@@ -98,22 +98,21 @@
</div>
</div>
<div *ngIf="loadedEvent.Documents" class="bottom-content width-100">
<div *ngIf="loadedAttachments" class="bottom-content width-100">
<ion-list>
<h5 class="font-17-rem">Documentos Anexados </h5>
<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)">
<ion-label>
<p class="attach-title-item d-block">{{attachment.Assunto}}</p>
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
<p class="attach-title-item d-block">{{attachment.Description}}</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-item>
</ion-list>
</div>
</div>
</div>
<div *ngIf="showAside" class="aside-right flex-column height-100 cursor-pointer">
<div class="aside-buttons">
<button full class="btn-ok" shape="round" >Editar evento</button>
version/git-version.ts
+7 -7
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "8091af78e",
"SHA": "8091af78eb185085bf2f2205bd97e0358a857f31",
"branch": "developer-catch-merge",
"shortSHA": "df8fbc373",
"SHA": "df8fbc373ea871a70c5cddc0341f210a82a3fc56",
"branch": "developer",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Mon Jul 31 16:39:35 2023 +0100'",
"lastCommitMessage": "bugs fixed",
"lastCommitNumber": "5127",
"lastCommitTime": "'Mon Jul 31 16:41:50 2023 +0100'",
"lastCommitMessage": "pull made",
"lastCommitNumber": "5131",
"change": "",
"changeStatus": "On branch developer-catch-merge\nYour branch and 'origin/developer-catch-merge' have diverged,\nand have 6 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts",
"changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 7 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/profile/profile.page.html\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": "eudes.inacio"
}