mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
merge developer to feature/viewer-attachment
This commit is contained in:
@@ -215,9 +215,9 @@ export class ViewEventPage implements OnInit {
|
||||
if(this.CalendarId) {
|
||||
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;
|
||||
this.setTimeZone()
|
||||
|
||||
|
||||
+2
-2
@@ -42,7 +42,7 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||
}
|
||||
|
||||
|
||||
const MySchema = z.object({
|
||||
const createProcessFromFileSchema = z.object({
|
||||
applicationId: z.any(),
|
||||
docId: z.any(),
|
||||
});
|
||||
@@ -141,7 +141,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
|
||||
if(this.createProcessFromFile) {
|
||||
try {
|
||||
MySchema.parse({
|
||||
createProcessFromFileSchema.parse({
|
||||
applicationId: this.aplicationId,
|
||||
docId: this.docId
|
||||
});
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user