fix expediente cant list and marcar reuniao

src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts

@@ -230,7 +230,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
         this.docs.push({
           ApplicationId: e.ApplicationId || e.ApplicationType,
           Source: 1,
-          SourceId: e.DocId || e.docID || e.docId || e.SourceId,
+          SourceId: e.DocId || e.docID || e.docId || e.SourceId || e.Id,
           SourceName: e.Assunto
         })
       })
@@ -239,7 +239,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
       this.docs.push({
         ApplicationId: this.document.ApplicationId || this.document.ApplicationType,
         Source: 1,
-        SourceId: this.document.DocId || this.document.docID || this.document.docId || this.document.SourceId,
+        SourceId: this.document.DocId || this.document.docID || this.document.docId || this.document.SourceId || this.document.Id,
         SourceName: this.document.Assunto
       })
     }
@@ -249,7 +249,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
       Subject: this.postData.Subject,
       Body: this.postData.Body.Text,
       Location: this.postData.Location,
-      CalendarId: this.postData.CalendarName,
+      CalendarId: this.selectedCalendarId(),
       CalendarName: this.postData.CalendarName,
       StartDate: this.postData.StartDate,
       EndDate: this.postData.EndDate,
@@ -369,6 +369,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
       modal.onDidDismiss().then((res)=> {
         if(res){
           const data = res.data;
+          console.log('data', data)
           this.attachments.push(data.selected);
         }
     });
@@ -378,13 +379,27 @@ export class DocumentSetUpMeetingPage implements OnInit {
     this.attachments = this.attachments.filter( (e, i) =>  index != i);
   }
 
-  validateFormInputs(){
+  validateFormInputs() {
     let formLocation = this.postData.Location.trim();
     if(!this.postData.Location && formLocation.length <= 0){
       this.formLocationSatus = true;
     }
   }
 
+  selectedCalendarId () {
+
+    if (this._eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') {
+      return this._eventService.calendarNamesType[this.CalendarName]['OficialId']
+
+    } else if (this._eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postData.CalendarName == 'Pessoal') {
+
+      return this._eventService.calendarNamesType[this.CalendarName]['PessoalId']
+
+    } else {
+      return '11:11'
+    }
+  }
+  
   dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
     this.taskParticipants = taskParticipants;
     this.taskParticipantsCc = taskParticipantsCc;

src/app/services/rules/event.service.ts

@@ -21,9 +21,14 @@ export class EventService {
 
 
     if(this.p.userRole(['PR'])) {
+      alert('pr')
       return this.eventService.postEventPr(body, calendar)
-    } else {
+    } else if(this.p.userRole(['MDGPR'])) {
+      alert('md')
       return this.eventService.postEventMd(body, calendar)
+    } else {
+      alert('other')
+      return this.eventService.postEventGeneric(body, calendar, body.CalendarId)
     }
 
   }

src/app/shared/gabinete-digital/expedients/expedients.page.ts

@@ -65,7 +65,7 @@ export class ExpedientsPage implements OnInit {
       this.taskslist = [];
       this.skeletonLoader = false
 
-      let res = result.filter(data => data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active");
+      let res = result.filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active");
 
       this.taskslist = res.map((e) => this.expedienteTaskPipe.transform(e))
       this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate')
@@ -93,16 +93,16 @@ export class ExpedientsPage implements OnInit {
     })
   }
 
-    doRefresh() {
+  doRefresh() {
 
-      setTimeout(() => {
-        this.LoadList();
-      }, 1000)
-
-    }
-
-    goToExpediente(serialNumber: any) {
-      this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']);
-    }
+    setTimeout(() => {
+      this.LoadList();
+    }, 1000)
+
+  }
+
+  goToExpediente(serialNumber: any) {
+    this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']);
+  }
 
   }

src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss

@@ -30,28 +30,19 @@
     margin-bottom: 5px !important;
     margin-top: 5px !important;
 }
-@media only screen and (max-width: 800px) {
-    .btn-ok, .btn-cancel, .btn-delete{
-        width: 100% !important;
-    }
+
+.arrow-right{
+    display: flex;
+    justify-content: flex-end;
 }
-@media only screen and (min-width: 1024px) {
-    .arrow-right{
-        display: flex;
-        justify-content: flex-end;
-    }
-    .btn-cancel{
-        width: 100% !important;
-        margin-bottom: 10px !important;
-    }
-    .btn-delete, .btn-ok{
-        width: 100% !important;
-        margin-bottom: 10px !important;
-        margin-top: 10px !important;
-    }
-   /*  .solid{
-        display: block;
-    } */
+.btn-cancel{
+    width: 100% !important;
+    margin-bottom: 10px !important;
+}
+.btn-delete, .btn-ok{
+    width: 100% !important;
+    margin-bottom: 10px !important;
+    margin-top: 10px !important;
 }