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

Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Peter Maquiran
2022-02-09 15:16:18 +01:00
parent 3215660c6e d04e50312e
commit 67dfd17ea0
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/group-messages/group-messages.page.ts
+12 -12
View File
@@ -97,7 +97,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
private AttachmentsService: AttachmentsService,
private storage: Storage,
private processesService: ProcessesService,
private CameraService: CameraService,
) {
this.loggedUserChat = authService.ValidatedUserChat['data'];
@@ -112,7 +112,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory();
this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked;
this.wsChatMethodsService.openRoom(this.roomId)
setTimeout(()=>{
this.scrollToBottomClicked()
}, 50)
@@ -199,7 +199,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
changeInput() {
this.wsChatMethodsService.getDmRoom(this.roomId).typing()
this.wsChatMethodsService.getGroupRoom(this.roomId).typing()
}
async goToEvent(eventId: any) {
@@ -437,11 +437,11 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
}
async takePicture() {
const roomId = this.roomId
const image = await this.CameraService.takePicture();
await this.fileService.saveImage(image)
const lastphoto: any = await this.fileService.loadFiles();
@@ -451,7 +451,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
const formData = new FormData();
formData.append("blobFile", blob);
this.wsChatMethodsService.getDmRoom(roomId).send({
this.wsChatMethodsService.getGroupRoom(roomId).send({
file: {
"type": "application/img",
"guid": ''
@@ -466,11 +466,11 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
})
}
async addImage() {
this.addFileToChat(['image/apng', 'image/jpeg', 'image/png'])
}
async addFile() {
this.addFileToChat(['.doc', '.docx', '.pdf'])
}
@@ -492,7 +492,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
if(data.selected) {
const loader = this.toastService.loading();
this.wsChatMethodsService.getDmRoom(this.roomId).send({
this.wsChatMethodsService.getGroupRoom(this.roomId).send({
file:{
"name": res.data.selected.Assunto,
"type": "application/webtrix",
@@ -528,8 +528,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
const formData = new FormData();
formData.append("blobFile", file);
this.wsChatMethodsService.getDmRoom(this.roomId).send({
this.wsChatMethodsService.getGroupRoom(this.roomId).send({
file: {
"type": "application/img",
"guid": ''
@@ -544,7 +544,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
})
}
async openChatOptions(ev?: any) {
console.log(this.members);
const roomId = this.roomId;
src/app/pages/publications/publications.page.ts
+3 -3
View File
@@ -103,7 +103,7 @@ export class PublicationsPage implements OnInit {
hideRefreshButton() {
window.onresize = (event) => {
if (window.innerWidth < 801) {
if (window.innerWidth < 701) {
this.hideRefreshBtn = false;
this.showSlidingOptions = false;
}
@@ -112,7 +112,7 @@ export class PublicationsPage implements OnInit {
this.showSlidingOptions = true;
}
}
if (window.innerWidth < 801) {
if (window.innerWidth < 701) {
this.hideRefreshBtn = false;
this.showSlidingOptions = false;
}
@@ -375,7 +375,7 @@ export class PublicationsPage implements OnInit {
this.closeDesktopComponent();
// OpenModal
if (window.innerWidth <= 800) {
if (window.innerWidth < 701) {
/* let item = this.publicationFolderList; */
const modal = await this.modalController.create({
component: ViewPublicationsPage,
src/app/shared/chat/group-messages/group-messages.page.ts
+2 -2
View File
@@ -555,7 +555,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
const formData = new FormData();
formData.append("blobFile", blob);
this.wsChatMethodsService.getDmRoom(roomId).send({
this.wsChatMethodsService.getGroupRoom(roomId).send({
file: {
"type": "application/img",
"guid": ''
@@ -638,7 +638,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
const formData = new FormData();
formData.append("blobFile", file);
this.wsChatMethodsService.getDmRoom(roomId).send({
this.wsChatMethodsService.getGroupRoom(roomId).send({
file: {
"type": "application/img",
"guid": ''