diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index 3d477eceb..ed38be2f9 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -234,7 +234,7 @@
-
{{searchResult}}
+
{{searchResult}}
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index f5145293d..dc1d8d94e 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -520,7 +520,7 @@ export class SearchPage implements OnInit {
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
, this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
this.showLoader = true;
- if (!res.Categories.length && this.showSearchDocuments.length == 0) {
+ if (!res.Categories.length) {
this.searchResult = "Não encontramos o que procura";
}
@@ -569,7 +569,7 @@ export class SearchPage implements OnInit {
this.showLoader = true;
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
, this.searchOrganicEntiryCode, this.searchDocTypeId, '361').subscribe(res => {
- if (!res.Categories.length && this.showSearchDocuments.length == 0) {
+ if (!res.Categories.length) {
this.searchResult = "Não encontramos o que procura";
}
@@ -622,7 +622,7 @@ export class SearchPage implements OnInit {
this.showLoader = true;
this.search.basicSearch(this.searchSubject, searchDocumentDate, searchDocumentDateEnd, this.searchSenderId
, this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
- if (!res.Categories.length && this.showSearchDocuments.length == 0) {
+ if (!res.Categories.length) {
this.searchResult = "Não encontramos o que procura";
}
res.Categories.forEach(e => {
@@ -671,7 +671,7 @@ export class SearchPage implements OnInit {
this.showLoader = true;
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
, this.searchOrganicEntiryCode, this.searchDocTypeId, '361').subscribe(res => {
- if (!res.Categories.length && this.showSearchDocuments.length == 0) {
+ if (!res.Categories.length) {
this.searchResult = "Não encontramos o que procura";
}
@@ -733,7 +733,7 @@ export class SearchPage implements OnInit {
this.showLoader = true;
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
, this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
- if (!res.Categories.length && this.showSearchDocuments.length == 0) {
+ if (!res.Categories.length) {
this.searchResult = "Não encontramos o que procura";
}
@@ -780,7 +780,7 @@ export class SearchPage implements OnInit {
this.showLoader = true;
this.search.basicSearch(this.searchSubject, searchDocumentDate, searchDocumentDateEnd, this.searchSenderId
, this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
- if (!res.Categories.length && this.showSearchDocuments.length == 0) {
+ if (!res.Categories.length) {
this.searchResult = "Não encontramos o que procura";
}
@@ -885,7 +885,7 @@ export class SearchPage implements OnInit {
this.showLoader = true;
this.search.basicSearchPublication(this.searchSubject, searchDocumentDate, searchDocumentDateEnd, this.searchSenderId
, this.searchOrganicEntiryCode, this.searchDocTypeId, '386').subscribe(res => {
- if (!res.Categories.length && this.showSearchDocuments.length == 0) {
+ if (!res.Categories.length) {
this.searchResult = "Não encontramos o que procura";
}
diff --git a/src/app/ui/chat/component/new-group/new-group.page.ts b/src/app/ui/chat/component/new-group/new-group.page.ts
index 9563aa9fc..428f59102 100644
--- a/src/app/ui/chat/component/new-group/new-group.page.ts
+++ b/src/app/ui/chat/component/new-group/new-group.page.ts
@@ -97,7 +97,19 @@ export class NewGroupPage implements OnInit{
this.showDuration = event.detail.checked;
if(event.detail.checked) {
- this.expirationDate = null;
+ // ✅ Set default 1 hour duration
+ const now = new Date();
+ this.expirationDate = new Date(
+ now.getFullYear(),
+ now.getMonth(),
+ now.getDate(),
+ now.getHours() + 1, // +1 hour
+ now.getMinutes(),
+ now.getSeconds(),
+ now.getMilliseconds()
+ );
+
+ this.displayDuration = this.formatDuration(0, 1, 0);
}
else {
this.expirationDate = null;
@@ -348,4 +360,29 @@ export class NewGroupPage implements OnInit{
}
+
+ formatDuration(days: number, hours: number, minutes: number): string {
+ if (days > 0) {
+ if (days === 1) {
+ if (hours === 1) {
+ return `${days} day ${hours} hora ${minutes} minutos`;
+ } else {
+ return `${days} day ${hours} horas ${minutes} minutos`;
+ }
+ } else {
+ if (hours === 1) {
+ return `${days} days ${hours} hora ${minutes} minutos`;
+ } else {
+ return `${days} days ${hours} horas ${minutes} minutos`;
+ }
+ }
+ } else {
+ if (hours === 1) {
+ return `${hours} hora ${minutes} minutos`;
+ } else {
+ return `${hours} horas ${minutes} minutos`;
+ }
+ }
+ }
+
}