Search solved, aprove envent and remove from home the serviceworker

src/app/home/home.page.ts

@@ -124,12 +124,12 @@ export class HomePage implements OnInit {
     }
 
 
-    navigator.serviceWorker.ready.then((registration) => {
+   /*  navigator.serviceWorker.ready.then((registration) => {
       console.log('yes please')
       registration.active.postMessage(
         "Test message sent immediately after creation",
       );
-    });
+    }); */
 
   }
 

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

@@ -82,7 +82,7 @@
             <div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
               <h5 class="font-17-rem">Detalhes</h5>
               <ion-item lines="none" class="ion-no-margin ion-no-padding">
-                <pre class="width-100 text">{{loadedEvent.workflowInstanceDataFields.Body }} </pre>
+                <pre class="text scrollable-pre">{{loadedEvent.workflowInstanceDataFields.Body }} </pre>
               </ion-item>
               <div class="line"></div>
             </div>

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

@@ -41,6 +41,7 @@ ion-menu{
   /* overflow: auto;
   width: 100%; */
   border-right: 1px solid #d8d8d8;
+  background: white;
 
   .upper-content{
     margin-left: 40px;
@@ -220,6 +221,11 @@ ion-menu{
   }
 }
 
+.scrollable-pre {
+  max-height: 300px;
+  overflow-y: auto; /* Add vertical scroll if content exceeds max height */
+}
+
 @media only screen and (min-width: 1140px){
   .content{
     width: 75%;

src/app/pages/search/search.page.scss

@@ -230,6 +230,7 @@ ion-slide{
     font-size: rem(20);
     text-align: center;
     color: black;
+    margin-bottom: 25px;
   }
 
   .most-searched-word-container{

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

@@ -99,8 +99,7 @@ export class SearchPage implements OnInit {
     private navParams: NavParams,
     public ThemeService: ThemeService,
     private router: Router,
-    private httpErrorhandle: HttpErrorHandle)
+    private httpErrorhandle: HttpErrorHandle) {
-    {
     this.ordinance = "recent";
     this.currentPath = window.location.pathname;
 
@@ -336,11 +335,21 @@ export class SearchPage implements OnInit {
 
     if (this.type == "Agenda") {
 
-      this.showLoader = true;
 
+
+      if (this.searchSubject.trim() == "" && searchDocumentDate == null && this.searchSenderId == null && this.searchOrganicEntiryCode == null && this.searchDocTypeId == null) {
+        this.searchResult = "Campo de pesquisa esta vazio, entre com assunto que deseja pesquisa";
+        console.log('enter text');
+
+      } else {
+        this.showLoader = true;
         this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSenderId
           , this.searchOrganicEntiryCode, this.searchDocTypeId, '0').subscribe(res => {
             
+            if (!res.Categories.length) {
+              this.searchResult = "Não encontramos o que procura";
+            }
+
             res.Categories.forEach(e => {
               e['Active'] = false;
             });
@@ -369,10 +378,9 @@ export class SearchPage implements OnInit {
             // console.log(error)
           });
       }
+    }
     else if (this.type == "AccoesPresidenciais & ArquivoDespachoElect") {
 
-      this.showLoader = true;
-
       this.searchCategories = [];
       this.searchDocuments = [];
       this.showSearchDocuments = [];
@@ -380,9 +388,18 @@ export class SearchPage implements OnInit {
       if (this.select) {
 
         let counter = 0;
+        if (this.searchSubject.trim() == "" && searchDocumentDate == null && this.searchSenderId == null && this.searchOrganicEntiryCode == null && this.searchDocTypeId == null) {
+          this.searchResult = "Campo de pesquisa esta vazio, entre com assunto que deseja pesquisa";
+          console.log('enter text');
+
+        } else {
           
           this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
             , this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
+              this.showLoader = true;
+              if (!res.Categories.length) {
+                this.searchResult = "Não encontramos o que procura";
+              }
 
               res.Categories.forEach(e => {
                 e['Active'] = false;
@@ -419,9 +436,19 @@ export class SearchPage implements OnInit {
                 this.showLoader = false;
               }
             });
+        }
 
+        if (this.searchSubject.trim() == "" && searchDocumentDate == null && this.searchSenderId == null && this.searchOrganicEntiryCode == null && this.searchDocTypeId == null) {
+          this.searchResult = "Campo de pesquisa esta vazio, entre com assunto que deseja pesquisa";
+          console.log('enter text');
+
+        } else {
+          this.showLoader = true;
           this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
             , this.searchOrganicEntiryCode, this.searchDocTypeId, '361').subscribe(res => {
+              if (!res.Categories.length) {
+                this.searchResult = "Não encontramos o que procura";
+              }
 
               res.Categories.forEach(e => {
                 e['Active'] = false;
@@ -459,12 +486,22 @@ export class SearchPage implements OnInit {
 
               console.log('application 361 failed', error);
             });
+        }
 
       } else {
         let counter = 0;
 
+        if (this.searchSubject.trim() == "" && searchDocumentDate == null && this.searchSenderId == null && this.searchOrganicEntiryCode == null && this.searchDocTypeId == null) {
+          this.searchResult = "Campo de pesquisa esta vazio, entre com assunto que deseja pesquisa";
+          console.log('enter text');
+
+        } else {
+          this.showLoader = true;
           this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSenderId
             , this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
+              if (!res.Categories.length) {
+                this.searchResult = "Não encontramos o que procura";
+              }
               res.Categories.forEach(e => {
                 e['Active'] = false;
                 this.searchCategories.push(e)
@@ -502,9 +539,18 @@ export class SearchPage implements OnInit {
                 this.showLoader = false;
               }
             });
+        }
+        if (this.searchSubject.trim() == "" && searchDocumentDate == null && this.searchSenderId == null && this.searchOrganicEntiryCode == null && this.searchDocTypeId == null) {
+          this.searchResult = "Campo de pesquisa esta vazio, entre com assunto que deseja pesquisa";
+          console.log('enter text');
 
+        } else {
+          this.showLoader = true;
           this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
             , this.searchOrganicEntiryCode, this.searchDocTypeId, '361').subscribe(res => {
+              if (!res.Categories.length) {
+                this.searchResult = "Não encontramos o que procura";
+              }
 
               res.Categories.forEach(e => {
                 e['Active'] = false;
@@ -544,12 +590,11 @@ export class SearchPage implements OnInit {
             });
         }
       }
+    }
 
 
     else if (this.type == "Correspondencia") {
 
-      this.showLoader = true;
-
       this.searchCategories = [];
       this.searchDocuments = [];
       this.showSearchDocuments = [];
@@ -557,9 +602,17 @@ export class SearchPage implements OnInit {
       if (this.select) {
 
         let counter = 0;
+        if (this.searchSubject.trim() == "" && searchDocumentDate == null && this.searchSenderId == null && this.searchOrganicEntiryCode == null && this.searchDocTypeId == null) {
+          this.searchResult = "Campo de pesquisa esta vazio, entre com assunto que deseja pesquisa";
+          console.log('enter text');
 
+        } else {
+          this.showLoader = true;
           this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
             , this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
+              if (!res.Categories.length) {
+                this.searchResult = "Não encontramos o que procura";
+              }
 
               res.Categories.forEach(e => {
                 e['Active'] = false;
@@ -592,12 +645,21 @@ export class SearchPage implements OnInit {
               this.searchResult = "Registo não encontrado"
               console.log(error)
             });
+        }
 
       } else {
         let counter = 0;
+        if (this.searchSubject.trim() == "" && searchDocumentDate == null && this.searchSenderId == null && this.searchOrganicEntiryCode == null && this.searchDocTypeId == null) {
+          this.searchResult = "Campo de pesquisa esta vazio, entre com assunto que deseja pesquisa";
+          console.log('enter text');
 
+        } else {
+          this.showLoader = true;
           this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSenderId
             , this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
+              if (!res.Categories.length) {
+                this.searchResult = "Não encontramos o que procura";
+              }
 
               res.Categories.forEach(e => {
                 e['Active'] = false;
@@ -638,12 +700,11 @@ export class SearchPage implements OnInit {
             });
         }
       }
+    }
 
     else if (this.type == "AccoesPresidenciais") {
 
       let counter = 0;
-
-      this.showLoader = true;
       this.searchCategories = []
       this.searchDocuments = []
 
@@ -693,9 +754,17 @@ export class SearchPage implements OnInit {
       // });
 
 
+      if (this.searchSubject.trim() == "" && searchDocumentDate == null && this.searchSenderId == null && this.searchOrganicEntiryCode == null && this.searchDocTypeId == null) {
+        this.searchResult = "Campo de pesquisa esta vazio, entre com assunto que deseja pesquisa";
+        console.log('enter text');
 
+      } else {
+        this.showLoader = true;
         this.search.basicSearchPublication(this.searchSubject, searchDocumentDate, this.searchSenderId
           , this.searchOrganicEntiryCode, this.searchDocTypeId, '386').subscribe(res => {
+            if (!res.Categories.length) {
+              this.searchResult = "Não encontramos o que procura";
+            }
 
 
             res.Categories.forEach(e => {
@@ -738,6 +807,7 @@ export class SearchPage implements OnInit {
             this.searchResult = "Registo não encontrado"
             console.log(error)
           });
+      }
 
     }
 

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "833a4df72",
+  "shortSHA": "ae2701cbc",
-  "SHA": "833a4df72f624fbaa3368bf89a05351eb1859a70",
+  "SHA": "ae2701cbcd02b0d0331f13927bc26d36d0752167",
   "branch": "developer",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Tue Aug 15 12:42:40 2023 +0100'",
+  "lastCommitTime": "'Tue Aug 15 12:44:53 2023 +0100'",
-  "lastCommitMessage": "date format solved and intevinets text correted",
+  "lastCommitMessage": "pull made",
-  "lastCommitNumber": "5157",
+  "lastCommitNumber": "5160",
   "change": "",
-  "changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 2 and 2 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified:   src/app/pages/chat/messages/contacts/contacts.page.html\n\tmodified:   src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   src/app/shared/header/header.page.html\n\tmodified:   src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html",
+  "changeStatus": "On branch developer\nYour branch is ahead of 'origin/developer' by 3 commits.\n  (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss\n\tmodified:   src/app/pages/search/search.page.scss\n\tmodified:   src/app/pages/search/search.page.ts\n\tmodified:   version/git-version.ts",
   "changeAuthor": "eudes.inacio"
 }