merge developer to feature/viewer-attachment

This commit is contained in:
Peter Maquiran
2024-02-16 11:07:52 +01:00
4 changed files with 14 additions and 12 deletions
@@ -126,6 +126,7 @@ export class ViewEventPage implements OnInit {
this.eventsService.getEvent(this.eventId).subscribe(res => {
this.loadedEvent = res;
this.setTimeZone()
this.today = new Date(res.StartDate);
@@ -145,10 +146,11 @@ export class ViewEventPage implements OnInit {
this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => {
const div = document.createElement("div")
/* const div = document.createElement("div")
div.innerHTML = res.Body.Text
res.Body.Text = div.innerText
res.Body.Text = div.innerText */
this.loadedEvent = res;
console.log('Event details',res)
this.setTimeZone()
this.today = new Date(res.StartDate);
@@ -73,7 +73,7 @@ export class NewActionPage implements OnInit {
}
get dateValid() {
/* get dateValid() {
var validado: boolean;
if (window.innerWidth <= 800) {
@@ -86,6 +86,10 @@ export class NewActionPage implements OnInit {
} else {
return ['ok']
}
} */
get dateValid() {
return new Date(this.folder.DateBegin).getTime() < new Date(this.folder.DateBegin).getTime() ? 'ok': null
}
runValidation() {
@@ -117,11 +121,7 @@ export class NewActionPage implements OnInit {
this.injectValidation()
this.runValidation()
if(this.Form.invalid) {
return false
} else {
}
if(this.Form.invalid) return false