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

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

Browse Source
This commit is contained in:
Peter Maquiran
2021-03-30 15:41:31 +01:00
parent 133bfdfaf6 3597466850
commit dd554f4ec0
17 changed files with 96 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/event-list.page.html
+6 -14
View File
@@ -1,21 +1,13 @@
<ion-header class="ion-no-border px-20 ">
<ion-header class="ion-no-border">
<div class="header-content">
<div class="header-icon-left">
<ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
</div>
<div class="header-title">
<label>""Eventos para Aprovação</label>
<label>Eventos para Aprovação</label>
</div>
<!-- <ion-toolbar>
<ion-buttons slot="start">
<ion-back-button (click) ="close()"></ion-back-button>
</ion-buttons>
<ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
<ion-title>Eventos para Aprovação</ion-title>
</ion-toolbar> -->
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
<ion-segment [(ngModel)]="profile">
<ion-segment-button value="MDGPR">
Seu calendário
</ion-segment-button>
@@ -33,7 +25,7 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div [ngSwitch]="segment">
<div [ngSwitch]="profile">
<ion-list *ngSwitchCase="'MDGPR'">
<div *ngIf="eventsMDGPRList">
<ion-list>
@@ -41,7 +33,7 @@
<ion-item class="Rectangle" lines="none"
*ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
<div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}}">
<div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
@@ -62,7 +54,7 @@
<ion-item-sliding>
<ion-item class="Rectangle" lines="none"
*ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber)">
<div class="content-pr-{{event.workflowInstanceDataFields.Agenda}}">
<div class="content-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
src/app/pages/gabinete-digital/event-list/event-list.page.scss
+17 -15
View File
@@ -1,7 +1,11 @@
:host{
padding: 30px 20px 0 20px !important;
margin: 0;
}
.header-content{
margin: 0 !important;
overflow: auto;
margin: 0 auto;
padding-top: 25px;
}
.header-icon-left{
width: 36px;
@@ -10,10 +14,10 @@
float: left;
}
.header-title{
width: 300px;
//width: 300px;
font-family: Roboto;
font-size: 25px;
margin: 0 5px 0 5px;
//margin: 0 5px 0 5px;
padding: 0;
color:#000;
float: left;
@@ -22,7 +26,7 @@ ion-item-sliding{
margin-top: 5px;
}
.Rectangle {
width: 360px;
//width: 360px;
border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
border: solid 1px #e9e9e9;
@@ -32,26 +36,24 @@ ion-item-sliding{
margin-bottom: 10px;
overflow: auto;
}
.content-mdgpr-Oficial{
width: 340px;
.content-pr-Oficial{
background-color: var(--white);
border-radius: 5px;
border-right: 5px solid #99e47b;
overflow: auto;
}
.content-mdgpr-Pessoal{
width: 340px;
.content-pr-Pessoal{
background-color: var(--white);
border-radius: 5px;
border-right: 5px solid #958bfc;
overflow: auto;
}
.content-pr-Oficial{
width: 340px;
.content-mdgpr-Oficial{
border-radius: 5px;
border-right: 5px solid #ffb703;
overflow: auto;
}
.content-pr-Pessoal{
width: 340px;
.content-mdgpr-Pessoal{
border-radius: 5px;
border-right: 5px solid #f05d5e;
overflow: auto;
@@ -78,7 +80,7 @@ ion-item-sliding{
margin-left: 10px;
}
.approve-event-detail p{
width: 250px;
//width: 250px;
font-family: Roboto;
font-size: 13px;
font-weight: normal;
@@ -91,7 +93,7 @@ ion-item-sliding{
padding: 0;
}
.approve-event-detail h3{
width: 250px;
//width: 250px;
font-family: Roboto;
font-size: 15px;
font-weight: bold;
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+4 -4
View File
@@ -13,7 +13,7 @@ import { NavigationEnd, Router } from '@angular/router';
styleUrls: ['./event-list.page.scss'],
})
export class EventListPage implements OnInit {
segment:string;
profile:string;
showLoader: boolean;
eventsPRList: any;
eventsMDGPRList: any;
@@ -29,11 +29,11 @@ export class EventListPage implements OnInit {
private router: Router,
private navParams: NavParams,
) { }
S
ngOnInit() {
this.segment = this.navParams.get('segment');
this.profile = this.navParams.get('profile');
/* console.log(this.navParams.get('md')); */
console.log(this.segment);
console.log(this.profile);
this.LoadToApproveEvents();
src/app/pages/gabinete-digital/gabinete-digital.page.html
+1 -1
View File
@@ -70,7 +70,7 @@
<!-- Aside right -->
<div class="aside-content d-none flex-column height-100">
<app-empty-container [texto]="emptyTextDescription" *ngIf="showEmptyContainer" class="d-flex height-100 flex-column"></app-empty-container>
<app-events-to-approve [segment]="'MDGPR'" *ngIf="showEventsToApprove" class="d-flex height-100 flex-column"></app-events-to-approve>
<app-events-to-approve [profile]="'MDGPR'" *ngIf="showEventsToApprove" class="d-flex height-100 flex-column"></app-events-to-approve>
<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>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+23 -3
View File
@@ -149,11 +149,11 @@ ion-content{
@media only screen and (min-width: 1024px) {
@media only screen and (min-width: 801px) {
.main-content{
.aside-wrapper{
width: 40%;
width: 35%;
justify-content: flex-start !important;
border-right: 1px solid #d8d8d8;
.aside-title{
@@ -163,7 +163,7 @@ ion-content{
}
}
.aside-content{
width: 60%;
width: 65%;
display: flex !important;
background-color: white;
}
@@ -198,3 +198,23 @@ ion-content{
}
}
}
@media only screen and (min-width: 1024px){
.content{
width: 70%;
}
.aside-right{
width: 30%;
}
}
@media only screen and (min-width: 1140px) {
.div-icon{
display: none;
}
.content{
width: 75%;
border-right: 1px solid #d8d8d8;
}
.aside-right{
width: 25%;
}
}
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+5 -5
View File
@@ -83,7 +83,7 @@ export class GabineteDigitalPage implements OnInit {
}
ngOnInit() {
//Initialize profile as mdgpr
this.profile = "mdgpr";
this.profile = "MDGPR";
this.LoadCounts();
/* this.eventService.getAllMdEvents.subscribe(res=>{
console.log(res);
@@ -138,17 +138,17 @@ this.processesbackend.GetActionsList().subscribe(res=>{
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openEventsToApprovePage(segment:any){
openEventsToApprovePage(profile:any){
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
this.openEventsToApproveList(segment);
this.openEventsToApproveList(profile);
}
else{
this.showEventsToApprove = true;
}
}
async openEventsToApproveList(segment:any){
async openEventsToApproveList(profile:any){
this.closeAllDesktopComponent();
@@ -164,7 +164,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
const modal = await this.modalController.create({
component: EventListPage,
componentProps:{
segment: segment,
profile: profile,
},
cssClass: classs,
backdropDismiss: false