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

Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-07 16:26:05 +01:00
parent 49d09e3593 29935b4cd5
commit 04573c24b9
4 changed files with 67 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+1 -1
View File
@@ -77,7 +77,7 @@
<ion-item
class="expediente ion-no-padding"
*ngFor = "let task of deferimentoList"
(click)="viewPedidoDetail(task.SerialNumber)"
(click)="goToPedido(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
-12
View File
@@ -165,18 +165,6 @@ export class PedidosPage implements OnInit {
}, 2000);
}
async viewPedidoDetail(serialNumber:any) {
let navigationExtras: NavigationExtras = {
queryParams: {
enterAnimation: "",
serialNumber: serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
}
}
src/app/pages/publications/publications.page.html
+49 -3
View File
@@ -34,7 +34,32 @@
<!-- Content -->
<div class="aside overflow-y-auto d-flex flex-wrap width-100">
<div class="item width-100 d-flex"
<!-- <ion-list class="width-100"> -->
<ion-item-sliding class="width-100"
*ngFor="let viagem of publicationsTravelFolderList">
<ion-item class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div (click)="goToPublicationsList(viagem.ProcessId)" class="item-icon cursor-pointer">
<ion-icon slot="end" src='assets/images/icons-plane-active.svg'></ion-icon>
</div>
<div (click)="goToPublicationsList(viagem.ProcessId)" class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5">De {{viagem.DateBegin}} a {{viagem.DateEnd}}</p>
<p class="item-content-title my-10">{{viagem.Description}}</p>
<p class="item-content-detail my-5">{{viagem.Detail}}</p>
</div>
<div (click)="openOptions(viagem.ProcessId)" class="item-options d-none cursor-pointer" autoHide="false">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
</div>
</ion-item>
<ion-item-options class="members-options" side="end">
<ion-item-option>
<button class="btn-no-color">
<ion-icon class="delete" name="trash-sharp"></ion-icon>
</button>
</ion-item-option>
</ion-item-options>
</ion-item-sliding>
<!-- </ion-list> -->
<!-- <div class="item width-100 d-flex"
*ngFor="let viagem of publicationsTravelFolderList">
<div (click)="goToPublicationsList(viagem.ProcessId)" class="item-icon cursor-pointer">
<ion-icon slot="end" src='assets/images/icons-plane-active.svg'></ion-icon>
@@ -47,8 +72,29 @@
<div (click)="openOptions(viagem.ProcessId)" class="item-options d-none cursor-pointer" autoHide="false">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
</div>
</div> -->
<ion-item-sliding class="item width-100"
*ngFor="let evento of publicationsEventFolderList">
<ion-item class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding"
(click)="viewPublications(evento)">
<div class="item-icon2">
<ion-icon slot="end" src='assets/images/icons-nav-actions.svg'></ion-icon>
</div>
<div class="item width-100 d-flex"
<div class="item-content flex-grow-1">
<ion-label>
<p class="item-content-date">{{evento.DateBegin}}</p>
<p class="item-content-title">{{evento.Description}}</p>
</ion-label>
</div>
<div (click)="openOptions(evento.ProcessId)" class="item-options d-none cursor-pointer" autoHide="false">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
</div>
</ion-item>
<ion-item-options class="members-options" side="end">
<ion-item-option color="danger"><ion-icon name="delete"></ion-icon> Apagar</ion-item-option>
</ion-item-options>
</ion-item-sliding>
<!-- <div class="item width-100 d-flex"
*ngFor="let evento of publicationsEventFolderList"
(click)="viewPublications(evento)">
<div class="item-icon2">
@@ -63,7 +109,7 @@
<div (click)="openOptions(evento.ProcessId)" class="item-options d-none cursor-pointer" autoHide="false">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
</div>
</div>
</div> -->
</div>
</div>
src/app/pages/publications/publications.page.scss
+16
View File
@@ -163,6 +163,22 @@ ion-toolbar{
}
}
ion-item-option{
display: flex;
background: #ffe0e0;
align-items: center;
align-content: center;
}
.delete{
padding: 7px;
font-size: 21px;
color:#d30a0a;
border-radius: 20px;
margin: 10px;
border: 1px solid #d30a0a;
}