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

fix

Browse Source
This commit is contained in:
Peter Maquiran
2024-03-03 18:14:33 +01:00
parent eb17b9d310
commit 588b59b3ab
5 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/new-group/new-group.page.ts
+58 -31
View File
@@ -6,6 +6,7 @@ import { ThemeService } from 'src/app/services/theme.service';
import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
import { SessionStore } from 'src/app/store/session.service';
import { ToastService } from 'src/app/services/toast.service';
import { catchError } from 'rxjs/operators';
@Component({
selector: 'app-new-group',
@@ -66,46 +67,72 @@ export class NewGroupPage implements OnInit {
let customFields = {}
let res: any;
if (this.thedate) {
let customFields = {
"countDownDate": this.thedate
}
res = await this.ChatSystemService.createPrivateRoom(name, SessionStore.user.UserName, customFields);
}
else {
res = await this.ChatSystemService.createPrivateRoom(name, SessionStore.user.UserName, customFields);
if(!SessionStore.user?.ChatData?.data) {
this.toastService._successMessage("Chat temporariamente indisponível")
}
this.isGroupCreated = true;
this.addContacts(res.result);
this.ChatSystemService.getRoom([res.result]);
try {
setTimeout(() => {
this.ChatSystemService.subscribeToRoomUpdate(res.result.rid, res.result);
}, 10)
if (res?.result?.rid) {
this.ChatSystemService.getAllRooms(() => {
if (!this.ChatSystemService.getGroupRoom(res.result.rid)) {
this.createGroupWithAttachmentsCath(res)
} else {
setTimeout(() => {
this.createGroupWithAttachments(res)
}, 500)
if (this.thedate) {
let customFields = {
"countDownDate": this.thedate
}
}, res.result.rid);
res = await this.ChatSystemService.createPrivateRoom(name, SessionStore.user.UserName, customFields);
}
else {
res = await this.ChatSystemService.createPrivateRoom(name, SessionStore.user.UserName, customFields);
}
try {
this.isGroupCreated = true;
this.addContacts(res.result);
this.ChatSystemService.getRoom([res.result]);
setTimeout(() => {
this.ChatSystemService.subscribeToRoomUpdate(res.result.rid, res.result);
}, 10)
} catch (error) {
await this.ChatSystemService.getUser();
await this.ChatSystemService.getAllRooms();
await this.ChatSystemService.subscribeToRoom();
this.isGroupCreated = true;
this.addContacts(res.result);
this.ChatSystemService.getRoom([res.result]);
setTimeout(() => {
this.ChatSystemService.subscribeToRoomUpdate(res.result.rid, res.result);
}, 10)
}
} else {
if (res?.result?.rid) {
this.toastService._badRequest('Existe um grupo com este nome!');
this.ChatSystemService.getAllRooms(() => {
if (!this.ChatSystemService.getGroupRoom(res.result.rid)) {
this.createGroupWithAttachmentsCath(res)
} else {
setTimeout(() => {
this.createGroupWithAttachments(res)
}, 500)
}
}, res.result.rid);
} else {
this.toastService._badRequest('Existe um grupo com este nome!');
}
} catch(error) {
this.toastService._successMessage("Chat temporariamente indisponível")
}
}
src/app/shared/popover/deploma-options/deploma-options.page.html
+1 -1
View File
@@ -27,7 +27,7 @@
<div class="buttons width-100">
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
</div>
<div class="buttons width-100" *ngIf="task.activityInstanceName != 'Assinar Diploma'">
<div class="buttons width-100" *ngIf="task.activityInstanceName != 'Assinar Diploma' && task.activityInstanceName != 'Revisar Diploma'">
<button (click)="openExpedientActionsModal('0',task)" class="btn-cancel" shape="round" >Efetuar despacho</button>
</div>
</div>
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+2 -1
View File
@@ -143,6 +143,7 @@ export class OptsExpedientePage implements OnInit {
this.attachmentsService.AddAttachment(body).subscribe((res)=> {
this.toastService._successMessage()
this.popoverController.dismiss()
}, (error) => {
this.httpErrorHanlde.httpStatusHandle(error)
},()=> {
@@ -151,7 +152,7 @@ export class OptsExpedientePage implements OnInit {
});
this.popoverController.dismiss()
}
}, (error) => {
src/app/shared/publication/new-publication/new-publication.page.ts
+5 -7
View File
@@ -181,7 +181,6 @@ export class NewPublicationPage implements OnInit {
FileType: 'image'
}
)
newAttachment.needUpload()
this.publicationFormMV.form.Files.push(newAttachment)
});
}
@@ -300,7 +299,6 @@ export class NewPublicationPage implements OnInit {
FileType: this.checkFileType.checkFileType( this.removeTextBeforeSlash(element.mimeType, '/')) as any
})
fileObject.needUpload()
this.publicationFormMV.form.Files.push(fileObject)
})
.catch((err) => console.error(err));
@@ -357,8 +355,8 @@ export class NewPublicationPage implements OnInit {
if(upload) {
this.publicationFormMV.form.Files = this.publicationFormMV.form.Files.map((e:PublicationAttachmentEntity)=> {
if(e.FileType == 'video' && e.toUpload) {
e.OriginalFileName = e.chucksManager.path.replace(".mp4", "")
if(e.FileType == 'video' && e.blobFile && e.toUpload) {
e.OriginalFileName = e?.chucksManager?.path?.replace(".mp4", "") || e.OriginalFileName
e.FileExtension = "mp4"
}
return e
@@ -408,7 +406,7 @@ export class NewPublicationPage implements OnInit {
if(upload) {
this.publicationFormMV.form.Files = this.publicationFormMV.form.Files.map((e:PublicationAttachmentEntity) => {
if(e.FileType == 'video') {
if(e.FileType == 'video' && e.blobFile && e.toUpload) {
e.OriginalFileName = e.chucksManager.path.replace(".mp4", "")
e.FileExtension = "mp4"
e.Base64 = ""
@@ -785,7 +783,7 @@ console.log(stringGerada);
}
)
fileObject.needUpload()
// fileObject.needUpload()
this.publicationFormMV.form.Files.push(fileObject)
})
.catch((erro) => console.error('read converted video erro ', erro));
@@ -815,7 +813,7 @@ console.log(stringGerada);
}
)
fileObject.needUpload()
// fileObject.needUpload()
this.publicationFormMV.form.Files.push(fileObject)
})
.catch((err) => console.error(err));
src/app/shared/publication/upload/upload-streaming.service.ts
+1 -1
View File
@@ -303,7 +303,7 @@ export class PublicationFormMV {
// this.ObjectMergeNotification.socket.registerWhenConnected(() => {
const videosFiles = this.getVideoFiles()
const videosFilesToUploads = videosFiles.filter( e => e.FileType == "video" && e.toUpload)
const videosFilesToUploads = videosFiles.filter( e => e.FileType == "video" && e.toUpload && e.blobFile)
const Promises: Promise<any>[] = []