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

Fixe merge

Browse Source
This commit is contained in:
Peter Maquiran
2021-03-25 16:04:07 +01:00
parent b2ba5bdca7 a29a25d7cc
commit d7be074140
99 changed files with 3043 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/app-routing.module.ts
+24
View File
@@ -11,7 +11,31 @@ const routes: Routes = [
{
path: '',
loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
},
{
path: 'empty-chat',
loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule)
},
{
path: 'btn-criar',
loadChildren: () => import('./shared/buttons/btn-criar/btn-criar.module').then( m => m.BtnCriarPageModule)
},
{
path: 'btn-adicionar',
loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule)
},
{
path: 'empty-container',
loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule)
},
{
path: 'events-to-approve',
loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule)
},
{
path: 'expedients',
loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule)
},
/* {
path: 'chat',
src/app/home/home.page.html
-1
View File
@@ -27,5 +27,4 @@
<ion-label>Chat</ion-label>
</ion-tab-button>
</ion-tab-bar>
</ion-tabs>
src/app/pages/agenda/agenda.page.ts
-1
View File
@@ -911,7 +911,6 @@ export class AgendaPage implements OnInit {
this.mobileComponent.showAttendeeModal = false;
this.closeEventToApprove();
}
async AproveEventEditEvent(data){
src/app/pages/chat/chat.module.ts
+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 {}
src/app/pages/chat/chat.page.html
+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>
src/app/pages/chat/chat.page.scss
-1
View File
@@ -8,7 +8,6 @@ ion-content{
.title-content{
width: 100%;
margin-bottom: 15px;
overflow: auto;
padding: 0 !important;
background: #fff;
src/app/pages/chat/chat.page.ts
+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){
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+1 -1
View File
@@ -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>
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+5 -3
View File
@@ -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');
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+78 -109
View File
@@ -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,60 +55,70 @@
<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-content class="height-100">
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<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>
<ion-item>
<ion-label position="stacked">Remetentes</ion-label>
<ion-input disabled="true">{{task.Remetente}}</ion-input><!-- {{ task.Senders }} -->
<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>
<ion-item>
<ion-label position="stacked">Data</ion-label>
<ion-input disabled="true" value=''>{{ task.CreateDate | date: 'dd-MM-yy | hh:mm'}}</ion-input>
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<p [innerHTML]="task.Note"></p>
</ion-label>
</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>
<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>
<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-list>
<div *ngIf="eventsList">
<ion-item-sliding>
@@ -146,54 +143,25 @@
</ion-item-sliding>
</div>
</ion-list>
</div>
</div>
<!-- <div *ngIf="!eventsList">
<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-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>
<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>
</ion-list>
</div> -->
</div>
<div *ngIf="!task">
<ion-list>
<ion-list-header>
@@ -235,5 +203,6 @@
</ion-button>
</ion-list>
</div>
</div>
</ion-content>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+135 -140
View File
@@ -1,17 +1,22 @@
@import '~src/function.scss';
.header-toolbar{
--background:transparent;
--opacity: 1;
.main-header{
width: 100%; /* 400px */
height: 100%;
.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:hidden;
padding: 30px 20px 0px 20px;
overflow:auto;
color:#000;
transform: translate3d(0, 1px, 0);
@@ -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;
}
.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;
.aside-right{
width: 25%;
}
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+15 -1
View File
@@ -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);
})
});
}
src/app/pages/gabinete-digital/expediente/expediente.page.ts
-2
View File
@@ -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:{
src/app/pages/gabinete-digital/gabinete-digital.module.ts
+14 -2
View File
@@ -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]
})
src/app/pages/gabinete-digital/gabinete-digital.page.html
+12 -14
View File
@@ -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>
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+20 -6
View File
@@ -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;
}
}
}
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+45
View File
@@ -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 =>{
@@ -123,6 +138,16 @@ this.processesbackend.GetActionsList().subscribe(res=>{
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){
this.closeAllDesktopComponent();
@@ -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();
src/app/services/processes.service.ts
+15 -2
View File
@@ -37,8 +37,7 @@ export class ProcessesService {
return this.http.get<any>(`${geturl}`, options);
}
GetTask(serialnumber:string): Observable<any>
{
GetTask(serialnumber:string): Observable<any>{
const geturl = environment.apiURL + 'Tasks/FindTask';
let params = new HttpParams();
@@ -50,6 +49,20 @@ export class ProcessesService {
};
return this.http.get<any>(`${geturl}`, options);
}
GetTaskParticipants(folderId:string): Observable<any>{
const geturl = environment.apiURL + 'Processes/GetUsersInDispash';
let params = new HttpParams();
params = params.set("folderId", folderId);
let options = {
headers: this.headers,
params: params
};
return this.http.get<any>(`${geturl}`, options);
}
FindTaskDocId(serialnumber:string): Observable<any>
{
const geturl = environment.apiURL + 'Tasks/FindExpedienteDocId';
src/app/shared/agenda/approve-event/approve-event.component.html
+39 -31
View File
@@ -1,4 +1,4 @@
<ion-header class="ion-no-border px-20">
<ion-header hidden class="ion-no-border px-20">
<div class="header-content d-flex justify-space-between">
<div class="header-icon-left">
<ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
@@ -6,7 +6,7 @@
<div class="header-title flex-grow-1">
<label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
</div>
<div class="header-icon-right">
<div class="header-icon-right display-none-{{showAside}}">
<ion-icon (click)="notImplemented()" src="assets/images/icons-edit.svg"></ion-icon>
</div>
</div>
@@ -36,14 +36,25 @@
</ion-menu>
<ion-content id="main-content">
<div class="upper-content">
<div class="content-location d-flex justify-space-between">
<div class="location-detail">
<ion-label >{{loadedEvent.workflowInstanceDataFields.Location}}</ion-label>
<div class="main-content d-flex height-100">
<div class="content">
<div class="header-content width-100 d-flex justify-space-between">
<div class="header-icon-left">
<ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
</div>
<div class="button-calendar-type">
<ion-button class="button-calendar-type" slot="end">{{loadedEvent.workflowInstanceDataFields.Agenda}}</ion-button>
<div class="header-title flex-grow-1">
<label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
</div>
<div class="header-icon-right display-none-{{showAside}}">
<ion-icon (click)="notImplemented()" src="assets/images/icons-edit.svg"></ion-icon>
</div>
</div>
<div class="upper-content d-flex flex-column">
<div class="content-location">
<p>
<span class="location">{{loadedEvent.workflowInstanceDataFields.Location}}</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}">{{loadedEvent.workflowInstanceDataFields.Agenda}}</span>
</p>
</div>
<div class="content-details">
<ion-label>
@@ -55,15 +66,15 @@
</div>
</div>
<div class="middle-content">
<ion-item>
<h5>Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<h3>Intervenientes</h3>
<p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
</ion-label>
</ion-item>
<ion-item>
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<h3>Detalhes</h3>
<p>{{loadedEvent.workflowInstanceDataFields.Body}}</p>
</ion-label>
</ion-item>
@@ -72,7 +83,7 @@
<div *ngIf="loadedAttachments" class="bottom-content">
<ion-list>
<h3>Documentos Anexados</h3>
<ion-item>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<p class="attach-title-item">Receita por Natureza</p>
<p><span class="span-left">{{loadedAttachments.Remetente}}</span><span class="span-right">{{loadedAttachments.CreateDate}}<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
@@ -80,28 +91,25 @@
</ion-item>
</ion-list>
</div>
</div>
<div *ngIf="showAside" class="aside-right flex-column height-100">
<div class="aside-buttons">
<button full class="btn-ok" shape="round" >Editar evento</button>
<button full class="btn-ok" shape="round" >Aprovar</button>
<button class="btn-cancel" shape="round" >Emendar</button>
<div class="solid"></div>
<button full class="btn-delete" shape="round" >Rejeitar</button>
</div>
</div>
</div>
</ion-content>
<ion-footer>
<ion-toolbar>
<ion-footer class="display-none-{{showAside}}">
<div class="buttons">
<ion-item lines="none">
<p>
<ion-button class="button-edit-event" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</ion-button>
</p>
<p>
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</button>
<ion-menu-button autoHide="false">
<ion-icon (click)="openMenu()" name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
</p>
<p>
<ion-button class="button-approve" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</ion-button>
</p>
</ion-item>
<ion-item hidden>
<p>
<ion-button class="button-reject" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</ion-button>
</p>
</ion-item>
<button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
<button hidden class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
</div>
</ion-toolbar>
</ion-footer>
src/app/shared/agenda/approve-event/approve-event.component.scss
+101 -26
View File
@@ -1,14 +1,12 @@
ion-content{
--padding-top:0px;
--padding-start: 20px;
--padding-end: 20px;
font-size: 18px;
}
ion-menu{
--height: 225px;
}
.display-none-true{
display: none;
border: 1px solid red;
}
.header-content{
margin: 25px auto;
//margin: 25px auto;
}
.header-icon-left{
width: 36px;
@@ -29,31 +27,40 @@ ion-content{
font-size: 45px;
float: left;
}
.content{
padding: 30px 20px 0 20px !important;
overflow: auto;
width: 100%;
.upper-content{
margin-left: 50px;
margin-left: 40px;
font-size: 18px;
.content-location{
margin: 0 auto;
margin-top: 0px !important;
width: 100%;
padding: 0;
}
.location-detail{
width: 210px;
font-weight: 700;
font-size: 18px;
float: left;
margin: 5px 5px 5px 0px;
}
.button-calendar-type{
width: 91px;
--border-radius: 12.5px;
--background: #ffb703;
margin-left: 5px;
.location{
float: left;
}
.button-calendar-type ion-button{
height: 25px;
.event-type-Oficial{
font-family: Roboto;
border-radius: 20px;
background: #fec077;
float: right !important;
padding: 5px 13.5px 5px 13.5px;
color: #fff;
}
.event-type-Pessoal{
font-family: Roboto;
border-radius: 20px;
background: #f05d5e;
float: right !important;
padding: 5px 13.5px 5px 13.5px;
color: #fff;
}
.button-edit-event {
width: 140px;
@@ -108,11 +115,53 @@ ion-content{
font-size: 13px;
}
}
}
.aside-right{
overflow: auto;
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;
} */
}
.aside-buttons{
width: 100% !important;
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;
}
}
.buttons{
width: 360px;
margin: 0 auto;
}
display: flex;
justify-content: space-between;
overflow: auto;
.button-options {
height: 44px;
@@ -132,4 +181,30 @@ ion-content{
border-radius: 22.5px;
--background: #ffe0e0;
}
}
/* @media only screen and (max-width: 1140px) {
.content{
width: 100%;
}
.aside-right{
display: none;
}
} */
/* @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/shared/agenda/approve-event/approve-event.component.ts
+5 -1
View File
@@ -21,11 +21,13 @@ export class ApproveEventComponent implements OnInit {
loadedAttachments:any;
customDate:any;
today:any;
show: boolean = false;
months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
@Input() serialNumber:string;
@Input() showAside:boolean;
@Output() approveEventDismiss = new EventEmitter<any>();
@Output() closeEventToApprove = new EventEmitter<any>();
@@ -44,6 +46,8 @@ export class ApproveEventComponent implements OnInit {
ngOnInit() {
this.getTask();
this.getAttachments();
console.log(this.showAside);
}
notImplemented(){
@@ -53,6 +57,7 @@ export class ApproveEventComponent implements OnInit {
close(){
/* this.router.navigate(['/home/gabinete-digital/event-list']); */
this.closeEventToApprove.emit();
this.modalController.dismiss();
}
getTask(){
@@ -119,7 +124,6 @@ export class ApproveEventComponent implements OnInit {
const modal = await this.modalController.create({
component: EmendMessageModalPage,
componentProps:{
},
cssClass: 'emend-message-modal',
backdropDismiss: false
src/app/shared/btn-seguinte/btn-seguinte.page.scss
+1 -1
View File
@@ -4,4 +4,4 @@
font-size: 15px;
color: #0782c9;
margin: 8px 0 0 5px;
}
}
src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { BtnAdicionarPage } from './btn-adicionar.page';
const routes: Routes = [
{
path: '',
component: BtnAdicionarPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class BtnAdicionarPageRoutingModule {}
src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { BtnAdicionarPageRoutingModule } from './btn-adicionar-routing.module';
import { BtnAdicionarPage } from './btn-adicionar.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
BtnAdicionarPageRoutingModule
],
declarations: [BtnAdicionarPage]
})
export class BtnAdicionarPageModule {}
src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html
+3
View File
@@ -0,0 +1,3 @@
<div class="right">
<ion-label>Adicionar</ion-label>
</div>
src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss
+7
View File
@@ -0,0 +1,7 @@
.right{
padding: 0!important;
float: right;
font-size: 15px;
color: #0782c9;
margin: 8px 5px 0 5px;
}
src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { BtnAdicionarPage } from './btn-adicionar.page';
describe('BtnAdicionarPage', () => {
let component: BtnAdicionarPage;
let fixture: ComponentFixture<BtnAdicionarPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ BtnAdicionarPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(BtnAdicionarPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts
+15
View File
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-btn-adicionar',
templateUrl: './btn-adicionar.page.html',
styleUrls: ['./btn-adicionar.page.scss'],
})
export class BtnAdicionarPage implements OnInit {
constructor() { }
ngOnInit() {
}
}
src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { BtnCriarPage } from './btn-criar.page';
const routes: Routes = [
{
path: '',
component: BtnCriarPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class BtnCriarPageRoutingModule {}
src/app/shared/buttons/btn-criar/btn-criar.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { BtnCriarPageRoutingModule } from './btn-criar-routing.module';
import { BtnCriarPage } from './btn-criar.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
BtnCriarPageRoutingModule
],
declarations: [BtnCriarPage]
})
export class BtnCriarPageModule {}
src/app/shared/buttons/btn-criar/btn-criar.page.html
+3
View File
@@ -0,0 +1,3 @@
<div class="right">
<ion-label>Criar grupo</ion-label>
</div>
src/app/shared/buttons/btn-criar/btn-criar.page.scss
+7
View File
@@ -0,0 +1,7 @@
.right{
padding: 0!important;
float: right;
font-size: 15px;
color: #0782c9;
margin: 8px 5px 0 5px;
}
src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { BtnCriarPage } from './btn-criar.page';
describe('BtnCriarPage', () => {
let component: BtnCriarPage;
let fixture: ComponentFixture<BtnCriarPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ BtnCriarPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(BtnCriarPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/shared/buttons/btn-criar/btn-criar.page.ts
+15
View File
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-btn-criar',
templateUrl: './btn-criar.page.html',
styleUrls: ['./btn-criar.page.scss'],
})
export class BtnCriarPage implements OnInit {
constructor() { }
ngOnInit() {
}
}
src/app/shared/chat/empty-chat/empty-chat-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { EmptyChatPage } from './empty-chat.page';
const routes: Routes = [
{
path: '',
component: EmptyChatPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class EmptyChatPageRoutingModule {}
src/app/shared/chat/empty-chat/empty-chat.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { EmptyChatPageRoutingModule } from './empty-chat-routing.module';
import { EmptyChatPage } from './empty-chat.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
EmptyChatPageRoutingModule
],
declarations: [EmptyChatPage]
})
export class EmptyChatPageModule {}
src/app/shared/chat/empty-chat/empty-chat.page.html
+5
View File
@@ -0,0 +1,5 @@
<ion-content>
<div class="center height-100">
<p>{{texto}}</p>
</div>
</ion-content>
src/app/shared/chat/empty-chat/empty-chat.page.scss
+5
View File
@@ -0,0 +1,5 @@
.center {
display: flex;
justify-content: center;
align-items: center;
}
src/app/shared/chat/empty-chat/empty-chat.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { EmptyChatPage } from './empty-chat.page';
describe('EmptyChatPage', () => {
let component: EmptyChatPage;
let fixture: ComponentFixture<EmptyChatPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ EmptyChatPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(EmptyChatPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/shared/chat/empty-chat/empty-chat.page.ts
+16
View File
@@ -0,0 +1,16 @@
import { Component, Input, OnInit } from '@angular/core';
@Component({
selector: 'app-empty-chat',
templateUrl: './empty-chat.page.html',
styleUrls: ['./empty-chat.page.scss'],
})
export class EmptyChatPage implements OnInit {
@Input() texto:string;
constructor() { }
ngOnInit() {
}
}
src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
+7 -10
View File
@@ -1,14 +1,14 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<div class="main-header width-100">
<div class="title-content width-100">
<div class="back-icon">
<ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon (click)="openGroupMessagesPage()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
<div class="div-title">
<ion-label class="title">Contactos</ion-label>
</div>
<app-btn-seguinte (click)="createGroup()"></app-btn-seguinte>
<app-btn-adicionar (click)="updateGroup()"></app-btn-adicionar>
</div>
</div>
</ion-toolbar>
@@ -26,9 +26,6 @@
</ion-refresher-content>
</ion-refresher>
<div class="main-content">
<div *ngIf="members">
<ion-label class="members-label">Contactos selecção:</ion-label>
@@ -41,7 +38,7 @@
</ion-list>
</div>
<ion-virtual-scroll [items]="users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
<ion-virtual-scroll [items]="users" approxItemHeight="70px" [headerFn]="separateLetter">
<div class="item-divider" *virtualHeader="let header">
<ion-label>{{header}}</ion-label>
@@ -49,8 +46,8 @@
<div *virtualItem="let user" class="item-checkbox">
<ion-checkbox (ionChange)="selectedContact(user)" color="primary"></ion-checkbox>
<p>{{user.name}}</p>
<ion-icon name="ellipse"></ion-icon>
<ion-label>{{user.name}}</ion-label>
<div class="icon"><ion-icon name="ellipse"></ion-icon></div>
</div>
</ion-virtual-scroll>
src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss
+7 -17
View File
@@ -3,11 +3,8 @@
--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;
@@ -26,7 +23,6 @@
padding-left: 20px;
}
.title-content{
width: 360px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
@@ -62,28 +58,28 @@
border-radius: 5px;
}
.search ion-searchbar{
/* border: 1px solid green; */
width: 100%;
margin: 0 !important;
padding: 0 !important;
--border-radius: 5px;
--box-shadow: none;
overflow: auto;
overflow: hidden;
--icon-color:#0d89d1;
}
}
ion-content{
--background:transparent;
}
.main-content{
width: 100%;
height: 100%;
font-family: Roboto;
margin: 0 auto;
background-color: #fff;
overflow:auto;
padding: 0 0 0 0;
overflow:auto;
.members-label{
margin: 10px 20px 10px 20px !important;
@@ -111,8 +107,6 @@
display: flex;
margin: 10px 20px 10px 20px !important;
overflow: auto;
align-items: center;
}
.item-checkbox ion-checkbox, .members-checkbox ion-checkbox{
@@ -121,20 +115,16 @@
float: left;
}
.item-checkbox p, .members-checkbox p{
display: block;
margin: 0 !important;
width: 330px;
.item-checkbox ion-label, .members-checkbox p{
padding-left: 10px;
font-size: 15px;
color: #0d89d1;
float: left;
flex-grow: 1;
}
.item-checkbox ion-icon, .members-checkbox ion-icon{
.icon, .members-checkbox ion-icon{
font-size: 10px;
float: left;
color:#99e47b;
margin-left: 10px;
}
}
src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+28 -18
View File
@@ -1,5 +1,5 @@
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular';
import * as _ from 'lodash';
import { AuthService } from 'src/app/services/auth.service';
@@ -31,12 +31,15 @@ export class GroupContactsPage implements OnInit {
groupName:string;
selectedUserList:any;
@Input() roomId:string;
@Output() openGroupMessage:EventEmitter<any> = new EventEmitter<any>();
constructor(
private modalController: ModalController,
private http: HttpClient,
private chatService: ChatService,
private authService: AuthService,
private navParams: NavParams,
//private navParams: NavParams,
)
{
this.authService.userData$.subscribe((res:any)=>{
@@ -45,16 +48,32 @@ export class GroupContactsPage implements OnInit {
this.textSearch="";
this.dm=null;
this.room=null;
this.isGroupCreated = this.navParams.get('isCreated');
/* this.isGroupCreated = this.navParams.get('isCreated');
this.groupName = this.navParams.get('name');
this.room = this.navParams.get('room');
this.members = this.navParams.get('members');
this.members = this.navParams.get('members'); */
}
ngOnInit() {
//this.getRoomInfo();
this.loadUsers();
console.log(this.groupName);
console.log(this.isGroupCreated);
console.log(this.roomId);
//console.log(this.isGroupCreated);
}
updateGroup(){
this.showLoader = true;
this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
this.room = room['room'];
this.addContacts(this.room);
this.showLoader = false;
this.openGroupMessage.emit(this.room._id)
});
}
openGroupMessagesPage(){
this.showLoader = true;
this.openGroupMessage.emit(this.roomId)
this.showLoader = false;
}
loadUsers(){
@@ -147,7 +166,6 @@ export class GroupContactsPage implements OnInit {
let body ={
"roomId":room._id,
"userId":user._id,
}
this.chatService.addUserToGroup(body).subscribe(res=>{
console.log(res['success']);
@@ -155,9 +173,9 @@ export class GroupContactsPage implements OnInit {
});
}
createGroup(){
/* createGroup(){
console.log(this.groupName);
if(!this.isGroupCreated){
/* this.close(); */
let body = { "name":this.groupName, }
this.chatService.addGroup(body).subscribe(res=>{
console.log('group created');
@@ -171,16 +189,8 @@ export class GroupContactsPage implements OnInit {
else{
this.addContacts(this.room);
this.close();
/* this.openGroupMessages(this.room); */
/* this.chatService.getGroupInfo(this.room._id).subscribe(res=>{
console.log(res);
this.addContacts(res['group']);
this.openGroupMessages(res['group']);
}) */
}
}
} */
async newGroup(){
this.close();
src/app/shared/chat/group-messages/group-messages.page.html
+3 -3
View File
@@ -6,10 +6,10 @@
<ion-label class="title">{{room.name.split('-').join(' ')}}</ion-label>
</div>
<div class="right">
<ion-icon (click)="openOptions()" src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon (click)="openGroupMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
</div>
</div>
<div (click)="addContacts()" class="header-bottom">
<div (click)="openGroupContactsPage()" class="header-bottom">
<div class="header-bottom-icon">
<ion-icon src="assets/icon/icons-user.svg"></ion-icon>
</div>
@@ -55,7 +55,7 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<ion-icon (click)="openChatOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
<ion-icon (click)="openSendGroupMessageOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
</div>
<div class="width-80">
<ion-item class="ion-no-padding type-message" lines="none">
src/app/shared/chat/group-messages/group-messages.page.scss
-1
View File
@@ -43,7 +43,6 @@
}
.header-bottom-contacts{
width: 275px;
font-size: 15px;
color: #797979;
white-space: nowrap;
src/app/shared/chat/group-messages/group-messages.page.ts
+109 -9
View File
@@ -1,5 +1,5 @@
import { Component, OnChanges, OnInit, Input, SimpleChanges} from '@angular/core';
import { ActionSheetController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { Component, OnChanges, OnInit, Input, SimpleChanges, Output, EventEmitter} from '@angular/core';
import { ActionSheetController, AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
@@ -25,6 +25,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
members:any;
@Input() roomId:string;
@Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
constructor(
private menu: MenuController,
@@ -33,6 +34,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
public popoverController: PopoverController,
private chatService: ChatService,
private authService: AuthService,
private animationController: AnimationController,
) {
this.isGroupCreated = true;
}
@@ -49,6 +51,10 @@ export class GroupMessagesPage implements OnInit, OnChanges {
console.log(this.roomId);
}
openGroupContactsPage(){
this.openGroupContacts.emit(this.roomId);
}
close(){
this.modalController.dismiss();
}
@@ -132,8 +138,68 @@ export class GroupMessagesPage implements OnInit, OnChanges {
});
this.message = "";
}
async openGroupMessagesOptions() {
/* async openOptions(ev: any) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
.fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
const wrapperAnimation = this.animationController.create()
.addElement(baseEl.querySelector('.modal-wrapper')!)
.keyframes([
{ offset: 0, opacity: '1', right: '-100%' },
{ offset: 1, opacity: '1', right: '0px' }
]);
return this.animationController.create()
.addElement(baseEl)
.easing('ease-out')
.duration(500)
.addAnimation([backdropAnimation, wrapperAnimation]);
}
const leaveAnimation = (baseEl: any) => {
return enterAnimation(baseEl).direction('reverse');
}
/* const popover = await this.popoverController.create({
component: MessagesOptionsPage,
componentProps: {
roomId: this.dm._id,
},
cssClass: 'messages-options',
event: ev,
translucent: true,
});
return await popover.present(); */
const modal = await this.modalController.create({
enterAnimation,
leaveAnimation,
component: ChatPopoverPage,
cssClass: 'model profile-modal search-submodal',
componentProps: {
roomId: this.roomId,
}
});
return await modal.present();
}
openSendGroupMessageOptions(ev: any){
if(window.innerWidth <= 1024){
console.log('mobile');
this.openChatOptions(ev);
}
else{
console.log('desktop');
this._openChatOptions();
}
}
async openOptions(ev: any) {
const popover = await this.popoverController.create({
component: ChatPopoverPage,
cssClass: 'chat-popover',
@@ -147,10 +213,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
popover.onDidDismiss().then(res=>{
console.log(res);
if(res.data){
this.roomName = res.data.name.split('-').join(' ');
console.log(this.roomName);
this.load();
this.getRoomInfo();
//this.modalController.dismiss();
};
@@ -186,10 +249,10 @@ export class GroupMessagesPage implements OnInit, OnChanges {
await modal.present();
modal.onDidDismiss().then(()=>{
this.load();
this.getRoomInfo();
});
}
*/
/* async actionSheet() {
const actionSheet = await this.actionSheetController.create({
cssClass: 'my-custom-class',
@@ -216,5 +279,42 @@ export class GroupMessagesPage implements OnInit, OnChanges {
}
*/
async _openChatOptions() {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
.fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
const wrapperAnimation = this.animationController.create()
.addElement(baseEl.querySelector('.modal-wrapper')!)
.keyframes([
{ offset: 0, opacity: '1', right: '-100%' },
{ offset: 1, opacity: '1', right: '0px' }
]);
return this.animationController.create()
.addElement(baseEl)
.easing('ease-out')
.duration(500)
.addAnimation([backdropAnimation, wrapperAnimation]);
}
const leaveAnimation = (baseEl: any) => {
return enterAnimation(baseEl).direction('reverse');
}
const modal = await this.modalController.create({
enterAnimation,
leaveAnimation,
component: ChatOptionsPopoverPage,
cssClass: 'model profile-modal search-submodal',
componentProps: {
roomId: this.roomId,
}
});
return await modal.present();
}
}
src/app/shared/chat/messages/contacts/contacts.module.ts
+3 -3
View File
@@ -8,7 +8,7 @@ import { ContactsPageRoutingModule } from './contacts-routing.module';
import { ContactsPage } from './contacts.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { PipesModule } from 'src/app/pipes/pipes.module';
import { FilterPipe } from 'src/app/pipes/filter.pipe';
@NgModule({
imports: [
@@ -16,9 +16,9 @@ import { PipesModule } from 'src/app/pipes/pipes.module';
FormsModule,
IonicModule,
SharedModule,
PipesModule,
ContactsPageRoutingModule
],
declarations: [ContactsPage]
exports: [FilterPipe],
declarations: [ContactsPage, FilterPipe]
})
export class ContactsPageModule {}
src/app/shared/chat/messages/contacts/contacts.page.html
+4 -2
View File
@@ -19,20 +19,22 @@
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content">
<ion-virtual-scroll [items]="users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
<ion-virtual-scroll [items]="users" approxItemHeight="70px" [headerFn]="separateLetter">
<div class="item-divider" *virtualHeader="let header">
<ion-label>{{header}}</ion-label>
</div>
<div (click)="createRoom(user.username)" *virtualItem="let user" class="item-user">
<div (click)="openMessagesPage(user.username)" *virtualItem="let user" class="item-user">
<p>{{user.name}}</p>
<span class="icon">
<ion-icon class="{{user.status}}" slot="end" name="ellipse"></ion-icon>
src/app/shared/chat/messages/contacts/contacts.page.scss
+2 -3
View File
@@ -4,7 +4,7 @@
--opacity: 1;
.main-header{
width: 100%; /* 400px */
width: 100%;
height: 100%;
font-family: Roboto;
border-top-left-radius: 25px;
@@ -27,7 +27,6 @@
padding-left: 20px;
}
.title-content{
width: 360px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
@@ -85,8 +84,8 @@
font-family: Roboto;
margin: 0 auto;
background-color: #fff;
overflow:auto;
padding: 0 0 0 0;
overflow:auto;
.item-divider{
background: #ebebeb;
src/app/shared/chat/messages/contacts/contacts.page.ts
+19 -1
View File
@@ -1,5 +1,5 @@
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { Component, EventEmitter, OnInit, Output } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
@@ -23,6 +23,8 @@ export class ContactsPage implements OnInit {
room:any;
dm:any;
@Output() openMessage:EventEmitter<any> = new EventEmitter<any>();
constructor(
private modalController: ModalController,
private http: HttpClient,
@@ -46,6 +48,22 @@ export class ContactsPage implements OnInit {
this.textSearch = event.detail.value;
}
openMessagesPage(username:string){
if( window.innerWidth <= 1024){
this.createRoom(username);
}
else{
let body = {
username: username,
}
this.chatService.createRoom(body).subscribe(res => {
console.log(res);
this.room = res['room'];
this.openMessage.emit(this.room._id);
});
}
}
loadUsers(){
this.options = {
headers: this.headers,
src/app/shared/chat/messages/messages.page.html
+3 -3
View File
@@ -7,10 +7,10 @@
<span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
</div>
<div class="right">
<ion-icon (click)="openMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon (click)="_openMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
</div>
</div>
<div class="header-bottom" (click)="addContacts()">
<div hidden class="header-bottom" (click)="addContacts()">
<div class="header-bottom-icon">
<ion-icon src="assets/icon/icons-user.svg"></ion-icon>
</div>
@@ -48,7 +48,7 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<ion-icon (click)="openChatOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
<ion-icon (click)="openSendMessageOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
</div>
<div class="width-80">
<ion-item class="ion-no-padding type-message" lines="none">
src/app/shared/chat/messages/messages.page.ts
+117 -1
View File
@@ -1,10 +1,11 @@
import { AfterViewChecked, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { Status } from 'src/app/models/chat/status.model';
import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
import { ProfileComponent } from '../../headers/header-no-search/profile/profile.component';
import { ContactsPage } from '../new-group/contacts/contacts.page';
@Component({
@@ -33,6 +34,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
/* private navParams: NavParams, */
private chatService: ChatService,
private authService: AuthService,
private animationController: AnimationController,
) {
/* this.dm = this.navParams.get('dm'); */
}
@@ -145,6 +147,17 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
modal.onDidDismiss();
}
openSendMessageOptions(ev:any){
if(window.innerWidth <= 1024){
console.log('mobile');
this.openChatOptions(ev);
}
else{
console.log('desktop');
this._openChatOptions();
}
}
async openChatOptions(ev: any) {
const popover = await this.popoverController.create({
component: ChatOptionsPopoverPage,
@@ -155,5 +168,108 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
return await popover.present();
}
async _openMessagesOptions() {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
.fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
const wrapperAnimation = this.animationController.create()
.addElement(baseEl.querySelector('.modal-wrapper')!)
.keyframes([
{ offset: 0, opacity: '1', right: '-100%' },
{ offset: 1, opacity: '1', right: '0px' }
]);
return this.animationController.create()
.addElement(baseEl)
.easing('ease-out')
.duration(500)
.addAnimation([backdropAnimation, wrapperAnimation]);
}
const leaveAnimation = (baseEl: any) => {
return enterAnimation(baseEl).direction('reverse');
}
/* const popover = await this.popoverController.create({
component: MessagesOptionsPage,
componentProps: {
roomId: this.dm._id,
},
cssClass: 'messages-options',
event: ev,
translucent: true,
});
return await popover.present(); */
const modal = await this.modalController.create({
enterAnimation,
leaveAnimation,
component: MessagesOptionsPage,
cssClass: 'model profile-modal search-submodal',
componentProps: {
roomId: this.roomId,
}
});
return await modal.present();
}
async _openChatOptions() {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
.fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
const wrapperAnimation = this.animationController.create()
.addElement(baseEl.querySelector('.modal-wrapper')!)
.keyframes([
{ offset: 0, opacity: '1', right: '-100%' },
{ offset: 1, opacity: '1', right: '0px' }
]);
return this.animationController.create()
.addElement(baseEl)
.easing('ease-out')
.duration(500)
.addAnimation([backdropAnimation, wrapperAnimation]);
}
const leaveAnimation = (baseEl: any) => {
return enterAnimation(baseEl).direction('reverse');
}
/* const popover = await this.popoverController.create({
component: MessagesOptionsPage,
componentProps: {
roomId: this.dm._id,
},
cssClass: 'messages-options',
event: ev,
translucent: true,
});
return await popover.present(); */
const modal = await this.modalController.create({
enterAnimation,
leaveAnimation,
component: ChatOptionsPopoverPage,
cssClass: 'model profile-modal search-submodal',
componentProps: {
roomId: this.roomId,
}
});
return await modal.present();
}
}
src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { GroupContactsPage } from './group-contacts.page';
const routes: Routes = [
{
path: '',
component: GroupContactsPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class GroupContactsPageRoutingModule {}
src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { GroupContactsPageRoutingModule } from './group-contacts-routing.module';
import { GroupContactsPage } from './group-contacts.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
GroupContactsPageRoutingModule
],
declarations: [GroupContactsPage]
})
export class GroupContactsPageModule {}
src/app/shared/chat/new-group/group-contacts/group-contacts.page.html
+9
View File
@@ -0,0 +1,9 @@
<ion-header>
<ion-toolbar>
<ion-title>group-contacts</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
</ion-content>
src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss
View File
src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { GroupContactsPage } from './group-contacts.page';
describe('GroupContactsPage', () => {
let component: GroupContactsPage;
let fixture: ComponentFixture<GroupContactsPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ GroupContactsPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(GroupContactsPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts
+15
View File
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-group-contacts',
templateUrl: './group-contacts.page.html',
styleUrls: ['./group-contacts.page.scss'],
})
export class GroupContactsPage implements OnInit {
constructor() { }
ngOnInit() {
}
}
src/app/shared/chat/new-group/new-group-routing.module.ts
+4
View File
@@ -15,7 +15,11 @@ const routes: Routes = [
{
path: 'group-chat',
loadChildren: () => import('./group-chat/group-chat.module').then( m => m.GroupChatPageModule)
}, {
path: 'group-contacts',
loadChildren: () => import('./group-contacts/group-contacts.module').then( m => m.GroupContactsPageModule)
}
];
@NgModule({
src/app/shared/chat/new-group/new-group.page.html
+2 -5
View File
@@ -2,20 +2,17 @@
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<div class="left">
<ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
<div class="middle">
<ion-label class="title">Novo Grupo</ion-label>
</div>
<app-btn-seguinte *ngIf="groupName" (click)="addContacts()"></app-btn-seguinte>
<app-btn-criar *ngIf="groupName" (click)="createGroup()"></app-btn-criar> <!-- addContacts -->
</div>
</div>
</ion-toolbar>
</ion-header>
<ion-content>
<div class="main-content">
<div class="main-content width-100">
<div class="item-container">
<ion-input [(ngModel)]="groupName" placeholder="Título"></ion-input>
</div>
src/app/shared/chat/new-group/new-group.page.scss
+9 -7
View File
@@ -47,7 +47,7 @@ ion-content{
transform: translate3d(0, 1px, 0);
.title-content{
width: 360px;
//width: 360px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
@@ -63,7 +63,7 @@ ion-content{
padding: 0!important;
float: left;
width: 221px;
margin: 2.5px 0 0 5px;
//margin: 2.5px 0 0 5px;
}
.right{
padding: 0!important;
@@ -101,7 +101,7 @@ ion-content{
padding: 15px 20px 0 20px;
.item-container{
width: 360px;
//width: 360px;
margin: 15px auto;
border: 1px solid #ebebeb;
border-radius: 5px;
@@ -110,7 +110,7 @@ ion-content{
.item-container-no-border{
display: flex;
width: 360px;
//width: 360px;
margin: 25px auto;
border-radius: 5px;
align-items: center;
@@ -124,15 +124,16 @@ ion-content{
}
.container-div{
width: 100%;
margin-bottom: 15px;
overflow: auto;
.ion-item-class-2{
width: 360px;
width: 100%;
margin: 0px auto;
.ion-icon-class{
width: 45px;
width: 5%;
height: 45px;
float: left;
padding: 10px;
@@ -140,12 +141,13 @@ ion-content{
}
}
.ion-input-class{
width: 315px;
width: 93%;
height: 45px;
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 5px;
padding-right: 10px;
margin-left: 2%;
float: left;
}
}
src/app/shared/chat/new-group/new-group.page.ts
+22 -5
View File
@@ -1,6 +1,7 @@
import { analyzeAndValidateNgModules } from '@angular/compiler';
import { Component, OnInit } from '@angular/core';
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { ModalController, NavParams, PickerController, PopoverController } from '@ionic/angular';
import { ChatService } from 'src/app/services/chat.service';
import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page';
import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page';
@@ -15,17 +16,21 @@ export class NewGroupPage implements OnInit {
displayDuration: any;
showDuration: boolean;
selectedDuration = ['','',''];
groupName:string;
//groupName:string;
@Input() groupName:string;
@Output() addGroupMessage:EventEmitter<any> = new EventEmitter<any>();
constructor(
private pickerController: PickerController,
private popoverController: PopoverController,
private modalController: ModalController,
private navParams: NavParams,
private chatService: ChatService,
//private navParams: NavParams,
)
{
this.isGroupCreated = false;
this.groupName = this.navParams.get('name');
//this.groupName = this.navParams.get('name');
}
ngOnInit() {
@@ -35,7 +40,19 @@ export class NewGroupPage implements OnInit {
this.showDuration = event.detail.checked;
}
close(){
this.modalController.dismiss();
//this.modalController.dismiss();
console.log('close');
this.addGroupMessage.emit();
}
createGroup(){
let name = this.groupName.split(' ').join('-');
let body = { "name":name, }
this.chatService.addGroup(body).subscribe(res=>{
console.log('group created');
console.log(res['group']);
this.addGroupMessage.emit(res['group']._id);
});
}
async addContacts(){
src/app/shared/empty-container/empty-container-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { EmptyContainerPage } from './empty-container.page';
const routes: Routes = [
{
path: '',
component: EmptyContainerPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class EmptyContainerPageRoutingModule {}
src/app/shared/empty-container/empty-container.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { EmptyContainerPageRoutingModule } from './empty-container-routing.module';
import { EmptyContainerPage } from './empty-container.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
EmptyContainerPageRoutingModule
],
declarations: [EmptyContainerPage]
})
export class EmptyContainerPageModule {}
src/app/shared/empty-container/empty-container.page.html
+5
View File
@@ -0,0 +1,5 @@
<ion-content>
<div class="center height-100">
<p>{{texto}}</p>
</div>
</ion-content>
src/app/shared/empty-container/empty-container.page.scss
+5
View File
@@ -0,0 +1,5 @@
.center {
display: flex;
justify-content: center;
align-items: center;
}
src/app/shared/empty-container/empty-container.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { EmptyContainerPage } from './empty-container.page';
describe('EmptyContainerPage', () => {
let component: EmptyContainerPage;
let fixture: ComponentFixture<EmptyContainerPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ EmptyContainerPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(EmptyContainerPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/shared/empty-container/empty-container.page.ts
+16
View File
@@ -0,0 +1,16 @@
import { Component, Input, OnInit } from '@angular/core';
@Component({
selector: 'app-empty-container',
templateUrl: './empty-container.page.html',
styleUrls: ['./empty-container.page.scss'],
})
export class EmptyContainerPage implements OnInit {
@Input() texto:string;
constructor() { }
ngOnInit() {
}
}
src/app/shared/gabinete-digital/events-to-approve/events-to-approve-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { EventsToApprovePage } from './events-to-approve.page';
const routes: Routes = [
{
path: '',
component: EventsToApprovePage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class EventsToApprovePageRoutingModule {}
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { EventsToApprovePageRoutingModule } from './events-to-approve-routing.module';
import { EventsToApprovePage } from './events-to-approve.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
EventsToApprovePageRoutingModule
],
declarations: [EventsToApprovePage]
})
export class EventsToApprovePageModule {}
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+68
View File
@@ -0,0 +1,68 @@
<ion-content>
<div class="title width-100">
<label>Sim Eventos para Aprovação</label>
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
<ion-segment-button value="MDGPR">
Seu calendário
</ion-segment-button>
<ion-segment-button value="PR">
Presidente da República
</ion-segment-button>
</ion-segment>
</ion-toolbar>
</div>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div [ngSwitch]="segment">
<!-- <div class="header-content width-100"> -->
<!-- </div> -->
<ion-list class="width-100" *ngSwitchCase="'MDGPR'">
<div class="width-100" *ngIf="eventsMDGPRList">
<ion-list>
<ion-item-sliding>
<ion-item class="Rectangle width-100" lines="none"
*ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
<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>
</div>
<div class="approve-event-detail">
<p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
</div>
</div>
</ion-item>
</ion-item-sliding>
</ion-list>
</div>
</ion-list>
<ion-list *ngSwitchCase="'PR'">
<div *ngIf="eventsPRList">
<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="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
</div>
<div class="approve-event-detail">
<p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
</div>
</div>
</ion-item>
</ion-item-sliding>
</div>
</ion-list>
</div>
</ion-content>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+92
View File
@@ -0,0 +1,92 @@
:host{
padding: 30px 20px 0 20px !important;
margin: 0;
}
.title{
font-family: Roboto;
font-size: 25px;
color:#000;
overflow: auto;
}
ion-item-sliding{
margin-top: 5px;
}
.Rectangle {
//width: 360px;
border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
border: solid 1px #e9e9e9;
background-color: var(--white);
margin: 0 auto;
padding: 10px;
margin-bottom: 10px;
overflow: auto;
}
.content-mdgpr-Oficial{
border-radius: 5px;
border-right: 5px solid #99e47b;
overflow: auto;
}
.content-mdgpr-Pessoal{
border-radius: 5px;
border-right: 5px solid #958bfc;
overflow: auto;
}
.content-pr-Oficial{
border-radius: 5px;
border-right: 5px solid #ffb703;
overflow: auto;
}
.content-pr-Pessoal{
border-radius: 5px;
border-right: 5px solid #f05d5e;
overflow: auto;
}
.approve-event-time{
float: left;
}
.approve-event-time p{
width: 33px;
font-family: Roboto;
font-size: 13px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
color: var(--Antartic-grey);
margin: 0;
padding-bottom: 10px;
}
.approve-event-detail{
float: left;
margin-left: 10px;
}
.approve-event-detail p{
//width: 250px;
font-family: Roboto;
font-size: 13px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
color: var(--black);
margin: 0;
padding-bottom: 10px;
}
.approve-event-detail h3{
width: 250px;
font-family: Roboto;
font-size: 15px;
font-weight: bold;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
color: #0d89d1;
margin: 0;
padding: 0;
}
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { EventsToApprovePage } from './events-to-approve.page';
describe('EventsToApprovePage', () => {
let component: EventsToApprovePage;
let fixture: ComponentFixture<EventsToApprovePage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ EventsToApprovePage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(EventsToApprovePage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+100
View File
@@ -0,0 +1,100 @@
import { Component, Input, OnInit } from '@angular/core';
import { EventBody } from 'src/app/models/eventbody.model';
import { EventPerson } from 'src/app/models/eventperson.model';
import { Event } from 'src/app/models/event.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController, NavParams } from '@ionic/angular';
import { NavigationEnd, Router } from '@angular/router';
import { ApproveEventComponent } from '../../agenda/approve-event/approve-event.component';
@Component({
selector: 'app-events-to-approve',
templateUrl: './events-to-approve.page.html',
styleUrls: ['./events-to-approve.page.scss'],
})
export class EventsToApprovePage implements OnInit {
//segment:string;
showLoader: boolean;
eventsPRList: any;
eventsMDGPRList: any;
eventPerson: EventPerson;
eventBody: EventBody;
categories: string[];
serialnumber:string;
@Input() segment:string;
constructor(
private processes:ProcessesService,
private modalController: ModalController,
private router: Router,
//private navParams: NavParams,
) { }
S
ngOnInit() {
//this.segment = this.navParams.get('segment');
/* console.log(this.navParams.get('md')); */
console.log(this.segment);
this.LoadToApproveEvents();
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
this.LoadToApproveEvents();
}
});
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth <= 1024){
this.modalController.dismiss();
}
};
}
LoadToApproveEvents(){
this.showLoader = true;
this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
this.showLoader = false;
this.eventsPRList = res;
});
this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
this.showLoader = false;
this.eventsMDGPRList = res;
});
}
async openApproveModal(eventSerialNumber){
let classs;
if( window.innerWidth <= 1024){
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
const modal = await this.modalController.create({
component: ApproveEventComponent,
componentProps:{
serialNumber: eventSerialNumber,
showAside: true,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss();
}
doRefresh(event) {
this.LoadToApproveEvents();
console.log('refresh');
setTimeout(() => {
event.target.complete();
}, 2000);
}
close(){
this.modalController.dismiss(null);
}
}
src/app/shared/gabinete-digital/expediente/expediente.page.html
+201 -74
View File
@@ -2,110 +2,237 @@
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<app-btn-modal-dismiss (click)="openExpedientListPage()"></app-btn-modal-dismiss>
<div class="middle">
<ion-label class="title">Gabinete Digital</ion-label>
<ion-label class="title">Detalhes do Expediente</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>
</ion-toolbar>
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
<ion-segment-button value="expediente">
Expediente
</ion-segment-button>
<ion-segment-button value="pendentes">
Pendentes
</ion-segment-button>
</ion-segment>
</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-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<div [ngSwitch]="segment" *ngIf="taskslist">
<ion-list *ngSwitchCase="'expediente'">
<ion-item-group>
<ion-item-sliding>
<!-- <ion-item lines="none" *ngFor = "let task of taskslist" >
<div class="div-content-expediente">
<ion-item lines="none" [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]">
<ion-icon slot="end" name="calendar"></ion-icon>
<h3>{{ task.Folio }}</h3>
<ion-menu autoHide="false" side="end" content-id="main-content">
<ion-header>
<ion-toolbar translucent>
<ion-title>Menu</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<ion-list>
<ion-item (click)="openExpedientActionsModal('0',fulltask)">
<ion-icon name="documents" slot="start"></ion-icon>
<ion-label>Efectuar Despacho</ion-label>
</ion-item>
<p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p>
<p><span class="span-left">{{ task.Senders }}</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p>
</div>
</ion-item> -->
<ion-item (click)="openExpedientActionsModal('1',fulltask)">
<ion-icon name="arrow-undo" slot="start"></ion-icon>
<ion-label>Pedido de Parecer</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('2',fulltask)">
<ion-icon name="arrow-redo" slot="start"></ion-icon>
<ion-label>Pedido de Deferimento</ion-label>
</ion-item>
<ion-item (click)="openBookMeetingModal(task)">
<ion-icon name="calendar" slot="start"></ion-icon>
<ion-label>Marcar reunião</ion-label>
</ion-item>
<ion-item (click)="discartExpedient()">
<ion-icon name="trash" slot="start"></ion-icon>
<ion-label>Descartar</ion-label>
</ion-item>
<ion-item disabled>
<ion-icon name="paper-plane" slot="start"></ion-icon>
<ion-label>Enviar para pendentes</ion-label>
</ion-item>
</ion-list>
</ion-content>
</ion-menu>
<div class="ion-page" id="main-content">
<ion-menu-button></ion-menu-button>
</div>
<ion-item
class="expediente"
lines="none"
*ngFor = "let task of taskslist"
(click)="viewExpedientDetail(task.SerialNumber)"
>
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="Rectangle">
<div class="exp-top-detail">
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
<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="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label></label>
<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="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
<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-item-group>
</ion-list>
<ion-list *ngSwitchCase="'pendentes'">
<ion-item-group>
<ion-item-sliding>
</ion-item-sliding>
</ion-item-group>
</ion-list>
</div>
<div *ngIf="!taskslist">
</ion-list> -->
<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 *ngIf="!eventsList">
<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-thumbnail slot="end">
<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>
<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="end">
<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>
<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>
</div>
</ion-content>
src/app/shared/gabinete-digital/expediente/expediente.page.scss
+107 -109
View File
@@ -77,48 +77,53 @@
}
}
}
/* CONTENT */
.item-list-small{
font-size: 11px;
ion-item-group{
margin: 15px;
}
ion-button{
display: block;
width: 80%;
margin: 20px auto;
}
.h3-event-title{
padding: 15px 0 0px 25px;
font-weight: bold;
}
//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;
}
.ion-item-class{
padding: 0;
}
.label-text{
width: 100%;
padding: 0;
margin: 0;
}
//DIV
ion-item{
--background: none;
}
.div-content-expediente{
width: 100%;
float: left;
border-left: 3px solid #dae3f3;
padding:5px 5px 15px 5px;
margin: 10px 0 10px 0;
background: #dae3f3;
border-radius: 20px;
}
.div-content-pendentes{
width: 100%;
float: left;
border-left: 3px solid #d9d9d9;
padding: 5px;
}
.div-content-expediente h3, .div-content-pendentes h3{
.div-up h3{
margin: 0;
padding: 0;
font-size: 14pt;
font-size: 17px;
width: 100%;
}
.div-icon{
width: 10%;
font-size: 20px;
font-size: 22px;
float: left;
color: #808080;
}
@@ -127,101 +132,94 @@ ion-item{
margin: 0 auto;
}
.div-content-expediente p, .div-content-pendentes p{
.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{
width: 75%;
float: left;
margin-top: 0.5px;
}
.div-botton-middle p{
padding: 0;
margin: 0;
}
.span-left{
/* border: 1px solid red; */
.div-botton-right{
width: 10%;
float: left;
font-size: 12px;
padding-left: 18px;
margin: 0;
padding: 0;
}
.span-right{
/* border: 1px solid blue; */
text-align: right;
.ion-icon-attach{
color: #666666;
font-size: 20px;
}
/* TOGGLE BUTTON */
.switch {
position: relative;
display: inline-block;
width: 90px;
height: 34px;
float: right;
font-size: 12px;
padding-right: 18px;
}
/* New CSS */
.expediente{
padding-top: 10px;
}
.exp-list-item{
width: 368px;
overflow: auto;
/* border-bottom: 1px solid gray; */
margin: 10px auto;
}
.exp-top-detail{
width: 100%;
overflow: auto;
}
.exp-date{
width: auto;
font-family: Roboto;
font-size: 13px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
color: #797979;
float: left;
}
.exp-remetente{
width: 200px;
font-family: Roboto;
font-size: 13px;
font-weight: normal;
color: #000000;
float: left;
margin-left: 16px;
}
.exp-icon{
width: 45px;
float: right;
font-size: 13px;
}
.exp-icon ion-icon{
font-size: 25px;
color: #42b9fe;
}
.exp-bottom-detail{
width: 100px;
float: left;
font-family: Roboto;
font-size: 16px;
font-weight: 700;
color: #0d89d1;
}
.div-top-header{
margin:20px 20px 0 0;
}
.div-top-header{
width: 400px;
margin: 6px auto;
background-color: #0782c9;
overflow: auto;
}
.div-search{
}
.div-search{
font-size: 45px;
float: left;
margin: 0 0 0 10px
}
.div-logo{
}
.div-logo{
background: transparent;
width: 150px;
margin: 2.5px 0 2.5px 71px;
float: left;
}
.div-logo img{
}
.div-logo img{
width: 100%;
}
.div-profile{
}
.div-profile{
font-size: 45px;
float: right;
margin-right: 10px;
}
}
src/app/shared/gabinete-digital/expediente/expediente.page.ts
+130 -59
View File
@@ -1,13 +1,19 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { ProcessesService } from 'src/app/services/processes.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { DailyWorkTask } from 'src/app/models/dailyworktask.model';
import { ActivatedRoute, Router } from '@angular/router';
import { formatDate } from '@angular/common';
import { LoadingService } from 'src/app/services/loading.service';
import { ModalController, NavParams } from '@ionic/angular';
import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { MenuController, ModalController, NavParams } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { Event } from 'src/app/models/event.model';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
@Component({
selector: 'app-expediente',
@@ -16,78 +22,143 @@ import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/
})
export class ExpedientePage implements OnInit {
segment:string;
profile:string;
task: any;
fulltask: any;
eventsList: Event[];
//serialnumber: string;
//profile: string;
@ViewChild(CalendarComponent) myCal: CalendarComponent;
@Input() profile:string;
@Input() serialNumber:string;
@Output() openExpedientList:EventEmitter<any> = new EventEmitter<any>();
taskslist:DailyWorkTask[];
serialNumber:string;
constructor(
private processes:ProcessesService,
constructor(private activateRoute: ActivatedRoute,
private processes: ProcessesService,
private iab: InAppBrowser,
private attachments: AttachmentsService,
private events: EventsService,
private menu: MenuController,
private router: Router,
private modalController: ModalController,
) {
this.profile = 'mdgpr';
//private navParams: NavParams,
private alertService: AlertService) {
//this.serialnumber = this.navParams.get('serialNumber');
//this.profile = this.navParams.get('profile');
}
ngOnInit() {
//Inicializar segment
this.segment = "expediente";
this.LoadList();
this.profile = "mdgpr";
console.log(this.serialNumber);
this.activateRoute.paramMap.subscribe(paramMap => {
if (!paramMap.has('SerialNumber')) {
return;
}
/* this.serialnumber = paramMap.get('SerialNumber'); */
this.LoadTaskDetail(this.serialNumber);
this.LoadRelatedEvents(this.serialNumber);
});
this.LoadTaskDetail(this.serialNumber);
this.LoadRelatedEvents(this.serialNumber);
}
openExpedientListPage(){
this.openExpedientList.emit();
}
LoadList()
{
this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.taskslist = new Array();
result.forEach(element => {
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceFolio,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
this.task = {
"SerialNumber": res.serialNumber,
"Folio": res.workflowInstanceFolio,
"Senders": res.originator.email,
"CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'),
"DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
"Remetente": res.workflowInstanceDataFields.Sender,
}
this.taskslist.push(task);
});
this.fulltask = res;
console.log(res);
});
}
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
async LoadRelatedEvents(serial: string) {
if (this.eventsList == null) {
this.attachments.getAttachmentsBySerial(serial).subscribe(res => {
console.log(res);
res.forEach(att => {
if (this.eventsList == null) {
this.eventsList = new Array();
}
this.events.getEvent(att.ParentId).subscribe(event => {
this.eventsList.push(event);
console.log(this.eventsList);
});
});
});
}
}
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
let classs;
if( window.innerWidth <= 1024){
classs = 'modal'
} else {
classs = 'gabinete-digital-mobile-modal-to-Desktop'
viewDocument(){
const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
const browser = this.iab.create(url,"_parent");
browser.show();
}
openMenu() {
this.menu.open();
}
async openExpedientActionsModal(taskAction: any, task: any) {
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
component: ExpedientTaskModalPage,
componentProps: {
taskAction: taskAction,
task: task,
},
cssClass: classs,
cssClass: 'expedient-task-modal modal-desktop',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((res)=>{
});
modal.onDidDismiss();
}
}
discartExpedient() {
let body = { "serialNumber": this.serialNumber, "action": "Task Completed" }
console.log(body);
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/expediente']);
}
async openBookMeetingModal(task: any) {
const modal = await this.modalController.create({
component: BookMeetingModalPage,
componentProps: {
task: task,
},
cssClass: 'book-meeting-modal modal-desktop',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
}
async viewEventDetail(eventId: any) {
console.log(this.profile);
const modal = await this.modalController.create({
component: ViewEventPage,
componentProps: {
eventId: eventId,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((res) => {
if (res) {
}
});
}
}
src/app/shared/gabinete-digital/expedients/expedients-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { ExpedientsPage } from './expedients.page';
const routes: Routes = [
{
path: '',
component: ExpedientsPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class ExpedientsPageRoutingModule {}
src/app/shared/gabinete-digital/expedients/expedients.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { ExpedientsPageRoutingModule } from './expedients-routing.module';
import { ExpedientsPage } from './expedients.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ExpedientsPageRoutingModule
],
declarations: [ExpedientsPage]
})
export class ExpedientsPageModule {}
src/app/shared/gabinete-digital/expedients/expedients.page.html
+86
View File
@@ -0,0 +1,86 @@
<ion-header class="ion-no-border">
<div class="title">
<ion-label >Correspondência</ion-label>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
<ion-segment-button value="expediente">
Expediente
</ion-segment-button>
<ion-segment-button value="pendentes">
Pendentes
</ion-segment-button>
</ion-segment>
</ion-toolbar>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<div class="width-100" [ngSwitch]="segment" *ngIf="taskslist">
<ion-list *ngSwitchCase="'expediente'">
<ion-item
class="expediente ion-no-padding"
*ngFor = "let task of taskslist"
(click)="viewExpedientDetail(task.SerialNumber)"
>
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100">
<div class="exp-top-detail">
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
<div class="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label></label>
</div>
</div>
<div class="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
</div>
</div>
</ion-item>
</ion-list>
<ion-list *ngSwitchCase="'pendentes'">
<ion-item-group>
<ion-item-sliding>
</ion-item-sliding>
</ion-item-group>
</ion-list>
</div>
<div *ngIf="!taskslist">
<ion-list>
<ion-item>
<ion-thumbnail slot="end">
<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="end">
<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>
</ion-content>
src/app/shared/gabinete-digital/expedients/expedients.page.scss
+168
View File
@@ -0,0 +1,168 @@
@import '~src/function.scss';
/* CONTENT */
:host{
padding: 30px 20px 0 20px !important;
margin: 0;
}
.title{
font-family: Roboto;
font-size: 25px;
color:#000;
overflow: auto;
}
.item-list-small{
font-size: 11px;
overflow: auto;
}
.ion-item-class{
padding: 0;
}
.label-text{
width: 100%;
padding: 0;
margin: 0;
}
//DIV
ion-item{
--background: none;
}
.item {
//border-radius: 15px;
//box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
//Sborder: solid 1px #e9e9e9;
background-color: var(--white);
margin: 0 auto;
//padding: 10px;
margin-bottom: 10px;
overflow: auto;
}
.div-content-expediente{
width: 100%;
float: left;
border-left: 3px solid #dae3f3;
padding:5px 5px 15px 5px;
margin: 10px 0 10px 0;
background: #dae3f3;
border-radius: 20px;
}
.div-content-pendentes{
width: 100%;
float: left;
border-left: 3px solid #d9d9d9;
padding: 5px;
}
.div-content-expediente h3, .div-content-pendentes h3{
margin: 0;
padding: 0;
font-size: 14pt;
width: 100%;
}
.div-icon{
width: 10%;
font-size: 20px;
float: left;
color: #808080;
}
.div-icon ion-icon{
display: block;
margin: 0 auto;
}
.div-content-expediente p, .div-content-pendentes p{
font-size: 14pt;
color: rgb(94, 92, 92);
padding: 0;
margin: 0;
}
.span-left{
/* border: 1px solid red; */
float: left;
font-size: 12px;
padding-left: 18px;
}
.span-right{
/* border: 1px solid blue; */
text-align: right;
float: right;
font-size: 12px;
padding-right: 18px;
}
/* New CSS */
.expediente{
padding-top: 10px;
}
.exp-list-item{
//width: 368px;
overflow: auto;
/* border-bottom: 1px solid gray; */
margin: 10px auto;
}
.exp-top-detail{
width: 100%;
overflow: auto;
}
.exp-date{
width: auto;
font-family: Roboto;
font-size: 13px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
color: #797979;
float: left;
}
.exp-remetente{
//width: 200px;
font-family: Roboto;
font-size: 13px;
font-weight: normal;
color: #000000;
float: left;
margin-left: 16px;
}
.exp-icon{
width: 45px;
float: right;
font-size: 13px;
}
.exp-icon ion-icon{
font-size: 25px;
color: #42b9fe;
}
.exp-bottom-detail{
float: left;
font-family: Roboto;
font-size: 16px;
font-weight: 700;
color: #0d89d1;
}
.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;
}
src/app/shared/gabinete-digital/expedients/expedients.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { ExpedientsPage } from './expedients.page';
describe('ExpedientsPage', () => {
let component: ExpedientsPage;
let fixture: ComponentFixture<ExpedientsPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ ExpedientsPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(ExpedientsPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+100
View File
@@ -0,0 +1,100 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common';
import { LoadingService } from 'src/app/services/loading.service';
import { ModalController, NavParams } from '@ionic/angular';
import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
@Component({
selector: 'app-expedients',
templateUrl: './expedients.page.html',
styleUrls: ['./expedients.page.scss'],
})
export class ExpedientsPage implements OnInit {
segment:string;
//profile:string;
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
serialNumber:string;
@Input() profile:string;
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
constructor(
private processes:ProcessesService,
private modalController: ModalController,
) {
this.profile = 'mdgpr';
}
ngOnInit() {
//Inicializar segment
this.segment = "expediente";
this.LoadList();
}
openExpedientDetailPage(data){
console.log(data);
this.openExpedientDetail.emit(data);
}
LoadList()
{
this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.taskslist = new Array();
result.forEach(element => {
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceFolio,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente
}
this.taskslist.push(task);
});
});
}
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
}
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
let classs;
if( window.innerWidth <= 1024){
classs = 'modal'
} else {
classs = 'gabinete-digital-mobile-modal-to-Desktop'
}
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
});
await modal.present();
modal.onDidDismiss().then((res)=>{
});
}
}
src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+15 -3
View File
@@ -1,5 +1,17 @@
<ion-content>
<ion-row>
<ion-content class="container">
<div class="arrow-right">
<ion-icon (click)="close()" slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
</div>
<div class="buttons">
<button full class="btn-ok" shape="round" >Tirar Fotografia</button>
<button class="btn-ok" shape="round" >Digitalizar Documento</button>
<button full class="btn-ok" shape="round" >Anexar Fotografia</button>
<button class="btn-ok" shape="round" >Anexar Documento</button>
<div class="solid"></div>
<button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
</div>
<!-- <ion-row>
<ion-col>
<button full class="btn-ok" shape="round" >Tirar Fotografia</button>
</ion-col>
@@ -19,5 +31,5 @@
</ion-col>
<ion-col>
</ion-col>
</ion-row>
</ion-row> -->
</ion-content>
src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss
+45 -30
View File
@@ -1,32 +1,47 @@
ion-row{
padding: 10px 10px 5px 10px;
}
.border-top{
padding-top: 5px !important;
border-top: 1px solid #ebebeb;
}
/* ion-col{
border: 1px solid red;
} */
.btn-cancel{
display: block;
width: 170px !important;
height: 45px !important;
border-radius: 22.5px;
background-color: #e0e9ee;
--color: #061b52 !important;
--background:transparent;
--box-shadow: none;
margin: 0 auto !important;
.container{
--padding-top:20px !important;
--padding-bottom:20px !important;
--padding-start:20px !important;
--padding-end:20px !important;
}
.arrow-right{
display: none;
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{
margin-bottom: 10px !important;
}
}
.solid {
display: none;
width: 90%;
border-top: 1px solid #bbb;
margin: 0 auto !important;
margin-bottom: 10px;
}
@media only screen and (min-width: 1024px) {
.arrow-right{
display: flex;
justify-content: flex-end;
}
.btn-cancel{
display: none;
}
.btn-ok{
width: 100% !important;
}
.mobile-only{
display: none !important;
}
.btn-ok{
display: block;
width: 170px !important;
height: 45px !important;
border-radius: 22.5px;
--background: #42b9fe;
--color: #ffffff !important;
margin: 0 auto !important;
}
src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
+8 -2
View File
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { PopoverController } from '@ionic/angular';
import { ModalController, PopoverController } from '@ionic/angular';
@Component({
selector: 'app-chat-options-popover',
@@ -9,14 +9,20 @@ import { PopoverController } from '@ionic/angular';
export class ChatOptionsPopoverPage implements OnInit {
constructor(
private popoverController: PopoverController
private popoverController: PopoverController,
private modalController: ModalController,
) { }
ngOnInit() {
}
close(){
if( window.innerWidth <= 1024){
this.popoverController.dismiss();
}
else{
this.modalController.dismiss();
}
}
}
src/app/shared/popover/chat-popover/chat-popover.page.html
+8 -14
View File
@@ -1,18 +1,12 @@
<ion-content>
<ion-row>
<ion-col>
<ion-content class="container">
<div class="arrow-right">
<ion-icon (click)="close()" slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
</div>
<div class="buttons">
<button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
</ion-col>
<ion-col>
<button (click)="openChangeGroupName()" class="btn-ok" shape="round" >Alterar nome do grupo</button>
</ion-col>
</ion-row>
<ion-row class="border-top">
<ion-col>
<button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
</ion-col>
<ion-col>
<div class="solid"></div>
<button (click)="close()" full class="btn-cancel mobile-only" shape="round" >Cancelar</button>
<button (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
</ion-col>
</ion-row>
</div>
</ion-content>
src/app/shared/popover/chat-popover/chat-popover.page.scss
+51 -13
View File
@@ -1,15 +1,53 @@
ion-row{
padding: 10px 10px 5px 10px;
.container{
--padding-top:20px !important;
--padding-bottom:20px !important;
--padding-start:20px !important;
--padding-end:20px !important;
}
.border-top{
padding-top: 5px !important;
border-top: 1px solid #ebebeb;
.arrow-right{
display: none;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
font-size: 35px;
overflow: hidden;
}
}
.buttons{
display: flex;
flex-wrap: wrap;
justify-content: space-around;
}
.solid {
display: none;
width: 90%;
border-top: 1px solid #bbb;
margin: 0 auto !important;
}
@media only screen and (min-width: 1024px) {
.arrow-right{
display: flex;
justify-content: flex-end;
}
.btn-cancel{
//display: none;
width: 100% !important;
margin-bottom: 10px !important;
}
.btn-ok{
width: 100% !important;
margin-bottom: 10px !important;
}
.btn-delete{
width: 100% !important;
margin-bottom: 10px !important;
margin-top: 10px !important;
}
.solid{
display: block;
}
.mobile-only{
display: none !important;
}
}
/* ion-col{
border: 1px solid red;
} */
/* .btn-ok, .btn-cancel, .btn-delete{
font-size: 13px;
padding:0 !important;
} */
src/app/shared/popover/chat-popover/chat-popover.page.ts
+5
View File
@@ -25,8 +25,13 @@ export class ChatPopoverPage implements OnInit {
}
close(){
if( window.innerWidth <= 1024){
this.popoverController.dismiss();
}
else{
this.modalController.dismiss();
}
}
//Top menu options
//Close
src/app/shared/popover/messages-options/messages-options.page.html
+7 -7
View File
@@ -1,10 +1,10 @@
<ion-content>
<ion-row class="border-top">
<ion-col>
<ion-content class="container">
<div class="arrow-right">
<ion-icon slot="end" class="arrow-right-icon" (click)="close()" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
</div>
<div class="buttons">
<button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
</ion-col>
<ion-col>
<div class="solid"></div>
<button (click)="closeChatRoom()" full class="btn-delete" shape="round" >Apagar conversa</button>
</ion-col>
</ion-row>
</div>
</ion-content>
src/app/shared/popover/messages-options/messages-options.page.scss
+45 -2
View File
@@ -1,3 +1,46 @@
ion-row{
padding: 10px 10px 5px 10px;
.container{
--padding-top:20px !important;
--padding-bottom:20px !important;
--padding-start:20px !important;
--padding-end:20px !important;
}
.arrow-right{
display: none;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
font-size: 35px;
overflow: hidden;
}
}
.buttons{
display: flex;
flex-wrap: wrap;
justify-content: space-around;
}
.solid {
display: none;
width: 90%;
border-top: 1px solid #bbb;
margin: 0 auto !important;
}
@media only screen and (min-width: 1024px) {
.arrow-right{
display: flex;
justify-content: flex-end;
}
.btn-cancel{
display: none;
width: 100% !important;
margin-bottom: 10px !important;
}
.btn-delete{
width: 100% !important;
margin-bottom: 10px !important;
margin-top: 10px !important;
}
/* .solid{
display: block;
} */
}
src/app/shared/popover/messages-options/messages-options.page.ts
+7 -1
View File
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { NavParams, PopoverController } from '@ionic/angular';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { ChatService } from 'src/app/services/chat.service';
@Component({
@@ -13,6 +13,7 @@ export class MessagesOptionsPage implements OnInit {
constructor(
private popoverController: PopoverController,
private modalController: ModalController,
private chatService: ChatService,
private navParams: NavParams,
)
@@ -24,8 +25,13 @@ export class MessagesOptionsPage implements OnInit {
}
close(){
if( window.innerWidth <= 1024){
this.popoverController.dismiss();
}
else{
this.modalController.dismiss();
}
}
closeChatRoom(){
let body = { "roomId": this.roomId }
src/app/shared/shared.module.ts
+9
View File
@@ -8,6 +8,9 @@ import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page';
import { BtnModalDismissPage } from './btn-modal-dismiss/btn-modal-dismiss.page';
import { ChatPopoverPage } from './popover/chat-popover/chat-popover.page';
import { HeaderNoSearchPage } from './headers/header-no-search/header-no-search.page';
import { EmptyChatPage } from './chat/empty-chat/empty-chat.page';
import { BtnCriarPage } from './buttons/btn-criar/btn-criar.page';
import { BtnAdicionarPage } from './buttons/btn-adicionar/btn-adicionar.page';
@NgModule({
imports: [
@@ -21,6 +24,9 @@ import { HeaderNoSearchPage } from './headers/header-no-search/header-no-search.
HeaderNoSearchPage,
BtnSeguintePage,
BtnModalDismissPage,
EmptyChatPage,
BtnCriarPage,
BtnAdicionarPage,
],
entryComponents:[],
declarations: [
@@ -29,6 +35,9 @@ import { HeaderNoSearchPage } from './headers/header-no-search/header-no-search.
HeaderNoSearchPage,
BtnSeguintePage,
BtnModalDismissPage,
EmptyChatPage,
BtnCriarPage,
BtnAdicionarPage,
]
})
export class SharedModule {}
src/assets/icon/icons-arrow-arrow-left.svg
+11
View File
@@ -0,0 +1,11 @@
<svg xmlns="http://www.w3.org/2000/svg" width="36" height="35" viewBox="0 0 36 35">
<g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g stroke="#42B9FE" stroke-width="2">
<g>
<g>
<path d="M22.629 9L13.371 18 22.629 27" transform="translate(-20 -124) translate(0 99) translate(20 25)"/>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 447 B

src/assets/images/icons-arrow-arrow-right.svg
+9
View File
@@ -0,0 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" width="36" height="35" viewBox="0 0 36 35">
<g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g stroke="#42B9FE" stroke-width="2">
<g>
<path d="M22.629 9L13.371 18 22.629 27" transform="translate(-968 -20) matrix(-1 0 0 1 1004 20)"/>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 394 B

src/global.scss
+38 -1
View File
@@ -290,6 +290,43 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
height: 100%;
}
}
.hideAsideOptions{
@media only screen and (min-width: 1140px) {
.div-icon{
display: none;
}
.content{
width: 100%;
border-right: 1px solid #d8d8d8;
}
.aside-right{
display: none;
}
}
/* .aside-right{
display: none;
width: 0;
}
.content{
width: 100%;
} */
}
.showAsideOptions{
@media only screen and (min-width: 1140px) {
.div-icon{
display: none;
}
.content{
width: 75%;
border-right: 1px solid #d8d8d8;
}
.aside-right{
width: 25%;
}
}
}
.modal-width-100{
.modal-wrapper{
@@ -364,7 +401,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
@media only screen and (min-width: 1024px) {
.gabinete-digital-mobile-modal-to-Desktop{
top: 75px;
//top: 75px;
left: 40%;
.modal-wrapper{
src/theme/variables.scss
+2 -2
View File
@@ -44,6 +44,7 @@
--ion-color-warning-tint: #ffca22;
/** danger **/
--ion-color-red:#d30a0a;
--ion-color-danger: #eb445a;
--ion-color-danger-rgb: 235, 68, 90;
--ion-color-danger-contrast: #ffffff;
@@ -264,7 +265,7 @@
background: rgba(51, 51, 51, 0.3);
}
.modal, .newchat, .new-group, .contacts, .group-messages, .custom-modal{
padding-top: 93px;
padding-top: 75px;
--border-radius: 25px 25px 0 0;
--border-width:0px;
}
@@ -312,7 +313,6 @@
/* .event-actions-popover ion-list{
} */
.Rectangle {
width: 360px;
border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
border: solid 1px #e9e9e9;