peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix book-meeting

Browse Source
This commit is contained in:
tiago.kayaya
2021-04-22 09:35:13 +01:00
parent c6534374cd
commit b58e14b0dc
13 changed files with 466 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+1 -1
View File
@@ -112,7 +112,7 @@ export class BookMeetingModalPage implements OnInit {
this.processes.FindTaskDocId(this.task.SerialNumber).subscribe(res =>{
if(res){
this.calendarService.postExpedientEvent(res, this.postData, "md",this.task.SerialNumber);
this.calendarService.postExpedientEvent(res, this.postData, "md",this.task.SerialNumber, this.task.FsId);
}
});
this.distartExpedientModal();
src/app/pages/gabinete-digital/gabinete-digital.module.ts
+3
View File
@@ -14,6 +14,7 @@ import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-contain
import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page';
import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page';
import { PedidosPage } from 'src/app/shared/gabinete-digital/pedidos/pedidos.page';
/* import { ComponentsModule } from 'src/app/components/components.module'; */
@@ -32,12 +33,14 @@ import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/exped
EventsToApprovePage,
ExpedientePage,
ExpedientsPage,
PedidosPage,
],
entryComponents: [
EmptyContainerPage,
EventsToApprovePage,
ExpedientePage,
ExpedientsPage,
PedidosPage,
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
src/app/pages/gabinete-digital/gabinete-digital.page.html
+3 -2
View File
@@ -45,7 +45,7 @@
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
</div>
<div [class.active]="selectedElement == 'RequestsForOpinion'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
<div [class.active]="selectedElement == 'RequestsForOpinion'" class="exp-card d-flex flex-column justify-center" (click)="openPedidosPage('parecer')">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-parecer.svg"></ion-icon>
</div>
@@ -53,7 +53,7 @@
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
</div>
<div [class.active]="selectedElement == 'RequestForApproval'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
<div [class.active]="selectedElement == 'RequestForApproval'" class="exp-card d-flex flex-column justify-center" (click)="openPedidosPage('deferimento')">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-deferimento.svg"></ion-icon>
</div>
@@ -130,6 +130,7 @@
<app-expedients (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedients"></app-expedients>
<app-expediente (openExpedientList)="openExpedientListPage()" [profile]="profile" [serialNumber]="serialNumber" class="d-flex height-100 flex-column" *ngIf="showExpedientDetail"></app-expediente>
<app-pedidos (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" [segment]="segment" class="d-flex height-100 flex-column" *ngIf="showPedidos"></app-pedidos>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+13
View File
@@ -37,6 +37,7 @@ export class GabineteDigitalPage implements OnInit {
showEventsToApprove = false;
showEmptyContainer = false;
showExpedients = true;
showPedidos = false;
showExpedientDetail = false;
emptyTextDescription = 'Sem opção selecionada';
@@ -111,6 +112,7 @@ export class GabineteDigitalPage implements OnInit {
this.showEventsToApprove = false;
this.showExpedients = false;
this.showExpedients = false;
this.showPedidos = false;
this.showExpedientDetail = false;
}
@@ -204,6 +206,17 @@ export class GabineteDigitalPage implements OnInit {
}
}
openPedidosPage(segment:string){
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
this.openExpedientList();
}
else{
this.segment = segment;
this.showPedidos = true;
}
}
async openExpedientList(){
this.closeAllDesktopComponent();