diff --git a/src/app/ui/agenda/component/edit-event/edit-event.page.html b/src/app/ui/agenda/component/edit-event/edit-event.page.html
index 3b5181f20..c7a784b84 100644
--- a/src/app/ui/agenda/component/edit-event/edit-event.page.html
+++ b/src/app/ui/agenda/component/edit-event/edit-event.page.html
@@ -211,7 +211,7 @@
         <ion-icon slot="start" src="assets/images/icons-reapet.svg"></ion-icon>
       </div>
 
-      <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" >
+      <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs" [class.input-error]="Form?.get('dateOccurrence')?.invalid  && validateFrom ">
 
         <mat-form-field appearance="none" class="date-hour-picker">
           <input matInput [ngxMatDatetimePicker]="picker1"
diff --git a/src/app/ui/agenda/component/edit-event/edit-event.page.ts b/src/app/ui/agenda/component/edit-event/edit-event.page.ts
index 5f022c7e9..1638fc00e 100644
--- a/src/app/ui/agenda/component/edit-event/edit-event.page.ts
+++ b/src/app/ui/agenda/component/edit-event/edit-event.page.ts
@@ -274,7 +274,7 @@ export class EditEventPage implements OnInit {
       Categories: new FormControl(this._postEvent.Category, [
         Validators.required
       ]),
-      dateOccurrence: new FormControl(this._postEvent.EventRecurrence.Type.toString() == '-1' ? ['ok'] : this._postEvent.EventRecurrence.LastOccurrence && new Date(this._postEvent.EventRecurrence.LastOccurrence).getTime() > new Date(this._postEvent.EndDate).getTime() ? 'ok' : null, [
+      dateOccurrence: new FormControl(this.postEvent.EventRecurrence.frequency != 'never'  ? this.postEvent.EventRecurrence.until : true, [
         Validators.required
       ]),
       participantes: new FormControl(this.taskParticipants, [
diff --git a/src/app/ui/agenda/component/new-event/new-event.page.html b/src/app/ui/agenda/component/new-event/new-event.page.html
index c82cc5c59..771cb5eb6 100644
--- a/src/app/ui/agenda/component/new-event/new-event.page.html
+++ b/src/app/ui/agenda/component/new-event/new-event.page.html
@@ -189,7 +189,7 @@
         <ion-icon slot="start" src="assets/images/icons-reapet.svg"></ion-icon>
       </div>
 
-      <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" >
+      <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs " [class.input-error]="Form?.get('dateOccurrence')?.invalid  && validateFrom " >
 
         <mat-form-field appearance="none" class="date-hour-picker">
           <input matInput [ngxMatDatetimePicker]="picker1"
@@ -197,7 +197,7 @@
             [(ngModel)]="postEvent.EventRecurrence.until"
             [disabled]="disabled"
           >
-          <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
+          <mat-datepicker-toggle id="new-inicio" style="margin:0px; width: 0px" matSuffix [for]="picker1" ></mat-datepicker-toggle>
           <ngx-mat-datetime-picker #picker1
             [showSpinners]="showSpinners"
             [showSeconds]="showSeconds"
@@ -219,7 +219,7 @@
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
 
-        <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" >
+        <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs " >
 
           <mat-form-field appearance="none" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1"
@@ -250,7 +250,7 @@
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
 
-        <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" >
+        <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs " >
 
           <mat-form-field appearance="none" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1"
@@ -283,7 +283,7 @@
         <!--
           [className]="Form?.get('Subject')?.invalid ? 'input-error ion-input-class  flex-grow-1' : 'ion-input-class  ion-input-class  flex-grow-1' "
          -->
-        <div (click)="openFim()" class="ion-input-class flex-grow-1 justify-center align-center materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
+        <div (click)="openFim()" class="ion-input-class flex-grow-1 justify-center align-center " [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
           <mat-form-field appearance="none" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim"
@@ -292,7 +292,7 @@
               [disabled]="disabled"
               [min]="postEvent.StartDate"
             >
-            <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" ></mat-datepicker-toggle>
+            <mat-datepicker-toggle id="new-fim"  matSuffix [for]="fim" ></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #fim
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"
@@ -315,7 +315,7 @@
         <!--
           [className]="Form?.get('Subject')?.invalid ? 'input-error ion-input-class  flex-grow-1' : 'ion-input-class  ion-input-class  flex-grow-1' "
          -->
-        <div (click)="openFim()" class="ion-input-class flex-grow-1 justify-center align-center materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
+        <div (click)="openFim()" class="ion-input-class flex-grow-1 justify-center align-center" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
           <mat-form-field appearance="none" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim"
diff --git a/src/app/ui/agenda/component/new-event/new-event.page.ts b/src/app/ui/agenda/component/new-event/new-event.page.ts
index ac72d7863..1eb3a3084 100644
--- a/src/app/ui/agenda/component/new-event/new-event.page.ts
+++ b/src/app/ui/agenda/component/new-event/new-event.page.ts
@@ -333,9 +333,9 @@ export class NewEventPage implements OnInit {
       dateEnd: new FormControl(this.postEvent.EndDate, [
         Validators.required
       ]),
-      /* dateOccurrence: new FormControl(this.postEvent.EventRecurrence.Type.toString() == '-1' ? ['ok'] : this.postEvent.EventRecurrence.LastOccurrence && new Date(this.postEvent.EventRecurrence.LastOccurrence).getTime() > new Date(this.postEvent.EndDate).getTime() ? 'ok' : null, [
+      dateOccurrence: new FormControl(this.postEvent.EventRecurrence.frequency != 'never'  ? this.postEvent.EventRecurrence.until : true, [
         Validators.required
-      ]), */
+      ]),
       participantes: new FormControl(this.taskParticipants, [
          Validators.required
       ]),
@@ -469,7 +469,7 @@ export class NewEventPage implements OnInit {
 
     if (this.Form.invalid) {
 
-      if (new Date(this.postEvent.StartDate).getTime() < new Date(this.postEvent.EndDate).getTime()) {
+      if (new Date(this.postEvent.StartDate).getTime() > new Date(this.postEvent.EndDate).getTime()) {
         this.toastService._badRequest("Data de inicio  menor que a data de fim")
       }
 
diff --git a/src/app/ui/agenda/modal/edit-event/edit-event.page.html b/src/app/ui/agenda/modal/edit-event/edit-event.page.html
index dc857f557..16d4e57b1 100644
--- a/src/app/ui/agenda/modal/edit-event/edit-event.page.html
+++ b/src/app/ui/agenda/modal/edit-event/edit-event.page.html
@@ -218,7 +218,7 @@
               <ion-icon slot="start" src="assets/images/icons-reapet.svg"></ion-icon>
             </div>
 
-            <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" >
+            <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" [class.input-error]="Form?.get('dateOccurrence')?.invalid  && validateFrom ">
 
               <mat-form-field appearance="none" class="date-hour-picker">
                 <input matInput [ngxMatDatetimePicker]="picker1"
diff --git a/src/app/ui/agenda/modal/edit-event/edit-event.page.ts b/src/app/ui/agenda/modal/edit-event/edit-event.page.ts
index 9d399d22a..09e87ee0d 100644
--- a/src/app/ui/agenda/modal/edit-event/edit-event.page.ts
+++ b/src/app/ui/agenda/modal/edit-event/edit-event.page.ts
@@ -376,7 +376,7 @@ export class EditEventPage implements OnInit {
       IsRecurring: new FormControl(this.postEvent.IsRecurring, [
         Validators.required
       ]),
-      dateOccurrence: new FormControl(this.postEvent.EventRecurrence.Type.toString() == '-1' ? ['ok'] : this.postEvent.EventRecurrence.LastOccurrence && new Date(this.postEvent.EventRecurrence.LastOccurrence).getTime() > new Date(this.postEvent.EndDate).getTime() ? 'ok' : null, [
+      dateOccurrence: new FormControl(this.postEvent.EventRecurrence.frequency != 'never' ? this.postEvent.EventRecurrence.until : true, [
         Validators.required
       ]),
       Date: new FormControl(new Date(this.postEvent.StartDate).getTime() <= new Date(this.postEvent.EndDate).getTime() ? 'ok' : null, [
diff --git a/src/app/ui/agenda/modal/new-event/new-event.page.html b/src/app/ui/agenda/modal/new-event/new-event.page.html
index 6d834e2ce..4e040ff68 100644
--- a/src/app/ui/agenda/modal/new-event/new-event.page.html
+++ b/src/app/ui/agenda/modal/new-event/new-event.page.html
@@ -170,7 +170,7 @@
           <ion-icon slot="start" src="assets/images/icons-reapet.svg"></ion-icon>
         </div>
 
-        <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" >
+        <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top"  [class.input-error]="Form?.get('dateOccurrence')?.invalid  && validateFrom ">
 
           <mat-form-field appearance="none" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1"
diff --git a/src/app/ui/agenda/modal/new-event/new-event.page.ts b/src/app/ui/agenda/modal/new-event/new-event.page.ts
index eea9fa8ba..0781801e8 100644
--- a/src/app/ui/agenda/modal/new-event/new-event.page.ts
+++ b/src/app/ui/agenda/modal/new-event/new-event.page.ts
@@ -410,9 +410,9 @@ export class NewEventPage implements OnInit {
       participantes: new FormControl(this.taskParticipants, [
         Validators.required
       ]),
-      /* dateOccurrence: new FormControl(this.postEvent.EventRecurrence.Type.toString() == '-1' ? ['ok'] : this.postEvent.EventRecurrence.LastOccurrence && new Date(this.postEvent.EventRecurrence.LastOccurrence).getTime() > new Date(this.postEvent.EndDate).getTime() ? 'ok' : null, [
+      dateOccurrence: new FormControl(this.postEvent.EventRecurrence.frequency != 'never'  ? this.postEvent.EventRecurrence.until : true, [
         Validators.required
-      ]), */
+      ]),
 
 
     })
diff --git a/version/git-version.ts b/version/git-version.ts
index db1394885..f8f9f37ff 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,11 +1,11 @@
 export let versionData = {
-  "shortSHA": "54fb4f57d",
-  "SHA": "54fb4f57d7f6d25bdb11cb5fcc3a224ac283c4f6",
+  "shortSHA": "0bbde0d98",
+  "SHA": "0bbde0d98b1fe8f79acb81baae723765d548670c",
   "branch": "feature/chat-new-api-peter",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Oct 22 14:31:04 2024 +0100'",
-  "lastCommitMessage": "create  weakly event",
-  "lastCommitNumber": "6105",
-  "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is up to date with 'origin/feature/chat-new-api-peter'.\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   version/git-version.ts",
+  "lastCommitTime": "'Tue Oct 22 14:39:20 2024 +0100'",
+  "lastCommitMessage": "merge",
+  "lastCommitNumber": "6112",
+  "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is up to date with 'origin/feature/chat-new-api-peter'.\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/ui/agenda/component/edit-event/edit-event.page.html\n\tmodified:   src/app/ui/agenda/component/edit-event/edit-event.page.ts\n\tmodified:   src/app/ui/agenda/component/new-event/new-event.page.html\n\tmodified:   src/app/ui/agenda/component/new-event/new-event.page.ts\n\tmodified:   src/app/ui/agenda/modal/edit-event/edit-event.page.html\n\tmodified:   src/app/ui/agenda/modal/edit-event/edit-event.page.ts\n\tmodified:   src/app/ui/agenda/modal/new-event/new-event.page.html\n\tmodified:   src/app/ui/agenda/modal/new-event/new-event.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file