peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix publication load and expediente

Browse Source
This commit is contained in:
Peter Maquiran
2024-03-13 11:52:27 +01:00
parent 48d4cd637e
commit 7f2425ef1b
9 changed files with 2798 additions and 2760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+4
View File
@@ -94,6 +94,10 @@ export class ExpedienteDetailPage implements OnInit {
this.caller = params["params"].caller;
}
});
window['attachments-expediente-update'] = () => {
this.LoadTaskDetail(this.serialNumber);
}
}
ngOnInit() {
src/app/services/socket-connection-mcr.service.ts
+34 -26
View File
@@ -5,7 +5,7 @@ import { v4 as uuidv4 } from 'uuid'
import { HttpClient, HttpHeaders, HttpEventType } from '@angular/common/http';
import { CMAPIService } from '../shared/repository/CMAPI/cmapi.service';
import { HubConnectionBuilder } from '@microsoft/signalr';
import { ok, err, Result } from 'neverthrow';
import { ok, err as Err, Result } from 'neverthrow';
@Injectable({
providedIn: 'root'
})
@@ -148,13 +148,21 @@ class ReconnectingWebSocketSignalR {
commit(path): Promise<Result<true, false>> {
return new Promise((resolve, reject) => {
try {
console.log('this.connection.invoke', this.connection)
this.connection.invoke("CommitUpload", path).then((e) => {
console.log("commit message", e)
resolve(ok(true))
}).catch(err => {
resolve(err(false))
console.error('upload catch commit error')
resolve(Err(false))
console.error(err.toString())
});
} catch(error) {
resolve(Err(false))
console.error('upload commit error')
console.error(error)
}
})
}
@@ -390,42 +398,42 @@ export class ObjectMergeNotification{
watchCount = 0
constructor() {
// this.socket.onDisconnectCallback(()=> {
// console.log("run watch")
// this.runWatch = true
// this.watch()
// })
this.socket.onDisconnectCallback(()=> {
console.log("run watch")
this.runWatch = true
this.watch()
})
// this.socket.onConnectCallback(()=> {
this.socket.onConnectCallback(()=> {
// console.log("open trigger")
// this.runWatch = false
// })
console.log("open trigger")
this.runWatch = false
})
// this.socket.subscribe((data: socketResponse) => {
// if(data.IsCompleted == true) {
// console.log("==================!!!====================")
// try {
// this.callbacks[data.Guid](data)
// delete this.callbacks[data.Guid]
// } catch (error) {}
// } else {
// console.log("else", data)
// }
// })
this.socket.subscribe((data: socketResponse) => {
if(data.IsCompleted == true) {
console.log("==================!!!====================")
try {
this.callbacks[data.Guid](data)
delete this.callbacks[data.Guid]
} catch (error) {}
} else {
console.log("else", data)
}
})
// this.socket.connect();
// this.watch()
}
connect() {
this.socket.connect();
// this.socket.connect();
}
close() {
this.socket.disconnect();
this.watchCount = 0;
this.runWatch = false
// this.socket.disconnect();
// this.watchCount = 0;
// this.runWatch = false
}
async watch() {
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+1
View File
@@ -142,6 +142,7 @@ export class OptsExpedientePage implements OnInit {
const loader = this.toastService.loading()
this.attachmentsService.AddAttachment(body).subscribe((res)=> {
window['attachments-expediente-update']();
this.toastService._successMessage()
this.popoverController.dismiss()
}, (error) => {
src/app/shared/publication/new-publication/new-publication.page.html
+2 -2
View File
@@ -114,7 +114,7 @@
src="assets/images/theme/gov/icons-add-photos.svg"></ion-icon>
</div>
<div class="attach-document cursor-pointer">
<ion-label>Galeria</ion-label>
<ion-label>Galeria 2</ion-label>
</div>
</ion-label>
</div>
@@ -127,7 +127,7 @@
src="assets/images/theme/gov/icons-add-photos.svg"></ion-icon>
</div>
<div class="attach-document cursor-pointer">
<ion-label>Galeria</ion-label>
<ion-label>Galeria 1</ion-label>
</div>
</ion-label>
</div>
src/app/shared/publication/new-publication/new-publication.page.ts
+7 -1
View File
@@ -406,14 +406,17 @@ export class NewPublicationPage implements OnInit {
const upload = await this.publicationFormMV.uploadVideosFiles()
console.log({upload})
if(upload) {
this.publicationFormMV.form.Files = this.publicationFormMV.form.Files.map((e:PublicationAttachmentEntity) => {
if(e.FileType == 'video' && e.blobFile && e.toUpload) {
e.OriginalFileName = e.chucksManager.path.replace(".mp4", "")
e.FileExtension = "mp4"
e.Base64 = ''
}
if(e.FileType == 'video' ) {
if(e.FileType == 'video' && !e.toUpload) {
e.Base64 = e.url
}
@@ -454,6 +457,9 @@ export class NewPublicationPage implements OnInit {
loader.remove()
}
} else {
this.toastService._badRequest("Tive um erro ao enviar o ficheiro")
loader.remove()
}
src/app/shared/publication/upload/upload-streaming.service.ts
+24 -11
View File
@@ -240,13 +240,25 @@ export class PublicationFormMV {
return this.form.Files.filter( x => x.FileType == 'video')
}
async commit(PublicationAttachmentEntity: PublicationAttachmentEntity) {
PublicationAttachmentEntity.chucksManager.doneChunkUpload()
const mergeRequest = await this.ObjectMergeNotification.socket.commit(PublicationAttachmentEntity.chucksManager.path)
if(mergeRequest.isOk()) {
PublicationAttachmentEntity.chucksManager.contentSetReady()
return true
} else {
return false
}
}
private upload(PublicationAttachmentEntity: PublicationAttachmentEntity) {
return new Promise(async (resolve, reject)=> {
if(!PublicationAttachmentEntity.hasChunkManger) {
const fileBlob = PublicationAttachmentEntity.blobFile;
const fileChunks = new Chunks({chunkSize: 400 })
const fileChunks = new Chunks({chunkSize: 50 })
fileChunks.setFile(fileBlob)
PublicationAttachmentEntity.setChunkManger(fileChunks)
@@ -276,20 +288,16 @@ export class PublicationFormMV {
resolve(false)
} else {
PublicationAttachmentEntity.chucksManager.doneChunkUpload()
const mergeRequest = await this.ObjectMergeNotification.socket.commit(PublicationAttachmentEntity.chucksManager.path)
if(mergeRequest.isOk()) {
PublicationAttachmentEntity.chucksManager.contentSetReady()
resolve(true)
} else {
resolve(false)
}
return await resolve(this.commit(PublicationAttachmentEntity))
}
} else {
} else if ( PublicationAttachmentEntity.chucksManager.contentReady == false) {
return await resolve(this.commit(PublicationAttachmentEntity))
} else {
console.log('already uploading')
}
})
@@ -413,6 +421,7 @@ export class ChucksManager {
contentReady = false
manualRetry = false
isUploading = false
needToCommit = true
subscribeToUseCaseResponse: Function[] = []
getUploadPercentage() {
@@ -531,6 +540,10 @@ export class ChucksManager {
this.onSetLastChunk.forEach(callback => callback());
}
doneCommit() {
this.needToCommit = false
}
contentSetReady() {
this.merging = false
this.contentReady = true
src/app/shared/publication/view-publications/view-publications.page.ts
+4
View File
@@ -129,6 +129,10 @@ export class ViewPublicationsPage implements OnInit {
this.stopVideo();
setTimeout(()=> {
this.doRefresh({})
}, 1500)
}
src/assets/www/pdfjs/web/viewer.js
+4 -2
View File
@@ -1916,6 +1916,7 @@
PDFViewerApplication.open(new Uint8Array(xhr.response));
};
console.log({file})
xhr.open('GET', file);
xhr.responseType = 'arraybuffer';
xhr.send();
@@ -1923,7 +1924,8 @@
}
if (file) {
PDFViewerApplication.open(file);
console.log({file})
PDFViewerApplication.open(new URLSearchParams(window.location.search).get('file'));
}
};
}
@@ -4245,7 +4247,7 @@
kind: OptionKind.VIEWER + OptionKind.PREFERENCE
},
defaultUrl: {
value: 'compressed.tracemonkey-pldi-09.pdf',
value: new URLSearchParams(window.location.search).get('file'),
kind: OptionKind.VIEWER
},
defaultZoomValue: {