+
Limpar
diff --git a/src/app/pages/inactivity/inactivity.page.scss b/src/app/pages/inactivity/inactivity.page.scss
index e8ba842b8..3cd90e111 100644
--- a/src/app/pages/inactivity/inactivity.page.scss
+++ b/src/app/pages/inactivity/inactivity.page.scss
@@ -9,12 +9,11 @@ ion-content{
}
.main-wrapper{
- background: var(--login-background);
+ background: var(--PinBackground);
display: flex;
width: 100vw;
height: 100vh;
overflow: auto;
- background: white !important;
display: flex;
align-items: center;
justify-content: center;
@@ -142,7 +141,7 @@ ion-item{
align-items: center;
justify-content: center;
font-size: 19pt;
- background: #44b5ea;
+ background: var(--PinDots);;
border-radius: 56px;
margin-bottom: 15px;
user-select: none;
@@ -163,7 +162,7 @@ ion-item{
justify-content: center;
display: flex;
flex-direction: column;
- background-image: url(/assets/background/auth.svg);
+ background-image: var(--PinCircleBackground);
background-position: center;
background-repeat: no-repeat;
width: 100%;
@@ -172,19 +171,20 @@ ion-item{
}
.clear{
- color: #44b5ea;
+ color: var(--PinTextColor);
font-size: 12pt;
z-index: 1000;
}
+
.dot-active{
- background: #44b5ea;
+ background: var(--PinDots);
}
.dot{
width: 25px;
height: 25px;
margin: 0 10px 0 0;
- border: 3px solid #44b5ea;
+ border: 3px solid var(--PinDots);
box-sizing: border-box;
border-radius: 50px;
-webkit-border-radius: 50px;
diff --git a/src/app/pages/inactivity/inactivity.page.ts b/src/app/pages/inactivity/inactivity.page.ts
index 1b2d1efae..5681c459f 100644
--- a/src/app/pages/inactivity/inactivity.page.ts
+++ b/src/app/pages/inactivity/inactivity.page.ts
@@ -132,11 +132,11 @@ export class InactivityPage implements OnInit {
}
}
else {
- this.toastService.badRequest('Por favor, insira a sua palavra-passe');
+ this.toastService._badRequest('Por favor, insira a sua palavra-passe');
}
}
else {
- this.toastService.badRequest('Por favor, insira o seu nome de utilizador');
+ this.toastService._badRequest('Por favor, insira o seu nome de utilizador');
}
}
@@ -182,7 +182,7 @@ export class InactivityPage implements OnInit {
}, 1000)
} else {
- this.toastService.badRequest('Pin incorreto')
+ this.toastService._badRequest('Pin incorreto')
this.code = []
}
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 32f026712..03fa662ba 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -123,11 +123,11 @@ export class LoginPage implements OnInit {
}
}
else {
- this.toastService.badRequest('Por favor, insira a sua palavra-passe');
+ this.toastService._badRequest('Por favor, insira a sua palavra-passe');
}
}
else {
- this.toastService.badRequest('Por favor, insira o seu nome de utilizador');
+ this.toastService._badRequest('Por favor, insira o seu nome de utilizador');
}
}
diff --git a/src/app/pages/publications/edit-action/edit-action.page.ts b/src/app/pages/publications/edit-action/edit-action.page.ts
index 97b765ca0..90eed9ce5 100644
--- a/src/app/pages/publications/edit-action/edit-action.page.ts
+++ b/src/app/pages/publications/edit-action/edit-action.page.ts
@@ -104,9 +104,9 @@ export class EditActionPage implements OnInit {
await this.publicationsService.UpdatePresidentialAction(body).toPromise()
this.close();
this.updateDesktopComponent.emit();
- this.toastService.successMessage('Acção presidencial atualizada')
+ this.toastService._successMessage('Acção presidencial atualizada')
} catch (error) {
- this.toastService.badRequest('Não foi possivel atualizar a acção presidencial')
+ this.toastService._badRequest('Não foi possivel atualizar a acção presidencial')
} finally {
loader.remove()
}
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index b96eb8e80..c0e2309f1 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -238,9 +238,9 @@ export class PublicationsPage implements OnInit {
try {
await this.publications.DeletePresidentialAction(id).toPromise();
- this.toastService.successMessage()
+ this.toastService._successMessage()
} catch (e) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
}
finally {
loader.remove()
diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts
index 04066f1da..8c3948e42 100644
--- a/src/app/services/agenda/list-box.service.ts
+++ b/src/app/services/agenda/list-box.service.ts
@@ -8,8 +8,8 @@ import { DateService } from '../date.service';
export class ListBoxService {
constructor(
- private dateService: DateService
- ){}
+ private dateService: DateService
+ ){}
filterProfile(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all') {
@@ -26,32 +26,34 @@ export class ListBoxService {
})
}
- filterSegment(eventSource: EventListStore[], segment): EventListStore[] {
- return eventSource.filter( data => data.calendarName == segment)
- }
-
+ filterSegment(eventSource: EventListStore[], segment): EventListStore[] {
+ return eventSource.filter( data => data.calendarName == segment)
+ }
daysBetween(){ }
list(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'Combinado', selectedDate= null}) {
- // filter range
- if(selectedDate) {
- eventSource = eventSource.filter(data =>
- data.startTime.toLocaleDateString('pt')>= selectedDate.toLocaleDateString('pt') &&
- data.endTime.toLocaleDateString('pt')>= selectedDate.toLocaleDateString('pt')
- )
- }
+ // console.log('eventSource', eventSource ,'rangeStartDate', new Date(rangeStartDate).toLocaleDateString('pt') , 'randEndDate', new Date(randEndDate).toLocaleDateString('pt'))
- if(segment!='Combinado') {
- eventSource = this.filterSegment(eventSource, segment)
- }
+ // // filter range
+ // if(selectedDate) {
+ // eventSource = eventSource.filter(data =>
+ // data.startTime.toLocaleDateString('pt') >= new Date(rangeStartDate).toLocaleDateString('pt') &&
+ // data.startTime.toLocaleDateString('pt') <= new Date(rangeStartDate).toLocaleDateString('pt')
+ // )
+ // }
+
+
+ if(segment!='Combinado') {
+ eventSource = this.filterSegment(eventSource, segment)
+ }
if(profile != 'all') {
eventSource = this.filterProfile(eventSource, profile)
}
- let newStracture:CustomCalendarEvent[];
+ let newStracture:CustomCalendarEvent[];
if(profile == 'md') {
newStracture = this.encapsulation(eventSource, 'mdgpr');
diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts
index db279af79..0539f5085 100644
--- a/src/app/services/toast.service.ts
+++ b/src/app/services/toast.service.ts
@@ -24,6 +24,73 @@ export class ToastService {
toast.present();
}
+
+ async _successMessage(message?: any, callback?) {
+
+ let notification = document.createElement('div')
+ notification.className = 'notification'
+ notification.innerHTML = `
+
+
+
+
+
{{ message }}
+
+
+
+ `
+
+ document.body.append(notification)
+ notification.querySelector('.text').innerHTML = message || 'Processo efetuado'
+ setTimeout(()=>{
+ if (callback) {
+ callback()
+ }
+
+ notification.style.right = "-100%"
+
+ setTimeout(()=>{
+ notification.remove()
+ },1000)
+
+ },6000)
+
+ }
+
+ async _badRequest(message?: string, callback?) {
+
+ let notification = document.createElement('div')
+ notification.className = 'notification'
+ notification.innerHTML = `
+
+
+
+
+
{{ message }}
+
+
+
+ `
+
+ notification.style.animationName = 'notification-top'
+
+ document.body.append(notification)
+ notification.querySelector('.text').innerHTML = message || 'Processo não efetuado'
+ setTimeout(()=>{
+ if (callback) {
+ callback()
+ }
+
+ notification.style.right = "-100%"
+
+ setTimeout(()=>{
+ notification.remove()
+ },1000)
+
+ },6000)
+
+ }
+
async successMessage(message?: any, callback?) {
let notification = document.createElement('div')
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index 4eef38a80..36759d852 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -142,6 +142,10 @@ export class EditEventPage implements OnInit {
}
+ ngOnChanges(changes: any): void {
+ // this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments)
+ }
+
close() {
this.closeComponent.emit();
this.setIntervenient.emit([]);
@@ -282,7 +286,6 @@ export class EditEventPage implements OnInit {
async saveDocument() {
- console.log(this.loadedEventAttachments)
await this.loadedEventAttachments.forEach( async (e)=>{
@@ -303,10 +306,10 @@ export class EditEventPage implements OnInit {
};
await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise();
- this.getAttachments(this.postEvent.EventId);
+ await this.getAttachments(this.postEvent.EventId);
} else if(remove) {
- this.attachmentsService.deleteEventAttachmentById(e.Id).subscribe( res=> {})
+ await this.attachmentsService.deleteEventAttachmentById(e.Id).toPromise()
}
})
@@ -365,11 +368,9 @@ export class EditEventPage implements OnInit {
window['temp.path:/home/agenda/edit-event.component.ts'] = {}
}
- getAttachments(eventId: string){
- this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{
- this.loadedEventAttachments = res;
- console.log('res', res);
- });
+ async getAttachments(eventId: string){
+ const rest: any = this.attachmentsService.getAttachmentsById(eventId).toPromise()
+ this.loadedEventAttachments = rest;
}
deleteAttachment(attachmentID: string, index) {
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index bcf7d5dc4..058c0910f 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -409,14 +409,14 @@ export class NewEventPage implements OnInit {
this.afterSave();
}
- this.toastService.successMessage('Evento criado')
+ this.toastService._successMessage('Evento criado')
},
error => {
loader.remove()
this.showLoader = false
- this.toastService.badRequest('Evento não criado')
+ this.toastService._badRequest('Evento não criado')
});
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts
index cff1408fe..2de4d89da 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -95,6 +95,7 @@ export class ViewEventPage implements OnInit {
}
loadEvent() {
+
this.eventsService.getEvent(this.eventId).subscribe(res => {
console.log(res);
this.loadedEvent = res;
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 2292ba298..247e6e8f2 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -31,7 +31,7 @@ export class DiplomasAssinarPage implements OnInit {
private router: Router,
private sortService: SortService,
public ThemeService: ThemeService
- ) { }
+ ) {}
ngOnInit() {
@@ -56,30 +56,27 @@ export class DiplomasAssinarPage implements OnInit {
doRefresh() {
setTimeout(() => {
this.LoadList();
- //event.target.complete();
}, 1000);
}
async LoadList() {
+
+
this.skeletonLoader = true
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.diplomasList = new Array();
this.skeletonLoader = false
- console.log(diplomas);
let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
- console.log(diplomasAssinar);
diplomasAssinar.forEach(element => {
-
let task: customTask = this.customTaskPipe.transform(element)
this.diplomasList.push(task);
- this.deplomasStore.resetDiplomasList(this.sortService.sortArrayByDate(this.diplomasList));
-
});
+ this.deplomasStore.resetDiplomasList(this.diplomasList);
}
}
diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts
index d976e4540..0ad15f77b 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -107,9 +107,9 @@ export class DeplomaOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
- this.toastService.successMessage()
+ this.toastService._successMessage()
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -154,9 +154,9 @@ export class DeplomaOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
- this.toastService.successMessage()
+ this.toastService._successMessage()
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -180,9 +180,9 @@ export class DeplomaOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
- this.toastService.successMessage()
+ this.toastService._successMessage()
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -205,9 +205,9 @@ export class DeplomaOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
- this.toastService.successMessage('Processo concluído')
+ this.toastService._successMessage('Processo concluído')
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
}
finally {
loader.remove()
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index b1d62bbc8..bd2ea5e42 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -74,12 +74,12 @@ export class DespachosOptionsPage implements OnInit {
sendExpedienteToPending(){
this.popoverController.dismiss();
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
- this.toastService.successMessage()
+ this.toastService._successMessage()
console.log(res);
this.close();
},()=>{
- this.toastService.badRequest('Processo não encontrado')
+ this.toastService._badRequest('Processo não encontrado')
});
}
@@ -163,10 +163,10 @@ export class DespachosOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
- this.toastService.successMessage()
+ this.toastService._successMessage()
this.close();
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -244,10 +244,10 @@ export class DespachosOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
- this.toastService.successMessage('Processo arquivado')
+ this.toastService._successMessage('Processo arquivado')
this.close();
} catch (error) {
- this.toastService.badRequest('Processo não arquivado')
+ this.toastService._badRequest('Processo não arquivado')
} finally {
loader.remove()
}
@@ -272,9 +272,9 @@ export class DespachosOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
- this.toastService.successMessage()
+ this.toastService._successMessage()
} catch(error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -298,10 +298,10 @@ export class DespachosOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
- this.toastService.successMessage()
+ this.toastService._successMessage()
this.close();
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index 5ba9b2902..abe5d0913 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -100,11 +100,11 @@ export class DespachosPrOptionsPage implements OnInit {
sendExpedienteToPending() {
this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{
console.log(res);
- this.toastService.successMessage()
+ this.toastService._successMessage()
this.popoverController.dismiss('close')
},()=>{
- this.toastService.badRequest('Processo não encontrado')
+ this.toastService._badRequest('Processo não encontrado')
});
}
@@ -192,10 +192,10 @@ export class DespachosPrOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
- this.toastService.successMessage()
+ this.toastService._successMessage()
this.close();
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -275,10 +275,10 @@ export class DespachosPrOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
- this.toastService.successMessage('')
+ this.toastService._successMessage('')
this.close();
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
}
finally {
loader.remove()
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
index 35a192b50..8fd55d91f 100644
--- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
@@ -142,9 +142,9 @@ export class OptsExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
- this.toastService.successMessage()
+ this.toastService._successMessage()
} catch(error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -179,10 +179,10 @@ export class OptsExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(otherbody).toPromise()
- this.toastService.successMessage('Processo descartado');
+ this.toastService._successMessage('Processo descartado');
this.goBack();
} catch (error) {
- this.toastService.badRequest('Processo não descartado')
+ this.toastService._badRequest('Processo não descartado')
} finally {
loader.remove()
}
@@ -201,7 +201,7 @@ export class OptsExpedientePrPage implements OnInit {
// this.toastService.successMessage('Processo descartado');
this.goBack();
} catch (error) {
- this.toastService.badRequest('Processo não descartado');
+ this.toastService._badRequest('Processo não descartado');
} finally {
loader.remove()
}
@@ -213,10 +213,10 @@ export class OptsExpedientePrPage implements OnInit {
try {
await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
- this.toastService.successMessage();
+ this.toastService._successMessage();
this.goBack();
} catch (error) {
- this.toastService.badRequest();
+ this.toastService._badRequest();
} finally {
loader.remove()
}
@@ -242,9 +242,9 @@ export class OptsExpedientePrPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
this.close();
- this.toastService.successMessage()
+ this.toastService._successMessage()
} catch(error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -258,7 +258,7 @@ export class OptsExpedientePrPage implements OnInit {
this.close();
},()=>{
- this.toastService.badRequest('Processo não encontrado')
+ this.toastService._badRequest('Processo não encontrado')
});
}
@@ -295,7 +295,7 @@ export class OptsExpedientePrPage implements OnInit {
// this.toastService.successMessage('Processo descartado');
this.goBack();
} catch (error) {
- this.toastService.badRequest('Processo não descartado');
+ this.toastService._badRequest('Processo não descartado');
} finally {
loader.remove()
}
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index b8d1bb688..f874a9f4d 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -166,9 +166,9 @@ export class OptsExpedientePage implements OnInit {
const loader = this.toastService.loading()
this.attachmentsService.AddAttachment(body).subscribe((res)=> {
- this.toastService.successMessage()
+ this.toastService._successMessage()
},()=> {
- this.toastService.badRequest()
+ this.toastService._badRequest()
},()=> {
loader.remove()
});
@@ -243,9 +243,9 @@ export class OptsExpedientePage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
- this.toastService.successMessage()
+ this.toastService._successMessage()
} catch(error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -257,7 +257,7 @@ export class OptsExpedientePage implements OnInit {
this.goBack();
},()=>{
- this.toastService.badRequest('Processo não encontrado')
+ this.toastService._badRequest('Processo não encontrado')
});
}
@@ -279,9 +279,9 @@ export class OptsExpedientePage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
this.close();
- this.toastService.successMessage('Processo aprovado')
+ this.toastService._successMessage('Processo aprovado')
} catch(error) {
- this.toastService.badRequest('Processo não aprovado')
+ this.toastService._badRequest('Processo não aprovado')
} finally {
loader.remove()
}
@@ -337,7 +337,7 @@ export class OptsExpedientePage implements OnInit {
await this.processes.CompleteTask(body).toPromise();
this.goBack();
} catch (error) {
- this.toastService.badRequest('Processo não descartado')
+ this.toastService._badRequest('Processo não descartado')
} finally {
loader.remove()
}
@@ -369,10 +369,10 @@ export class OptsExpedientePage implements OnInit {
try {
await this.expedienteService.discard({SerialNumber: this.task.SerialNumber}).toPromise()
- this.toastService.successMessage('Processo descartado');
+ this.toastService._successMessage('Processo descartado');
this.goBack();
} catch (error) {
- this.toastService.badRequest('Processo não descartado')
+ this.toastService._badRequest('Processo não descartado')
} finally {
loader.remove()
}
@@ -389,10 +389,10 @@ export class OptsExpedientePage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise();
- this.toastService.successMessage('Processo descartado');
+ this.toastService._successMessage('Processo descartado');
this.goBack();
} catch (error) {
- this.toastService.badRequest('Processo não descartado')
+ this.toastService._badRequest('Processo não descartado')
} finally {
loader.remove()
}
@@ -404,10 +404,10 @@ export class OptsExpedientePage implements OnInit {
try {
await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
- this.toastService.successMessage();
+ this.toastService._successMessage();
this.goBack();
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts
index ed59e7c99..d64b9d583 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -80,11 +80,11 @@ export class RequestOptionsPage implements OnInit {
sendExpedienteToPending() {
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
console.log(res);
- this.toastService.successMessage()
+ this.toastService._successMessage()
this.close();
},()=>{
- this.toastService.badRequest('Processo não encontrado')
+ this.toastService._badRequest('Processo não encontrado')
});
}
@@ -157,9 +157,9 @@ export class RequestOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
- this.toastService.successMessage()
+ this.toastService._successMessage()
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
}
finally {
loader.remove()
@@ -226,9 +226,9 @@ export class RequestOptionsPage implements OnInit {
note
}).toPromise()
- this.toastService.successMessage('Processo arquivado')
+ this.toastService._successMessage('Processo arquivado')
} catch (error) {
- this.toastService.badRequest('Processo não arquivado')
+ this.toastService._badRequest('Processo não arquivado')
} finally {
loader.remove()
}
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts
index 50c3a3d32..4d25f3b8f 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -200,11 +200,11 @@ export class NewPublicationPage implements OnInit {
try {
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
- this.toastService.successMessage()
+ this.toastService._successMessage()
this.goBack();
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -228,11 +228,12 @@ export class NewPublicationPage implements OnInit {
try {
console.log(this.publication);
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
- this.toastService.successMessage()
+
+ this.toastService._successMessage()
this.goBack();
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -256,11 +257,11 @@ export class NewPublicationPage implements OnInit {
try {
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
- this.toastService.successMessage()
+ this.toastService._successMessage()
this.goBack();
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -287,11 +288,11 @@ export class NewPublicationPage implements OnInit {
try {
console.log(this.publication);
await this.publications.CreatePublication(this.folderId, this.publication).toPromise()
- this.toastService.successMessage()
+ this.toastService._successMessage()
this.goBackToViewPublications.emit();
} catch (error) {
- this.toastService.badRequest()
+ this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -302,9 +303,11 @@ export class NewPublicationPage implements OnInit {
close(){
this.goBack();
}
+
clear(){
this.capturedImage = '';
}
+
setTitle(){
if(this.publicationType == '1') {
this.publicationTitle = 'Nova Publicação Rápida';
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index b94ed647f..0dc8d3c09 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -94,10 +94,10 @@ export class PublicationDetailPage implements OnInit {
try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
- this.toastService.successMessage("Publicação eliminado")
+ this.toastService._successMessage("Publicação eliminado")
this.goBackToViewPublications.emit();
} catch (error) {
- this.toastService.badRequest("Publicação não eliminado")
+ this.toastService._badRequest("Publicação não eliminado")
} finally {
laoder.remove()
}
diff --git a/src/global.scss b/src/global.scss
index 60aff4c0b..0dcae205f 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -1235,7 +1235,7 @@ ngx-mat-datetime-content{
.loading-blocker {
.loading-blocker-container {
- width: 250px;
+ width: 196px;
}
}
}
@@ -1297,4 +1297,6 @@ ngx-mat-datetime-content{
.add-people {
align-items: center;
height: 45px;
-}
\ No newline at end of file
+}
+
+
diff --git a/src/proxy.conf.json b/src/proxy.conf.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/src/proxy.conf.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index b9d52a1e0..a4271f04d 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -588,9 +588,11 @@ $app-theme: mat-light-theme(
color: #061b52 !important;
margin: 0 auto !important;
}
+
.btn-no-color {
background-color: #fff;
}
+
.exp-workflow {
float: left;
margin-left: 15px;
@@ -627,6 +629,7 @@ body {
--indicator-color: transparent !important;
--indicator-color-checked: transparent !important;
}
+
.yellow-orange{
color: #ffb703 !important;
}
@@ -647,8 +650,12 @@ body {
--header-container-background: #fff;
--header-bottom-line-background: rgb(255, 0, 0);
--header-bottom-line-background-image: linear-gradient(to right, #ff0000, #fd0000, #ff0000);
- --font-awesome: #ff0000;
+ --font-awesome: #f7dddd;
--font-awesome-1: #c63527;
+ --PinDots: #44b5ea;
+ --PinCircleBackground: url(/auth.svg);
+ --PinBackground: #e1e7eb;
+ --PinTextColor: #44b5ea;
--color: #97cae631;
--color2: #97cae631;
@@ -721,6 +728,7 @@ body {
--button-color: #ffb81c;
--button-text-color: white;
--inicio-open-page-from-box: #c63527;
+ --PinBackground: #e1e7eb;
--header-tab-top-border: #000;
--header-tab-text-white: rgb(0, 0, 0);
@@ -733,6 +741,9 @@ body {
--mat-selected-hover: #c634277e;
--mat-calendar-body-selected: #c63527;
--monthview-selected: rgb(198 53 39 / 49%);
+ --PinDots: #c63527;
+ --PinTextColor: black;
+ --PinCircleBackground: url(/auth.svg);
--color: #d9d9d9;
--color2: #f0f0f0;
@@ -802,6 +813,12 @@ body {
--mat-selected-hover: rgb(216 240 255);
--mat-calendar-body-selected: #42b9fe ;
--monthview-selected: lightskyblue;
+
+ --PinDots: #44b5ea;
+ --PinTextColor: #44b5ea;
+ --PinCircleBackground: url(/assets/background/auth.svg);
+ --PinBackground: white !important;
+
--header-container-background: linear-gradient(
270deg,
var(--color2) 0%,