Merge branch 'feature/pendentes-count' into develop

src/app/app.component.ts

@@ -67,7 +67,7 @@ export class AppComponent {
         window.screen.orientation.unlock();
       } else if( this.platform.is("mobile")) {
         window.screen.orientation.lock('portrait');
-        console.log('Orientation locked')
+        // console.log('Orientation locked')
       }
 
       if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
@@ -76,16 +76,16 @@ export class AppComponent {
         try {
           this.sqliteservice.databaseConn();
         } catch (error) {
-          console.log("Error creating local database: ", error)
+          // console.log("Error creating local database: ", error)
         }
       }
 
       this.storageservice.get('networkCheckStore').then((network) => {
         if(network === 'online') {
-          console.log('Network app componente check', network)
+          // console.log('Network app componente check', network)
           this.backgroundservice.online()
         } else {
-          console.log('Network app componente check', network)
+          // console.log('Network app componente check', network)
           this.backgroundservice.offline();
         }
       })

src/app/home/home.page.ts

@@ -142,7 +142,7 @@ export class HomePage implements OnInit {
     this.notificationsService.onReciveBackground();
 
     window.addEventListener('online', () => {
-      console.log('Became online')
+      // console.log('Became online')
       this.backgroundservice.online()
       if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
       } else {
@@ -151,7 +151,7 @@ export class HomePage implements OnInit {
 
     });
     window.addEventListener('offline', () => {
-      console.log('Became offline')
+      // console.log('Became offline')
       this.backgroundservice.offline()
     });
 

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

@@ -77,7 +77,7 @@ export class DocumentDetailPage implements OnInit {
       } else if (document.ApplicationID == 8 || document.ApplicationId == 8) {
 
       } else {
-        console.log('unexpected id')
+        // console.log('unexpected id')
       }
 
 

src/app/modals/preview-camera/preview-camera.page.ts

@@ -42,7 +42,7 @@ ngOnInit() {
   this.image = this.navParams.get('image')
   this.name = this.navParams.get('username')
   this._updatedAt = this.navParams.get('_updatedAt')
-  console.log(this.image)
+  // console.log(this.image)
   // this.image = this.myimage
 }
 

src/app/modals/profile/profile.page.ts

@@ -52,7 +52,7 @@ export class ProfilePage implements OnInit {
 
   ngOnInit() {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-      console.log('Notifications not supported')
+      // console.log('Notifications not supported')
       this.getNotificationData();
     } else {
       this.getNotificationData();
@@ -138,7 +138,7 @@ export class ProfilePage implements OnInit {
 
   notificatinsRoutes = (index, Service, Object, IdObject, FolderId) => {
 
-    console.log(index, Service, Object, IdObject, FolderId)
+    // console.log(index, Service, Object, IdObject, FolderId)
 
     if (Service === "agenda" && IdObject.length > 10) {
       this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda']));

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

@@ -46,6 +46,7 @@ export class ViewDocumentPage implements OnInit {
 
     this.processes.GetViewer(this.docId, this.applicationId).subscribe(res=> {
       const link: string = res;
+      console.log(res,' link!!!')
       this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link);
     }, ()=>{
       this.close();
@@ -77,7 +78,7 @@ export class ViewDocumentPage implements OnInit {
         } else if(res.data.component == 'openExpedientActionsModal') {
           this.openExpedientActionsModal(res.data.taskAction)
         } else {
-          console.log('not found')
+          // console.log('not found')
         }
       }
 

src/app/pages/agenda/edit-event/edit-event.page.ts

@@ -99,7 +99,7 @@ export class EditEventPage implements OnInit {
     this.isEventEdited = false;
     /* this.postEvent.EventRecurrence = { Type:'-1', LastOccurrence:''}; */
     this.postEvent = this.navParams.get('event');
-    console.log(this.postEvent);
+    // console.log(this.postEvent);
 
     this.caller = this.navParams.get('caller');
     this.initCalendarName = this.postEvent.CalendarName;
@@ -185,7 +185,7 @@ export class EditEventPage implements OnInit {
   }
 
   calculetedLastOccurrence(type:number){
-    console.log(type);
+    // console.log(type);
     var valor; 
     var opcao: boolean;
     if (type == 0) {

src/app/pages/agenda/new-event/new-event.page.ts

@@ -211,7 +211,7 @@ export class NewEventPage implements OnInit {
   }
 
   calculetedLastOccurrence(type:number){
-    console.log(type);
+    // console.log(type);
     var valor; 
     var opcao: boolean;
     if (type == 0) {

src/app/pages/chat/chat.page.ts

@@ -138,7 +138,7 @@ export class ChatPage implements OnInit {
     }
     SessionStore.user.ChatData = data
     SessionStore.save() */
-    console.log(SessionStore.user.ChatData.data.authToken)
+    // console.log(SessionStore.user.ChatData.data.authToken)
     this.chatService.refreshtoken();
 
     this.segment = "Contactos";

src/app/pages/chat/new-group/new-group.page.ts

@@ -44,7 +44,7 @@ export class NewGroupPage implements OnInit {
 
   ngOnInit() {
     this.chatService.refreshtoken();
-    console.log(this.documents)
+    // console.log(this.documents)
     
   }
 

src/app/pages/gabinete-digital/diplomas/diplomas.page.ts

@@ -128,11 +128,11 @@ export class DiplomasPage implements OnInit, OnDestroy {
 
         let task = this.pipeTask(element);
         diplomasAssinadoList.push(task);
-        console.log('DIPLOMAS ASSINADOS', task)
+        // console.log('DIPLOMAS ASSINADOS', task)
       });
 
       this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'CreateDate')
-      console.log('DIPLOMAS ASSINADOS', this.diplomasAssinadoList)
+      // console.log('DIPLOMAS ASSINADOS', this.diplomasAssinadoList)
 
     }, (error) => {
       this.getFromDb()

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -657,8 +657,8 @@ export class ExpedienteDetailPage implements OnInit {
       this.newGroup();
     }
     else {
-      console.log(this.task)
-      console.log(this.fulltask)
+      // console.log(this.task)
+      // console.log(this.fulltask)
       this.dataService.set("newGroup", true);
       this.dataService.set("task", this.task);
       this.dataService.set("newGroupName", this.task.Folio);

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -108,7 +108,6 @@ export class GabineteDigitalPage implements OnInit {
   despachoStore = DespachoStore;
   eventoaprovacaostore = EventoAprovacaoStore;
   pedidosstore = PedidosStore;
-  // expedienteprstore = ExpedienteprStore;
   despachoprstore = DespachosprStore;
   totalDocumentStore = TotalDocumentStore
   deplomasStore = DeplomasStore
@@ -138,7 +137,6 @@ export class GabineteDigitalPage implements OnInit {
     private router: Router,
     authService: AuthService,
     public waitForDomService: WaitForDomService,
-    //private notificationsService: NotificationsService,
     private despachoRule: DespachoService,
     private sqliteservice: SqliteService,
     private platform: Platform,
@@ -190,7 +188,7 @@ export class GabineteDigitalPage implements OnInit {
           selector: 'app-gabinete-digital ion-content .aside-wrapper',
           callback: () => {
             this.checkRoutes();
-            console.log('FIRST CALL')
+            // console.log('FIRST CALL')
             this.LoadCounts();
           }
         })
@@ -202,7 +200,7 @@ export class GabineteDigitalPage implements OnInit {
     this.waitForDomService.selector({
       selector: 'app-gabinete-digital ion-content .aside-wrapper',
       callback: () => {
-        console.log('SECOND CALL')
+        // console.log('SECOND CALL')
         this.loadAllProcesses();
       }
     })
@@ -421,14 +419,6 @@ export class GabineteDigitalPage implements OnInit {
   checkUser() {
     this.selectedElement = 'allProcessesTag';
     this.showAllProcesses = true;
-    /* switch(this.loggeduser.Profile){
-      case 'MDGPR':
-        this.showExpedients = true;
-        break;
-      case 'PR':
-        this.showExpedientesPr = true;
-        break;
-    } */
   }
 
   hideRefreshButton() {

src/app/pages/search/search.page.ts

@@ -104,7 +104,23 @@ export class SearchPage implements OnInit {
 
     if(ApplicationType == '8' ) {
       
-      this.viewDocumentDetail(Id, ApplicationType);
+      // this.viewDocumentDetail(Id, ApplicationType);
+
+      const modal = await this.modalController.create({
+        component: ViewDocumentPage,
+        componentProps: {
+          trustedUrl: '',
+          file: {
+            title: item.Assunto,
+            url: '',
+            title_link: '',
+          },
+          applicationId: ApplicationType,
+          docId: item.Id,
+        },
+        cssClass: 'modal modal-desktop'
+      });
+      await modal.present();
 
     } else if (ApplicationType == '361') {
 

src/app/services/chat.service.ts

@@ -88,7 +88,7 @@ export class ChatService {
   }
 
   getAllUsers() {
-    console.log(this.options)
+    // console.log(this.options)
     return this.http.get(environment.apiChatUrl + 'users.list', this.options);
   }
   getAllConnectedUsers() {
@@ -375,8 +375,8 @@ export class ChatService {
       SessionStore.user.ChatData = data
       SessionStore.save()
       this.setheader()
-      console.log(res)
-      console.log(SessionStore.user.ChatData)
+      // console.log(res)
+      // console.log(SessionStore.user.ChatData)
     });
   }
 

src/app/services/chat/ws-chat-methods.service.ts

@@ -337,7 +337,7 @@ export class WsChatMethodsService {
 
         this.dm[roomId] = room
         this._dm.push(room)
-        console.log(this._dm)
+        // console.log(this._dm)
         this.dmCount++
 
       } else {

src/app/services/notification/sw.js

@@ -10,7 +10,7 @@ self.addEventListener('activate', function(event) {
 self.addEventListener('notificationclick', function(event) {
   // Close the notification when it is clicked
   event.notification.close();
-  console.log(event)
+  // console.log(event)
 });
 
 

src/app/shared/agenda/approve-event/approve-event.page.ts

@@ -71,7 +71,7 @@ export class ApproveEventPage implements OnInit {
     this.processes.GetTask(this.serialNumber).subscribe(res => {
       
       this.loadedEvent = res;
-      console.log(this.loadedEvent);
+      // console.log(this.loadedEvent);
       this.today = new Date(res.workflowInstanceDataFields.StartDate);
       // 
       this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);

src/app/shared/agenda/edit-event/edit-event.page.ts

@@ -233,7 +233,7 @@ export class EditEventPage implements OnInit {
   }
 
   calculetedLastOccurrence(type:number){
-    console.log(type);
+    // console.log(type);
     var valor; 
     var opcao: boolean;
     if (type == 0) {

src/app/shared/agenda/new-event/new-event.page.ts

@@ -377,7 +377,7 @@ export class NewEventPage implements OnInit {
   }
 
   calculetedLastOccurrence(type:number){
-    console.log(type);
+    // console.log(type);
     var valor; 
     var opcao: boolean;
     if (type == 0) {

src/app/shared/agenda/view-event/view-event.page.html

@@ -53,7 +53,7 @@
           <p>{{customDate}}</p>
           <p *ngIf="toDateString(loadedEvent.StartDate) == toDateString(loadedEvent.EndDate)">das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
           <p *ngIf="toDateString(loadedEvent.StartDate) != toDateString(loadedEvent.EndDate)">{{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.StartDate | date: 'dd/M/yy'}} </p>
-          <p>
+          <p *ngIf="loadedEvent.EventRecurrence">
             <span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 2">Mensal</span>

src/app/shared/agenda/view-event/view-event.page.ts

@@ -105,7 +105,7 @@ export class ViewEventPage implements OnInit {
       this.eventsService.getEvent(this.eventId).subscribe(res => {
         
         this.loadedEvent = res;
-        console.log(this.loadedEvent);
+        // console.log(this.loadedEvent);
         this.today = new Date(res.StartDate);
         this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
       }, (error)=> {

src/app/shared/chat/group-messages/group-messages.page.ts

@@ -167,7 +167,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
   ngOnInit() {
     this.chatService.refreshtoken();
-    console.log(this.roomId)
+    // console.log(this.roomId)
     this.loggedUser = this.loggedUserChat;
     //setTimeout(() => {
       this.getRoomInfo()
@@ -407,7 +407,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   async getRoomInfo() {
     this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory({});
     let room = await this.chatService.getRoomInfo(this.roomId).toPromise();
-    console.log('ROOM',room)
+    // console.log('ROOM',room)
     this.room = room['room'];
     if (this.room.name) {
       this.roomName = this.room.name.split('-').join(' ');

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

@@ -85,8 +85,8 @@ export class EventsToApprovePage implements OnInit {
     else if(this.segment == 'PR') {
       let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
       let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
-      console.log(prEventsOficial)
-      console.log(prEventsPessoal)
+      // console.log(prEventsOficial)
+      // console.log(prEventsPessoal)
       this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
       this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
       this.eventsPRList = (this.eventsPRList || []).filter(function(item) {
@@ -105,12 +105,12 @@ export class EventsToApprovePage implements OnInit {
   getFromDB() {
     this.storage.get('event-to-aproveMD').then((events =  []) => {
       this.eventsMDGPRList = events
-      console.log('DB',this.eventsMDGPRList)
+      // console.log('DB',this.eventsMDGPRList)
     })
 
     this.storage.get('event-to-aprovePR').then((events) => {
       this.eventsPRList = events
-      console.log('DB',this.eventsPRList)
+      // console.log('DB',this.eventsPRList)
     })
   }
 

src/app/shared/publication/edit-action/edit-action.page.ts

@@ -99,7 +99,7 @@ export class EditActionPage implements OnInit {
       DateEnd: this.folder.DateEnd,
       ActionType: this.folder.ActionType,
     }
-    console.log(this.folder.DateEnd);
+    // dconsole.log(this.folder.DateEnd);
 
     const loader = this.toastService.loading()
 

src/assets/www/pdfjs/web/debugger.js

@@ -125,7 +125,7 @@ var FontInspector = (function FontInspectorClosure() {
       logIt.textContent = 'Log';
       logIt.addEventListener('click', function(event) {
         event.preventDefault();
-        console.log(fontObj);
+        // console.log(fontObj);
       });
       var select = document.createElement('input');
       select.setAttribute('type', 'checkbox');

src/assets/www/pdfjs/web/viewer.html

@@ -33,7 +33,7 @@
 
       window.addEventListener("message", (event) => {
 
-        console.log(event)
+        // console.log(event)
         if (event.data && event.data.sender == "cookies") {
           // setCookie()
         }