This commit is contained in:
Peter Maquiran
2021-12-06 15:09:59 +01:00
parent 4545ef0698
commit fc780613b1
6 changed files with 27 additions and 17 deletions
@@ -41,13 +41,11 @@ export class EditEventPage implements OnInit {
recurringTypes: any; recurringTypes: any;
selectedRecurringType: any; selectedRecurringType: any;
loadedEventAttachments: Attachment[] = []; loadedEventAttachments: Attachment[] = [];
taskParticipants: any = []; taskParticipants: any = [];
taskParticipantsCc: any = []; taskParticipantsCc: any = [];
adding: "intervenient" | "CC" = "intervenient"; adding: "intervenient" | "CC" = "intervenient";
showAttendees = false; showAttendees = false;
constructor( constructor(
@@ -196,19 +194,22 @@ export class EditEventPage implements OnInit {
this.postEvent.EventRecurrence.Type = this.selectedRecurringType; this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
if(this.initCalendarName != this.postEvent.CalendarName){
if(this.initCalendarName != this.postEvent.CalendarName) {
let body = { let body = {
"EventId": this.postEvent.EventId, "EventId": this.postEvent.EventId,
"CalendarDestinationName": this.postEvent.CalendarName, "CalendarDestinationName": this.postEvent.CalendarName,
} }
try { try {
await this.eventsService.changeAgenda(body).toPromise(); await this.eventsService.changeAgenda(body).toPromise();
} catch (error) {} } catch (error) {}
finally { finally {
this.goBack(); this.goBack();
}
} }
}
this.toastService.successMessage(); this.toastService.successMessage();
}, error => { }, error => {
@@ -14,7 +14,6 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
import { ParticipantsPipe } from 'src/app/pipes/participants.pipe'; import { ParticipantsPipe } from 'src/app/pipes/participants.pipe';
import { ThemeService } from 'src/app/services/theme.service' import { ThemeService } from 'src/app/services/theme.service'
@Component({ @Component({
selector: 'app-edit-event', selector: 'app-edit-event',
templateUrl: './edit-event.page.html', 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) this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments)
@@ -176,7 +176,7 @@ ion-content{
.attach-title-item{ .attach-title-item{
width: 100%; width: 100%;
font-size: 15px; font-size: 15px;
color:#0d89d1; color:var(--title-text-color);
} }
/* SPAN */ /* SPAN */
.span-left{ .span-left{
@@ -216,19 +216,19 @@ export class DespachosOptionsPage implements OnInit {
Attachments: DocumentToSave, Attachments: DocumentToSave,
} }
if(actionName == 'Executado'){ if(actionName == 'Executado') {
await this.executado(res.data.note, docs); await this.executado(res.data.note, docs);
} }
else if(actionName == 'Arquivar'){ else if(actionName == 'Arquivar'){
await this.arquivar(res.data.note, docs); await this.arquivar(res.data.note, docs);
} }
else if(actionName == 'Gerar Diploma'){ else if(actionName == 'Gerar Diploma') {
await this.generateDiploma(res.data.note, docs); await this.generateDiploma(res.data.note, docs);
} }
else if(actionName == 'Concluido'){ else if(actionName == 'Concluido') {
//this.concluir(res.data.note, docs); //this.concluir(res.data.note, docs);
} }
else if(actionName == 'Reexecução'){ else if(actionName == 'Reexecução') {
await this.reexecutar(res.data.note, docs); await this.reexecutar(res.data.note, docs);
} }
this.goBack(); this.goBack();
+1 -1
View File
@@ -11,7 +11,7 @@
<script type="text/javascript" src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script> --> <script type="text/javascript" src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script> -->
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.9.359/pdf.min.js" integrity="sha512-U5C477Z8VvmbYAoV4HDq17tf4wG6HXPC6/KM9+0/wEXQQ13gmKY2Zb0Z2vu0VNUWch4GlJ+Tl/dfoLOH4i2msw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.9.359/pdf.min.js" integrity="sha512-U5C477Z8VvmbYAoV4HDq17tf4wG6HXPC6/KM9+0/wEXQQ13gmKY2Zb0Z2vu0VNUWch4GlJ+Tl/dfoLOH4i2msw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<!-- <script src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script> <!-- <script src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script>
<script src="node_modules/ibm-mfp-web-sdk/ibmmfpfanalytics.js"></script> --> <script src="node_modules/ibm-mfp-web-sdk/ibmmfpfanalytics.js"></script> -->
<!-- <script src="assets/js/index.js"></script> --> <!-- <script src="assets/js/index.js"></script> -->
<link rel="manifest" href="assets/manifest.json"> <link rel="manifest" href="assets/manifest.json">
+9
View File
@@ -715,6 +715,10 @@ body {
} }
} }
} }
.desk{
color: black !important;
}
} }
.gov { .gov {
@@ -794,6 +798,10 @@ body {
} }
} }
} }
.desk{
color: black !important;
}
} }
// blue // blue
@@ -913,6 +921,7 @@ body {
} }
} }
} }
} }
.font-awesome { .font-awesome {