fixe error

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

@@ -936,7 +936,7 @@ export class AgendaPage implements OnInit {
     }
 
     // change header profile picture
-    window['header'](this.profile);
+    // window['header'](this.profile);
 
   }
 
@@ -981,13 +981,13 @@ export class AgendaPage implements OnInit {
     let postEvent: Event = data;
     if (postEvent.Subject != null)
     {
-      this.eventSource.push({
-        title: postEvent.Subject,
-        startTime: new Date(postEvent.StartDate),
-        endTime: new Date(postEvent.EndDate),
-        allDay: false,
-        event: postEvent
-      });
+      // this.eventSource.push({
+      //   title: postEvent.Subject,
+      //   startTime: new Date(postEvent.StartDate),
+      //   endTime: new Date(postEvent.EndDate),
+      //   allDay: false,
+      //   event: postEvent
+      // });
       this.myCal.update();
       this.myCal.loadEvents();
       this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);

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

@@ -96,11 +96,11 @@
         </div>
   
         <div class="ion-item-container-no-border" (click)="getDoc()">
-          <ion-label class="d-flex ">
-            <div class="attach-icon">
+          <ion-label class="d-flex align-center">
+            <div class="attach-icon d-flex align-center">
               <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
             </div>
-            <div class="attach-document">
+            <div class="attach-document pl-10">
               <ion-label>Anexar Documentos</ion-label>
             </div> 
           </ion-label>

src/app/pages/publications/new-publication/new-publication.page.ts

@@ -62,7 +62,7 @@ export class NewPublicationPage implements OnInit {
   ngOnInit() {
     this.setTitle();
     this.clear();
-    this.takePicture();
+    // this.takePicture();
   }
   takePicture(){
     const options: CameraOptions = {

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

@@ -253,59 +253,143 @@ export class SearchPage implements OnInit {
       this.searchDocuments = [];
       this.showSearchDocuments = [];
 
-      this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
-        ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
-        
-        res.Categories.forEach( e => {
-          e['Active'] = false;
-          this.searchCategories.push(e)
+      if(this.select) {
+
+        let counter  = 0;
+
+        this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender
+          ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
+          
+          res.Categories.forEach( e => {
+            e['Active'] = false;
+            this.searchCategories.push(e)
+          });
+          
+          // bind respose
+  
+          this.sortArrayISODate(res.Documents).forEach(e => {
+            e['appName'] = 'Correspondencia'
+            this.searchDocuments.push(e)
+          });
+  
+          this.reorderList(this.ordinance);
+  
+          // hide show document
+          if(this.searchDocuments.length >= 1){
+            this.showDocuments = true;  
+          } else {
+            this.showDocuments = false
+          }
+          counter++;
+
+          if(counter ==2){
+            this.showLoader = false;
+          }
+          
+          this.loadWordCloud();
         });
-        
-        // bind respose
+  
+        this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender
+          ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{
+          
+          res.Categories.forEach( e => {
+            e['Active'] = false;
+            this.searchCategories.push(e)
+          });
+          
+  
+          this.sortArrayISODate(res.Documents).forEach(e => {
+            e['appName'] = 'ArquivoDespachoElect'
+            this.searchDocuments.push(e)
+          });
+  
+          this.reorderList(this.ordinance);
+  
+          // hide show document
+          if(this.searchDocuments.length >= 1){
+            this.showDocuments = true;  
+          } else {
+            this.showDocuments = false
+          }
+          
+          this.loadWordCloud();
+          counter++;
 
-        this.sortArrayISODate(res.Documents).forEach(e => {
-          e['appName'] = 'Correspondencia'
-          this.searchDocuments.push(e)
+          if(counter ==2){
+            this.showLoader = false;
+          }
         });
+  
+      } else {
+        let counter  = 0;
 
-        this.reorderList(this.ordinance);
+        this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
+          ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
+          
+          res.Categories.forEach( e => {
+            e['Active'] = false;
+            this.searchCategories.push(e)
+          });
+          
+          // bind respose
+  
+          this.sortArrayISODate(res.Documents).forEach(e => {
+            e['appName'] = 'Correspondencia'
+            this.searchDocuments.push(e)
+          });
+  
+          this.reorderList(this.ordinance);
+  
+          // hide show document
+          if(this.searchDocuments.length >= 1){
+            this.showDocuments = true;  
+          } else {
+            this.showDocuments = false
+          }
+          
+          counter++;
 
-        // hide show document
-        if(this.searchDocuments.length >= 1){
-          this.showDocuments = true;  
-        } else {
-          this.showDocuments = false
-        }
-        
-        this.loadWordCloud();
-      });
+          if(counter ==2){
+            this.showLoader = false;
+          }
 
-      this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
-        ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{
-        
-        res.Categories.forEach( e => {
-          e['Active'] = false;
-          this.searchCategories.push(e)
+          this.loadWordCloud();
         });
-        
+  
+        this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
+          ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{
+          
+          res.Categories.forEach( e => {
+            e['Active'] = false;
+            this.searchCategories.push(e)
+          });
+          
+  
+          this.sortArrayISODate(res.Documents).forEach(e => {
+            e['appName'] = 'ArquivoDespachoElect'
+            this.searchDocuments.push(e)
+          });
+  
+          this.reorderList(this.ordinance);
+  
+          // hide show document
+          if(this.searchDocuments.length >= 1){
+            this.showDocuments = true;  
+          } else {
+            this.showDocuments = false
+          }
+          
+          
+          counter++;
 
-        this.sortArrayISODate(res.Documents).forEach(e => {
-          e['appName'] = 'ArquivoDespachoElect'
-          this.searchDocuments.push(e)
+          if(counter ==2){
+            this.showLoader = false;
+          }
+          this.loadWordCloud();
         });
+  
+      }
 
-        this.reorderList(this.ordinance);
-
-        // hide show document
-        if(this.searchDocuments.length >= 1){
-          this.showDocuments = true;  
-        } else {
-          this.showDocuments = false
-        }
-        
-        this.showLoader = false;
-        this.loadWordCloud();
-      });
 
     } else if (this.type == "AccoesPresidenciais"){
       

src/app/services/search.service.ts

@@ -72,4 +72,28 @@ export class SearchService {
     return this.http.get<any>(`${geturl}`, options);
   }
 
+  searchForDoc(subject:string, date:string, sender:string, organicEntity:string, docTypeId:string, applicationType:string): Observable<EventSearch> {
+    // Endpoint
+    const geturl = environment.apiURL + 'search/attachment?';
+    // store params
+    let params = new HttpParams();
+    // set https params
+    console.log(subject);
+
+    params = params.set("assunto", subject);
+    params = params.set("data", date);
+    params = params.set("remetente", sender);
+    params = params.set("entidadeOrganica", organicEntity);
+    params = params.set("docTypeId", docTypeId);
+    params = params.set("applicationType", applicationType);
+
+
+    const options = { 
+      headers: this.headers, 
+      params: params 
+    };
+
+    return this.http.get<EventSearch>(`${geturl}`, options);
+  }
+
 }