Fixe merge

This commit is contained in:
Peter Maquiran
2021-03-25 16:04:07 +01:00
99 changed files with 3043 additions and 1017 deletions
+1 -2
View File
@@ -901,7 +901,7 @@ export class AgendaPage implements OnInit {
}
async cloneAllmobileComponent(){
this.mobileComponent.showAddNewEvent = false;
this.mobileComponent.showEditEvent = false;
this.mobileComponent.showEventDetails = false;
@@ -911,7 +911,6 @@ export class AgendaPage implements OnInit {
this.mobileComponent.showAttendeeModal = false;
this.closeEventToApprove();
}
async AproveEventEditEvent(data){
+16 -1
View File
@@ -11,6 +11,10 @@ import { SharedModule } from 'src/app/shared/shared.module';
import { RouterModule } from '@angular/router';
import { GroupMessagesPage } from 'src/app/shared/chat/group-messages/group-messages.page';
import { MessagesPage } from 'src/app/shared/chat/messages/messages.page';
import { EmptyChatPage } from 'src/app/shared/chat/empty-chat/empty-chat.page';
import { ContactsPage } from 'src/app/shared/chat/messages/contacts/contacts.page';
import { NewGroupPage } from 'src/app/shared/chat/new-group/new-group.page';
import { GroupContactsPage } from 'src/app/shared/chat/group-messages/group-contacts/group-contacts.page';
@NgModule({
imports: [
@@ -24,9 +28,20 @@ import { MessagesPage } from 'src/app/shared/chat/messages/messages.page';
declarations: [
ChatPage,
MessagesPage,
ContactsPage,
GroupMessagesPage,
NewGroupPage,
GroupContactsPage,
EmptyChatPage,
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
entryComponents: [MessagesPage, GroupMessagesPage]
entryComponents: [
MessagesPage,
ContactsPage,
GroupMessagesPage,
NewGroupPage,
GroupContactsPage,
EmptyChatPage,
]
})
export class ChatPageModule {}
+8 -7
View File
@@ -10,15 +10,15 @@
</ion-refresher>
<div class="main-content d-flex height-100">
<!-- Aside left -->
<div class="d-flex aside-wrapper flex-column pt-25">
<div class="aside-wrapper d-flex flex-column pt-25">
<!-- <p class="text-center mt-0 aside-title px-20">Chat</p> -->
<div class="title-content">
<div class="div-title">
<ion-label class="title">Chat</ion-label>
</div>
<div class="div-icon">
<ion-icon slot="end" (click)="newGroup()" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
<ion-icon slot="end" (click)="selectContact()" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
<ion-icon slot="end" (click)="openNewGroupPage()" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
<ion-icon slot="end" (click)="openContactsPage()" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
</div>
</div>
<ion-toolbar>
@@ -87,11 +87,12 @@
</div>
<!-- Aside right -->
<div class="aside-content d-none flex-column height-100">
<!-- <ion-button (click)="openMessagesPage()">Messages</ion-button>
<ion-button (click)="openGroupMessagesPage('MduvQyrQBejb3xMrY')">Groups</ion-button>
<ion-button (click)="destroyComponent()">Destroy</ion-button> -->
<app-empty-chat [texto]="emptyTextDescription" class="d-flex height-100 flex-column" *ngIf="showEmptyComponent" #messagecontainer></app-empty-chat>
<app-messages class="d-flex height-100 flex-column" [roomId]="roomId" *ngIf="showMessages" #messagecontainer></app-messages>
<app-group-messages class="d-flex height-100 flex-column" [roomId]="roomId" *ngIf="showGroupMessages" #messagecontainer></app-group-messages>
<app-contacts (openMessage)="openMessagesPage($event)" *ngIf="showContacts" class="d-flex height-100 flex-column"></app-contacts>
<app-new-group (addGroupMessage)="openGroupContactsPage($event)" *ngIf="showNewGroup" class="d-flex height-100 flex-column"></app-new-group>
<app-group-contacts (openGroupMessage)="openGroupMessagesPage($event)" [roomId]="groupRoomId" class="d-flex height-100 flex-column" *ngIf="showGroupContacts"></app-group-contacts>
<app-group-messages (openGroupContacts)="openGroupContactsPage($event)" *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
</div>
</div>
</ion-content>
-1
View File
@@ -8,7 +8,6 @@ ion-content{
.title-content{
width: 100%;
margin-bottom: 15px;
overflow: auto;
padding: 0 !important;
background: #fff;
+53 -10
View File
@@ -57,11 +57,18 @@ export class ChatPage implements OnInit {
componentRef: any;
roomId:any;
groupRoomId:any;
showEmptyComponent=true;
showMessages=false;
showContacts=false;
showNewGroup=false;
showGroupMessages=false;
showGroupContacts=false;
emptyTextDescription = 'Sem conversa selecionada';
@Output() getRoomInfo;
constructor(
private http:HttpClient,
private chatService: ChatService,
@@ -75,11 +82,6 @@ export class ChatPage implements OnInit {
/* this.headers = this.headers.set('X-User-Id', 'GqjNWiLrGEHRna7Zn');
this.headers = this.headers.set('X-Auth-Token', 'SJwIgtlqfloPK696fpc2VBvyDluipuIHKB_0Q6-9ycJ'); */
}
closeAllDesktopComponent(){
this.desktopComponent = {
showMessages: false,
}
}
ngOnInit() {
this.segment = "Contactos";
@@ -99,7 +101,24 @@ export class ChatPage implements OnInit {
}
closeAllDesktopComponents() {
this.showMessages=false;
this.showContacts=false;
this.showNewGroup=false;
this.showGroupMessages=false;
this.showEmptyComponent=false;
this.showGroupContacts=false;
console.log('All components closed!');
}
openGroupContactsPage(data){
console.log(data);
this.groupRoomId = data;
console.log(this.groupRoomId);
this.closeAllDesktopComponents();
if(window.innerWidth <= 1024){
}
else{
this.showGroupContacts = true;
}
}
openMessagesPage(rid) {
if( window.innerWidth <= 1024){
@@ -107,22 +126,46 @@ export class ChatPage implements OnInit {
}
else{
this.closeAllDesktopComponents();
this.showEmptyComponent = false;
this.roomId = rid;
this.showMessages=true;
}
}
openGroupMessagesPage(rid) {
openContactsPage() {
console.log('OK');
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
this.openGroupMessagesModal(rid);
//this.selectContact();
}
else{
console.log('here');
this.showContacts=true;
}
}
openNewGroupPage() {
if( window.innerWidth <= 1024){
this.newGroup();
}
else{
this.closeAllDesktopComponents();
this.roomId = rid;
this.showNewGroup=true;
}
}
openGroupMessagesPage(data) {
console.log('HERE');
if( window.innerWidth <= 1024){
this.openGroupMessagesModal(data);
}
else{
this.closeAllDesktopComponents();
this.showEmptyComponent = false;
this.roomId = data;
this.showGroupMessages=true;
}
}
onSegmentChange(){
this.load();
}
@@ -219,7 +262,7 @@ export class ChatPage implements OnInit {
modal.onDidDismiss();
}
async openMessagesModal(roomId:any){
this.closeAllDesktopComponent();
this.closeAllDesktopComponents();
let classs;
if( window.innerWidth <= 1024){
@@ -48,7 +48,7 @@
<div class="content-details">
<ion-label>
<p>{{customDate}}</p>
<p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
<p>das {{loadedEvent.workflowInstanceDataFields.StartDate}} às {{loadedEvent.workflowInstanceDataFields.EndDate}}</p>
<p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
<p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
</ion-label>
@@ -34,6 +34,7 @@ S
this.segment = this.navParams.get('segment');
/* console.log(this.navParams.get('md')); */
console.log(this.segment);
this.LoadToApproveEvents();
@@ -64,9 +65,9 @@ S
this.eventsMDGPRList = res;
});
}
async openApproveModal(eventSerialNumber){
let classs;
if( window.innerWidth <= 1024){
classs = 'cal-modal modal modal-desktop'
@@ -79,7 +80,7 @@ S
componentProps:{
serialNumber: eventSerialNumber,
},
cssClass: classs,
cssClass: 'event-list',
backdropDismiss: false
});
@@ -87,6 +88,7 @@ S
modal.onDidDismiss();
}
doRefresh(event) {
this.LoadToApproveEvents();
console.log('refresh');
@@ -1,10 +1,10 @@
<ion-header class="ion-no-border">
<!-- <ion-header hidden class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<div class="middle">
<ion-label class="title">Detalhes do Expediente</ion-label>
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon">
<ion-menu-button autoHide="false">
@@ -14,19 +14,6 @@
</div>
</div>
</ion-toolbar>
</ion-header>
<!-- <ion-header>
<ion-toolbar class="bg-blue">
<ion-buttons slot="start">
<ion-back-button defaultHref="/expediente"></ion-back-button>
</ion-buttons>
<ion-title>Expediente</ion-title>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
</ion-header> -->
<ion-menu autoHide="false" side="end" content-id="main-content">
@@ -68,172 +55,154 @@
<ion-menu-button></ion-menu-button>
</div>
<ion-content padding>
<div *ngIf="task">
<h3 class="h3-event-title">Detalhes do Expediente</h3>
<ion-item-group>
<ion-item>
<ion-label position="stacked">Assunto</ion-label>
<ion-input disabled="true">{{ task.Folio }}</ion-input>
</ion-item>
<ion-item>
<ion-label position="stacked">Remetentes</ion-label>
<ion-input disabled="true">{{task.Remetente}}</ion-input><!-- {{ task.Senders }} -->
</ion-item>
<ion-item>
<ion-label position="stacked">Data</ion-label>
<ion-input disabled="true" value=''>{{ task.CreateDate | date: 'dd-MM-yy | hh:mm'}}</ion-input>
</ion-item>
<ion-button (click)="viewDocument()" class="btn-ok-no-width" fill="clear" color="#fff" shape="round" expand="block">
<ion-icon name="attach" slot="start"></ion-icon>
Ver documento
</ion-button>
</ion-item-group>
<div *ngIf="eventsList">
<h3 class="h3-event-title">Eventos Associados</h3>
<!-- <ion-list>
<ion-item-sliding>
<ion-item lines="none"
*ngFor="let event of eventsList"
[routerLink]="['/home/gabinete-digital/expediente/events/', event.EventId, 'gabinete-digital/expediente/' + serialnumber]">
<div class="div-item-{{event.CalendarName}}">
<div class="div-up">
<div class="div-icon">
<ion-icon slot="start" name="reader"></ion-icon>
</div>
<div class="div-content-{{event.CalendarName}}">
<h3 class="capitalizeText">{{event.Subject}}</h3>
<p>{{event.StartDate | date: 'dd-MM-yy | hh:mm'}} - {{event.EndDate| date: 'hh:mm'}}</p>
</div>
</div>
<div class="div-botton">
<div class="div-botton-left">
<ion-icon class="ion-icon-location" slot="start" name="location"></ion-icon>
</div>
<div class="div-botton-middle">
<p class="item-list-small capitalizeText">{{event.Location}}</p>
</div>
<div *ngIf="event.HasAttachments" class="div-botton-right">
<ion-icon class="ion-icon-attach" slot="end" name="attach-outline"></ion-icon>
</div>
</div>
</div>
</ion-item>
</ion-item-sliding>
</ion-list> -->
<ion-content class="height-100">
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<ion-list>
<div *ngIf="eventsList">
<ion-item-sliding>
<ion-item
class="Rectangle" lines="none"
*ngFor="let event of eventsList"
(click)="viewEventDetail(event.EventId)"
>
<!-- [routerLink]="['/home/events', event.EventId, 'events']" -->
<div class="content-{{profile}}-{{event.CalendarName}}">
<div class="approve-event-time">
<p>{{event.StartDate | date: 'hh:mm'}}</p>
<p>{{event.EndDate | date: 'hh:mm'}}</p>
</div>
<div class="approve-event-detail">
<p *ngIf="event.StartDate != event.EndDate">{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}} | {{event.Location}}</p>
<p *ngIf="event.StartDate == event.EndDate">{{event.StartDate | date: 'd/M/yy' }} | {{event.Location}}</p>
<h3>{{event.Subject}}</h3>
</div>
</div>
</ion-item>
</ion-item-sliding>
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<div class="middle">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon">
<ion-menu-button autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
</div>
</div>
</div>
<div class="upper-content">
<div class="content-details">
<ion-label>
<p><span class="date">Sexta, 14 de Abril</span><span class="label">Expediente</span></p>
<p><span class="color-red">Muitíssimo urgente</span></p>
</ion-label>
</div>
</div>
<div class="middle-content">
<h5>Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let interveniente of intervenientes">
<p>{{interveniente.Name}}</p>
</div>
</ion-label>
</ion-item>
<h5>Com conhecimento</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let c of cc">
<p>{{c.Name}}</p>
</div>
</ion-label>
</ion-item>
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<p [innerHTML]="task.Note"></p>
</ion-label>
</ion-item>
</div>
<div class="bottom-content width-100">
<ion-list>
<h5>Documentos Anexados</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label
(click)="viewDocument()">
<p class="attach-title-item">{{ task.Folio }}<span class="span-right color-red btn-size"><ion-icon name="close"></ion-icon></span></p>
<p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd/MM/yy' }}</span></p>
</ion-label>
</ion-item>
</ion-list>
</div>
</ion-list>
<div *ngIf="eventsList">
<h3 class="h3-event-title">Eventos Associados</h3>
<ion-list>
<div *ngIf="eventsList">
<ion-item-sliding>
<ion-item
class="Rectangle" lines="none"
*ngFor="let event of eventsList"
(click)="viewEventDetail(event.EventId)"
>
<!-- [routerLink]="['/home/events', event.EventId, 'events']" -->
<div class="content-{{profile}}-{{event.CalendarName}}">
<div class="approve-event-time">
<p>{{event.StartDate | date: 'hh:mm'}}</p>
<p>{{event.EndDate | date: 'hh:mm'}}</p>
</div>
<div class="approve-event-detail">
<p *ngIf="event.StartDate != event.EndDate">{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}} | {{event.Location}}</p>
<p *ngIf="event.StartDate == event.EndDate">{{event.StartDate | date: 'd/M/yy' }} | {{event.Location}}</p>
<h3>{{event.Subject}}</h3>
</div>
</div>
</ion-item>
</ion-item-sliding>
</div>
</ion-list>
</div>
</div>
<!-- <div *ngIf="!eventsList">
<ion-list>
<ion-list-header>
<ion-label>
</div>
<div class="aside-right flex-column height-100">
<div class="buttons">
<button full class="btn-ok" shape="round" >Efectuar dispacho</button>
<button class="btn-cancel" shape="round" >Descartar</button>
<div class="solid"></div>
<button full class="btn-cancel" shape="round" >Solicitar</button>
<button class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button full class="btn-cancel" shape="round" >Marcar Reunião</button>
<button class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<div class="solid"></div>
<button class="btn-cancel" shape="round" >Executar</button>
<button full class="btn-cancel" shape="round" >Delegar</button>
<button class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
</div>
<div *ngIf="!task">
<ion-list>
<ion-list-header>
<ion-label>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</ion-label>
</ion-list-header>
<ion-item>
<ion-label>
<h3>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</h3>
<p>
<ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
</p>
</ion-label>
</ion-item>
<ion-item>
<ion-label>
<h3>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
<ion-item>
<ion-label>
<h3>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</h3>
<p>
<ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
</p>
</ion-label>
</ion-item>
<ion-button color="medium" shape="round" expand="block">
<!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</ion-label>
</ion-list-header>
<ion-item>
<ion-thumbnail slot="start">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</h3>
<p>
<ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
</p>
<p>
<ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
</p>
</ion-label>
</ion-item>
<ion-item>
<ion-thumbnail slot="start">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</h3>
<p>
<ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
</p>
<p>
<ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
</p>
</ion-label>
</ion-item>
</ion-list>
</div> -->
</div>
<div *ngIf="!task">
<ion-list>
<ion-list-header>
<ion-label>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</ion-label>
</ion-list-header>
<ion-item>
<ion-label>
<h3>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</h3>
<p>
<ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
</p>
</ion-label>
</ion-item>
<ion-item>
<ion-label>
<h3>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
<ion-item>
<ion-label>
<h3>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</h3>
<p>
<ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
</p>
</ion-label>
</ion-item>
<ion-button color="medium" shape="round" expand="block">
<!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</ion-button>
</ion-list>
</ion-button>
</ion-list>
</div>
</div>
</ion-content>
@@ -1,19 +1,24 @@
@import '~src/function.scss';
.header-toolbar{
--background:transparent;
--opacity: 1;
.main-header{
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background-color: #fff;
overflow:hidden;
padding: 30px 20px 0px 20px;
color:#000;
transform: translate3d(0, 1px, 0);
.content{
padding: 30px 20px 0 20px !important;
margin: 0;
float: left;
}
.color-red{
font-weight: 500;
color:#d30a0a !important;
}
.btn-size{
font-size: 18px !important;
}
.main-header{
font-family: Roboto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background-color: #fff;
overflow:auto;
color:#000;
transform: translate3d(0, 1px, 0);
.header-top{
width: 360px;
@@ -67,6 +72,8 @@
font-size: 25px;
overflow: auto;
float: left;
padding-top: 4px;
padding-left: 5px;
}
.div-icon{
width: 40px;
@@ -75,8 +82,7 @@
overflow: auto;
padding: 1px;
}
}
}
}
ion-item-group{
margin: 15px;
}
@@ -85,141 +91,130 @@ ion-button{
width: 80%;
margin: 20px auto;
}
.h3-event-title{
padding: 15px 0 0px 25px;
font-weight: bold;
.upper-content{
font-family: Roboto;
margin-left: 41px;
overflow: auto;
font-size: 18px;
.label{
border-radius: 20px;
background: #ffb703;
float: right;
padding: 5px 13.5px 5px 13.5px;
color: #fff;
}
.button-calendar-type ion-button{
height: 25px;
}
.content-details{
font-size: 17px;
.date{
color: #797979;
}
}
}
.middle-conten{
.middle-content p{
font-size: 16px;
}
}
.bottom-content{
//width: 360px;
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
}
.attach-document{
font-size: 15px;
color: #0d89d1;
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
}
.attach-icon{
width: 37px;
font-size: 35px;
float: left;
}
.attach-title-item{
font-size: 18px;
width: 100%;
color:#0d89d1;
padding-bottom: 5px;
}
/* SPAN */
.span-left{
float: left;
font-size: 15x;
}
.span-right{
text-align: right;
float: right;
font-size: 13px;
}
}
.aside-right{
padding: 30px 20px 0 20px !important;
.arrow-right{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
font-size: 35px;
overflow: hidden;
}
}
.buttons{
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
font-weight: 600 !important;
width: 100% !important;
margin-bottom: 10px !important;
padding: 15px !important;
}
}
.solid {
display: block;
width: 90%;
border-top: 1px solid #ebebeb;
margin: 0 auto !important;
margin-bottom: 10px !important;
}
}
//DIV
.div-item-Oficial{
width: 100%;
overflow: auto;
border-bottom: 1px solid #ccc;
margin: 10px 0 5px 0;
/* background: #cab0dc; */
/* border-radius: 20px; */
/* padding: 10px; */
/* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
}
.div-item-Pessoal{
width: 100%;
overflow: auto;
border-bottom: 1px solid #ccc;
margin: 10px 0 5px 0;
/* background: #cbeecb; */
/* border-radius: 20px; */
/* padding: 10px; */
/* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
}
.div-up{
width: 100%;
overflow: auto;
}
.div-up h3{
margin: 0;
padding: 0;
font-size: 17px;
@media only screen and (max-width: 1023px) {
.content{
width: 100%;
}
.aside-right{
display: none;
}
}
@media only screen and (min-width: 1024px) {
.div-icon{
width: 10%;
font-size: 22px;
float: left;
color: #808080;
display: none;
}
.div-icon ion-icon{
display: block;
margin: 0 auto;
}
.div-content-Oficial{
width: 85%;
float: left;
border-left: 4px solid #cab0dc;
padding: 0 0 0 12px;
}
.div-content-Pessoal{
width: 85%;
float: left;
border-left: 4px solid #cbeecb;
padding: 0 0 0 12px;
}
.div-content-Oficial h3, .div-content-Pessoal h3{
font-size: 14pt;
/* border: 1px solid red; */
}
.div-content-Oficial p, .div-content-Pessoal p{
font-size: 12pt;
color: rgb(94, 92, 92);
padding: 0 !important;
margin: 0 !important;
}
.div-botton{
width: 100%;
overflow: auto;
margin: 10px 0 5px 0;
}
.div-botton-left{
width: 10%;
float: left;
}
.ion-icon-location{
text-align: center;
display: block;
color: #000;
font-size: 16px;
margin: 0 auto;
}
.div-botton-middle{
.content{
width: 75%;
float: left;
margin-top: 0.5px;
border-right: 1px solid #d8d8d8;
}
.div-botton-middle p{
padding: 0;
margin: 0;
.aside-right{
width: 25%;
}
.div-botton-right{
width: 10%;
float: left;
margin: 0;
padding: 0;
}
.ion-icon-attach{
color: #666666;
font-size: 20px;
}
/* TOGGLE BUTTON */
.switch {
position: relative;
display: inline-block;
width: 90px;
height: 34px;
float: right;
margin:20px 20px 0 0;
}
.div-top-header{
width: 400px;
margin: 6px auto;
background-color: #0782c9;
overflow: auto;
}
.div-search{
font-size: 45px;
float: left;
margin: 0 0 0 10px
}
.div-logo{
background: transparent;
width: 150px;
margin: 2.5px 0 2.5px 71px;
float: left;
}
.div-logo img{
width: 100%;
}
.div-profile{
font-size: 45px;
float: right;
margin-right: 10px;
}
}
@@ -26,6 +26,8 @@ export class ExpedienteDetailPage implements OnInit {
eventsList: Event[];
serialnumber: string;
profile: string;
intervenientes: any;
cc: any;
constructor(private activateRoute: ActivatedRoute,
private processes: ProcessesService,
@@ -62,14 +64,26 @@ export class ExpedienteDetailPage implements OnInit {
this.processes.GetTask(serial).subscribe(res => {
this.task = {
"SerialNumber": res.serialNumber,
"Folio": res.workflowInstanceFolio,
"Folio": res.workflowInstanceDataFields.Subject,
"Senders": res.originator.email,
"CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'),
"DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
"Remetente": res.workflowInstanceDataFields.Sender,
"Note": res.workflowInstanceDataFields.Note,
"FolderId": res.workflowInstanceDataFields.FolderID
}
this.fulltask = res;
console.log(res);
this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{
this.intervenientes = users.filter(user=>{
return user.Type == 'I';
});
this.cc = users.filter(user=>{
return user.Type == 'CC';
});
console.log(users);
})
});
}
@@ -67,7 +67,6 @@ export class ExpedientePage implements OnInit {
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
let classs;
if( window.innerWidth <= 1024){
classs = 'modal modal-desktop'
@@ -75,7 +74,6 @@ export class ExpedientePage implements OnInit {
classs = 'gabinete-digital-mobile-modal-to-Desktop'
}
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
componentProps:{
@@ -10,7 +10,10 @@ import { GabineteDigitalPage } from './gabinete-digital.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { EventListComponent } from 'src/app/shared/agenda/event-list/event-list.component';
import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page'
import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page';
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 { ComponentsModule } from 'src/app/components/components.module'; */
@@ -25,7 +28,16 @@ import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/exped
declarations: [
GabineteDigitalPage,
EventListComponent,
ExpedientePage
EmptyContainerPage,
EventsToApprovePage,
ExpedientePage,
ExpedientsPage,
],
entryComponents: [
EmptyContainerPage,
EventsToApprovePage,
ExpedientePage,
ExpedientsPage,
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
@@ -8,29 +8,27 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content height-100">
<div class="main-content d-flex height-100">
<div class="d-flex height-100">
<!-- -->
<div class="d-flex aside-wrapper flex-column pt-25 justify-center width-md-40">
<!-- Aside left -->
<div class="aside-wrapper d-flex flex-column pt-25 justify-center width-md-40 ">
<p class="text-center mt-0 aside-title px-20">Gabinete Digital</p>
<div class="aside overflow-y-auto d-flex d-md-block flex-wrap justify-center width-100 px-20">
<div class="exp-card d-flex flex-column justify-center" (click)="openEventsToApproveList('MDGPR')">
<div class="exp-card d-flex flex-column justify-center" (click)="openEventsToApprovePage('MDGPR')">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-agenda.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Eventos para Aprovação</p>
<p class="text-center exp-card-content">{{count_ev_md+count_ev_pr}} <span class="title1">Documentos</span></p>
</div>
<div class="exp-card d-flex flex-column justify-center" (click)="openExpedientList()">
<div class="exp-card d-flex flex-column justify-center" (click)="openExpedientListPage()">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-correspondencia.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Correspondencia</p>
<p class="text-center exp-card-content">{{count_exp_dailywork}} <span class="title1">Documentos</span></p>
</div>
<div class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
<div class="exp-card d-flex flex-column justify-center" (click)="viewEventDetail('1')">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-pendente.svg"></ion-icon>
</div>
@@ -69,12 +67,12 @@
</div>
</div>
<!-- -->
<div class="d-none flex-1 aside-content height-100 overflow-y-auto pt-25">
<app-event-list class="d-flex flex-1 flex-column height-100" *ngIf="desktopComponent.showEventList"></app-event-list>
<app-expediente class="d-flex flex-1 flex-column height-100" *ngIf="desktopComponent.showExpediente"></app-expediente>
<!-- 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-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>
</div>
</div>
</ion-content>
@@ -107,7 +107,7 @@ ion-content{
padding: 30px 5px 30px 5px;
border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
border: solid 1px #e9e9e9;
//border: solid 1px #e9e9e9;
/* --background-color: #ffffff !important; */
background-color: #ffffff !important;
float: left;
@@ -153,8 +153,9 @@ ion-content{
.main-content{
.aside-wrapper{
border: 1px solid red;
width: 40%;
justify-content: flex-start !important;
border-right: 1px solid #d8d8d8;
.aside-title{
font-family: Roboto;
font-size: 25px;
@@ -162,25 +163,38 @@ ion-content{
}
}
.aside-content{
width: 60%;
display: flex !important;
background-color: white;
}
}
.exp-card{
margin: 5px auto;
display: flex;
align-items: center;
margin: 0 auto;
margin-bottom: 15px;
flex-direction: row !important;
width: 100%;
padding-right: 11px;
padding-bottom: 5px;
padding-top: 5px;
padding: 10px 17px 10px 17px;
height: unset !important;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
.exp-card-title{
flex: 1;
text-align: left;
margin-top: 0px !important;
}
.exp-card-content{
margin: 0 !important;
}
.exp-card-content .title1{
display: none;
margin-top: 0px !important;
}
.exp-card-content .number{
//display: none;
margin-top: 0px !important;
}
}
}
@@ -31,6 +31,13 @@ export class GabineteDigitalPage implements OnInit {
showEventList: false,
showExpediente : false
}
showEventsToApprove = false;
showEmptyContainer = true;
showExpedients = false;
showExpedientDetail = false;
emptyTextDescription = 'Sem opção selecionada';
serialNumber:string;
constructor(
private processesbackend:ProcessesService,
@@ -90,6 +97,14 @@ this.processesbackend.GetActionsList().subscribe(res=>{
});
}
closeAllDesktopComponents(){
this.showEmptyContainer = false;
this.showEventsToApprove = false;
this.showExpedients = false;
this.showExpedients = false;
this.showExpedientDetail = false;
}
LoadCounts() {
this.showLoader = true;
this.processesbackend.GetTasksList("Expediente", true).subscribe(res =>{
@@ -122,6 +137,16 @@ this.processesbackend.GetActionsList().subscribe(res=>{
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openEventsToApprovePage(segment:any){
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
this.openEventsToApproveList(segment);
}
else{
this.showEventsToApprove = true;
}
}
async openEventsToApproveList(segment:any){
@@ -151,7 +176,27 @@ this.processesbackend.GetActionsList().subscribe(res=>{
//}
}
openExpedientListPage(){
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
this.openExpedientList();
}
else{
this.showExpedients = true;
}
}
openExpedientPage(data){
console.log(data);
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
//this.openExpedientList();
}
else{
this.serialNumber = data;
this.showExpedientDetail = true;
}
}
async openExpedientList(){
this.closeAllDesktopComponent();