commit version change

codemagic.yaml

@@ -1,28 +1,44 @@
-workflows:
+ workflows:
-  ios-native-workflow:
+  ios-workflow:
-    name: iOS Native
+    name: iOS Workflow
-    instance_type: mac_mini_m1
+    max_build_duration: 120
     integrations:
-      app_store_connect: GabineteDigital
+      app_store_connect: 433YAF3YWG
     environment:
       ios_signing:
         distribution_type: app_store
         bundle_identifier: com.gpr.gabinetedigital.teste
       vars:
-        BUNDLE_ID: "com.gpr.gabinetedigital.teste"
+        APP_STORE_APPLE_ID: 1664747447
-        APP_STORE_APPLE_ID: DV5P2ZCAPJ
+        XCODE_WORKSPACE: "platforms/ios/App.app.xcworkspace"
-      xcode: latest
+        XCODE_SCHEME: "App.app"
-      cocoapods: default
     scripts:
-      - name: Install CocoaPods dependencies
+      - name: Install npm dependencies for Ionic Capacitor project
-        script: |
+        script: | 
-          pod install
+          npm install
-      - name: Set up provisioning profiles settings on Xcode project
+      - name: Cocoapods installation
-        script: xcode-project use-profiles
+        script: | 
+          cd ios/App && pod install
+      - name: Update dependencies and copy web assets to native project
+        script: | 
+          # if you don't need to update native dependencies, use this:
+          # npx cap copyapp
+          #
+          # to update native dependencies, use this command:
+          npx cap sync
+      - name: Set up code signing settings on Xcode project
+        script: | 
+          xcode-project use-profiles
+      - name: Increment build number
+        script: | 
+          cd $CM_BUILD_DIR/ios/App
+          LATEST_BUILD_NUMBER=$(app-store-connect get-latest-app-store-build-number "$APP_STORE_APPLE_ID")
+          agvtool new-version -all $(($LATEST_BUILD_NUMBER + 1))
       - name: Build ipa for distribution
-        script: |
+        script: | 
+          cd $CM_BUILD_DIR/ios/App
           xcode-project build-ipa \
-            --workspace "$CM_BUILD_DIR/$XCODE_WORKSPACE" \
+            --workspace "$XCODE_WORKSPACE" \
             --scheme "$XCODE_SCHEME"
     artifacts:
       - build/ios/ipa/*.ipa
@@ -30,7 +46,22 @@ workflows:
       - $HOME/Library/Developer/Xcode/DerivedData/**/Build/**/*.app
       - $HOME/Library/Developer/Xcode/DerivedData/**/Build/**/*.dSYM
     publishing:
+      email:
+        recipients:
+          - romavicdosanjoskc@gmail.com
+        notify:
+          success: true
+          failure: false
       app_store_connect:
         auth: integration
+
+        # Configuration related to TestFlight (optional)
+        # Note: This action is performed during post-processing.
         submit_to_testflight: true
-        submit_to_app_store: false
+        beta_groups: # Specify the names of beta tester groups that will get access to the build once it has passed beta review.
+          - group name 1
+          - group name 2
+
+        # Configuration related to App Store (optional)
+        # Note: This action is performed during post-processing.
+        submit_to_app_store: false        

src/app/modals/create-process/create-process.page.html

@@ -191,6 +191,6 @@
     <button *ngIf="taskType == '1'" class="btn-ok" shape="round" (click)="saveTask()">Solicitar</button>
     <button *ngIf="taskType == '2'" class="btn-ok" shape="round" (click)="saveTask()">Solicitar</button>
     <button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
-    
+
   </div>
 </ion-footer>

src/app/modals/document-detail/document-detail.page.ts

@@ -223,7 +223,7 @@ export class DocumentDetailPage implements OnInit {
       backdropDismiss: false
     });
 
