mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
Bug before presentation solved
This commit is contained in:
@@ -101,8 +101,8 @@ export class TokenInterceptor implements HttpInterceptor {
|
|||||||
}),
|
}),
|
||||||
catchError((error) => {
|
catchError((error) => {
|
||||||
console.log(error)
|
console.log(error)
|
||||||
SessionStore.user.Authorization = "";
|
SessionStore.user.Authorization = SessionStore.user.Authorization;
|
||||||
SessionStore.user.RefreshToken = "";
|
SessionStore.user.RefreshToken = SessionStore.user.RefreshToken;
|
||||||
SessionStore.setInativity(false)
|
SessionStore.setInativity(false)
|
||||||
/* SessionStore.setUrlBeforeInactivity(this.router.url); */
|
/* SessionStore.setUrlBeforeInactivity(this.router.url); */
|
||||||
|
|
||||||
|
|||||||
@@ -740,12 +740,24 @@ export class NewPublicationPage implements OnInit {
|
|||||||
if (this.checkFileType.checkFileType(FileExtension) == 'image' || this.checkFileType.checkFileType(FileExtension) == 'video') {
|
if (this.checkFileType.checkFileType(FileExtension) == 'image' || this.checkFileType.checkFileType(FileExtension) == 'video') {
|
||||||
let resultUrl = decodeURIComponent(element.url);
|
let resultUrl = decodeURIComponent(element.url);
|
||||||
Filesystem.readFile({ path: resultUrl }).then(async (content) => {
|
Filesystem.readFile({ path: resultUrl }).then(async (content) => {
|
||||||
console.log('shared base', content.data)
|
let fileObject;
|
||||||
let fileObject = {
|
if(this.checkFileType.checkFileType(FileExtension) == 'image') {
|
||||||
FileBase64: this.removeTextBeforeSlash(content.data, ','),
|
fileObject = {
|
||||||
FileExtension: FileExtension,
|
FileBase64: this.removeTextBeforeSlash(content.data, ','),
|
||||||
OriginalFileName: 'shared',
|
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)
|
this.seletedContent.push(fileObject)
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -370,7 +370,7 @@ export class ChatService {
|
|||||||
|
|
||||||
async refreshtoken() {
|
async refreshtoken() {
|
||||||
|
|
||||||
/* if(this.headers && SessionStore.user.ChatData) {
|
if(this.headers && SessionStore.user.ChatData) {
|
||||||
this.headers = this.headers.set('Authorization', 'Bearer ' + SessionStore.user.Authorization);
|
this.headers = this.headers.set('Authorization', 'Bearer ' + SessionStore.user.Authorization);
|
||||||
let options = {
|
let options = {
|
||||||
headers: this.headers
|
headers: this.headers
|
||||||
@@ -423,7 +423,7 @@ export class ChatService {
|
|||||||
} else if (!this.headers) {
|
} else if (!this.headers) {
|
||||||
this.setheader()
|
this.setheader()
|
||||||
this.refreshtoken()
|
this.refreshtoken()
|
||||||
} */
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ export let versionData = {
|
|||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Thu Aug 31 12:00:52 2023 +0100'",
|
"lastCommitTime": "'Thu Aug 31 12:00:52 2023 +0100'",
|
||||||
"lastCommitMessage": "add attachments",
|
"lastCommitMessage": "add attachments",
|
||||||
"lastCommitNumber": "1573",
|
"lastCommitNumber": "1579",
|
||||||
"change": "",
|
"change": "",
|
||||||
"changeStatus": "On branch notification-header/feature\nChanges to be committed:\n (use \"git restore --staged <file>...\" 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 <file>...\" to update what will be committed)\n (use \"git restore <file>...\" 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",
|
"changeStatus": "On branch notification-header/feature\nChanges to be committed:\n (use \"git restore --staged <file>...\" 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 <file>...\" to update what will be committed)\n (use \"git restore <file>...\" 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"
|
"changeAuthor": "peter.maquiran"
|
||||||
|
|||||||
Reference in New Issue
Block a user