mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
fix asside options
This commit is contained in:
@@ -16,9 +16,8 @@
|
||||
[fulltask]="fulltask"
|
||||
></app-task-details>
|
||||
|
||||
<!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
|
||||
|
||||
|
||||
<div *ngIf="task && showOptions" (click)="showOptions=!showOptions" class="aside-right ">
|
||||
<div class="aside-right-container flex-column height-100 overflow-y-auto">
|
||||
<div class="buttons px-20" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
|
||||
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Responder ao PR</div> </div>
|
||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Executado')" class="btn-cancel mb-0" style="margin-bottom: 0px !important;" shape="round" >Executado</button>
|
||||
@@ -39,9 +38,8 @@
|
||||
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
|
||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
|
||||
</div>
|
||||
|
||||
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div *ngIf="!task">
|
||||
<ion-list>
|
||||
|
||||
@@ -15,9 +15,27 @@ ion-button{
|
||||
width: 80%;
|
||||
margin: 20px auto;
|
||||
}
|
||||
.aside-right-container {
|
||||
position: fixed;
|
||||
height: 100%;
|
||||
background: white;
|
||||
top: 0px;
|
||||
box-shadow: 0px 0px 10px black;
|
||||
z-index: 1111111111111111111111111111111111111111111111;
|
||||
/* display: none; */
|
||||
right: 0px;
|
||||
width: 400px;
|
||||
padding: 30px 20px 0 20px !important;
|
||||
}
|
||||
|
||||
.aside-right{
|
||||
padding: 30px 20px 0 20px !important;
|
||||
position: absolute;
|
||||
height: 100%;
|
||||
width: 100% !important;
|
||||
background: #0000006b;
|
||||
right: 0px;
|
||||
z-index: 111111111111111;
|
||||
top: 0px;
|
||||
|
||||
.arrow-right{
|
||||
display: flex;
|
||||
|
||||
@@ -50,6 +50,8 @@ export class DespachoPrPage implements OnInit {
|
||||
dropButton = false
|
||||
selectedIndex = 0
|
||||
|
||||
|
||||
showOptions = false
|
||||
constructor(
|
||||
private activateRoute: ActivatedRoute,
|
||||
private processes: ProcessesService,
|
||||
@@ -597,31 +599,7 @@ export class DespachoPrPage implements OnInit {
|
||||
async openOptions(taskAction?: any) {
|
||||
|
||||
if (window.innerWidth > 500) {
|
||||
const popover = await this.popoverController.create({
|
||||
component: DkDespachosPrOptionsPage,
|
||||
cssClass: 'exp-options-desktop',
|
||||
componentProps: {
|
||||
task: this.task,
|
||||
fulltask: this.fulltask,
|
||||
taskAction: taskAction,
|
||||
showEnviarPendentes: false
|
||||
}
|
||||
});
|
||||
|
||||
await popover.present();
|
||||
|
||||
popover.onDidDismiss().then((res => {
|
||||
|
||||
if (res['data'] == 'close') {
|
||||
this.goBack()
|
||||
|
||||
}
|
||||
|
||||
this.TaskService.loadDiplomas()
|
||||
|
||||
}), (error) => {
|
||||
console.log(error)
|
||||
})
|
||||
this.showOptions = true
|
||||
} else {
|
||||
const popover = await this.popoverController.create({
|
||||
component: DespachosPrOptionsPage,
|
||||
|
||||
@@ -16,9 +16,8 @@
|
||||
[fulltask]="fulltask"
|
||||
></app-task-details>
|
||||
|
||||
<!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
|
||||
|
||||
|
||||
<div *ngIf="task && showOptions" class="aside-right" (click)="showOptions=!showOptions">
|
||||
<div class="aside-right-container flex-column height-100 overflow-y-auto">
|
||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
|
||||
<div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' "> <div>Responder ao PR</div> </div>
|
||||
<button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
|
||||
@@ -53,9 +52,13 @@
|
||||
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
|
||||
<button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div> -->
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div *ngIf="!task">
|
||||
<ion-list>
|
||||
|
||||
@@ -16,8 +16,27 @@ ion-button{
|
||||
margin: 20px auto;
|
||||
}
|
||||
|
||||
.aside-right{
|
||||
.aside-right-container {
|
||||
position: fixed;
|
||||
height: 100%;
|
||||
background: white;
|
||||
top: 0px;
|
||||
box-shadow: 0px 0px 10px black;
|
||||
z-index: 1111111111111111111111111111111111111111111111;
|
||||
/* display: none; */
|
||||
right: 0px;
|
||||
width: 400px;
|
||||
padding: 30px 20px 0 20px !important;
|
||||
}
|
||||
|
||||
.aside-right{
|
||||
position: absolute;
|
||||
height: 100%;
|
||||
width: 100% !important;
|
||||
background: #0000006b;
|
||||
right: 0px;
|
||||
z-index: 111111111111111;
|
||||
top: 0px;
|
||||
|
||||
.arrow-right{
|
||||
display: flex;
|
||||
|
||||
@@ -59,6 +59,8 @@ export class DespachoPage implements OnInit {
|
||||
|
||||
dropButton = true
|
||||
|
||||
showOptions = false
|
||||
|
||||
|
||||
constructor(private activateRoute: ActivatedRoute,
|
||||
private processes: ProcessesService,
|
||||
@@ -608,28 +610,7 @@ export class DespachoPage implements OnInit {
|
||||
async openOptions(taskAction?: any) {
|
||||
|
||||
if (window.innerWidth > 500) {
|
||||
const model = await this.popoverController.create({
|
||||
component: DkDespachosOptionsPage,
|
||||
cssClass: 'exp-options-desktop',
|
||||
componentProps: {
|
||||
task: this.task,
|
||||
fulltask: this.fulltask,
|
||||
taskAction: taskAction,
|
||||
showEnviarPendentes: false
|
||||
}
|
||||
});
|
||||
|
||||
await model.present();
|
||||
|
||||
model.onDidDismiss().then((res) => {
|
||||
// console.log('res', res.data)
|
||||
if (res.data == 'back') {
|
||||
this.goBack();
|
||||
}
|
||||
|
||||
}, (error) => {
|
||||
console.log(error)
|
||||
})
|
||||
this.showOptions = true
|
||||
} else {
|
||||
const popover = await this.popoverController.create({
|
||||
component: DespachosOptionsPage,
|
||||
|
||||
+5
-2
@@ -15,7 +15,8 @@
|
||||
|
||||
></app-task-details>
|
||||
|
||||
<!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
|
||||
<div *ngIf="task && showOptions" (click)="showOptions=!showOptions" class="aside-right">
|
||||
<div class="aside-right-container flex-column height-100 overflow-y-auto">
|
||||
<div class="buttons">
|
||||
<button *ngIf="p.userRole('PR')" (click)="AssinarDraft()" class="btn-cancel" shape="round" >Assinar</button>
|
||||
<div class="solid"></div>
|
||||
@@ -25,7 +26,9 @@
|
||||
</div>
|
||||
<div class="buttons">
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div *ngIf="!task">
|
||||
<ion-list>
|
||||
|
||||
+20
-1
@@ -194,8 +194,27 @@ ion-button{
|
||||
font-size: rem(13);
|
||||
}
|
||||
}
|
||||
.aside-right{
|
||||
.aside-right-container {
|
||||
position: fixed;
|
||||
height: 100%;
|
||||
background: white;
|
||||
top: 0px;
|
||||
box-shadow: 0px 0px 10px black;
|
||||
z-index: 1111111111111111111111111111111111111111111111;
|
||||
/* display: none; */
|
||||
right: 0px;
|
||||
width: 400px;
|
||||
padding: 30px 20px 0 20px !important;
|
||||
}
|
||||
|
||||
.aside-right{
|
||||
position: absolute;
|
||||
height: 100%;
|
||||
width: 100% !important;
|
||||
background: #0000006b;
|
||||
right: 0px;
|
||||
z-index: 111111111111111;
|
||||
top: 0px;
|
||||
|
||||
.arrow-right{
|
||||
display: flex;
|
||||
|
||||
+2
-19
@@ -45,6 +45,7 @@ export class DiplomaAssinarPage implements OnInit {
|
||||
DraftNames = ""
|
||||
asDraft = true;
|
||||
|
||||
showOptions = false
|
||||
constructor(
|
||||
private processes: ProcessesService,
|
||||
public popoverController: PopoverController,
|
||||
@@ -87,25 +88,7 @@ export class DiplomaAssinarPage implements OnInit {
|
||||
async openOptions(taskAction?: any) {
|
||||
|
||||
if (window.innerWidth > 500) {
|
||||
const modalController = await this.popoverController.create({
|
||||
component: DkDiplomasGerarOptionsPage,
|
||||
cssClass: 'exp-options-desktop',
|
||||
componentProps: {
|
||||
serialNumber: this.task.SerialNumber,
|
||||
task: this.task,
|
||||
showEnviarPendentes: false,
|
||||
fulltask: this.fulltask,
|
||||
DraftNames: this.DraftNames,
|
||||
DraftIds: this.DraftIds,
|
||||
asDraft: this.asDraft
|
||||
|
||||
}
|
||||
});
|
||||
return await modalController.present().then(() => {
|
||||
this.TaskService.loadDiplomas()
|
||||
}, (error) => {
|
||||
console.log(error)
|
||||
})
|
||||
this.showOptions = true
|
||||
} else {
|
||||
const popover = await this.popoverController.create({
|
||||
component: DiplomaOptionsPage,
|
||||
|
||||
+4
-1
@@ -21,7 +21,8 @@
|
||||
></app-task-details>
|
||||
</div>
|
||||
|
||||
<div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
|
||||
<div *ngIf="task && showOptions" (click)="showOptions=!showOptions" class="aside-right">
|
||||
<div class="aside-right-container flex-column height-100 overflow-y-auto">
|
||||
<div class="buttons">
|
||||
<button (click)="enviarDiploma({note: '', documents: [], serialnumber: task.SerialNumber})" class="btn-cancel" shape="round" >Enviar Diploma</button>
|
||||
<button (click)="openDelegarModal()" class="btn-cancel" shape="round" >Delegar</button>
|
||||
@@ -31,6 +32,8 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div *ngIf="!task">
|
||||
<ion-list>
|
||||
<ion-list-header>
|
||||
|
||||
+20
-1
@@ -180,8 +180,27 @@ ion-button{
|
||||
font-size: rem(13);
|
||||
}
|
||||
}
|
||||
.aside-right{
|
||||
.aside-right-container {
|
||||
position: fixed;
|
||||
height: 100%;
|
||||
background: white;
|
||||
top: 0px;
|
||||
box-shadow: 0px 0px 10px black;
|
||||
z-index: 1111111111111111111111111111111111111111111111;
|
||||
/* display: none; */
|
||||
right: 0px;
|
||||
width: 400px;
|
||||
padding: 30px 20px 0 20px !important;
|
||||
}
|
||||
|
||||
.aside-right{
|
||||
position: absolute;
|
||||
height: 100%;
|
||||
width: 100% !important;
|
||||
background: #0000006b;
|
||||
right: 0px;
|
||||
z-index: 111111111111111;
|
||||
top: 0px;
|
||||
|
||||
.arrow-right{
|
||||
display: flex;
|
||||
|
||||
+2
-14
@@ -38,6 +38,7 @@ export class DiplomasGerarPage implements OnInit {
|
||||
customDate: any;
|
||||
caller:string;
|
||||
|
||||
showOptions = false
|
||||
constructor(
|
||||
private processes: ProcessesService,
|
||||
public popoverController: PopoverController,
|
||||
@@ -74,20 +75,7 @@ export class DiplomasGerarPage implements OnInit {
|
||||
|
||||
|
||||
if (window.innerWidth > 500) {
|
||||
const modal = await this.popoverController.create({
|
||||
component: DkDiplomasGerarOptionsPage,
|
||||
cssClass: 'exp-options-desktop',
|
||||
componentProps: {
|
||||
serialNumber: this.task.SerialNumber,
|
||||
task: this.task,
|
||||
showEnviarPendentes: false
|
||||
}
|
||||
});
|
||||
return await modal.present().then(() => {
|
||||
this.TaskService.loadDiplomas()
|
||||
}, (error) => {
|
||||
console.log(error)
|
||||
})
|
||||
this.showOptions = true
|
||||
} else {
|
||||
const popover = await this.popoverController.create({
|
||||
component: DiplomasGerarOptionsPage,
|
||||
|
||||
@@ -16,7 +16,8 @@
|
||||
[fulltask]="fulltask"
|
||||
></app-task-details>
|
||||
|
||||
<!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
|
||||
<div *ngIf="task && showOptions" (click)="showOptions=!showOptions" class="aside-right ">
|
||||
<div class="aside-right-container flex-column height-100 overflow-y-auto">
|
||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
|
||||
<button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
|
||||
<button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
|
||||
@@ -30,7 +31,9 @@
|
||||
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efectuar Despacho</button>
|
||||
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div *ngIf="!task">
|
||||
<ion-list>
|
||||
|
||||
@@ -16,9 +16,27 @@ ion-button{
|
||||
width: 80%;
|
||||
margin: 20px auto;
|
||||
}
|
||||
.aside-right-container {
|
||||
position: fixed;
|
||||
height: 100%;
|
||||
background: white;
|
||||
top: 0px;
|
||||
box-shadow: 0px 0px 10px black;
|
||||
z-index: 1111111111111111111111111111111111111111111111;
|
||||
/* display: none; */
|
||||
right: 0px;
|
||||
width: 400px;
|
||||
padding: 30px 20px 0 20px !important;
|
||||
}
|
||||
|
||||
.aside-right{
|
||||
padding: 30px 20px 0 20px !important;
|
||||
position: absolute;
|
||||
height: 100%;
|
||||
width: 100% !important;
|
||||
background: #0000006b;
|
||||
right: 0px;
|
||||
z-index: 111111111111111;
|
||||
top: 0px;
|
||||
|
||||
.arrow-right{
|
||||
display: flex;
|
||||
|
||||
@@ -50,6 +50,7 @@ export class DiplomaPage implements OnInit {
|
||||
DraftNames = ""
|
||||
DraftIds = ""
|
||||
|
||||
showOptions = false
|
||||
constructor(
|
||||
private processes: ProcessesService,
|
||||
public popoverController: PopoverController,
|
||||
@@ -100,27 +101,7 @@ export class DiplomaPage implements OnInit {
|
||||
|
||||
if (window.innerWidth > 500) {
|
||||
|
||||
const model = await this.popoverController.create({
|
||||
component: DkDeplomasOptionsPage,
|
||||
cssClass: 'exp-options-desktop',
|
||||
componentProps: {
|
||||
serialNumber: this.serialNumber,
|
||||
task: this.task,
|
||||
fulltask: this.fulltask,
|
||||
showEnviarPendentes: false
|
||||
}
|
||||
});
|
||||
|
||||
model.onDidDismiss().then(() => {
|
||||
this.TaskService.loadDiplomas()
|
||||
}, (error) => {
|
||||
console.log(error)
|
||||
}).catch((e) => {
|
||||
console.log(e)
|
||||
})
|
||||
|
||||
|
||||
await model.present();
|
||||
this.showOptions = true
|
||||
} else {
|
||||
const popover = await this.popoverController.create({
|
||||
component: DiplomaOptionsPage,
|
||||
|
||||
@@ -128,6 +128,7 @@ ion-menu{
|
||||
.aside-right{
|
||||
overflow: auto;
|
||||
padding: 30px 20px 0 20px !important;
|
||||
width: 100% !important;
|
||||
|
||||
.arrow-right{
|
||||
display: flex;
|
||||
|
||||
+5
-2
@@ -15,7 +15,8 @@
|
||||
></app-task-details>
|
||||
</div>
|
||||
|
||||
<!-- <div class="aside-right flex-column height-100 overflow-y-auto">
|
||||
<div *ngIf="task && showOptions" class="aside-right" (click)="showOptions=!showOptions">
|
||||
<div class="aside-right-container flex-column height-100 overflow-y-auto">
|
||||
<div class="buttons">
|
||||
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Enviar para o PR</div> </div>
|
||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
|
||||
@@ -32,7 +33,9 @@
|
||||
<button *ngIf="p.userPermission([p.permissionList.Chat.access])" (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
|
||||
<div class="solid"></div>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
+21
-2
@@ -160,9 +160,28 @@ ion-button{
|
||||
font-size: rem(13);
|
||||
}
|
||||
}
|
||||
.aside-right-container {
|
||||
position: fixed;
|
||||
height: 100%;
|
||||
background: white;
|
||||
top: 0px;
|
||||
box-shadow: 0px 0px 10px black;
|
||||
z-index: 1111111111111111111111111111111111111111111111;
|
||||
/* display: none; */
|
||||
right: 0px;
|
||||
width: 400px;
|
||||
padding: 30px 20px 0 20px !important;
|
||||
}
|
||||
|
||||
.aside-right{
|
||||
padding: 0px 20px;
|
||||
margin: 20px 0px;
|
||||
position: absolute;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
background: #0000006b;
|
||||
right: 0px;
|
||||
z-index: 111111111111111;
|
||||
top: 0px;
|
||||
|
||||
|
||||
.arrow-right{
|
||||
display: flex;
|
||||
|
||||
+2
-14
@@ -64,6 +64,7 @@ export class ExpedienteDetailPage implements OnInit {
|
||||
|
||||
loggeduser: LoginUserRespose;
|
||||
|
||||
showOptions = false
|
||||
constructor(
|
||||
private processes: ProcessesService,
|
||||
private router: Router,
|
||||
@@ -595,20 +596,7 @@ export class ExpedienteDetailPage implements OnInit {
|
||||
|
||||
if (window.innerWidth > 500) {
|
||||
|
||||
const model = await this.popoverController.create({
|
||||
component: DKOptsExpedientePage,
|
||||
cssClass: 'exp-options-desktop',
|
||||
componentProps: {
|
||||
task: this.task,
|
||||
fulltask: this.fulltask,
|
||||
taskAction: taskAction,
|
||||
}
|
||||
});
|
||||
return await model.present().then(() => {
|
||||
this.TaskService.loadExpedientes()
|
||||
}, (error) => {
|
||||
console.log(error)
|
||||
})
|
||||
this.showOptions = true
|
||||
} else {
|
||||
const popover = await this.popoverController.create({
|
||||
component: OptsExpedientePage,
|
||||
|
||||
@@ -160,7 +160,7 @@ ion-button{
|
||||
}
|
||||
.aside-right{
|
||||
padding: 30px 20px 0 20px !important;
|
||||
|
||||
width: 100% !important;
|
||||
.arrow-right{
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
|
||||
@@ -55,7 +55,8 @@
|
||||
</ion-item>
|
||||
</div>
|
||||
|
||||
<!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
|
||||
<div *ngIf="task && showOptions" class="aside-right" (click)="showOptions=!showOptions">
|
||||
<div class="aside-right-container flex-column height-100 overflow-y-auto">
|
||||
<div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
|
||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
|
||||
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
||||
@@ -105,6 +106,8 @@
|
||||
<button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</ion-content>
|
||||
|
||||
@@ -125,8 +125,27 @@ ion-button{
|
||||
font-size: rem(13);
|
||||
}
|
||||
}
|
||||
.aside-right{
|
||||
.aside-right-container {
|
||||
position: fixed;
|
||||
height: 100%;
|
||||
background: white;
|
||||
top: 0px;
|
||||
box-shadow: 0px 0px 10px black;
|
||||
z-index: 1111111111111111111111111111111111111111111111;
|
||||
/* display: none; */
|
||||
right: 0px;
|
||||
width: 400px;
|
||||
padding: 30px 20px 0 20px !important;
|
||||
}
|
||||
|
||||
.aside-right{
|
||||
position: absolute;
|
||||
width: 100% !important;
|
||||
height: 100%;
|
||||
background: #0000006b;
|
||||
right: 0px;
|
||||
z-index: 111111111111111;
|
||||
top: 0px;
|
||||
|
||||
.arrow-right{
|
||||
display: flex;
|
||||
|
||||
@@ -51,6 +51,7 @@ export class PedidoPage implements OnInit {
|
||||
loggeduser: LoginUserRespose;
|
||||
taskArrayActions = [];
|
||||
|
||||
showOptions = false
|
||||
constructor(private activatedRoute: ActivatedRoute,
|
||||
private processes: ProcessesService,
|
||||
private menu: MenuController,
|
||||
@@ -252,31 +253,7 @@ export class PedidoPage implements OnInit {
|
||||
|
||||
|
||||
if (window.innerWidth > 500) {
|
||||
const model = await this.popoverController.create({
|
||||
component: DKRequestOptionsPage,
|
||||
cssClass: 'exp-options-desktop',
|
||||
componentProps: {
|
||||
task: this.task,
|
||||
serialNumber: this.task.SerialNumber,
|
||||
fulltask: this.fulltask,
|
||||
taskAction: taskAction,
|
||||
showEnviarPendentes: false,
|
||||
actions: this.taskArrayActions
|
||||
}
|
||||
});
|
||||
await model.present();
|
||||
|
||||
model.onDidDismiss().then((res => {
|
||||
this.TaskService.loadPedidos();
|
||||
if (res['data'] == 'close') {
|
||||
this.goBack()
|
||||
}
|
||||
this.TaskService.loadPedidos();
|
||||
|
||||
|
||||
}), (error) => {
|
||||
console.log(error)
|
||||
})
|
||||
this.showOptions = true
|
||||
} else {
|
||||
const popover = await this.popoverController.create({
|
||||
component: RequestOptionsPage,
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
<div class="height-100 d-flex flex-column overflow-hidden width-100">
|
||||
|
||||
<div class="d-flex overflow-x-auto pa-10 width-100">
|
||||
<div style="background-color: #d9d9d9;" *ngIf="showAttachmentList">
|
||||
<div class="d-flex overflow-x-auto pa-10 width-100" style="background-color: #d9d9d9;" *ngIf="showAttachmentList">
|
||||
|
||||
<div *ngFor="let attachment of taskViewerAttachment; let i = index"
|
||||
class="ion-no-margin ion-no-padding cursor-pointer attachment-list" class="pa-10 mx-10 card-text"
|
||||
@@ -47,7 +46,6 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div [ngClass]="{'d-none': draft}" #iframeContainer class="height-100 flex-1" ></div>
|
||||
|
||||
Reference in New Issue
Block a user