From 46373ccc6ec608fd3f1c54430cd56c03db4695f0 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 30 Jan 2024 14:09:30 +0100 Subject: [PATCH 1/4] fix slow chat --- src/app/services/chat/room.service.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 5a2aa305c..ae6f14d55 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -334,22 +334,28 @@ export class RoomService { message.loadHistory = this.DoneLoadingHistory this.lastMessage = message; - this.calDateDuration(ChatMessage._updatedAt); + + try { + this.calDateDuration(ChatMessage._updatedAt); + } catch (error) { + console.log(error) + } + if (message.t == 'r') { this.name = message.msg; } - if (this.isSenderIsNotMe(ChatMessage)) { + //if (this.isSenderIsNotMe(ChatMessage)) { /* this.NativeNotificationService.sendNotificationChat({ message: message.msg, title: this.name }); */ - } + //} if (this.hasLoadHistory == true) { this.messages.push(message) - await message.addMessageDB() + message.addMessageDB() } else { this.messagesBeforeOfflineAPI.push(message) } From 52463381221586ff182d1ad5a7091d6a0d137b05 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 30 Jan 2024 14:27:23 +0100 Subject: [PATCH 2/4] remove corrent login user email from login --- src/app/pages/login/login.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 195eead2a..7d425e674 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -30,7 +30,7 @@ import { StorageService } from 'src/app/services/storage.service'; export class LoginPage implements OnInit { logstatus: boolean; - username: string = SessionStore.user.Email || environment.defaultuser; + username: string = environment.defaultuser; password: string = environment.defaultuserpwd; userattempt: UserForm; code = [] From 5fee98c2352d03e2b8c00ab024fa1960682e8b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Wed, 31 Jan 2024 17:13:07 +0100 Subject: [PATCH 3/4] bugs before presantation --- android/app/src/main/AndroidManifest.xml | 106 ++++++------------ .../new-publication/new-publication.page.html | 2 +- .../new-publication/new-publication.page.ts | 2 +- .../pages/publications/publications.page.ts | 6 +- .../view-publications.page.ts | 22 ++++ .../new-publication/new-publication.page.html | 2 +- .../new-publication/new-publication.page.ts | 99 +++++++++++----- .../view-publications.page.ts | 1 + src/app/store/publication-folder.service.ts | 77 ++++++++----- web.config | 59 +++------- 10 files changed, 198 insertions(+), 178 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e30b92953..96d5670a8 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,72 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index fe0e05983..b0bdbcfd7 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -45,7 +45,7 @@ diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 620b320ca..b696a11c7 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -252,7 +252,7 @@ export class NewPublicationPage implements OnInit { .then(async (content) => { this.filecontent = true; let fileObject = { - FileBase64: 'data:video/mp4;base64,'+content.data, + FileBase64: 'data:video/mp4;base64,' + content.data, FileExtension: 'mp4', OriginalFileName: 'video' } diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 5ffd706d5..4b11d83f3 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -98,6 +98,7 @@ export class PublicationsPage implements OnInit { this.hideRefreshButton(); this.intent = window["sharedContent"] + window["refreshPublication"] = this.refreshing } @@ -124,7 +125,7 @@ export class PublicationsPage implements OnInit { } } - refreshing() { + refreshing = () => { setTimeout(() => { this.getActions(); }, 1500); @@ -300,6 +301,9 @@ export class PublicationsPage implements OnInit { const loader = this.toastService.loading(); try { await this.publications.DeletePresidentialAction(id).toPromise(); + if(window["refreshPublication"]) { + window["refreshPublication"](); + } this.toastService._successMessage() } catch (error) { if(error.status == 0) { diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index 4ce5d16b5..247a1ca9f 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -270,6 +270,7 @@ export class ViewPublicationsPage implements OnInit { if (!found) { this.publicationFolderService.publicationList[folderId].push(publicationDetails) + this.publicationFolderService.revertPublicationOrder(folderId) } else { @@ -348,4 +349,25 @@ export class ViewPublicationsPage implements OnInit { await modal.present(); } + + getSortedPublications(): Publication[] { + const unsortedPublications = this.publicationFolderService.publicationList[this.folderId]; + + if (unsortedPublications) { + // Copiar a lista original para evitar alterações indesejadas + const publicationsCopy = [...unsortedPublications]; + + // Ordenar as publicações pelo DatePublication + publicationsCopy.sort((a, b) => { + const dateA = new Date(a.DatePublication).getTime(); + const dateB = new Date(b.DatePublication).getTime(); + return dateA - dateB; + }); + + return publicationsCopy; + } else { + return []; + } + } } + diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index c44017053..ea7b7deb4 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -77,7 +77,7 @@ diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 4f6f9b84c..5eaad0d59 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -258,26 +258,26 @@ export class NewPublicationPage implements OnInit { multiple: true, }); - console.log(result) + console.log(result) result.files.forEach(async blobFile => { console.log(blobFile) if (this.checkFileType.checkFileType(blobFile.mimeType) == 'image' || this.checkFileType.checkFileType(blobFile.mimeType) == 'video') { - /* console.log('converte new way',this.getBase64(blobFile)) */ + /* console.log('converte new way',this.getBase64(blobFile)) */ - /* const blob = await fetch( - Capacitor.convertFileSrc(blobFile.path) - ).then(r => r.blob()); */ + /* const blob = await fetch( + Capacitor.convertFileSrc(blobFile.path) + ).then(r => r.blob()); */ - /* console.log(await blob.arrayBuffer()); - - + /* console.log(await blob.arrayBuffer()); + - console.log("base64 :data:video/mp4;base64,",this.arrayBufferToBase64(await blob.arrayBuffer())) */ + + console.log("base64 :data:video/mp4;base64,",this.arrayBufferToBase64(await blob.arrayBuffer())) */ this.convertBlobToBase64(blobFile.blob).then((value) => { - console.log(value) + console.log(this.removeTextBeforeSlash(value, ',')) this.filesSizeSum = this.filesSizeSum + blobFile.size if (this.fileSizeToMB(this.filesSizeSum) <= 20) { @@ -288,7 +288,7 @@ export class NewPublicationPage implements OnInit { const newAttachment = new PublicationAttachmentEntity( { - base64: value, + base64: this.removeTextBeforeSlash(value, ','), extension: FileExtension, blobFile: file, FileType: this.checkFileType.checkFileType(FileExtension) @@ -315,7 +315,7 @@ export class NewPublicationPage implements OnInit { }); - + /* this.capturedImage = 'data:image/jpeg;base64,' +capturedImage.base64String; @@ -347,7 +347,7 @@ export class NewPublicationPage implements OnInit { ({ multiple: true, }); - console.log(result.files) + console.log(result.files) result.files.forEach(element => { this.filesSizeSum = this.filesSizeSum + element.size @@ -359,15 +359,16 @@ export class NewPublicationPage implements OnInit { .then(async (content) => { console.log(result) - console.log('load video tablet base64',content) + console.log('load video tablet base64', content) this.filecontent = true; - let fileObject = new PublicationAttachmentEntity ({ + let fileObject = new PublicationAttachmentEntity({ base64: content.data, extension: this.removeTextBeforeSlash(element.mimeType, '/'), OriginalFileName: 'video', - FileType: this.checkFileType.checkFileType( this.removeTextBeforeSlash(element.mimeType, '/')) + FileType: this.checkFileType.checkFileType(this.removeTextBeforeSlash(element.mimeType, '/')) }) this.seletedContent.push(fileObject) + console.log('Files array',this.seletedContent) }) .catch((err) => console.error(err)); } catch (error) { @@ -607,17 +608,59 @@ export class NewPublicationPage implements OnInit { } convertBlobToBase64(blob: Blob) { - console.log('Convert blob ',blob) - return new Promise((resolve, reject) => { - const reader = new FileReader; - reader.onerror = reject; - reader.onload = () => { - resolve(reader.result) - } - reader.readAsDataURL(blob) - },) + try { + return new Promise((resolve, reject) => { + const chunkSize = 5000000; // 5 MB + const fileSize = blob.size; + const chunks = Math.ceil(fileSize / chunkSize); + let currentChunk = 0; + const base64Chunks = []; + + const reader = new FileReader(); + + reader.onload = function () { + base64Chunks.push(reader.result); + currentChunk++; + + if (currentChunk < chunks) { + loadNextChunk(); + } else { + const base64Data = base64Chunks.join(""); + resolve(base64Data); + } + }; + + reader.onerror = function (error) { + reject(error); + }; + + function loadNextChunk() { + const start = currentChunk * chunkSize; + const end = Math.min(start + chunkSize, fileSize); + const chunk = blob.slice(start, end); + reader.readAsDataURL(chunk); + } + + loadNextChunk(); + }); + } catch (error) { + console.log(error); + } } + + /* convertBlobToBase64(blob: Blob) { + console.log('Convert blob ',blob) + return new Promise((resolve, reject) => { + const reader = new FileReader; + reader.onerror = reject; + reader.onload = () => { + resolve(reader.result) + } + reader.readAsDataURL(blob) + },) + } */ + getBase64(file) { return new Promise((resolve, reject) => { const reader = new FileReader(); @@ -625,7 +668,7 @@ export class NewPublicationPage implements OnInit { reader.onload = () => resolve(reader.result); reader.onerror = error => reject(error); }); - } + } removeTextBeforeSlash(inputString, mark) { if (inputString.includes(mark)) { @@ -1002,7 +1045,7 @@ export class NewPublicationPage implements OnInit { .then(async (content) => { this.filecontent = true; - console.log('',content) + console.log('', content) let fileObject = new PublicationAttachmentEntity({ base64: content.data, extension: 'mp4', @@ -1028,7 +1071,7 @@ export class NewPublicationPage implements OnInit { } checkTableDivice() { - if (!this.platform.is('desktop')) + if (this.platform.is('tablet')) return true; } diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index ec82302c1..fc0b7d51e 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -225,6 +225,7 @@ export class ViewPublicationsPage implements OnInit { if (!found) { this.publicationFolderService.publicationList[folderId].push(publicationDetails) + this.publicationFolderService.revertPublicationOrder(folderId) } else { let a: any = Object.assign({},this.publicationFolderService.publicationList[folderId][findIndex]) diff --git a/src/app/store/publication-folder.service.ts b/src/app/store/publication-folder.service.ts index b30a1dbe8..25419850f 100644 --- a/src/app/store/publication-folder.service.ts +++ b/src/app/store/publication-folder.service.ts @@ -10,8 +10,8 @@ import { PublicationPipe } from 'src/app/pipes/publication.pipe'; }) export class PublicationFolderService { - publicationList: {[key: string]: Publication[] } = {}; - FolderDetails: {[key: string]: PublicationFolder } = {}; + publicationList: { [key: string]: Publication[] } = {}; + FolderDetails: { [key: string]: PublicationFolder } = {}; restoreFolder: {} = {} @@ -25,14 +25,14 @@ export class PublicationFolderService { constructor( private storage: Storage, private publications: PublicationsService, - ) {} + ) { } createPublicationList(folderId) { - if(!this.publicationList[folderId]) { + if (!this.publicationList[folderId]) { this.publicationList[folderId] = [] } - if(!this.FolderDetails[folderId]) { + if (!this.FolderDetails[folderId]) { this.FolderDetails[folderId] = new PublicationFolder(); } } @@ -40,13 +40,13 @@ export class PublicationFolderService { getFromDB(folderId: any) { - if(!this.restoreFolder[folderId]) { + if (!this.restoreFolder[folderId]) { this.storage.get(folderId).then((viewPublications) => { this.publicationList[folderId] = viewPublications }) - this.storage.get(folderId+"name").then((viewPublications) => { + this.storage.get(folderId + "name").then((viewPublications) => { this.FolderDetails[folderId] = viewPublications }) } @@ -56,29 +56,30 @@ export class PublicationFolderService { updateFolderDetails(folderId, res) { this.FolderDetails[folderId] = res - this.storage.set(folderId+"name", res) + this.storage.set(folderId + "name", res) } save(folderId) { - this.storage.set(folderId+"name", this.FolderDetails) + this.storage.set(folderId + "name", this.FolderDetails) this.storage.set(folderId, this.publicationList[folderId]); } publicationIsPresent(publicationId, folderId) { - return this.publicationList[folderId].find( e => e.DocumentId == publicationId ) + return this.publicationList[folderId].find(e => e.DocumentId == publicationId) } publicationFind(publicationId, folderId) { - return this.publicationList[folderId].find( e => e.DocumentId == publicationId ) + return this.publicationList[folderId].find(e => e.DocumentId == publicationId) } publicationFindIndex(publicationId, folderId) { - return this.publicationList[folderId].findIndex( e => e.DocumentId == publicationId ) + return this.publicationList[folderId].findIndex(e => e.DocumentId == publicationId) } PublicationAddOrUpdate(folderId, publicationId, Publication: Publication) { const findIndex = this.publicationFindIndex(publicationId, folderId) const found = this.publicationIsPresent(publicationId, folderId) - if(!found) { + if (!found) { this.publicationList[folderId].push(Publication) + this.revertPublicationOrder(folderId); } else { this.publicationList[folderId][findIndex] = Publication } @@ -86,9 +87,9 @@ export class PublicationFolderService { deletePost(folderId: any, DocumentId: any) { - if(this.publicationList[folderId]) { + if (this.publicationList[folderId]) { - this.publicationList[folderId] = this.publicationList[folderId].filter( e => e.DocumentId != DocumentId) + this.publicationList[folderId] = this.publicationList[folderId].filter(e => e.DocumentId != DocumentId) this.save(folderId) } @@ -99,7 +100,7 @@ export class PublicationFolderService { this.publications.GetPresidentialAction(folderId).subscribe(res => { this.FolderDetails[folderId] = res - this.storage.set(folderId+"name", res) + this.storage.set(folderId + "name", res) }, (error) => { this.showLoader = false; // this.httpErroHandle.httpStatusHandle(error) @@ -118,7 +119,7 @@ export class PublicationFolderService { let loadLater = [] for (let publicationId of publicationIds) { - if(!this.publicationIsPresent(publicationId, folderId)) { + if (!this.publicationIsPresent(publicationId, folderId)) { await this.loadPublication(publicationId, folderId) } else { @@ -126,7 +127,7 @@ export class PublicationFolderService { } } - for( let publicationId of loadLater) { + for (let publicationId of loadLater) { await this.loadPublication(publicationId, folderId) } @@ -134,7 +135,7 @@ export class PublicationFolderService { this.storage.set(folderId, this.publicationList[folderId]); this.getpublication = this.publicationList[folderId]; - } catch(error) { + } catch (error) { this.showLoader = false; } @@ -147,17 +148,18 @@ export class PublicationFolderService { const findIndex = this.publicationFindIndex(publicationId, folderId) const found = this.publicationIsPresent(publicationId, folderId) - if(!found) { + if (!found) { this.publicationList[folderId].push(publicationDetails) + this.revertPublicationOrder(folderId); } else { - let a: any = Object.assign({},this.publicationList[folderId][findIndex]) + let a: any = Object.assign({}, this.publicationList[folderId][findIndex]) let b: any = Object.assign({}, publicationDetails) a.Files = a.Files.length b.Files = b.Files.length - if(JSON.stringify(a) != JSON.stringify(b)) { + if (JSON.stringify(a) != JSON.stringify(b)) { // console.log({a, b}) this.publicationList[folderId][findIndex] = publicationDetails @@ -171,9 +173,10 @@ export class PublicationFolderService { async CreatePublication(folderId, publication: Publication) { - const response = await this.publications.CreatePublication(folderId, publication).toPromise() + const response = await this.publications.CreatePublication(folderId, publication).toPromise() let publicationDetails: Publication = this.publicationPipe.itemList(response) this.publicationList[folderId].push(publicationDetails) + this.revertPublicationOrder(folderId) return publicationDetails } @@ -182,8 +185,9 @@ export class PublicationFolderService { const findIndex = this.publicationFindIndex(publicationId, folderId) const found = this.publicationIsPresent(publicationId, folderId) - if(!found) { + if (!found) { this.publicationList[folderId].push(publicationDetails) + this.revertPublicationOrder(folderId) } else { this.publicationList[folderId][findIndex] = publicationDetails } @@ -196,8 +200,10 @@ export class PublicationFolderService { const findIndex = this.publicationFindIndex(publicationId, folderId) const found = this.publicationIsPresent(publicationId, folderId) - if(!found) { + if (!found) { this.publicationList[folderId].push(publicationDetails) + this.revertPublicationOrder(folderId); + } else { return this.publicationList[folderId][findIndex] } @@ -205,10 +211,10 @@ export class PublicationFolderService { } - getLocalPublication (folderId, DocumentId) { + getLocalPublication(folderId, DocumentId) { - if(this.publicationList[folderId]) { - return this.publicationList[folderId].find( e => e.DocumentId == DocumentId ) + if (this.publicationList[folderId]) { + return this.publicationList[folderId].find(e => e.DocumentId == DocumentId) } else { } @@ -217,11 +223,22 @@ export class PublicationFolderService { PublicationHasImage(Publication: Publication) { - return Publication?.Files?.[0]?.FileBase64 != '' && Publication?.Files?.[0]?.FileBase64 != "data:image/jpg;base64,null" + return Publication?.Files?.[0]?.FileBase64 != '' && Publication?.Files?.[0]?.FileBase64 != "data:image/jpg;base64,null" } hasCapturedImage(Publication: Publication) { - return Publication?.Files?.[0]?.FileBase64 != '' && Publication?.Files?.[0]?.FileBase64 != "data:image/jpg;base64,null" + return Publication?.Files?.[0]?.FileBase64 != '' && Publication?.Files?.[0]?.FileBase64 != "data:image/jpg;base64,null" + } + + revertPublicationOrder(folderId) { + //Revert order of the list + if (this.publicationList[folderId]) { + this.publicationList[folderId] = this.publicationList[folderId].sort((a, b) => { + const dateA = new Date(a.DatePublication).getTime(); + const dateB = new Date(b.DatePublication).getTime(); + return dateB - dateA; // Revertendo a ordem aqui + }) + } } } diff --git a/web.config b/web.config index 59223982a..27402b4c3 100644 --- a/web.config +++ b/web.config @@ -1,6 +1,17 @@ + + + + + + + + + + + @@ -16,49 +27,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -74,13 +43,13 @@ - + From da2c3252fd6d5dadf2618fc95d20cd6c0e565ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 1 Feb 2024 10:41:41 +0100 Subject: [PATCH 4/4] Bug before presentation solved --- src/app/interceptors/token.interceptors.ts | 4 ++-- .../new-publication/new-publication.page.ts | 22 ++++++++++++++----- src/app/services/chat.service.ts | 4 ++-- version/git-version.ts | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/app/interceptors/token.interceptors.ts b/src/app/interceptors/token.interceptors.ts index d087096b8..e85eb81bc 100644 --- a/src/app/interceptors/token.interceptors.ts +++ b/src/app/interceptors/token.interceptors.ts @@ -101,8 +101,8 @@ export class TokenInterceptor implements HttpInterceptor { }), catchError((error) => { console.log(error) - SessionStore.user.Authorization = ""; - SessionStore.user.RefreshToken = ""; + SessionStore.user.Authorization = SessionStore.user.Authorization; + SessionStore.user.RefreshToken = SessionStore.user.RefreshToken; SessionStore.setInativity(false) /* SessionStore.setUrlBeforeInactivity(this.router.url); */ diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index b696a11c7..daecf62fc 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -740,12 +740,24 @@ export class NewPublicationPage implements OnInit { if (this.checkFileType.checkFileType(FileExtension) == 'image' || this.checkFileType.checkFileType(FileExtension) == 'video') { let resultUrl = decodeURIComponent(element.url); Filesystem.readFile({ path: resultUrl }).then(async (content) => { - console.log('shared base', content.data) - let fileObject = { - FileBase64: this.removeTextBeforeSlash(content.data, ','), - FileExtension: FileExtension, - OriginalFileName: 'shared', + let fileObject; + if(this.checkFileType.checkFileType(FileExtension) == 'image') { + fileObject = { + FileBase64: this.removeTextBeforeSlash(content.data, ','), + FileExtension: FileExtension, + OriginalFileName: 'shared', + } + + } else if (this.checkFileType.checkFileType(FileExtension) == 'video') { + fileObject = { + FileBase64: 'data:video/mp4;base64,'+ this.removeTextBeforeSlash(content.data, ','), + FileExtension: FileExtension, + OriginalFileName: 'shared', + } + } + console.log('shared base', content.data) + this.seletedContent.push(fileObject) }) } else { diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index c650cdf12..236cd2fd0 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -370,7 +370,7 @@ export class ChatService { async refreshtoken() { - /* if(this.headers && SessionStore.user.ChatData) { + if(this.headers && SessionStore.user.ChatData) { this.headers = this.headers.set('Authorization', 'Bearer ' + SessionStore.user.Authorization); let options = { headers: this.headers @@ -423,7 +423,7 @@ export class ChatService { } else if (!this.headers) { this.setheader() this.refreshtoken() - } */ + } } diff --git a/version/git-version.ts b/version/git-version.ts index f17aeadab..1f15e5358 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -5,7 +5,7 @@ export let versionData = { "lastCommitAuthor": "'Peter Maquiran'", "lastCommitTime": "'Thu Aug 31 12:00:52 2023 +0100'", "lastCommitMessage": "add attachments", - "lastCommitNumber": "1573", + "lastCommitNumber": "1579", "change": "", "changeStatus": "On branch notification-header/feature\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.ts\n\tnew file: src/app/store/notification-holder.service.spec.ts\n\tnew file: src/app/store/notification-holder.service.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/modals/document-detail/document-detail.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html", "changeAuthor": "peter.maquiran"