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

Merge branch 'developer' into developer_mobilefirst

Browse Source
This commit is contained in:
Eudes Inácio
2021-06-23 09:21:26 +01:00
parent a6dbd09473 c8ab514b10
commit 0d6aaa985f
67 changed files with 433 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home-routing.module.ts
+27 -4
View File
@@ -102,6 +102,24 @@ const routes: Routes = [
path: 'view-event',
loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule)
},
{
path:'event-list',
children: [
{
path:'',
loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
},
{
path:'approve-event',
children : [
{
path:':serialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
},
]
}
]
},
]
},
{
@@ -144,10 +162,15 @@ const routes: Routes = [
loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
},
{
path:':serialNumber',
loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
},
]
path:'approve-event',
children : [
{
path:':serialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
},
]
}
]
},
{
path: 'events-to-approve',
src/app/modals/create-process/create-process.page.html
+4 -4
View File
@@ -25,7 +25,7 @@
<div class="container-div width-100">
<div class="ion-item-class-2 width-100">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
<ion-icon class="icon-time" slot="start" name="time-outline"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select placeholder="Prazo" [(ngModel)]="postData.Priority" interface="action-sheet" Cancel-text="Cancelar" required>
@@ -40,7 +40,7 @@
<div class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-item class="ion-no-border ion-no-padding ion-no-margin">
@@ -65,7 +65,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -86,7 +86,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Com conhecimento</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Com conhecimento</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/modals/create-process/create-process.page.scss
+3
View File
@@ -186,3 +186,6 @@ text-align: right;
float: right;
font-size: 13px;
}
.icon-time{
color: #797979b0;
}
src/app/modals/create-process/create-process.page.ts
+67 -27
View File
@@ -116,16 +116,16 @@ export class CreateProcessPage implements OnInit {
}
ngOnInit() {
this.getSubjectType();
setTimeout(() => {
this.selectedTypes = ['99999850'];
}, 500);
console.log(this.postData.DispatchFolder.SubjectTypes);
this.taskDate = new Date(this.task.taskStartDate);
this.getSubjectType();
if(this.selectedTypes.length > 1){
console.log('Yes');
}
}
onSelectedTypesChanged(ev:any){
console.log(ev);
if(ev.length > 1){
@@ -200,7 +200,7 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.postDespatcho(this.postData).toPromise();
this.FinalizarDespacho();
this.FinalizarDespacho('Despacho criado');
} catch (error) {
this.toastService.badRequest('Processo não efectuado');
}
@@ -219,8 +219,7 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.postParecer(this.postData).toPromise();
this.FinalizarParecer('Pedido de Parecer criado');
this.FinalizarParecer('Pedido de Parecer enviado');
}
catch (error) {
this.toastService.badRequest('Processo não efectuado');
@@ -240,7 +239,7 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.postDeferimento(this.postData).toPromise();
this.executado('Pedido de Deferimento criado');
this.FinalizarDeferimento('Pedido de deferimento enviado');
}
catch (error) {
this.toastService.badRequest('Processo não efectuado');
@@ -357,17 +356,18 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
this.toastService.successMessage('');
this.toastService.successMessage(message);
} catch (error) {
this.toastService.badRequest('Processo não efectuado');
}
}
async FinalizarDespacho() {
async FinalizarDespacho(message?) {
let body;
if(this.task.activityInstanceName =='Tarefa de Despacho' || this.task.activityInstanceName =='Reexecutar Despacho') {
if(this.task.activityInstanceName =='Tarefa de Despacho' ||
this.task.activityInstanceName =='Reexecutar Despacho') {
body = {
"serialNumber": this.task.serialNumber,
@@ -379,7 +379,11 @@ export class CreateProcessPage implements OnInit {
"AttachmentList" :null,
}
}
else if(this.task.activityInstanceName =='Concluir Despacho' || this.task.activityInstanceName == 'Concluir Parecer') {
else if(this.task.activityInstanceName =='Concluir Despacho' ||
this.task.activityInstanceName == 'Concluir Parecer' ||
this.task.activityInstanceName =='Concluir Deferimento' ||
this.task.activityInstanceName =='Reapreciar Deferimento'
) {
body = {
"serialNumber": this.task.serialNumber,
@@ -390,12 +394,12 @@ export class CreateProcessPage implements OnInit {
},
"AttachmentList" :null,
}
}
console.log(body);
try {
await this.processes.CompleteTask(body).toPromise();
this.toastService.successMessage('');
this.toastService.successMessage(message);
} catch (error) {
this.toastService.badRequest('Processo não efectuado');
}
@@ -403,16 +407,32 @@ export class CreateProcessPage implements OnInit {
}
async FinalizarParecer(message?) {
let body = {
"serialNumber": this.task.serialNumber,
"action": "Parecer",
"ActionTypeId": 96,
"dataFields": {
"ReviewUserComment": '',
},
"AttachmentList" :null,
}
let body;
if(this.task.activityInstanceName =='Concluir Deferimento' ||
this.task.activityInstanceName =='Reapreciar Deferimento'
){
body = {
"serialNumber": this.task.serialNumber,
"action": "Parecer",
"ActionTypeId": 92,
"dataFields": {
"ReviewUserComment": message,
},
"AttachmentList" :null,
}
}
else{
body = {
"serialNumber": this.task.serialNumber,
"action": "Parecer",
"ActionTypeId": 96,
"dataFields": {
"ReviewUserComment": message,
},
"AttachmentList" :null,
}
}
try {
await this.processes.CompleteTask(body).toPromise();
@@ -422,6 +442,26 @@ export class CreateProcessPage implements OnInit {
}
}
async FinalizarDeferimento(message?){
if(this.task.activityInstanceName =='Reapreciar Deferimento'){
let body = {
"serialNumber": this.task.serialNumber,
"action": "Parecer",
"ActionTypeId": 92,
"dataFields": {
"ReviewUserComment": '',
},
"AttachmentList" :null,
}
try {
await this.processes.CompleteTask(body).toPromise();
this.toastService.successMessage(message)
} catch (e) {
this.toastService.badRequest()
}
}
}
async addParticipants() {
src/app/modals/delegar/delegar.page.html
+1 -1
View File
@@ -18,7 +18,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/modals/forward/forward.page.html
+1 -1
View File
@@ -18,7 +18,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/models/event.model.ts
+1 -1
View File
@@ -32,7 +32,7 @@ export class EventToApproveEdit {
"StartDate": "2021-05-12T10:30:00"
"EndDate": "2021-05-12T11:30:00"
"Private": false
"ReviewUserComments": ""
"ReviewUserComment": ""
"MDName": "Paulo Pinto"
"MDEmail": "paulo.pinto@gabinetedigital.local"
"Agenda": "Oficial" | "Pessoal"
src/app/pages/agenda/agenda.page.ts
+2 -11
View File
@@ -1176,17 +1176,8 @@ export class AgendaPage implements OnInit {
async viewEventsToApprove(){
await this.cloneAllmobileComponent()
if( window.innerWidth <= 1024){
const modal = await this.modalCtrl.create({
component: EventListPage,
componentProps:{
profile: this.profile,
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
if( window.innerWidth <= 801){
this.router.navigate(['/home/agenda/event-list']);
} else {
// hide all components
this.cloneAllmobileComponent();
src/app/pages/agenda/edit-event/edit-event.page.html
+2 -2
View File
@@ -144,7 +144,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -165,7 +165,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+2 -3
View File
@@ -70,7 +70,7 @@ export class EventActionsPopoverPage implements OnInit {
}
async emendarTask() {
console.log('Mobile');
this.closePopover();
const modal = await this.modalController.create({
component: EmendMessageModalPage,
@@ -122,8 +122,7 @@ export class EventActionsPopoverPage implements OnInit {
}
async editTask() {
console.log(this.serialNumber);
console.log(this.instanceId);
this.closePopover();
const modal = await this.modalController.create({
component: EditEventToApproveComponent,
componentProps: {
src/app/pages/agenda/new-event/new-event.page.html
+2 -2
View File
@@ -54,7 +54,7 @@
<div class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select placeholder="Selecione tipo"
@@ -135,7 +135,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar interveniente</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar interveniente</ion-label>
<div class="list-people">
<ion-item lines="none">
<ion-list>
src/app/pages/agenda/new-event/new-event.page.scss
+3
View File
@@ -210,4 +210,7 @@ ion-content{
.close-button {
display: block !important;
}
}
.icon-time{
color: #797979b0;
}
src/app/pages/agenda/new-event/new-event.page.ts
+1 -1
View File
@@ -76,7 +76,7 @@ export class NewEventPage implements OnInit {
Body: this.eventBody,
Location: '',
CalendarId: '',
CalendarName: this.selectedSegment,
CalendarName: '',
StartDate: selectedStartdDate,
EndDate: new Date(selectedEndDate),
EventType: 'Reunião',
src/app/pages/events/attendees/attendees.page.html
+3 -3
View File
@@ -1,6 +1,6 @@
<ion-header class="ion-no-border px-20">
<ion-toolbar class="px-10">
<ion-title class="pa-0">Adicionar intervenientes - A.M.</ion-title>
<ion-title class="pa-0">Adicionar intervenientes</ion-title>
</ion-toolbar>
<ion-searchbar class="attendee-search-bar" (ionChange)="onChange($event)" placeholder="Insira email para adicionar destinatário"></ion-searchbar><!-- [(ngModel)]="searchCountryString" -->
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
@@ -30,7 +30,7 @@
</ion-list>
<hr/>
<ion-list lines="none" *ngIf="taskParticipants.length >= 1 && adding == 'intervenient' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
<ion-list lines="none" *ngIf="taskParticipants?.length >= 1 && adding == 'intervenient' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
<div class="px-20 font-15 pt-20" style="border-top:1px solid #ebebeb;font-weight: 500;" *ngIf="taskParticipants.length >= 1 || taskParticipantsCc.length >= 1" > Destinatário</div>
<ion-item-sliding class="px-20">
<ion-item lines="none" *ngFor="let attendee of taskParticipants;" class="d-flex">
@@ -47,7 +47,7 @@
</ion-item>
</ion-item-sliding>
</ion-list>
<ion-list lines="none" *ngIf="taskParticipantsCc.length >= 1 && adding == 'CC' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
<ion-list lines="none" *ngIf="taskParticipantsCc?.length >= 1 && adding == 'CC' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
<div class="px-20 font-15 pt-20" style="border-top:1px solid #ebebeb;font-weight: 500;" *ngIf="taskParticipants.length >= 1 || taskParticipantsCc.length >= 1" > Destinatário</div>
<ion-item-sliding class="px-20">
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
-35
View File
@@ -1,41 +1,6 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<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>
<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 hidden 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 d-none" id="main-content">
<ion-menu-button></ion-menu-button>
</div>
<ion-content>
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+2 -2
View File
@@ -6,10 +6,10 @@
<div class="main-header">
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
<div class="thetitle">
<ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais !!</ion-label>
<ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
<ion-label *ngIf="loggeduser.Profile =='PR'" >Despachos</ion-label>
</div>
<div class="theicon">
<div class="theicon btn-refresh">
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+1 -4
View File
@@ -162,10 +162,7 @@ export class DespachosPrPage implements OnInit {
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
event.target.complete();
}
async viewExpedientDetail(serialNumber:any) {
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+2 -5
View File
@@ -7,17 +7,14 @@
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content d-flex justify-space-between align-center">
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<div class=" btn-dismiss font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
<div class="middle d-flex align-center flex-grow-1">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon" (click)="openOptions()">
<!-- <ion-menu-button autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button> -->
<ion-icon class="font-25 cursor-pointer" name="ellipsis-vertical-outline"></ion-icon>
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
</div>
</div>
</div>
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+21 -64
View File
@@ -17,73 +17,31 @@
font-size: 18px !important;
}
.main-header{
display: flex;
font-family: Roboto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background-color: #fff;
overflow:auto;
color:#000;
transform: translate3d(0, 1px, 0);
.header-top{
margin: 0px auto;
.title-content{
display: flex;
justify-content: start !important;
align-items: flex-start !important;
border-radius: 0 !important;
}
.title{
width: fit-content;
height: auto;
font-size: 25px;
overflow: auto;
padding: 0 !important;
background: #fff;
.middle{
padding: 0!important;
float: left;
width: 280px;
margin: 2.5px 0 0 5px;
display: flex;
align-items: center;
}
.right{
padding: 0!important;
float: right;
font-size: 25px;
color: #0782c9;
margin: 5px 0 0 0;
}
}
.header-bottom{
width: 310px;
overflow: auto;
margin: 0 auto;
.header-bottom-icon{
width: 30px;
font-size: 25px;
float: left;
padding: 2px;
}
.header-bottom-contacts{
width: 275px;
font-size: 15px;
color: #797979;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
float: left;
padding: 5px;
margin: 1px;
}
}
.title{
font-size: 25px;
overflow: auto;
float: left;
padding-top: 4px;
padding-left: 5px;
}
.div-icon{
width: 40px;
float: right;
font-size: 35px;
overflow: auto;
padding: 1px;
}
float: left;
padding-left: 5px;
}
.div-icon{
width: 40px !important;
font-size: 35px !important;
text-align: start !important;
padding: 1px;
}
}
ion-item-group{
margin: 15px;
@@ -94,11 +52,10 @@ ion-button{
margin: 20px auto;
}
.upper-content{
font-family: Roboto;
margin-top: 15px;
margin-left: 41px;
overflow: auto;
font-size: 18px;
.label{
src/app/pages/gabinete-digital/despachos/despachos.page.html
+2 -2
View File
@@ -8,7 +8,7 @@
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
<div class="thetitle"><ion-label >Despachos</ion-label></div>
<div class="theicon">
<div class="theicon btn-refresh">
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
@@ -65,7 +65,7 @@
</div>
</div>
<div *ngIf="despachoList.length < 1">
<div *ngIf="despachoList?.length < 1">
<ion-list>
<ion-item>
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+3 -3
View File
@@ -6,8 +6,8 @@
<ion-header class="ion-no-border header-2">
<div class="title">
<div class="thetitle"><ion-label >Diplomas</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh()">
<div class="theicon btn-refresh">
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
@@ -18,7 +18,7 @@
<div class="main-content">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+2 -2
View File
@@ -43,10 +43,10 @@ export class DiplomasAssinarPage implements OnInit {
this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras);
}
doRefresh() {
doRefresh(event) {
this.LoadList();
setTimeout(() => {
//event.target.complete();
event.target.complete();
}, 2000);
}
src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+1 -1
View File
@@ -7,7 +7,7 @@
<div class="title">
<app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
<div class="thetitle"><ion-label >Diplomas</ion-label></div>
<div class="theicon">
<div class="theicon btn-refresh">
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+1 -1
View File
@@ -199,7 +199,7 @@ constructor(
doRefresh(event) {
this.LoadList();
setTimeout(() => {
//event.target.complete();
event.target.complete();
}, 2000);
}
src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
+5 -9
View File
@@ -12,13 +12,9 @@
</div>
</ion-content>
<ion-footer>
<ion-toolbar class="width-100 d-flex justify-space-between px-20">
<ion-buttons slot="start">
<button class="btn-delete" shape="round" (click)="save()">Sim</button>
</ion-buttons>
<ion-title></ion-title>
<ion-buttons slot="end">
<button class="btn-ok" shape="round" (click)="close()">Não</button>
</ion-buttons>
</ion-toolbar>
<div class="buttons width-100">
<button class="btn-ok-medium" shape="round" (click)="close()">Não</button>
<button class="btn-delete-medium" shape="round" (click)="save()">Sim</button>
</div>
</ion-footer>
src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss
+3 -19
View File
@@ -20,23 +20,7 @@ ion-content{
}
.buttons{
width: 100%;
margin: 0 auto;
padding: 5px 0 5px 0;
display: flex;
justify-content: space-between;
padding: 15px 0 15px 0;
}
.button-reject {
width: 130px;
height: 44px;
--color: #d30a0a;
border-radius: 22.5px;
--background: #ffe0e0;
margin: 0 12px 0 0px;
}
.button-approve {
width: 130px;
height: 44px;
border-radius: 22.5px;
--background: #42b9fe;
margin: 0 0px 0 12px;
}
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+18 -4
View File
@@ -31,6 +31,7 @@ export class ApproveEventPage implements OnInit {
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
serialNumber:string;
caller:string;
@Input() InstanceId:string;
@Output() approveEventDismiss = new EventEmitter<any>();
@@ -51,27 +52,40 @@ export class ApproveEventPage implements OnInit {
private toastService: ToastService,
) {
this.activatedRoute.queryParams.subscribe(params => {
this.activatedRoute.paramMap.subscribe(params => {
console.log(params["params"]);
if(params["params"].serialNumber) {
this.serialNumber = params["params"].serialNumber;
}
if(params["params"].caller){
this.caller = params["params"].caller;
}
});
/* this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialNumber = params["serialNumber"];
console.log(params["serialNumber"]);
}
});
}); */
}
ngOnInit() {
console.log(this.serialNumber);
console.log(this.caller);
this.getTask();
}
goBack() {
let navigationExtras: NavigationExtras = {
queryParams: {
"eventos": true,
}
};
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/event-list']);
this.router.navigate(['/home',this.caller, 'event-list']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
src/app/pages/gabinete-digital/event-list/event-list.page.html
+1 -3
View File
@@ -2,7 +2,7 @@
<app-header></app-header>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
<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>
@@ -32,7 +32,6 @@
<ion-list *ngSwitchCase="'MDGPR'">
<div *ngIf="eventsMDGPRList">
<ion-list>
<ion-item-sliding>
<ion-item class="Rectangle cursor-pointer" lines="none"
*ngFor="let event of eventsMDGPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
@@ -50,7 +49,6 @@
</div>
</ion-item>
</ion-item-sliding>
</ion-list>
</div>
</ion-list>
<ion-list *ngSwitchCase="'PR'">
src/app/pages/gabinete-digital/event-list/event-list.page.scss
+1 -1
View File
@@ -29,7 +29,7 @@
float: left;
}
ion-item-sliding{
margin-top: 5px;
margin-top: 10px;
}
.Rectangle {
//width: 360px;
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+23 -7
View File
@@ -5,7 +5,7 @@ import { Event } from 'src/app/models/event.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular';
import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
@Component({
selector: 'app-event-list',
@@ -28,6 +28,7 @@ export class EventListPage implements OnInit {
private processes:ProcessesService,
private modalController: ModalController,
private router: Router,
private activatedRoute: ActivatedRoute,
) { }
ngOnInit() {
@@ -76,25 +77,40 @@ export class EventListPage implements OnInit {
}
goToEventToApproveDetail(serialNumber:string){
let navigationExtras: NavigationExtras = {
console.log(serialNumber);
/* let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
}; */
if(this.router.url == '/home/agenda/event-list'){
this.router.navigate(['/home/agenda/event-list/approve-event',serialNumber, 'agenda'])
}
else if(this.router.url == '/home/gabinete-digital/event-list'){
this.router.navigate(['/home/gabinete-digital/event-list/approve-event',serialNumber, 'gabinete-digital'])
}
//this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
}
doRefresh() {
doRefresh(event) {
this.LoadToApproveEvents();
console.log('refresh');
setTimeout(() => {
event.target.complete();
}, 2000);
}
close(){
this.modalController.dismiss(null);
}
goBack(){
this.router.navigate(['/home/gabinete-digital']);
if(this.router.url == '/home/agenda/event-list'){
this.router.navigate(['/home/agenda']);
}
else if(this.router.url == '/home/gabinete-digital/event-list'){
this.router.navigate(['/home/gabinete-digital']);
}
}
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+9 -4
View File
@@ -2,12 +2,12 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column width-100 height-100 ">
<div class="header-content">
<div class="header-content header-default-padding">
<div class="header-title">
<label>Convocar Reunião</label>
</div>
</div>
<div class="overflow-y-auto">
<div class="overflow-y-auto content-default-padding">
<div class="ion-item-container width-100">
<ion-input placeholder="Assunto" [(ngModel)]="postData.Subject"></ion-input>
@@ -111,7 +111,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -132,7 +132,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Com conhecimento</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Com conhecimento</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -188,6 +188,11 @@
</div>
<div class="aside-righ flex-grow-1">
<app-empty-container
[texto]="emptyTextDescription"
*ngIf="!showAttendees"
class="d-flex height-100 flex-column">
</app-empty-container>
<app-attendee-modal class=" d-flex flex-column height-100"
*ngIf="showAttendees"
[footer]="false"
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
-1
View File
@@ -1,5 +1,4 @@
.content{
padding: 30px 20px 0 20px !important;
margin: 0;
float: left;
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+22 -4
View File
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { AnimationController, ModalController, NavParams } from '@ionic/angular';
import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-participants-cc-modal.page';
import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page';
@@ -29,7 +29,7 @@ export class BookMeetingModalPage implements OnInit {
task: any;
taskParticipants: EventPerson[] = [];
taskParticipants: EventPerson[];
taskParticipantsCc: EventPerson[] = [];
taskDocId:string;
@@ -45,6 +45,7 @@ export class BookMeetingModalPage implements OnInit {
formLocationSatus: boolean = false;
showAttendees= false;
loggeduser: User;
emptyTextDescription = "Sem intervenientes selecionados";
constructor(
private modalController: ModalController,
@@ -56,7 +57,9 @@ export class BookMeetingModalPage implements OnInit {
authService: AuthService,
private animationController: AnimationController,
private toastService: ToastService,
private activatedRoute: ActivatedRoute,
) {
this.taskParticipants = [];
this.loggeduser = authService.ValidatedUser;
this.task = this.navParams.get('task');
this.postData = new Event();
@@ -96,6 +99,19 @@ export class BookMeetingModalPage implements OnInit {
cancelTask(){
this.modalController.dismiss(null);
}
goBack() {
this.modalController.dismiss(null);
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes": true,
}
}
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/expediente']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
async saveTask(){
// issue12323423
@@ -138,9 +154,11 @@ export class BookMeetingModalPage implements OnInit {
await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise()
break;
}
this.modalController.dismiss();
this.distartExpedientModal();
this.toastService.successMessage('Reunião criada')
this.toastService.successMessage('Reunião criada');
} catch (error) {
this.toastService.badRequest('Reunião não criada')
}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+4 -4
View File
@@ -25,7 +25,7 @@
<div class="container-div width-100">
<div class="ion-item-class-2 width-100">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
<ion-icon class="icon-time" slot="start" name="time-outline"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select placeholder="Prazo" [(ngModel)]="postData.Priority" interface="action-sheet" Cancel-text="Cancelar" required>
@@ -40,7 +40,7 @@
<div class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-item class="ion-no-border ion-no-padding ion-no-margin">
@@ -65,7 +65,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -86,7 +86,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Com conhecimento</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Com conhecimento</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
+3
View File
@@ -205,5 +205,8 @@ font-size: 13px;
-ms-border-radius: 18px;
-o-border-radius: 18px;
}
.icon-time{
color: #797979b0;
}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+1 -1
View File
@@ -248,7 +248,7 @@ export class ExpedientTaskModalPage implements OnInit {
}
}
this.taskResult = await this.processes.postParecer(this.postData).toPromise();
await this.toastService.successMessage('Processo efetuado');
await this.toastService.successMessage('Pedido enviado');
this.modalController.dismiss(action_parecer);
} catch (error) {
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -51
View File
@@ -35,14 +35,6 @@
<div class="overflow-y-auto">
<div class="middle-content">
<!-- <h5 *ngIf="intervenientes">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> -->
<div *ngIf="cc.length > 0">
<h5>Com conhecimento</h5>
<ion-item class="ion-no-margin ion-no-padding">
@@ -99,7 +91,7 @@
</div>
</div>
<div class="aside-right flex-column height-100">
<div *ngIf="task" class="aside-right flex-column height-100">
<div class="buttons">
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
@@ -114,48 +106,6 @@
</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>
</div>
</ion-content>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+5 -8
View File
@@ -135,7 +135,7 @@ export class ExpedienteDetailPage implements OnInit {
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
console.log(res);
//console.log(res);
this.task = {
"SerialNumber": res.serialNumber,
@@ -151,10 +151,10 @@ export class ExpedienteDetailPage implements OnInit {
"WorkflowName": res.workflowDisplayName,
}
console.log('task', this.task);
//console.log('task', this.task);
this.fulltask = res;
console.log('GetTask', res);
//console.log('GetTask', res);
let thedate = new Date(this.task.CreateDate);
this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]);
@@ -204,11 +204,6 @@ export class ExpedienteDetailPage implements OnInit {
});
}
openMenu() {
this.menu.open();
this.modalController.dismiss();
}
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
let classs;
@@ -303,6 +298,8 @@ export class ExpedienteDetailPage implements OnInit {
}
async openBookMeetingModal(task: any) {
console.log(task);
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+1 -1
View File
@@ -27,7 +27,7 @@
<div class="upper-content" style="overflow: unset !important;">
<div class="content-details">
<ion-label>
<p><span class="date">{{customDate}}</span><span class="label">{{ task.WorkflowName }}</span></p>
<p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
</ion-label>
</div>
</div>
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+4 -1
View File
@@ -132,6 +132,7 @@ export class ExpedientePrPage implements OnInit {
"FsId": res.workflowInstanceDataFields.FsId,
"DocId": res.workflowInstanceDataFields.DocIdD,
"WorkflowName": res.workflowDisplayName,
"activityInstanceName": res.activityInstanceName,
}
console.log('task', this.task);
@@ -200,8 +201,10 @@ export class ExpedientePrPage implements OnInit {
"AttachmentList" :documents,
}
console.log(body);
try {
await this.processes.CompleteTask(body).toPromise()
await this.processes.CompleteTask(body).toPromise();
this.close();
this.toastService.successMessage('Processo aprovado')
} catch(error) {
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+3 -3
View File
@@ -8,8 +8,8 @@
<div class="title">
<div class="thetitle"><ion-label >Expediente</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh()">
<div class="theicon btn-refresh">
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
@@ -19,7 +19,7 @@
<div class="main-content">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
<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>
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+2 -1
View File
@@ -116,9 +116,10 @@ export class ExpedientesPrPage implements OnInit {
}
}
doRefresh() {
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
}
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+1 -1
View File
@@ -283,7 +283,7 @@ export class PedidoPage implements OnInit {
const modal = await this.modalController.create({
component: BookMeetingModalPage,
componentProps: {
task: this.task,
task: task,
},
cssClass: classs,
backdropDismiss: false
src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+3 -3
View File
@@ -6,8 +6,8 @@
<app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
<div class="title">
<div class="thetitle"><ion-label >Pedidos</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh()">
<div class="theicon btn-refresh">
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
@@ -27,7 +27,7 @@
<ion-content>
<div class="main-content">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+2 -1
View File
@@ -168,9 +168,10 @@ export class PedidosPage implements OnInit {
console.log(this.taskType);
}
doRefresh() {
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
}
src/app/pages/gabinete-digital/pendentes/pendentes.page.html
+1 -1
View File
@@ -7,7 +7,7 @@
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
<div class="title">
<div class="thetitle"><ion-label >Pendentes</ion-label></div>
<div class="theicon">
<div class="theicon btn-refresh">
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+1 -1
View File
@@ -133,7 +133,7 @@ export class PendentesPage implements OnInit {
this.LoadList();
setTimeout(() => {
//event.target.complete();
event.target.complete();
}, 2000);
}
src/app/services/events.service.ts
+62 -8
View File
@@ -397,29 +397,83 @@ export class EventsService {
postExpedientEvent(docId:any, body:any, sharedagenda:string, serialNumber:any, applicationID:any){
const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente')+'/event';
let params = new HttpParams();
let options;
params = params.set("DocId", docId);
params = params.set("SerialNumber", serialNumber);
params = params.set("applicationID", applicationID);
let options = {
headers: this.headers,
params: params
};
switch (this.loggeduser.Profile) {
case 'MDGPR':
if(body.CalendarName == 'Pessoal'){
options = {
headers: this.headersMdPessoal,
params: params
};
}
else if(body.CalendarName == 'Oficial'){
options = {
headers: this.headersMdOficial,
params: params
};
}
break;
case 'PR':
if(body.CalendarName == 'Pessoal'){
options = {
headers: this.headersPrPessoal,
params: params
};
}
else if(body.CalendarName == 'Oficial'){
options = {
headers: this.headersPrOficial,
params: params
};
}
break;
}
return this.http.post<any>(`${geturl}`, body, options)
}
createTaskEvent(folderId:any, body:any, sharedagenda:string, serialNumber:any, applicationID:any){
const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente')+'/dispatch';
let params = new HttpParams();
let options;
params = params.set("FolderId", folderId);
params = params.set("SerialNumber", serialNumber);
params = params.set("applicationID", applicationID);
let options = {
headers: this.headers,
params: params
};
switch (this.loggeduser.Profile) {
case 'MDGPR':
if(body.CalendarName == 'Pessoal'){
options = {
headers: this.headersMdPessoal,
params: params
};
}
else if(body.CalendarName == 'Oficial'){
options = {
headers: this.headersMdOficial,
params: params
};
}
break;
case 'PR':
if(body.CalendarName == 'Pessoal'){
options = {
headers: this.headersPrPessoal,
params: params
};
}
else if(body.CalendarName == 'Oficial'){
options = {
headers: this.headersPrOficial,
params: params
};
}
break;
}
return this.http.post<any>(`${geturl}`, body, options)
}
src/app/shared/agenda/approve-event/approve-event.page.html
-3
View File
@@ -100,9 +100,6 @@
<ion-footer class="display-none-{{showAside}} ion-no-border">
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
<ion-menu-button (click)="openMenu()" autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
<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>
src/app/shared/agenda/approve-event/approve-event.page.ts
+18 -32
View File
@@ -106,18 +106,7 @@ export class ApproveEventPage implements OnInit {
}); */
}
async emendTask(serialNumber:string){
/* console.log('Emendar'); */
this.menu.close();
try {
await this.openEmendMessageModal(serialNumber);
this.modalController.dismiss(null);
} catch (error) {
this.toastService.badRequest()
}
}
async rejectTask(serialNumber:string) {
@@ -158,23 +147,22 @@ export class ApproveEventPage implements OnInit {
});
return await popover.present();
}
openMenu() {
this.menu.open();
}
async openEmendMessageModal(serialNumber:string) {
async emendTask(serialNumber:string){
console.log('Desktop');
const modal = await this.modalController.create({
component: EmendMessageModalPage,
componentProps:{
},
cssClass: 'emend-message-modal',
backdropDismiss: false
});-
});
await modal.present();
modal.onDidDismiss().then( async (res) => {
modal.onDidDismiss()
.then( async (res) => {
console.log(res.data);
if(res.data !== ''){
@@ -184,24 +172,23 @@ export class ApproveEventPage implements OnInit {
"ReviewUserComment": res.data,
}
}
console.log(body);
try {
await this.processes.PostTaskAction(body).toPromise()
//this.router.navigate(['/home/gabinete-digital/event-list']);
this.goToEventsToApprove();
this.toastService.successMessage()
} catch (error) {
this.toastService.badRequest()
}
console.log(body);
try {
await this.processes.PostTaskAction(body).toPromise();
this.toastService.successMessage('Pedido enviado');
this.close();
} catch (error) {
this.toastService.badRequest();
}
}
else{
//this.alertService.presentAlert('Operação cancelada!');
}
});
//this.openEmendMessageModal(serialNumber);
//this.goBack();
}
goToEventsToApprove(){
@@ -237,5 +224,4 @@ export class ApproveEventPage implements OnInit {
}
}
src/app/shared/agenda/edit-event/edit-event.page.html
+2 -2
View File
@@ -139,7 +139,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -162,7 +162,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Como conhecido</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Como conhecido</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/shared/agenda/new-event/new-event.page.html
+1 -1
View File
@@ -80,7 +80,7 @@
<div class="container-div">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1">
<ion-select placeholder="Selecione tipo"
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+1 -1
View File
@@ -60,7 +60,7 @@
</div>
</div>
<div *ngIf="despachoList.length < 1">
<div *ngIf="despachoList?.length < 1">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/despachos/despachos.page.html
+1 -1
View File
@@ -56,7 +56,7 @@
</div>
</div>
<div *ngIf="despachoList.length < 1">
<div *ngIf="despachoList?.length < 1">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+3 -3
View File
@@ -8,7 +8,7 @@
<ion-header>
<div class="title-content">
<div class="middle">
<ion-label class="title">Editar Evento Por Aprovar</ion-label>
<ion-label class="title">Editar Evento Por Aprovar QQ</ion-label>
</div>
</div>
</ion-header>
@@ -143,7 +143,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -164,7 +164,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+4 -2
View File
@@ -69,7 +69,7 @@ export class EditEventToApproveComponent implements OnInit {
// "EndDate":"2021-04-30T15:30:00",
// "Participants":"gilson.manuel@gabinetedigital.local;tiago.kayaya@gabinetedigital.local;solange.vandunem@gabinetedigital.local",
// "CC":"",
// "ReviewUserComments":"teste",
// "ReviewUserComment":"teste",
// "Role":0,
// "MDName":"Paulo Pinto",
// "MDEmail":"paulo.pinto@gabinetedigital.local",
@@ -251,8 +251,10 @@ export class EditEventToApproveComponent implements OnInit {
Message: this.eventProcess.workflowInstanceDataFields.Message,
ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
Private: false,
ReviewUserComments: ''
ReviewUserComment: ''
}
console.log(event);
this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
this.toastService.successMessage('Evento editado');
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+1 -1
View File
@@ -30,7 +30,7 @@
<ion-item
class="item ion-no-padding width-100 cursor-pointer"
*ngFor="let event of eventsMDGPRList"
(click)="goToEventDetail(event)"
(click)="goToEventDetail(event.serialNumber)"
>
<!-- (click)="openApproveModal(event)" -->
<div class="event-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+2 -15
View File
@@ -77,21 +77,8 @@ export class EventsToApprovePage implements OnInit {
this.showLoader = false;
}
goToEventDetail(eventToAprove){
let InstanceId;
if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){
InstanceId = ''
} else {
InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId
}
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": eventToAprove.serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
goToEventDetail(event){
this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital'])
}
/* async openApproveModal(eventToAprove) {
src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+1 -1
View File
@@ -52,7 +52,7 @@
</div>
</div>
<div *ngIf="pendentesList.length < 1 || pendentesList.length == 0">
<div *ngIf="pendentesList?.length < 1 || pendentesList.length == 0">
<ion-list>
<ion-item>
src/app/shared/popover/deploma-options/deploma-options.page.ts
+5 -1
View File
@@ -42,6 +42,7 @@ export class DeplomaOptionsPage implements OnInit {
async openAddNoteModal(actionName:string) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -109,6 +110,7 @@ export class DeplomaOptionsPage implements OnInit {
async openBookMeetingModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -152,6 +154,8 @@ export class DeplomaOptionsPage implements OnInit {
}
close(){}
close(){
this.popoverController.dismiss();
}
}
src/app/shared/popover/despachos-options/despachos-options.page.ts
+4 -1
View File
@@ -70,7 +70,7 @@ export class DespachosOptionsPage implements OnInit {
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -107,6 +107,7 @@ export class DespachosOptionsPage implements OnInit {
}
async distartExpedientModal(){
this.popoverController.dismiss();
console.log(this.fulltask);
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
@@ -133,6 +134,7 @@ export class DespachosOptionsPage implements OnInit {
async openBookMeetingModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -192,6 +194,7 @@ export class DespachosOptionsPage implements OnInit {
}
async openAddNoteModal(actionName:string) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+5 -1
View File
@@ -65,7 +65,7 @@ export class DespachosPrOptionsPage implements OnInit {
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -102,6 +102,7 @@ export class DespachosPrOptionsPage implements OnInit {
}
async distartExpedientModal(){
this.popoverController.dismiss();
console.log(this.fulltask);
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
@@ -128,6 +129,7 @@ export class DespachosPrOptionsPage implements OnInit {
async openBookMeetingModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -147,6 +149,7 @@ export class DespachosPrOptionsPage implements OnInit {
}
async openDelegarModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -187,6 +190,7 @@ export class DespachosPrOptionsPage implements OnInit {
}
async openAddNoteModal(actionName:string) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+4 -21
View File
@@ -68,6 +68,7 @@ export class OptsExpedientePrPage implements OnInit {
}
async openAddNoteModal(actionName:string) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -131,6 +132,7 @@ export class OptsExpedientePrPage implements OnInit {
}
async distartExpedientModal(body:any) {
this.popoverController.dismiss();
console.log(this.fulltask);
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
@@ -214,7 +216,7 @@ export class OptsExpedientePrPage implements OnInit {
}
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -243,13 +245,13 @@ export class OptsExpedientePrPage implements OnInit {
}
else{
console.log('Not open');
}
});
}
async openBookMeetingModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -289,24 +291,5 @@ export class OptsExpedientePrPage implements OnInit {
// window.history.back();
}
async badRequest(message?: string, callback?) {
const modal = await this.modalController.create({
component: BadRequestPage,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},1000)
}
}
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+4 -2
View File
@@ -60,6 +60,7 @@ export class OptsExpedientePage implements OnInit {
}
async openBookMeetingModal() {
this.close();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -77,8 +78,9 @@ export class OptsExpedientePage implements OnInit {
await modal.present();
modal.onDidDismiss();
}
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
this.close();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -108,7 +110,7 @@ export class OptsExpedientePage implements OnInit {
}
async distartExpedientModal(){
console.log(this.fulltask);
this.close();
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
componentProps: {
src/app/shared/popover/request-options/request-options.page.ts
+6
View File
@@ -77,6 +77,7 @@ export class RequestOptionsPage implements OnInit {
}
async openBookMeetingModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -96,6 +97,7 @@ export class RequestOptionsPage implements OnInit {
}
async openExpedientActionsModal(taskAction: any, task: any) {
this.popoverController.dismiss();
//this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800) {
@@ -126,6 +128,7 @@ export class RequestOptionsPage implements OnInit {
}
async distartExpedientModal(){
this.popoverController.dismiss();
console.log(this.fulltask);
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
@@ -172,6 +175,7 @@ export class RequestOptionsPage implements OnInit {
}
async openAddNoteModal(actionName:string) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -239,6 +243,7 @@ export class RequestOptionsPage implements OnInit {
}
async openDarParecer(task: any) {
this.popoverController.dismiss();
// console.log(task);
let classs;
@@ -261,6 +266,7 @@ export class RequestOptionsPage implements OnInit {
}
async openDelegarModal(task: any) {
this.popoverController.dismiss();
// console.log(task);
let classs;
src/global.scss
+6
View File
@@ -717,6 +717,12 @@ body, .blue-background{ background: #0782C9 !important;}
ion-content {
--background:none;
}
.header-default-padding{
padding: 30px 20px 0 20px !important;
}
.content-default-padding{
padding: 0px 20px 0 20px !important;
}
src/theme/variables.scss
+35 -5
View File
@@ -467,18 +467,19 @@ $app-theme: mat-light-theme((
overflow: auto;
--background: #fff;
}
.btn-ok{
width: 170px !important;
.btn-ok-no-width{
height: 45px !important;
margin: 0 auto !important;
margin: 0 auto;
padding:0 !important;
border-radius: 22.5px;
background-color: #42b9fe;
color: #ffffff !important;
}
.btn-ok-no-width{
.btn-ok{
width: 170px !important;
height: 45px !important;
margin: 0 auto;
margin: 0 auto !important;
padding:0 !important;
border-radius: 22.5px;
background-color: #42b9fe;
@@ -504,6 +505,35 @@ $app-theme: mat-light-theme((
color: #061b52 !important;
margin: 0 auto !important;
}
.btn-ok-medium{
width: 130px !important;
height: 45px !important;
margin: 0 auto !important;
padding:0 !important;
border-radius: 22.5px;
background-color: #42b9fe;
color: #ffffff !important;
}
.btn-delete-medium{
display: block;
width: 130px !important;
height: 45px !important;
margin: 0 auto !important;
padding:0 !important;
border-radius: 22.5px;
background-color: #ffe0e0;
color: #d30a0a !important;
}
.btn-cancel-medium{
display: block;
width: 130px !important;
height: 45px !important;
padding:0 !important;
border-radius: 22.5px;
background-color: #e0e9ee;
color: #061b52 !important;
margin: 0 auto !important;
}
.btn-no-color{
background-color: #fff;
}