-    modal.onDidDismiss().then(res=>{
+    modal.onDidDismiss().then(res => {
       //this.RouteService.goBack();
     }, (error) => {
       console.log(error)

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

@@ -117,14 +117,45 @@ export class DocumentSetUpMeetingPage implements OnInit {
     this.document = this.navParams.get('document')
 
     if(Array.isArray(this.document)) {
-      this.attachments = this.document
+      const E = this.document
+      this.document = []
+      E.forEach((e)=> {
+        this.document.push({
+          ApplicationId: e.ApplicationId || e.ApplicationType,
+          Source: 1,
+          SourceId: e.DocId || e.docID || e.docId || e.SourceId || e.Id,
+          SourceName: e.Assunto || e.attachments,
+          DocDate: e.CreateDate,
+          Data: e.Data,
+          Assunto: e.Description,
+          ...e
+        })
+      })
+    } else if (this.document) {
+
+      const E = this.document
+      this.document = []
+      this.document.push({
+        ApplicationId: E.ApplicationId || E.ApplicationType,
+        Source: 1,
+        SourceId: E.DocId || E.docID || E.docId || E.SourceId || E.Id,
+        SourceName: E.Assunto || E.attachments,
+        DocDate: E.CreateDate,
+        Data: E.Data,
+        Assunto: E.Description,
+        ...E
+      })
     } else {
-      this.attachments = [this.document]
+      this.document = []
     }
 
 
 
-    this.document = []
+    if(Array.isArray(this.document)) {
+      this.attachments = this.document
+    } else {
+      this.attachments = [this.document]
+    }
 
     this.subject = this.navParams.get('subject')
 
@@ -277,25 +308,6 @@ export class DocumentSetUpMeetingPage implements OnInit {
 
     let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
 
-    if(this.document.Documents) {
-      this.document.Documents.forEach((e)=> {
-        this.docs.push({
-          ApplicationId: e.ApplicationId || e.ApplicationType,
-          Source: 1,
-          SourceId: e.DocId || e.docID || e.docId || e.SourceId || e.Id,
-          SourceName: e.Assunto
-        })
-      })
-    }
-    else{
-      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 || this.document.Id,
-        SourceName: this.document.Assunto
-      })
-    }
-
     let postEvent = {
       EventId: '',
       Subject: this.postData.Subject,
@@ -318,10 +330,11 @@ export class DocumentSetUpMeetingPage implements OnInit {
         Type: this.EventRecurrenceType,
         LastOccurrence: this.Occurrence,
       },
-      // Attachments: this.docs,
+      Attachments: this.attachments,
     }
 
-    const laoder = this.toastService.loading()
+    const laoder = this.toastService.loading();
+
 
     this.eventService.create({ body: postEvent, calendar: this.postData.CalendarName }).subscribe(async (respose) => {
       laoder.remove();

src/app/modals/view-document/view-document.page.ts

@@ -58,7 +58,7 @@ export class ViewDocumentPage implements OnInit {
   ngOnInit() {
 
     this.processes.GetViewer(this.docId, this.applicationId).subscribe(async(res)=> {
-      
+
       const link: string = res.replace('//pdfjs/web/', '/pdfjs/web/')
       this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link);
 
@@ -125,7 +125,7 @@ export class ViewDocumentPage implements OnInit {
   }
 
   async openBookMeetingModal() {
-    console.log('this.Document', this.Document)
+    console.log('this.Document----------', this.Document)
     let classs;
     if( window.innerWidth < 701) {
       classs = 'book-meeting-modal modal modal-desktop'
@@ -164,6 +164,8 @@ export class ViewDocumentPage implements OnInit {
       classs = 'modal modal-desktop showAsideOptions'
     }
     // check passing
+
+    console.log('this.Document----------openExpedientActionsModal', this.Document)
     const modal = await this.modalController.create({
       component: ExpedientTaskModalPage,
       componentProps: {
@@ -175,7 +177,7 @@ export class ViewDocumentPage implements OnInit {
       cssClass: classs,
     });
 
-    modal.onDidDismiss().then( 
+    modal.onDidDismiss().then(
       async(res)=>{}
       , (error) => {
         console.log(error)

src/app/pages/agenda/agenda.page.ts

@@ -220,7 +220,7 @@ export class AgendaPage implements OnInit {
       } else if (this.eventService.hasSharedCalendar) {
         this.profile = "pr";
       }
-      
+
     }
 
     this.calendarHeight = ["height-356"];
@@ -253,7 +253,7 @@ export class AgendaPage implements OnInit {
     }, 1000)
   }
 
-  
+
 
   ngOnInit() {
 
@@ -270,18 +270,26 @@ export class AgendaPage implements OnInit {
             this.segment = "Combinado";
           }
           if (realoadCounter != 0) {
-            this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+
+            if(this.currentMoth.rangeStartDate != null) {
+
+              this.loadRangeEvents(this.currentMoth.rangeStartDate, this.currentMoth.rangeEndDate)
+            } else {
+              this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+            }
+
+
             this.updateEventListBox()
           }
           realoadCounter++;
           this.weekToShow()
         }
       });
-  
+
       this.backgroundservice.registerBackService('Online', () => {
         //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
       });
-  
+
       window.onresize = (event) => {
         // if not table remove all component
         if (window.innerWidth <= 1024) {
@@ -296,7 +304,7 @@ export class AgendaPage implements OnInit {
     setTimeout(() => {
       try {
         let weekNum = 0;
-  
+
         function Week(a) {
           for(let b of a.querySelectorAll('td')) {
             if(!b.className.includes('text-muted')) {
@@ -305,17 +313,17 @@ export class AgendaPage implements OnInit {
             }
           }
         }
-        
+
         const dayBoxHeight = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td').clientHeight
         const weeks = document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr');
-  
+
         for (let week of weeks as any ){
           Week(week)
-        } 
+        }
-    
+
         this.showCalendar = true
         this.listBoxService.height = (weekNum * dayBoxHeight) +'px'
-  
+
         if(dayBoxHeight == 0) {
           this.weekToShow()
         }
@@ -424,10 +432,23 @@ export class AgendaPage implements OnInit {
     this.eventSelectedDate2 = ev.selectedTime;
   }
 
+
+  currentMoth = {
+    rangeStartDate: null,
+    rangeEndDate: null
+  }
+
   onRangeChanged(ev: { startTime: Date, endTime: Date }) {
     this.rangeStartDate = ev.startTime;
     this.rangeEndDate = ev.endTime;
 
+    if(this.currentMoth.rangeEndDate == null) {
+      this.currentMoth = {
+        rangeStartDate: ev.startTime,
+        rangeEndDate: ev.endTime
+      }
+    }
+
     this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
 
 
@@ -554,7 +575,7 @@ export class AgendaPage implements OnInit {
 
   loadRangeEvents(startTime: Date, endTime: Date) {
     this.weekToShow()
-    
+
     if(!this.eventService.hasAnyCalendar) {
       return false
     }
@@ -602,7 +623,7 @@ export class AgendaPage implements OnInit {
     } catch (error) {
 
     }
-    
+
 
     let  load = 0;
 
@@ -622,7 +643,7 @@ export class AgendaPage implements OnInit {
         let eventsList = response;
         this.CalendarStore.removeRangeForCalendar(startTime, endTime, label, selectedCalendar.CalendarId)
         this.CalendarStore.pushEvent(eventsList, label);
-    
+
         this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds)
         this.updateEventListBox()
 
@@ -635,7 +656,7 @@ export class AgendaPage implements OnInit {
         if(load == selectedCalendarIds.length) {
           this.showLoader = false;
         }
-        
+
         this.myCal.update();
         this.myCal.loadEvents();
         this.updateEventListBox()
@@ -657,19 +678,19 @@ export class AgendaPage implements OnInit {
 
       return result.concat(join)
     } else {
-      
+
     const calendar = this.eventService.calendarNamesType[this.CalendarName];
     let Oficial = calendar?.['OficialId']
     let Pessoal = calendar?.['PessoalId']
 
     if(Oficial &&  Pessoal) {
-      
+
       return [
         {
           CalendarId : Oficial,
           OwnerId: calendar.OwnerId,
           CalendarName: calendar.CalendarName
-        }, 
+        },
         {
           OwnerId: calendar.OwnerId,
           CalendarId : Pessoal,
@@ -700,7 +721,7 @@ export class AgendaPage implements OnInit {
     }
 
     }
-    
+
 
 
   }
@@ -743,7 +764,7 @@ export class AgendaPage implements OnInit {
 
       this.updateEventListBox()
     } else {
-      
+
     }
 
 
@@ -751,7 +772,7 @@ export class AgendaPage implements OnInit {
 
   changeMonth = (month) => {
     const a = this.calendar.currentDate;
-    
+
 
     const isInvalidDate = (dateString) => JSON.stringify(new Date(dateString)) === 'null';
 
@@ -768,7 +789,7 @@ export class AgendaPage implements OnInit {
 
       this.updateEventListBox()
     } else {
-      
+
     }
   }
 
@@ -796,7 +817,7 @@ export class AgendaPage implements OnInit {
   }
 
   changeProfile() {
-    
+
     if (this.profile == "mdgpr") {
       this.profile = "pr";
       this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
@@ -839,7 +860,7 @@ export class AgendaPage implements OnInit {
         cssClass: 'modal  modal-desktop',
         backdropDismiss: false
       });
-   
+
       modal.onDidDismiss().then((data) => {
         if (data) {
 
@@ -870,7 +891,7 @@ export class AgendaPage implements OnInit {
   openAddEventDismiss(data) {
 
     try {
-    
+
       let postEvent: Event = data;
       if (postEvent.Subject != null) {
         // this.eventSource.push({
@@ -900,7 +921,7 @@ export class AgendaPage implements OnInit {
     let navigationExtras: NavigationExtras = { queryParams: { CalendarId } }
 
     this.router.navigate(['/home/agenda/',eventId,'agenda'], navigationExtras);
-    
+
   }
 
   // open component
@@ -923,7 +944,7 @@ export class AgendaPage implements OnInit {
     setTimeout(()=>{
       this.onCurrentChanged(this.eventSelectedDate)
     }, 500)
-    
+
   }
 
 
@@ -1083,7 +1104,7 @@ export class AgendaPage implements OnInit {
   }
 
   reloadCalendar() {
-    // 
+    //
     this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
   }
 

src/app/pages/chat/group-messages/group-messages.page.html

@@ -40,7 +40,6 @@
         <i class="far fa-clock font-15"></i>
         <ion-label class="font-15 pl-10" color="warning">{{roomCountDownDate}}</ion-label>
       </div>
-      {{ RouteService.history }}
     </div>
   </ion-toolbar>
 </ion-header>
@@ -341,4 +340,4 @@
     </div>
   </div>
 
-</ion-footer>
+</ion-footer>

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html

@@ -17,7 +17,7 @@
         <div *ngIf="Form && validateFrom" >
           <div *ngIf="Form.get('Subject').invalid " class="input-errror-message">
             <div *ngIf="Form.get('Subject').errors?.required">
-              
+
             </div>
             <div *ngIf="Form.get('Subject').errors?.minlength">
               O campo deve ter pelo menos 4 caracteres.
@@ -34,12 +34,12 @@
 
               <mat-form-field appearance="none"  class="width-100" color="ion-color-secondary"  placeholder="Selecione agenda">
                 <mat-select [(value)]="CalendarName" (selectionChange)="changeAgenda()">
-    
+
                   <!-- <mat-option *ngFor="let calendars of _eventService.calendarNamesAry; let i = index" value="{{calendars}}">
                     <div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> {{ environment.agendaPR}} </div>
                     <div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
                     <div *ngIf="calendars != 'Meu calendario' && calendars != 'Ministro e Director do Gabinete do PR' && calendars != 'Presidente da República'"> Agenda do {{calendars}} </div>
-                    
+
                     <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div> -->
                     <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{ calendars.Fullname || calendars}}">
                      <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
@@ -47,7 +47,7 @@
                      <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
                      <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
                   </mat-option>
-    
+
                 </mat-select>
               </mat-form-field>
 
@@ -72,16 +72,16 @@
               <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 " [class.input-error]="Form?.get('CalendarName')?.invalid  && validateFrom ">
-    
+
               <mat-form-field appearance="none"  class="width-100" color="ion-color-secondary"  placeholder="Selecione agenda">
                 <mat-select [(value)]="postData.CalendarName" >
                   <mat-option *ngFor="let calendars of CalendarNamesOptions" value="{{calendars}}">
                     Agenda {{ calendars }}
                   </mat-option>
-    
+
                 </mat-select>
               </mat-form-field>
-    
+
             </div>
           </div>
         </div>
@@ -195,7 +195,7 @@
                   [stepHour]="stepHour" [stepMinute]="stepMinute"
                   [stepSecond]="stepSecond"
                   [touchUi]="touchUi"
-                  
+
                   >
                 </ngx-mat-datetime-picker>
               </mat-form-field>
@@ -232,7 +232,7 @@
             <div class="ion-icon-class">
               <ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
             </div>
-            <div class="ion-input-class-no-height">
+            <div class="ion-input-class-no-height cursor-pointer" (click)="addParticipantsCc()">
               <div class="list-people">
                 <ion-item lines="none">
                   <ion-list>
@@ -241,7 +241,7 @@
                   </ion-list>
                 </ion-item>
               </div>
-              <div class="add-people" (click)="addParticipantsCc()">
+              <div class="add-people" >
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "  slot="start" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-arrow-forward.svg"></ion-icon>

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -124,37 +124,30 @@ export class ExpedientTaskModalPage implements OnInit {
 
       this.SearchFolder = this.navParams.get('SearchFolder');
       this.aplicationId = this.navParams.get('aplicationId')
-      // this.document = this.navParams.get('document')
+      this.document = this.navParams.get('document')
 
       this.taskType = this.navParams.get('taskAction');
 
-
+      // try {
-      // if(this.document) {
+      //   if(this.document) {
-      //   const doc: any = this.document
+      //     const doc: any = this.document
-
+      //     this.documents.push({
-      //   this.documents.push({
+      //       ApplicationId: (doc.ApplicationType || doc.ApplicationId),
-      //     ApplicationId: (doc.ApplicationType || doc.ApplicationId),
+      //       ApplicationType: (doc.ApplicationType || doc.ApplicationId),
-      //     ApplicationType: (doc.ApplicationType || doc.ApplicationId),
+      //       SourceId: (doc.Id || doc.DocId || doc.SourceId),
-      //     SourceId: (doc.Id || doc.DocId || doc.SourceId),
+      //       Id: (doc.Id || doc.DocId || doc.SourceId),
-      //     Id: (doc.Id || doc.DocId || doc.SourceId),
+      //       EntidadeOrganicaNome: (doc.sender || doc.SourceName || doc. EntidadeOrganicaNome),
-      //     EntidadeOrganicaNome: (doc.sender || doc.SourceName || doc. EntidadeOrganicaNome),
+      //       Sender: (doc.sender || doc.SourceName || doc. EntidadeOrganicaNome),
-      //     Sender: (doc.sender || doc.SourceName || doc. EntidadeOrganicaNome),
+      //       Data: (doc.DocDate || doc.Data),
-      //     Data: (doc.DocDate || doc.Data),
+      //       DocDate: (doc.DocDate || doc.Data),
-      //     DocDate: (doc.DocDate || doc.Data),
+      //       Assunto: doc.Assunto,
-      //     Assunto: doc.Assunto,
+      //     } as any)
-      //   } as any)
+      //   }
+      // } catch (error) {
+      //   console.log(error)
       // }
 
-
+      // console.log('this.document', this.document)
-      const DocumentToSave = this.documents.map((e) => {
-        return {
-          ApplicationId: e.ApplicationType,
-          SourceId: e.Id
-        }
-      });
-
-
-      console.log('this.document', this.document)
 
 
       /* this.selectedTypes = ['99999850']; */

src/app/services/chat/message.service.ts

@@ -319,6 +319,8 @@ export class MessageService {
     if(params?.attachments) {
       if(params?.attachments[0]?.image_url) {
         delete params?.attachments[0]?.image_url
+        delete params?.file?.image_url
+        // delete
       }
     }
 

src/app/store/notification-holder.service.ts

@@ -43,11 +43,15 @@ export class NotificationHolderService {
 
   notificationObject(notification) {
     const element = notification
+    const i = this._notificationList.length + 1
+
     let notificationObject;
+
     if (element.notification) {
 
       notificationObject = {
-        id: notification?.id,
+        id: notification?.id || uuidv4(),
+        index: i,
         title: element.notification.title,
         Service: element.data.Service,
         Object: element.data.Object,
@@ -65,7 +69,8 @@ export class NotificationHolderService {
 
     } else if (element.data) {
       notificationObject = {
-        id: notification?.id,
+        id: notification?.id || uuidv4(),
+        index: i,
         title: element.title,
         Service: element.data.Service,
         Object: element.data.Object,
@@ -84,19 +89,20 @@ export class NotificationHolderService {
     } else {
       {
         notificationObject = {
-          id: notification?.id,
+          id: notification?.id || uuidv4(),
-          title: element.title,
-          Service: element.Service,
-          Object: element.Object,
-          IdObject: element.IdObject,
           FolderId: element.FolderId,
-          body: element.body,
+          IdObject: element.IdObject,
-          dateInit: element.dateInit,
-          dateEnd: element.dateEnd,
           Location: element.Location,
-          TypeAgenda: element.TypeAgenda,
+          Object: element.Object,
           Role: element.Role,
+          Service: element.Service,
           Status: element.Status,
+          TypeAgenda: element.TypeAgenda,
+          body: element.body,
+          dateEnd: element.dateEnd,
+          dateInit: element.dateInit,
+          index: element.index,
+          title: element.title,
           read: false,
         }
       }

src/environments/environment.prod.ts

@@ -4,4 +4,4 @@ import { doneITProd } from './suport/doneIt'
 import { DevDev } from './suport/dev'
 
 
-export const environment: Environment = DevDev;
+export const environment: Environment = oaprProd;

src/environments/environment.ts

@@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt'
 import { DevDev } from './suport/dev'
 
 
-export const environment: Environment = DevDev
+export const environment: Environment = oaprDev