diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index 8cd58e2f1..368bdc781 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -41,13 +41,11 @@ export class EditEventPage implements OnInit {
recurringTypes: any;
selectedRecurringType: any;
-
loadedEventAttachments: Attachment[] = [];
taskParticipants: any = [];
taskParticipantsCc: any = [];
adding: "intervenient" | "CC" = "intervenient";
-
showAttendees = false;
constructor(
@@ -196,19 +194,22 @@ export class EditEventPage implements OnInit {
this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
- if(this.initCalendarName != this.postEvent.CalendarName){
+
+ if(this.initCalendarName != this.postEvent.CalendarName) {
+
let body = {
"EventId": this.postEvent.EventId,
"CalendarDestinationName": this.postEvent.CalendarName,
- }
- try {
- await this.eventsService.changeAgenda(body).toPromise();
- } catch (error) {}
- finally {
- this.goBack();
+ }
+ try {
+ await this.eventsService.changeAgenda(body).toPromise();
+ } catch (error) {}
+ finally {
+ this.goBack();
+ }
+
}
- }
this.toastService.successMessage();
}, error => {
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 f66e97819..609cc47d9 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -14,7 +14,6 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
import { ParticipantsPipe } from 'src/app/pipes/participants.pipe';
import { ThemeService } from 'src/app/services/theme.service'
-
@Component({
selector: 'app-edit-event',
templateUrl: './edit-event.page.html',
@@ -127,6 +126,7 @@ export class EditEventPage implements OnInit {
}
}
+ this.initCalendarName = this.postEvent.CalendarName;
this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments)
diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss
index 4f044aa5f..039695b83 100644
--- a/src/app/shared/agenda/view-event/view-event.page.scss
+++ b/src/app/shared/agenda/view-event/view-event.page.scss
@@ -176,7 +176,7 @@ ion-content{
.attach-title-item{
width: 100%;
font-size: 15px;
- color:#0d89d1;
+ color:var(--title-text-color);
}
/* SPAN */
.span-left{
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 bd0343cf6..b87751e16 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -216,19 +216,19 @@ export class DespachosOptionsPage implements OnInit {
Attachments: DocumentToSave,
}
- if(actionName == 'Executado'){
+ if(actionName == 'Executado') {
await this.executado(res.data.note, docs);
}
else if(actionName == 'Arquivar'){
await this.arquivar(res.data.note, docs);
}
- else if(actionName == 'Gerar Diploma'){
+ else if(actionName == 'Gerar Diploma') {
await this.generateDiploma(res.data.note, docs);
}
- else if(actionName == 'Concluido'){
+ else if(actionName == 'Concluido') {
//this.concluir(res.data.note, docs);
}
- else if(actionName == 'Reexecução'){
+ else if(actionName == 'Reexecução') {
await this.reexecutar(res.data.note, docs);
}
this.goBack();
diff --git a/src/index.html b/src/index.html
index 2d40cbfe9..2d125ea04 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,7 +11,7 @@
-->
-
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 84d552a9d..79c7281e0 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -715,6 +715,10 @@ body {
}
}
}
+
+ .desk{
+ color: black !important;
+ }
}
.gov {
@@ -794,6 +798,10 @@ body {
}
}
}
+
+ .desk{
+ color: black !important;
+ }
}
// blue
@@ -913,6 +921,7 @@ body {
}
}
}
+
}
.font-awesome {