merge with Peter changes

This commit is contained in:
Eudes Inácio
2023-02-03 14:45:16 +01:00
17 changed files with 136 additions and 35 deletions
@@ -258,7 +258,7 @@
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send"
src="assets/icon/theme/gov/icons-chat-record-audio.svg"></ion-icon>
</button>
<button *ngIf="ChatSystemService.getDmRoom(roomId).message" class="btn-no-color" (click)="sendMessage(ChatSystemService.getDmRoom(roomId).messages)"
<button *ngIf="ChatSystemService.getDmRoom(roomId).message" class="btn-no-color" (click)="sendMessage()"
class="btn-no-color">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send"
src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
+1 -1
View File
@@ -381,7 +381,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
window.removeEventListener('scroll', this.scrollChangeCallback, true);
}
sendMessage(msg) {
sendMessage() {
this.ChatSystemService.getDmRoom(this.roomId).send({}).then(() => {
})
}
@@ -6,8 +6,8 @@
<div class="main-header">
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
<div class="thetitle">
<ion-label *ngIf="sessionProfile =='MDGPR'" >{{ environment.despachoLabel2 }}</ion-label>
<ion-label *ngIf="sessionProfile =='PR'" >Despachos</ion-label>
<ion-label *ngIf="SessionStore.user.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
<ion-label *ngIf="SessionStore.user.Profile =='PR'" >Despachos</ion-label>
</div>
<div class="theicon btn-refresh">
<button class="btn-no-color" (click)="doRefresh($event)">
@@ -15,7 +15,7 @@
</button>
</div>
</div>
<!-- <div *ngIf="loggeduser.Profile =='MDGPR'" class="bottom-title d-flex">
<!-- <div *ngIf="SessionStore.user.Profile =='MDGPR'" class="bottom-title d-flex">
<h3 class="bottom-text">Presidente da República</h3>
</div> -->
</ion-header>
@@ -50,14 +50,12 @@ export class DespachosPrPage implements OnInit {
dicIndex = 0;
inicial = false
loggeduser: LoginUserRespose;
sessionProfile = SessionStore.user.Profile
skeletonLoader = true
despachoprstore = DespachosprStore
listToPresent = [];
customTaskPipe = new CustomTaskPipe()
environment = environment
SessionStore = SessionStore
constructor(
private processes: ProcessesService,
@@ -35,12 +35,9 @@
}
.bottom-title{
width: calc(100% - 40px);
margin-left: 20px !important;
margin-right: 20px !important;
margin: 0 auto;
align-items: center;
justify-content: center;
border-bottom: 5px solid #42b9fe;
.bottom-text{
font-size: 15px !important;
@@ -70,7 +70,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
this.router.events.forEach((event) => {
if (event instanceof NavigationStart && event.url.startsWith(pathname)) {
if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing()
this.LoadList()
} else {
this.LoadList()
}
@@ -285,7 +285,7 @@
<p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
</div>
<!-- <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'" [class.active]="selectedElement == 'DiplomasParaAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'" [class.active]="selectedElement == 'DiplomasParaAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
@@ -295,7 +295,7 @@
</div>
<p class="text-center exp-card-title">Diplomas por Assinar </p>
<p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
</div> -->
</div>
</div>
@@ -24,8 +24,6 @@
}
.bottom-title{
width: calc(100% - 40px);
margin-left: 20px !important;
margin-right: 20px !important;
margin: 0 auto;
align-items: center;
justify-content: center;
@@ -63,8 +63,6 @@ export class DiplomasAssinarPage implements OnInit {
async LoadList() {
this.skeletonLoader = true
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
@@ -80,7 +78,6 @@ export class DiplomasAssinarPage implements OnInit {
this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
this.deplomasStore.resetDiplomasParaAssinar(this.diplomasList);
}
@@ -42,7 +42,7 @@ export class DiplomasPage implements OnInit {
this.router.events.forEach((event) => {
if (event instanceof NavigationStart && '/home/gabinete-digital?diplomas=true'.startsWith(event.url)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing()
this.LoadList()
} else {
this.LoadList()
}
@@ -112,14 +112,18 @@ export class DiplomasGerarOptionsPage implements OnInit {
const loader = this.toastService.loading()
this.despachoService.sendExpedienteToPending(this.serialNumber).subscribe(res => {
this.goBack();
this.toastService.successMessage()
this.toastService._badRequest("Processo enviado para Pendentes")
loader.remove()
},
error => {
loader.remove()
this.toastService.badRequest("Processo não enviado para despacho")
});
error => {
loader.remove()
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest("Processo não enviado para Pendentes")
}
});
}