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

fix box sixing

Browse Source
This commit is contained in:
Peter Maquiran
2023-05-18 17:40:52 +01:00
parent ef882e8ff1
commit a526b91532
36 changed files with 460 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
readme.md
+4
View File
@@ -82,6 +82,10 @@ ionic cap copy &&
ionic cap update &&
ionic cap open ios &&
# Android
npx cap copy android &&
ionic cap sync android
## Tag stable version
```bash
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+7 -6
View File
@@ -17,7 +17,7 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick
import { EventsService } from 'src/app/services/events.service';
import { EventService } from 'src/app/services/rules/event.service';
import { EventPipe } from 'src/app/pipes/event.pipe';
import { ThemeService } from 'src/app/services/theme.service'
import { ThemeService } from 'src/app/services/theme.service';
import { SessionStore } from 'src/app/store/session.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { environment } from 'src/environments/environment';
@@ -288,20 +288,21 @@ export class DocumentSetUpMeetingPage implements OnInit {
Type: this.EventRecurrenceType,
LastOccurrence: this.Occurrence,
},
Attachments: this.docs,
// Attachments: this.docs,
}
const laoder = this.toastService.loading()
this.eventService.create({ body: postEvent, calendar: this.postData.CalendarName }).subscribe(async (respose) => {
laoder.remove()
laoder.remove();
this.httpErroHandle.httpsSucessMessagge('new event');
this.modalController.dismiss()
}, (error) => {
laoder.remove()
console.log('error', error)
laoder.remove();
this.httpErroHandle.httpStatusHandle(error)
}, ()=>{
laoder.remove()
laoder.remove();
});
}
@@ -473,4 +474,4 @@ export class DocumentSetUpMeetingPage implements OnInit {
}
}
}
src/app/models/user.model.ts
+1 -1
View File
@@ -96,4 +96,4 @@ export class UserSession {
Inactivity: boolean
UrlBeforeInactivity: string;
UserPermissions: any;
}
}
src/app/pages/agenda/agenda.page.ts
+3 -1
View File
@@ -579,7 +579,9 @@ export class AgendaPage implements OnInit {
let label;
if(SessionStore.user.OwnerCalendars.find(e => e.CalendarId == selectedCalendar.CalendarId)) {
if(SessionStore.user.Profile == 'PR') {
label = "pr"
} else if(SessionStore.user.OwnerCalendars.find(e => e.CalendarId == selectedCalendar.CalendarId)) {
label = 'md'
} else {
label = "pr"
src/app/pages/events/events.page.html
+2 -2
View File
@@ -22,9 +22,9 @@
</ion-refresher>
<div class="conteiner-box pt-20 px-20 height-100">
<div class="conteiner-box pt-20 height-100">
<div class="main-content height-100">
<div class="box-container d-flex ">
<div class="box-container d-flex mx-20">
<div>
<p class="time ion-text-left ">{{customDate}}</p>
<div class="wrap d-flex float-left">
src/app/pages/events/events.page.scss
+1 -1
View File
@@ -577,7 +577,7 @@ ion-title{
}
.event-box {
background-color: #ffb81c2b;
width: 150px;
width: 130px;
height: 73px;
margin:5px;
flex-direction: column;
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+15 -1
View File
@@ -234,6 +234,7 @@ export class DespachoPrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.httpErroHandle.httpsSucessMessagge('Executado')
this.TaskService.loadDiplomas()
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
}
@@ -259,6 +260,7 @@ export class DespachoPrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.httpErroHandle.httpsSucessMessagge('Arquivar')
this.TaskService.loadDiplomas()
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
}
@@ -281,6 +283,7 @@ export class DespachoPrPage implements OnInit {
}).toPromise()
this.httpErroHandle.httpsSucessMessagge('Gerar Diploma')
this.TaskService.loadDiplomas()
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
}
@@ -306,6 +309,7 @@ export class DespachoPrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.httpErroHandle.httpsSucessMessagge('Concluir')
this.TaskService.loadDiplomas()
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
}
@@ -331,6 +335,7 @@ export class DespachoPrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.httpErroHandle.httpsSucessMessagge('Reexecução')
this.TaskService.loadDiplomas()
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
}
@@ -349,6 +354,7 @@ export class DespachoPrPage implements OnInit {
this.processes.SetTaskToPending(this.serialNumber).subscribe(res => {
this.popoverController.dismiss('close')
this.httpErroHandle.httpsSucessMessagge('Enviar para Pendentes')
this.TaskService.loadDiplomas()
this.goBack()
loader.remove()
}, (error) => {
@@ -408,6 +414,7 @@ export class DespachoPrPage implements OnInit {
await this.reexecutar(res.data.note, docs);
}
this.TaskService.loadDiplomas()
this.goBack();
}
});
@@ -442,6 +449,7 @@ export class DespachoPrPage implements OnInit {
}
this.goBack();
this.TaskService.loadDiplomas()
});
}
@@ -459,7 +467,9 @@ export class DespachoPrPage implements OnInit {
});
await modal.present();
modal.onDidDismiss();
modal.onDidDismiss().then(() => {
this.TaskService.loadDiplomas()
})
}
async openBookMeetingModal(task: any) {
@@ -503,6 +513,7 @@ export class DespachoPrPage implements OnInit {
if(data == 'close') {
this.goBack();
}
this.TaskService.loadDiplomas()
}
});
@@ -526,6 +537,7 @@ export class DespachoPrPage implements OnInit {
if (res['data'] == 'close') {
this.close();
}
this.TaskService.loadDiplomas()
});
}
@@ -551,6 +563,8 @@ export class DespachoPrPage implements OnInit {
}
this.TaskService.loadDiplomas()
}))
}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+10 -1
View File
@@ -219,6 +219,7 @@ export class DespachoPage implements OnInit {
try {
await this.despachoService.executado(note, documents, this.serialnumber).toPromise();
this.httpErrorHandle.httpsSucessMessagge('Executado')
this.TaskService.loadDespachos();
this.close();
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
@@ -235,6 +236,7 @@ export class DespachoPage implements OnInit {
try {
await this.despachoService.arquivar(note, documents, this.serialnumber).toPromise()
this.httpErrorHandle.httpsSucessMessagge('Arquivar')
this.TaskService.loadDespachos();
this.close();
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
@@ -261,6 +263,7 @@ export class DespachoPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.httpErrorHandle.httpsSucessMessagge('Reexecução')
this.TaskService.loadDespachos();
this.close();
} catch (error) {
@@ -288,6 +291,7 @@ export class DespachoPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.httpErrorHandle.httpsSucessMessagge('Gerar Diploma')
this.TaskService.loadDespachos();
this.close();
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error);
@@ -307,6 +311,7 @@ export class DespachoPage implements OnInit {
this.despachoService.sendExpedienteToPending(this.serialnumber).subscribe(res => {
this.goBack();
loader.remove()
this.TaskService.loadDespachos();
this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes')
},
error => {
@@ -446,6 +451,7 @@ export class DespachoPage implements OnInit {
if(data == 'close') {
this.goBack();
}
this.TaskService.loadDespachos();
}
});
@@ -473,6 +479,7 @@ export class DespachoPage implements OnInit {
this.openMenu(); */
}
this.TaskService.loadDespachos();
});
}
@@ -489,7 +496,9 @@ export class DespachoPage implements OnInit {
},
translucent: true
});
return await popover.present();
return await popover.present().then(()=> {
this.TaskService.loadDespachos();
})
}
src/app/pages/gabinete-digital/despachos/despachos.page.html
+31 -31
View File
@@ -10,37 +10,37 @@
<div class="title flex-1"><ion-label >Despachos</ion-label></div>
<div class="theicon btn-refresh">
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
<mat-select [(value)]="filterName">
<mat-option value="Para hoje" >
Para hoje
</mat-option>
<mat-option value="Novos" >
Novos
</mat-option>
<mat-option value="Lidos" >
Lidos
</mat-option>
<mat-option value="Não lidos" >
Não lidos
</mat-option>
<mat-option value="OverdueTasks">
Em atraso
</mat-option>
<mat-option value="Todos" >
Todos
</mat-option>
</mat-select>
</mat-form-field>
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
<mat-select [(value)]="filterName">
<mat-option value="Para hoje" >
Para hoje
</mat-option>
<mat-option value="Novos" >
Novos
</mat-option>
<mat-option value="Lidos" >
Lidos
</mat-option>
<mat-option value="Não lidos" >
Não lidos
</mat-option>
<mat-option value="OverdueTasks">
Em atraso
</mat-option>
<mat-option value="Todos" >
Todos
</mat-option>
</mat-select>
</mat-form-field>
</div>
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
src/app/pages/gabinete-digital/despachos/despachos.page.ts
+1
View File
@@ -103,6 +103,7 @@ export class DespachosPage implements OnInit {
await this.despachoRule.getList({ updateStore: true }).then((pre) => {
//
this.dynamicSearch()
}).catch(() => {
})
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+6 -1
View File
@@ -81,7 +81,9 @@ export class DiplomaAssinarPage implements OnInit {
},
translucent: true
});
return await popover.present();
return await popover.present().then(() => {
this.TaskService.loadDiplomas()
})
}
async LoadTaskDetail(serial: string) {
@@ -185,6 +187,7 @@ export class DiplomaAssinarPage implements OnInit {
await this.processes.CompleteTask(body).toPromise()
this.httpErroHandle.httpsSucessMessagge('Assinado')
this.TaskService.loadDiplomas()
this.goBack();
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
@@ -246,6 +249,8 @@ export class DiplomaAssinarPage implements OnInit {
/* await this.generateDiploma(res.data.note, docs);
this.goBack(); */
}
this.TaskService.loadDiplomas()
}
});
}
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
+7 -2
View File
@@ -80,7 +80,9 @@ export class DiplomasGerarPage implements OnInit {
},
translucent: true
});
return await popover.present();
return await popover.present().then(() => {
this.TaskService.loadDiplomas()
})
}
async LoadTaskDetail(serial: string) {
@@ -161,6 +163,7 @@ export class DiplomasGerarPage implements OnInit {
if(data == 'close') {
this.goBack();
}
this.TaskService.loadDiplomas()
}
});
@@ -192,6 +195,7 @@ export class DiplomasGerarPage implements OnInit {
this.despachoService.sendExpedienteToPending(this.serialnumber).subscribe(res => {
this.goBack();
this.httpErroHandle.httpsSucessMessagge('Enviar para Pendentes')
this.TaskService.loadDiplomas()
loader.remove()
},
error => {
@@ -226,6 +230,7 @@ export class DiplomasGerarPage implements OnInit {
modal.onDidDismiss().then(async (res) => {
if (res.data) {
this.TaskService.loadDiplomas()
const DocumentToSave = res.data.documents.map((e) => {
return {
@@ -314,7 +319,7 @@ export class DiplomasGerarPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.TaskService.loadDiplomas()
this.httpErroHandle.httpsSucessMessagge('Assinado',() => {
this.goBack();
})
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+10 -1
View File
@@ -125,7 +125,9 @@ export class DiplomaPage implements OnInit {
},
translucent: true
});
return await popover.present();
return await popover.present().then(() => {
this.TaskService.loadDiplomas()
})
}
async LoadTaskDetail(serial: string) {
@@ -271,6 +273,7 @@ export class DiplomaPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.httpErrorHandle.httpsSucessMessagge('Solicitar alteração')
this.TaskService.loadDiplomas()
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
}
@@ -297,6 +300,7 @@ export class DiplomaPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
this.httpErrorHandle.httpsSucessMessagge('Concluir')
this.TaskService.loadDiplomas()
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
}
@@ -329,6 +333,7 @@ export class DiplomaPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(async (res) => {
this.TaskService.loadDiplomas()
if (res.data) {
@@ -390,6 +395,7 @@ export class DiplomaPage implements OnInit {
try {
await this.despachoService.arquivar(note, documents, this.serialNumber).toPromise()
this.httpErrorHandle.httpsSucessMessagge('Arquivar')
this.TaskService.loadDiplomas()
this.close();
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
@@ -436,6 +442,8 @@ export class DiplomaPage implements OnInit {
await this.distartExpedientModal();
}
this.TaskService.loadDiplomas()
this.goBack();
});
}
@@ -455,6 +463,7 @@ export class DiplomaPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(res => {
this.TaskService.loadDiplomas()
if (res['data'] == 'close') {
this.close();
/*
src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+201 -134
View File
@@ -1,175 +1,242 @@
<ion-header class="ion-no-border header-2">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content></ion-refresher-content>
</ion-refresher>
<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 btn-refresh">
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
<mat-select [(value)]="filterName">
<div class="theicon d-flex">
<!-- <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src='assets/images/icons-search.svg'></ion-icon>
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
</div>
<button title="Fechar" class="btn-no-color d-flex" (click)="closeSearch();showSearch=false;searchSubject=''" *ngIf="showSearch">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' " class="font-35" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</button>
<mat-option value="Para hoje" >
Para hoje
</mat-option>
<div *ngIf="showSearch">
<div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
<div class="input-text d-flex ion-align-items-center">
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<mat-option value="Novos" >
Novos
</mat-option>
<div (click)="basicSearch()" class="d-flex align-center icon">
<mat-option value="Lidos" >
Lidos
</mat-option>
<mat-option value="Não lidos" >
Não lidos
</mat-option>
<mat-option value="OverdueTasks">
Em atraso
</mat-option>
<mat-option value="Todos" >
Todos
</mat-option>
</mat-select>
</mat-form-field>
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
</div>
</div>
</div>
</div>
</div> -->
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
<mat-select [(value)]="filterName">
<mat-option value="Para hoje" >
Para hoje
</mat-option>
<mat-option value="Novos" >
Novos
</mat-option>
<mat-option value="Lidos" >
Lidos
</mat-option>
<mat-option value="Não lidos" >
Não lidos
</mat-option>
<mat-option value="OverdueTasks">
Em atraso
</mat-option>
<mat-option value="Todos" >
Todos
</mat-option>
</mat-select>
</mat-form-field>
</div>
<!-- <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</button> -->
</div>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="validar" *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">
Por validar
Diplomas por validar
</ion-segment-button>
<ion-segment-button value="assinados">
Assinados PR
Diplomas assinados PR
</ion-segment-button>
</ion-segment>
</ion-toolbar>
</ion-header>
<ion-content>
<div class="main-content width-100 overflow-y-auto height-100">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content></ion-refresher-content>
</ion-refresher>
<div class="width-100" [ngSwitch]="segment">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div *ngIf="diplomasList && p.userPermission([p.permissionList.Gabinete.md_tasks])">
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">
<ion-list *ngSwitchCase="'validar'">
<ion-item
class=" ion-no-padding cursor-pointer"
*ngFor = "let task of diplomasList"
(click)="goToDiploma(task.SerialNumber)"
lines="none"
>
<div class="item width-100 expediente">
<div class="exp-top-detail">
<div class="subject d-flex align-center">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
<div class="exp-bottom-detail">
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
</div>
<div class="exp-middle-detail">
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div>
</div>
</div>
</ion-item>
</ion-list>
</div>
<div *ngIf="diplomasAssinadoList">
<ion-list *ngSwitchCase="'assinados'">
<ion-item
class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of diplomasAssinadoList"
<div *ngIf="listDiplomasPorValidar.length >= 1">
<ion-item
class=" ion-no-padding cursor-pointer"
*ngFor = "let task of listDiplomasPorValidar"
(click)="goToDiploma(task.SerialNumber)"
lines="none"
>
<div class="item width-100">
<div class="exp-top-detail">
<div class="subject d-flex">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
>
<div class="item width-100 expediente">
<div class="exp-top-detail">
<div class="subject d-flex align-center">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
<div class="exp-bottom-detail">
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
</div>
<div class="exp-middle-detail">
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div>
</div>
</div>
<div class="exp-bottom-detail">
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
</ion-item>
</div>
<div *ngIf="listDiplomasPorValidar.length == 0 && skeletonLoader">
<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>
<div *ngIf="listDiplomasPorValidar.length == 0 && !skeletonLoader"
class="empty-list d-flex height-100 align-center justify-content-center">
<span>Lista vazia</span>
</div>
</ion-list>
</div>
<ion-list *ngSwitchCase="'assinados'">
<div *ngIf="listDiplomasAssinadosPR.length >= 1">
<ion-item
class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of listDiplomasAssinadosPR"
(click)="goToDiploma(task.SerialNumber)"
lines="none"
>
<div class="item width-100">
<div class="exp-top-detail">
<div class="subject d-flex">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div>
<div class="exp-middle-detail">
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
<div class="exp-bottom-detail">
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
</div>
<div class="exp-middle-detail">
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div>
</div>
</div>
</ion-item>
</ion-list>
</div>
</div>
</div>
<div
*ngIf="!skeletonLoader && diplomasList.length == 0 && diplomasAssinadoList.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
<div *ngIf="listDiplomasAssinadosPR.length == 0 && skeletonLoader">
<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>
<div *ngIf="skeletonLoader && diplomasAssinadoList.length == 0 && skeletonLoader && diplomasList.length == 0">
<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>
<div *ngIf="listDiplomasAssinadosPR.length == 0 && !skeletonLoader"
class="empty-list d-flex height-100 align-center justify-content-center">
<span>Lista vazia</span>
</div>
</ion-list>
</div>
</div>
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+30 -6
View File
@@ -18,9 +18,6 @@ import { TaskService } from 'src/app/services/task.service'
styleUrls: ['./diplomas.page.scss'],
})
export class DiplomasPage implements OnInit, OnDestroy {
list: DailyWorkTask[] = [];
diplomasList: DailyWorkTask[] = [];
diplomasAssinadoList: DailyWorkTask[] = [];
showLoader: boolean;
totalDocs: any;
serialNumber: string;
@@ -34,6 +31,9 @@ export class DiplomasPage implements OnInit, OnDestroy {
showSearch = false
searchSubject = ''
listDiplomasPorValidar = []
listDiplomasAssinadosPR = []
hideSearchBtn: boolean = false;
constructor(
private processes: ProcessesService,
@@ -92,17 +92,39 @@ export class DiplomasPage implements OnInit, OnDestroy {
}
openSearch() {
this.dynamicSearch()
}
async closeSearch() {
this.searchSubject = ''
this.dynamicSearch()
}
async basicSearch() {
this.dynamicSearch()
}
async dynamicSearch() {
if(this.showSearch && this.searchSubject) {
this.list = this.TaskService.despachoStore.list.filter((task) => {
this.listDiplomasAssinadosPR = this.deplomasStore.diplomasAssinadoList.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
this.listDiplomasPorValidar = this.deplomasStore.diplomasReviewList.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
})
} else {
this.list = this.TaskService.AllProcess
this.listDiplomasAssinadosPR = this.deplomasStore.diplomasAssinadoList
this.listDiplomasPorValidar = this.deplomasStore.diplomasReviewList
}
}
@@ -130,6 +152,8 @@ export class DiplomasPage implements OnInit, OnDestroy {
this.skeletonLoader = true
await this.TaskService.loadDiplomas()
this.skeletonLoader = false
} catch(error) {
this.skeletonLoader = false
}
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+6 -2
View File
@@ -12,6 +12,7 @@ import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ToastService } from 'src/app/services/toast.service';
import { ThemeService } from 'src/app/services/theme.service'
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-approve-event-modal',
@@ -42,7 +43,8 @@ export class ApproveEventModalPage implements OnInit {
private iab: InAppBrowser,
private toastService: ToastService,
public ThemeService: ThemeService,
private httpErrorHandle: HttpErrorHandle
private httpErrorHandle: HttpErrorHandle,
public TaskService: TaskService
) {
@@ -169,7 +171,9 @@ export class ApproveEventModalPage implements OnInit {
event: ev,
translucent: true
});
return await popover.present();
return await popover.present().then(() =>{
this.TaskService.loadEventosParaAprovacao()
})
}
openMenu() {
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+7 -2
View File
@@ -18,6 +18,8 @@ import { RouteService } from 'src/app/services/route.service';
import { Storage } from '@ionic/storage';
import config from 'capacitor.config';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-approve-event',
@@ -60,7 +62,8 @@ export class ApproveEventPage implements OnInit {
public ThemeService: ThemeService,
private offlineManager: OfflineManagerService,
private storage: Storage,
private httpErrorHandle: HttpErrorHandle
private httpErrorHandle: HttpErrorHandle,
public TaskService: TaskService
) {
this.activatedRoute.paramMap.subscribe(params => {
//
@@ -259,7 +262,9 @@ export class ApproveEventPage implements OnInit {
activityInstanceName: this.loadedEvent.activityInstanceName
},
});
return await popover.present();
return await popover.present().then(() => {
this.TaskService.loadEventosParaAprovacao()
})
}
openMenu() {
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+12 -5
View File
@@ -3,7 +3,7 @@ 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 { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { ActivatedRoute, Router } from '@angular/router';
import { Event } from '../../../../models/event.model';
import { ModalController, PopoverController } from '@ionic/angular';
import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page';
@@ -36,7 +36,7 @@ import { LoginUserRespose } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service';
import { SessionStore } from 'src/app/store/session.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
import { TaskService } from 'src/app/services/task.service';
@Component({
@@ -248,7 +248,8 @@ export class ExpedienteDetailPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
this.close();
this.httpErroHandle.httpsSucessMessagge('Avaliação Superiror')
this.httpErroHandle.httpsSucessMessagge('Avaliação Superiror');
this.TaskService.loadExpedientes()
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
} finally {
@@ -274,6 +275,7 @@ export class ExpedienteDetailPage implements OnInit {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.httpErroHandle.httpsSucessMessagge('Rever')
this.TaskService.loadExpedientes()
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
} finally {
@@ -345,6 +347,7 @@ export class ExpedienteDetailPage implements OnInit {
this.processes.SetTaskToPending(this.serialNumber).subscribe(res => {
this.httpErroHandle.httpsSucessMessagge('Enviar para Pendentes')
this.TaskService.loadExpedientes()
this.goBack();
loader.remove()
},
@@ -562,8 +565,10 @@ export class ExpedienteDetailPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(async (res) => {
if (body == 'descartar') {
this.TaskService.loadExpedientes()
if (res['data'] == 'Yes') {
const loader = this.toastService.loading()
@@ -687,7 +692,9 @@ export class ExpedienteDetailPage implements OnInit {
},
translucent: true
});
return await popover.present();
return await popover.present().then(() => {
this.TaskService.loadExpedientes()
})
}
openNewGroupPage() {
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+1
View File
@@ -106,6 +106,7 @@ export class ExpedientePage implements OnInit {
LoadList() {
this.processes.GetTaskListExpediente(false).subscribe(async res => {
this.TaskService.loadExpedientes()
this.skeletonLoader = true
const result = res
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+12 -2
View File
@@ -142,6 +142,7 @@ export class ExpedientePrPage implements OnInit {
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
this.httpErroHandle.httpsSucessMessagge('Enviar para Pendente')
this.TaskService.loadExpedientes()
this.goBack();
loader.remove()
},
@@ -310,6 +311,7 @@ export class ExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
this.close();
this.TaskService.loadExpedientes();
this.httpErroHandle.httpsSucessMessagge('Aprovar')
} catch(error) {
this.httpErroHandle.httpStatusHandle(error)
@@ -336,6 +338,7 @@ export class ExpedientePrPage implements OnInit {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.httpErroHandle.httpsSucessMessagge('Rever')
this.TaskService.loadExpedientes()
} catch(error) {
this.httpErroHandle.httpStatusHandle(error)
} finally {
@@ -377,12 +380,14 @@ export class ExpedientePrPage implements OnInit {
Attachments: DocumentToSave,
}
if(actionName == 'Aprovar'){
if(actionName == 'Aprovar') {
this.approve(res.data.note, docs);
}
else if(actionName == 'Revisão'){
this.sendToReview(res.data.note, docs);
}
this.TaskService.loadExpedientes();
this.goBack();
}
});
@@ -421,6 +426,8 @@ export class ExpedientePrPage implements OnInit {
} finally {
loader.remove()
}
this.TaskService.loadExpedientes()
}
else{
this.close();
@@ -441,6 +448,7 @@ export class ExpedientePrPage implements OnInit {
modal.onDidDismiss().then( async (res)=>{
this.TaskService.loadExpedientes()
if(body == 'descartar') {
if(res['data']== 'Yes'){
let otherbody = {
@@ -576,7 +584,9 @@ export class ExpedientePrPage implements OnInit {
},
translucent: true
});
return await popover.present();
return await popover.present().then(() => {
this.TaskService.loadExpedientes();
})
}
}
src/app/pages/gabinete-digital/gabinete-digital.page.html
+33 -38
View File
@@ -52,11 +52,6 @@
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<!-- <div class="icon" (click)="clearSearchInput()">
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div> -->
<div (click)="basicSearch()" class="d-flex align-center icon">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
@@ -224,7 +219,7 @@
<p class="text-center exp-card-title ">
Todas as tarefas <br>
<span class="new-task-count" *ngIf="TaskService.new >=2">{{ TaskService.new }} correspondências novas </span>
<span class="new-task-count" *ngIf="TaskService.new == 1">{{ TaskService.new }} correspondência tarefa</span>
<span class="new-task-count" *ngIf="TaskService.new == 1">{{ TaskService.new }} correspondência novas</span>
</p>
<p class="text-center exp-card-content" > {{ AllProcess.length }}
<span class="title1" *ngIf="AllProcess.length == 0">Documento</span>
@@ -245,14 +240,14 @@
<!-- <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do Presidente da República</p> -->
<p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">
Despachos {{ environment.despachoLabel }} <br>
<span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length >=2">{{ TaskService.despachoprstore.newList.length}} correspondências novos </span>
<span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length == 1">{{ TaskService.despachoprstore.newList.length}} correspondência novo </span>
<span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length >=2">{{ TaskService.despachoprstore.newList.length}} correspondências novas </span>
<span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length == 1">{{ TaskService.despachoprstore.newList.length}} correspondência nova </span>
</p>
<p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && !p.userPermission([p.permissionList.Gabinete.md_tasks])">
Despachos criados por mim<br>
<span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length >=2">{{ TaskService.despachoprstore.newList.length}} correspondências novos </span>
<span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length ==1">{{ TaskService.despachoprstore.newList.length}} correspondência novo </span>
<span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length >=2">{{ TaskService.despachoprstore.newList.length}} correspondências novas </span>
<span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length ==1">{{ TaskService.despachoprstore.newList.length}} correspondência nova </span>
</p>
<p class="text-center exp-card-content"> {{ TaskService.despachoprstore.count }}
<span class="title1" *ngIf="TaskService.despachoprstore.count == 0">Documento</span>
@@ -272,12 +267,12 @@
</div>
<p class="text-center exp-card-title " *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])">
Diplomas assinados PR <br>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length >=2">{{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondências novos</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length ==1">{{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length >=2">{{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length ==1">{{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondência nova</span>
</p>
<p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" >Diplomas <br>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length >=2">{{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondências novo</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length ==1">{{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length >=2">{{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length ==1">{{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondência nova</span>
</p>
<p class="text-center exp-card-content"> {{ TaskService.deplomasStore.countDiplomasAssinadoListCount }}
<span class="title1" *ngIf="TaskService.deplomasStore.countDiplomasAssinadoListCount == 0">Documento</span>
@@ -297,8 +292,8 @@
<ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title">Diplomas por Assinar {{ environment.PR}} <br>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length >=2">{{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas correspondências novos</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length ==1">{{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diploma correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length >=2">{{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length ==1">{{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diploma correspondência nova</span>
</p>
<p class="text-center exp-card-content">
{{ TaskService.deplomasStore.diplomasParaAssinartCount }}
@@ -317,8 +312,8 @@
</div>
<p class="text-center exp-card-title " >
Diplomas por Validar<br>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasReviewListNewCount.length >=2">{{ TaskService.deplomasStore.diplomasReviewListNewCount.length}} correspondências novos</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasReviewListNewCount.length ==1">{{ TaskService.deplomasStore.diplomasReviewListNewCount.length}} correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasReviewListNewCount.length >=2">{{ TaskService.deplomasStore.diplomasReviewListNewCount.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasReviewListNewCount.length ==1">{{ TaskService.deplomasStore.diplomasReviewListNewCount.length}} correspondência nova</span>
</p>
<!-- <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas por Assinar PR</p> -->
<p class="text-center exp-card-content">
@@ -340,8 +335,8 @@
<ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title">Diplomas para Assinar<br>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length >= 2">{{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondências novos</span>
<span class="new-task-count " *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length == 1">{{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length >= 2">{{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondências novas</span>
<span class="new-task-count " *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length == 1">{{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondência nova</span>
</p>
<p class="text-center exp-card-content">
{{ TaskService.deplomasStore.diplomasParaAssinartCount }}
@@ -364,8 +359,8 @@
<p class="text-center exp-card-title" >
Diplomas por elaborar <br>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasGerarListNewCount.length >=2">{{ TaskService.deplomasStore.diplomasGerarListNewCount.length}} correspondências novos</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasGerarListNewCount.length ==1">{{ TaskService.deplomasStore.diplomasGerarListNewCount.length}} correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasGerarListNewCount.length >=2">{{ TaskService.deplomasStore.diplomasGerarListNewCount.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasGerarListNewCount.length ==1">{{ TaskService.deplomasStore.diplomasGerarListNewCount.length}} correspondência nova</span>
</p>
<p class="text-center exp-card-content">
{{ TaskService.deplomasStore.DiplomaGerarList.length }}
@@ -382,8 +377,8 @@
<ion-icon src="assets/images/icons-agenda.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Eventos para Aprovação <br>
<span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length >=2">{{ TaskService.eventoaprovacaostore.newList.length}} correspondências novos</span>
<span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length ==1">{{ TaskService.eventoaprovacaostore.newList.length}} correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length >=2">{{ TaskService.eventoaprovacaostore.newList.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length ==1">{{ TaskService.eventoaprovacaostore.newList.length}} correspondência nova</span>
</p>
<p class="text-center exp-card-content">
{{TaskService.eventoaprovacaostore.countAll}}
@@ -404,8 +399,8 @@
</div>
<p class="text-center exp-card-title ">Expediente <br>
<span *ngIf="TaskService.expedientegbstore.newList.length == 1" class="new-task-count">{{ TaskService.expedientegbstore.newList.length}} correspondência novo</span>
<span *ngIf="TaskService.expedientegbstore.newList.length >= 2" class="new-task-count">{{ TaskService.expedientegbstore.newList.length}} correspondências novos</span>
<span *ngIf="TaskService.expedientegbstore.newList.length == 1" class="new-task-count">{{ TaskService.expedientegbstore.newList.length}} correspondência nova</span>
<span *ngIf="TaskService.expedientegbstore.newList.length >= 2" class="new-task-count">{{ TaskService.expedientegbstore.newList.length}} correspondências novas</span>
</p>
<p class="text-center exp-card-content">
@@ -427,8 +422,8 @@
<ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Dispatches'" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-despachos-presidente-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Despachos<br>
<span class="new-task-count" *ngIf="TaskService.despachoStore.newList.length >=2">{{ TaskService.despachoStore.newList.length}} correspondências novos</span>
<span class="new-task-count" *ngIf="TaskService.despachoStore.newList.length ==1">{{ TaskService.despachoStore.newList.length}} correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.despachoStore.newList.length >=2">{{ TaskService.despachoStore.newList.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.despachoStore.newList.length ==1">{{ TaskService.despachoStore.newList.length}} correspondência nova</span>
</p>
<p class="text-center exp-card-content">
{{TaskService.despachoStore.count}}
@@ -452,13 +447,13 @@
</div>
<p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
Pedidos de Parecer<br>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length >=2" >{{ TaskService.pedidosstore.listParecerCount.length}} correspondências novos</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length ==1" >{{ TaskService.pedidosstore.listParecerCount.length}} correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length >=2" >{{ TaskService.pedidosstore.listParecerCount.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length ==1" >{{ TaskService.pedidosstore.listParecerCount.length}} correspondência nova</span>
</p>
<p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
Pedidos de Parecer solicitados por mim <br>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length >=2">{{ TaskService.pedidosstore.listParecerCount.length}} correspondências novos</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length ==1">{{ TaskService.pedidosstore.listParecerCount.length}} correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length >=2">{{ TaskService.pedidosstore.listParecerCount.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length ==1">{{ TaskService.pedidosstore.listParecerCount.length}} correspondência nova</span>
</p>
<p class="text-center exp-card-content">
{{TaskService.pedidosstore.countparecer}}
@@ -480,8 +475,8 @@
</div>
<p class="text-center exp-card-title ">
Pedidos de Deferimento<br>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listDeferimentoCount.length >=2">{{ TaskService.pedidosstore.listDeferimentoCount.length}} correspondências novos</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listDeferimentoCount.length ==1">{{ TaskService.pedidosstore.listDeferimentoCount.length}} correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listDeferimentoCount.length >=2">{{ TaskService.pedidosstore.listDeferimentoCount.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listDeferimentoCount.length ==1">{{ TaskService.pedidosstore.listDeferimentoCount.length}} correspondência nova</span>
</p>
<p class="text-center exp-card-content">
{{ TaskService.pedidosstore.countdeferimento}}
@@ -502,13 +497,13 @@
</div>
<p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
Pendentes<br>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=2">{{ TaskService.pendentesstore.newList.length}} correspondências novos</span>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=1">{{ TaskService.pendentesstore.newList.length}} correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=2">{{ TaskService.pendentesstore.newList.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=1">{{ TaskService.pendentesstore.newList.length}} correspondência nova</span>
</p>
<p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Meus Pendentes<br>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=2">{{ TaskService.pendentesstore.newList.length}} correspondências novos</span>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length ==1">{{ TaskService.pendentesstore.newList.length}} correspondência novo</span>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=2">{{ TaskService.pendentesstore.newList.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length ==1">{{ TaskService.pendentesstore.newList.length}} correspondência nova</span>
</p>
<p class="text-center exp-card-content">
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+7 -1
View File
@@ -269,7 +269,7 @@ export class PedidoPage implements OnInit {
await popover.present();
popover.onDidDismiss().then((res => {
this.TaskService.loadPedidos();
if (res['data'] == 'close') {
this.goBack()
}
@@ -295,6 +295,7 @@ export class PedidoPage implements OnInit {
await this.processes.CompleteTask(body).toPromise()
this.htppErroHandle.httpsSucessMessagge('Solicitar alteração')
this.TaskService.loadPedidos();
this.close();
} catch (error) {
this.htppErroHandle.httpStatusHandle(error)
@@ -315,6 +316,7 @@ export class PedidoPage implements OnInit {
}).toPromise()
this.htppErroHandle.httpsSucessMessagge('Arquivar')
this.TaskService.loadPedidos();
this.close();
} catch (error) {
this.htppErroHandle.httpStatusHandle(error)
@@ -341,6 +343,7 @@ export class PedidoPage implements OnInit {
await this.processes.CompleteTask(body).toPromise()
this.toastService._successMessage()
this.close();
this.TaskService.loadPedidos();
} catch (error) {
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
@@ -359,6 +362,7 @@ export class PedidoPage implements OnInit {
this.processes.SetTaskToPending(this.serialnumber).subscribe(res => {
this.goBack();
loader.remove()
this.TaskService.loadPedidos();
}, (error) => {
loader.remove()
this.htppErroHandle.httpStatusHandle(error)
@@ -546,6 +550,7 @@ export class PedidoPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then(res => {
this.TaskService.loadPedidos();
if(res.data == 'sucess'){
this.goBack();
}
@@ -596,6 +601,7 @@ export class PedidoPage implements OnInit {
else if (actionName == 'Assignar') {
await this.assignar(res.data.note, docs);
}
this.TaskService.loadPedidos();
}
});
}
src/app/services/auth.service.ts
-2
View File
@@ -52,8 +52,6 @@ export class AuthService {
}
}
}
async login(user: UserForm, {saveSession = true}): Promise<LoginUserRespose> {
src/app/services/task.service.ts
+5 -6
View File
@@ -64,15 +64,15 @@ export class TaskService {
) {
window['all-process-gabinete'] = () => {
this.updateCount()
this.updateAllProcess()
this.updateAllProcess();
this.updateCount();
this.runCallback();
}
this.updateAllProcess()
this.updateAllProcess();
this.updateCount()
this.runCallback();
}
registerCallback({funx, id}) {
@@ -133,7 +133,6 @@ export class TaskService {
.concat(this.eventoaprovacaostore.contactList as any).concat(this.expedientegbstore.list as any).concat(this.despachoStore.list as any).concat(this.pedidosstore.listparecer as any).concat(this.pedidosstore.listdeferimento as any)
.concat(this.pendentesstore.list as any)).reverse()
this.runCallback();
}
sortArrayISODate(myArray: any): any[] {
src/app/shared/agenda/approve-event/approve-event.page.ts
+6 -1
View File
@@ -10,6 +10,8 @@ import { ToastService } from 'src/app/services/toast.service';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
import { ThemeService } from 'src/app/services/theme.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-approve-event',
@@ -49,6 +51,7 @@ export class ApproveEventPage implements OnInit {
private toastService: ToastService,
public ThemeService: ThemeService,
private httpErroHandle: HttpErrorHandle,
public TaskService: TaskService
) {
// Event to approve list
@@ -162,7 +165,9 @@ export class ApproveEventPage implements OnInit {
event: ev,
translucent: true
});
return await popover.present();
return await popover.present().then(() =>{
this.TaskService.loadEventosParaAprovacao()
})
}
async emendTask(serialNumber:string) {
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+2 -10
View File
@@ -6,7 +6,7 @@
</div>
<div class="theicon d-flex">
<div>
<!-- <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
@@ -20,19 +20,11 @@
<div *ngIf="showSearch">
<div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
<!-- <div class="icon" (click)="basicSearch()">
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</div> -->
<div class="input-text d-flex ion-align-items-center">
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<!-- <div class="icon" (click)="clearSearchInput()">
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div> -->
<div (click)="basicSearch()" class="d-flex align-center icon">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
@@ -41,7 +33,7 @@
</div>
</div>
</div>
</div>
</div> -->
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
src/app/shared/gabinete-digital/despachos/despachos.page.html
+4 -11
View File
@@ -7,7 +7,7 @@
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button> -->
<div>
<!-- <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
@@ -21,19 +21,12 @@
<div *ngIf="showSearch">
<div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
<!-- <div class="icon" (click)="basicSearch()">
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</div> -->
<div class="input-text d-flex ion-align-items-center">
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<!-- <div class="icon" (click)="clearSearchInput()">
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div> -->
<div (click)="basicSearch()" class="d-flex align-center icon">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
@@ -42,7 +35,7 @@
</div>
</div>
</div>
</div>
</div> -->
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+4 -10
View File
@@ -3,7 +3,7 @@
<div class="title">
<div class="thetitle"><ion-label >Diplomas para assinar</ion-label></div>
<div class="theicon d-flex">
<div>
<!-- <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
@@ -17,19 +17,13 @@
<div *ngIf="showSearch">
<div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
<!-- <div class="icon" (click)="basicSearch()">
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</div> -->
<div class="input-text d-flex ion-align-items-center">
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<!-- <div class="icon" (click)="clearSearchInput()">
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div> -->
<div (click)="basicSearch()" class="d-flex align-center icon">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
@@ -38,7 +32,7 @@
</div>
</div>
</div>
</div>
</div> -->
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+4 -11
View File
@@ -3,7 +3,7 @@
<div class="title">
<div class="thetitle"><ion-label >Diplomas</ion-label></div>
<div class="theicon d-flex">
<div>
<!-- <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
@@ -17,19 +17,12 @@
<div *ngIf="showSearch">
<div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
<!-- <div class="icon" (click)="basicSearch()">
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</div> -->
<div class="input-text d-flex ion-align-items-center">
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<!-- <div class="icon" (click)="clearSearchInput()">
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div> -->
<div (click)="basicSearch()" class="d-flex align-center icon">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
@@ -38,7 +31,7 @@
</div>
</div>
</div>
</div>
</div> -->
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+4 -10
View File
@@ -6,7 +6,7 @@
<div class="d-flex">
<div>
<!-- <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
@@ -20,19 +20,13 @@
<div *ngIf="showSearch">
<div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
<!-- <div class="icon" (click)="basicSearch()">
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</div> -->
<div class="input-text d-flex ion-align-items-center">
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<!-- <div class="icon" (click)="clearSearchInput()">
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div> -->
<div (click)="basicSearch()" class="d-flex align-center icon">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
@@ -41,7 +35,7 @@
</div>
</div>
</div>
</div>
</div> -->
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+4 -11
View File
@@ -5,7 +5,7 @@
<div class="theicon d-flex" (click)="refreshing()">
<div>
<!-- <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
@@ -19,19 +19,12 @@
<div *ngIf="showSearch">
<div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
<!-- <div class="icon" (click)="basicSearch()">
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</div> -->
<div class="input-text d-flex ion-align-items-center">
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<!-- <div class="icon" (click)="clearSearchInput()">
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div> -->
<div (click)="basicSearch()" class="d-flex align-center icon">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
@@ -40,7 +33,7 @@
</div>
</div>
</div>
</div>
</div> -->
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
src/app/shared/gabinete-digital/expedients/expedients.page.html
+4 -10
View File
@@ -3,7 +3,7 @@
<div class="title">
<div class="thetitle"><ion-label >Expediente</ion-label></div>
<div class="theicon d-flex">
<!--
<div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
@@ -18,19 +18,13 @@
<div *ngIf="showSearch">
<div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
<!-- <div class="icon" (click)="basicSearch()">
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</div> -->
<div class="input-text d-flex ion-align-items-center">
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<!-- <div class="icon" (click)="clearSearchInput()">
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div> -->
<div (click)="basicSearch()" class="d-flex align-center icon">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
@@ -40,7 +34,7 @@
</div>
</div>
</div>
-->
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
<mat-select [(value)]="filterName">
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+4 -10
View File
@@ -5,7 +5,7 @@
<div class="theicon btn-refresh d-flex">
<div>
<!-- <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
@@ -19,19 +19,13 @@
<div *ngIf="showSearch">
<div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
<!-- <div class="icon" (click)="basicSearch()">
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</div> -->
<div class="input-text d-flex ion-align-items-center">
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<!-- <div class="icon" (click)="clearSearchInput()">
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div> -->
<div (click)="basicSearch()" class="d-flex align-center icon">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
@@ -40,7 +34,7 @@
</div>
</div>
</div>
</div>
</div> -->
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+4 -11
View File
@@ -5,7 +5,7 @@
<div class="theicon d-flex">
<div>
<!-- <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
@@ -19,19 +19,12 @@
<div *ngIf="showSearch">
<div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
<!-- <div class="icon" (click)="basicSearch()">
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</div> -->
<div class="input-text d-flex ion-align-items-center">
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<!-- <div class="icon" (click)="clearSearchInput()">
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div> -->
<div (click)="basicSearch()" class="d-flex align-center icon">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
@@ -40,7 +33,7 @@
</div>
</div>
</div>
</div>
</div> -->
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
src/environments/suport/doneIt.ts
+2 -3
View File
@@ -1,5 +1,5 @@
import { versionData } from '../../../version/git-version'
import { Environment } from './../../app/models/envarioment'
import { versionData } from '../../../version/git-version';
import { Environment } from './../../app/models/envarioment';
export const doneITProd: Environment = {
id:'1',
@@ -23,7 +23,6 @@ export const doneITProd: Environment = {
VP: '',
dispatchPR: 'Despachos Titular',
};
export const doneITDev: Environment = {
id:'1',
apiURL: 'https://API.DONEIT.CO.AO/api/',
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "073f04e54",
"SHA": "073f04e541a403a0b6d51f432942c8078d7ac4ff",
"shortSHA": "ef882e8ff",
"SHA": "ef882e8ff15e33bf250aceb4f21876f626391d1b",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu May 4 10:18:16 2023 +0100'",
"lastCommitMessage": "remove search",
"lastCommitNumber": "4934",
"lastCommitTime": "'Mon May 8 10:52:54 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "4935",
"change": "",
"changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/global.scss",
"changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: readme.md\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/models/user.model.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/environments/suport/doneIt.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}