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

fix

Browse Source
This commit is contained in:
Peter Maquiran
2023-02-01 09:08:46 +01:00
parent cc9c5a9cf5
commit b3a8379276
33 changed files with 230 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/chat/message.service.ts
+6 -7
View File
@@ -1,18 +1,18 @@
import { Injectable } from '@angular/core';
import { Message } from 'src/app/models/chatMethod';
import { SessionStore } from 'src/app/store/session.service';
import { capitalizeTxt } from 'src/plugin/text'
import { NfService } from 'src/app/services/chat/nf.service'
import { capitalizeTxt } from 'src/plugin/text';
import { NfService } from 'src/app/services/chat/nf.service';
import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service';
import { showDateDuration } from 'src/plugin/showDateDuration';
import { ChatMethodsService } from './chat-methods.service'
import { MessageModel } from '../../models/beast-orm'
import { AESEncrypt } from '../aesencrypt.service'
import { ChatMethodsService } from './chat-methods.service';
import { MessageModel } from '../../models/beast-orm';
import { AESEncrypt } from '../aesencrypt.service';
import { HttpEventType } from '@angular/common/http';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { NetworkServiceService , ConnectionStatus} from 'src/app/services/network-service.service';
import { ChatSystemService } from './chat-system.service';
import { v4 as uuidv4 } from 'uuid'
import { v4 as uuidv4 } from 'uuid';
@Injectable({
providedIn: 'root'
@@ -180,7 +180,6 @@ export class MessageService {
async send(): Promise<any> {
if(this.messageSend) {
console.log('sended')
return new Promise((resolve, reject) => {
resolve('solve')
})
src/app/services/events.service.ts
+7 -7
View File
@@ -110,7 +110,7 @@ export class EventsService {
if (SessionStore.user.Profile == 'MDGPR') {
for (let calendar of SessionStore.user.OwnerCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
if (calendar.CalendarName == 'Oficial') {
@@ -133,7 +133,7 @@ export class EventsService {
}
for (let sharedCalendar of SessionStore.user.SharedCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
if (sharedCalendar.CalendarName == 'Oficial') {
@@ -158,7 +158,7 @@ export class EventsService {
else if (SessionStore.user.Profile == 'PR') {
for (let calendar of SessionStore.user.OwnerCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
if (calendar.CalendarName == 'Oficial') {
this.hasOwnOficial = true
@@ -181,7 +181,7 @@ export class EventsService {
}
for (let calendar of SessionStore.user.OwnerCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
if(!this.usersCalendarIds.includes(calendar.OwnerUserId)) {
this.usersCalendarIds.push(calendar.OwnerUserId)
}
@@ -213,7 +213,7 @@ export class EventsService {
}
for (let sharedCalendar of SessionStore.user.SharedCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
if(!this.usersCalendarIds.includes(sharedCalendar.OwnerUserId)) {
this.usersCalendarIds.push(sharedCalendar.OwnerUserId)
@@ -246,7 +246,7 @@ export class EventsService {
for (let sharedCalendar of SessionStore.user.SharedCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
if(sharedCalendar?.OwnerUserId) {
this.GetCalendarName(sharedCalendar.OwnerUserId).subscribe((e)=> {
this.calendarNames[sharedCalendar.CalendarId] = e.FullName
@@ -266,7 +266,7 @@ export class EventsService {
}
for (let sharedCalendar of SessionStore.user.OwnerCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
this.calendarNames[sharedCalendar.CalendarId] = 'Meu calendario'