fix edit event to approve

src/app/core/user/mapper/user-login.ts

@@ -7,12 +7,13 @@ export class UserLoginMapper{
       RefreshToken: input.data.refreshToken,
       Authorization: input.data.authorization,
       Email: input.data.user.wxeMail,
-      FullName: input.data.user.wxeMail,
+      FullName: input.data.user.wxFullName,
       RoleDescription: input.data.user.role,
       RoleID: input.data.user.roleId,
       UserId: input.data.user.wxUserId,
       UserPermissions: input.data.permissions,
-      Profile: ''
+      Profile: '',
+      UserPhoto: input.data.user?.userPhoto
     }
   }
 }

src/app/core/user/use-case/user-login-use-case.service.ts

@@ -29,6 +29,7 @@ const UserLoginOutputSchema = z.object({
   RoleID: z.number(),
   Profile: z.string(), // You can further define the Profile if you have more details
   UserPermissions: z.array(z.number()), // Same as above, you can define more details if needed
+  UserPhoto:  z.string().optional()
 });
 
 

src/app/module/agenda/data/repository/agenda-data-repository.service.ts

@@ -189,16 +189,16 @@ export class AgendaDataRepositoryService {
 
     let body;
     if(typeof eventData?.Body == 'object') {
-      body =  eventData?.Body?.Text
+      body =  eventData.Body.Text
-    } else {
+    } else if (eventData?.Body) {
-      body =  eventData?.Body
+      body =  eventData.Body
     }
 
     let eventInput = {
       userId: calendar.wxUserId,
       ownerType: this.utils.selectedCalendarOwner(calendar.role),
       subject: eventData.Subject,
-      body: eventData?.Body?.Text,
+      body: body,
       location: eventData.Location,
       startDate: this.utils.addOneHourToIsoString(eventData.StartDate),
       endDate: this.utils.addOneHourToIsoString(eventData.EndDate),

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html

@@ -107,7 +107,7 @@
     <div  class="aside-right flex-column height-100">
       <div class="aside-buttons" >
         <button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" >Aprovar</button>
-        <button (click)="editar(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" >Editar evento</button>
+        <button (click)="editar(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="p.userPermission([p.permissionList.Agenda.creatEvent])">Editar evento</button>
         <button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Enviar para Revisão</button>
         <button (click)="rejeitar(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Eliminar</button>
       </div>

src/app/services/decorator/api-validate-schema.decorator.ts

@@ -79,7 +79,7 @@ export function APINODReturn(schema: z.ZodTypeAny, data , path: string, tracing?
         tracing?.setAttribute('map.error.schema-'+i, JSON.stringify(schema))
       }
 
-      tracing.log('API return '+ path, {
+      tracing?.log('API return '+ path, {
         data,
         issues: error?.errors
       })

src/app/ui/agenda/agenda.page.html

@@ -416,7 +416,7 @@
         [serialNumber] = "eventToaprove.serialNumber"
         [InstanceId] = "eventToaprove.InstanceId"
         [saveData] = "eventToaprove.saveData"
-        (cloneAllmobileComponent)="viewEventDetailDismiss($event)"
+        (viewEventDetailDismiss)="viewEventDetailDismiss($event)"
         (closeEventToApprove)="closeEventToApproveGoBack()"
         (AproveEventEditEvent)="AproveEventEditEvent($event)"
         (EditApproveEventDismiss)="EditApproveEventDismiss()"

src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.ts

@@ -143,7 +143,6 @@ export class EditEventToApprovePage implements OnInit {
   }
 
   ngOnInit() {
-    console.log('here!!!')
     if (this.restoreTemporaryData()) {
       this.setOtherData()
     } else {
@@ -158,7 +157,7 @@ export class EditEventToApprovePage implements OnInit {
   @XTracerAsync({name:'edit-event-approve/getTask', bugPrint: true})
   async getTask(tracing?: TracingType) {
 
-    const res = await this.agendaDataRepository.getEventToApproveById(this.serialNumber)
+    const res = await this.agendaDataRepository.getEventToApproveById(this.serialNumber, tracing)
     if(res.isOk()) {
       console.log('evento to apro to edit', res.value)
       this.eventProcess = res.value as any;

src/app/ui/agenda/component/event-list/event-list.page.scss

@@ -1,6 +1,7 @@
 @import '~src/function.scss';
 :host{
   margin: 0;
+  background-color: white;
 }
 .header-content{
   overflow: auto;

src/app/ui/agenda/component/event-list/event-list.page.ts

@@ -74,6 +74,8 @@ export class EventListPage implements OnInit {
 
       this.setCalendarByDefault()
 
+      console.log('remove!=================')
+
   }
 
   async setCalendarByDefault() {
@@ -184,12 +186,22 @@ export class EventListPage implements OnInit {
   }
 
   async openApproveModal(eventSerialNumber, data) {
-
+    if (window.innerWidth <= 1024) {
+      if (this.router.url == '/home/agenda/event-list') {
+        this.router.navigate(['/home/agenda/event-list/approve-event', eventSerialNumber, 'agenda'])
+      }
+      else if (this.router.url == '/home/gabinete-digital/event-list') {
+        this.router.navigate(['/home/gabinete-digital/event-list/approve-event', eventSerialNumber, 'gabinete-digital'])
+      }
+    }
+    else {
     this.approveEventDismiss.emit({
-      "serialNumber": eventSerialNumber,
+        "serialNumber": eventSerialNumber,
-      "action": "Aprovar",
+        "action": "Aprovar",
-      "saveData": data
+        "saveData": data
-    });
+      });
+    }
+
   }
 
   refreshing() {

src/app/ui/chat/component/messages/messages.page.html

@@ -7,13 +7,13 @@
           <!-- <button (click)="ChatMessageDebuggingPage()">Dev</button> -->
           <span *ngIf="roomStatus$ | async as roomStatus"><ion-icon *ngIf="roomStatus" class="online" name="ellipse"></ion-icon></span>
         </div>
-        <div class="right" >
+        <!-- <div class="right" >
           <button title="Menu" class="btn-no-color" (click)="_openMessagesOptions()" >
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-menu.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg">
             </ion-icon>
           </button>
-        </div>
+        </div> -->
       </div>
       <div class="d-flex header-bottom" >
         <div class="header-bottom-icon" *ngIf="roomType == RoomTypeEnum.Group">

src/app/ui/shared/components/header/header.page.ts

@@ -134,7 +134,7 @@ export class HeaderPage implements OnInit {
   async getProfilpicture(tracing?: TracingType) {
 
     if (this.SessionStore.user.UserPhoto) {
-
+      
       const base = await this.UserRepositoryService.getUserProfilePhoto(this.SessionStore.user.UserPhoto, tracing)
 
       if(base.isOk()) {

version/git-version.ts

@@ -1,11 +1,11 @@
 export let versionData = {
-  "shortSHA": "7e8dc49d5",
+  "shortSHA": "f0b4ada55",
-  "SHA": "7e8dc49d5bc7329b17223e54617c7f0fbbe4b0bb",
+  "SHA": "f0b4ada550488841ace50da67bdd6e703dc74680",
   "branch": "feature/login-v2",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Wed Nov 6 10:47:07 2024 +0100'",
+  "lastCommitTime": "'Wed Nov 6 14:17:14 2024 +0100'",
-  "lastCommitMessage": "change tab activation code to app component",
+  "lastCommitMessage": "fix gerar diploma",
-  "lastCommitNumber": "6130",
+  "lastCommitNumber": "6131",
-  "changeStatus": "On branch feature/login-v2\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   gabinete-digital-fo.code-workspace\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts\n\tmodified:   src/app/ui/chat/component/messages/messages.page.html\n\tmodified:   src/app/ui/chat/modal/messages/messages.page.html\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch feature/login-v2\nYour branch is up to date with 'origin/feature/login-v2'.\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/core/user/mapper/user-login.ts\n\tmodified:   src/app/core/user/use-case/user-login-use-case.service.ts\n\tmodified:   src/app/module/agenda/data/repository/agenda-data-repository.service.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified:   src/app/services/decorator/api-validate-schema.decorator.ts\n\tmodified:   src/app/ui/agenda/agenda.page.html\n\tmodified:   src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified:   src/app/ui/agenda/component/event-list/event-list.page.scss\n\tmodified:   src/app/ui/agenda/component/event-list/event-list.page.ts\n\tmodified:   src/app/ui/chat/component/messages/messages.page.html\n\tmodified:   src/app/ui/shared/components/header/header.page.ts",
   "changeAuthor": "peter.maquiran"
 }