Adicionou {{user.name}}
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index d2ebd9d38..34927a2d0 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -52,7 +52,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
roomName: any;
members: any = []
contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
- allUsers: any[] = [];
roomId: string;
loggedUserChat: any;
@@ -421,12 +420,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
async getChatMembers() {
- this.chatService.getAllUsers().subscribe(res => {
-
-
- this.allUsers = res['users'].filter(data => data.username != SessionStore.user.UserName);
-
- });
+ if(this.ChatSystemService.users.length == 0) {
+ this.ChatSystemService.getUser()
+ }
}
/* load(){
diff --git a/src/app/pages/events/edit-event/edit-event.page.ts b/src/app/pages/events/edit-event/edit-event.page.ts
index 66ea7f577..17b596792 100644
--- a/src/app/pages/events/edit-event/edit-event.page.ts
+++ b/src/app/pages/events/edit-event/edit-event.page.ts
@@ -162,28 +162,28 @@ export class EditEventPage implements OnInit {
Save()
{
- if (this.ionicForm.valid){
+ // if (this.ionicForm.valid){
- this.activatedRoute.paramMap.subscribe(paramMap =>{
- if (paramMap.has("profile")){
+ // this.activatedRoute.paramMap.subscribe(paramMap =>{
+ // if (paramMap.has("profile")){
- }
- });
+ // }
+ // });
- this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () =>
- {
- const alert = await this.alertController.create({
- cssClass: 'my-custom-class',
- header: 'Evento actualizado',
- buttons: ['OK']
- });
+ // this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () =>
+ // {
+ // const alert = await this.alertController.create({
+ // cssClass: 'my-custom-class',
+ // header: 'Evento actualizado',
+ // buttons: ['OK']
+ // });
- setTimeout(()=>{
- alert.dismiss();
- }, 1500);
- });
- }
+ // setTimeout(()=>{
+ // alert.dismiss();
+ // }, 1500);
+ // });
+ // }
}
showAlert(){
diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts
index 52095b581..d2b709dff 100644
--- a/src/app/pages/events/event-detail/event-detail.page.ts
+++ b/src/app/pages/events/event-detail/event-detail.page.ts
@@ -163,27 +163,27 @@ export class EventDetailPage implements OnInit {
Save()
{
- if (this.ionicForm.valid){
+ // if (this.ionicForm.valid){
- this.activatedRoute.paramMap.subscribe(paramMap =>{
- if (paramMap.has("profile")){
+ // this.activatedRoute.paramMap.subscribe(paramMap =>{
+ // if (paramMap.has("profile")){
- }
- });
+ // }
+ // });
- this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () =>
- {
- const alert = await this.alertController.create({
- cssClass: 'my-custom-class',
- header: 'Evento actualizado',
- buttons: ['OK']
- });
+ // this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () =>
+ // {
+ // const alert = await this.alertController.create({
+ // cssClass: 'my-custom-class',
+ // header: 'Evento actualizado',
+ // buttons: ['OK']
+ // });
- setTimeout(()=>{
- alert.dismiss();
- }, 1500);
- });
- }
+ // setTimeout(()=>{
+ // alert.dismiss();
+ // }, 1500);
+ // });
+ // }
}
showAlert(){
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index e4dc8f6b0..caef83496 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -886,7 +886,7 @@ export class EventsService {
return this.http.put
(`${puturl}`, event, options)
}
- editEvent(event: Event, conflictResolutionMode: number, sendInvitationsOrCancellationsMode: number, CalendarId? ): Observable {
+ editEvent(event: Event, conflictResolutionMode: number, sendInvitationsOrCancellationsMode: number, CalendarId ): Observable {
let arrayReq = [];
arrayReq.push(event);
const puturl = environment.apiURL + 'calendar/PutEvent';
@@ -917,18 +917,35 @@ export class EventsService {
this.headers = this.headersPrOficial;
} else {
- const headers = [
- this.headerSharedOficial,
- this.headerSharedPessoal,
- this.headerOwnPessoal,
- this.headerOwnOficial
- ]
- const header = headers.find((header)=> {
- return header?.get('CalendarId')?.includes(CalendarId)
- })
+ if(CalendarId) {
+
+ const headers = [
+ this.headerSharedOficial,
+ this.headerSharedPessoal,
+ this.headerOwnPessoal,
+ this.headerOwnOficial
+ ]
+
+ const calendar = this.DetectCalendars(CalendarId)
+ const header = this.makeHeader(calendar)
+
+ this.headers = header
+ } else {
+ const headers = [
+ this.headerSharedOficial,
+ this.headerSharedPessoal,
+ this.headerOwnPessoal,
+ this.headerOwnOficial
+ ]
+
+ const header = headers.find((header)=> {
+ return header?.get('CalendarId')?.includes(CalendarId)
+ })
+
+ this.headers = header
+ }
- this.headers = header
}
}
else {
@@ -939,18 +956,36 @@ export class EventsService {
this.headers = this.headersPrPessoal;
}
else {
- const headers = [
- this.headerSharedOficial,
- this.headerSharedPessoal,
- this.headerOwnPessoal,
- this.headerOwnOficial
- ]
- const header = headers.find((header)=> {
- return header?.get('CalendarId')?.includes(CalendarId)
- })
- this.headers = header
+
+ if(CalendarId) {
+
+ const headers = [
+ this.headerSharedOficial,
+ this.headerSharedPessoal,
+ this.headerOwnPessoal,
+ this.headerOwnOficial
+ ]
+
+ const calendar = this.DetectCalendars(CalendarId)
+ const header = this.makeHeader(calendar)
+
+ this.headers = header
+ } else {
+ const headers = [
+ this.headerSharedOficial,
+ this.headerSharedPessoal,
+ this.headerOwnPessoal,
+ this.headerOwnOficial
+ ]
+
+ const header = headers.find((header)=> {
+ return header?.get('CalendarId')?.includes(CalendarId)
+ })
+
+ this.headers = header
+ }
}
}
diff --git a/src/app/services/events/edit-event/edit-event-routing.module.ts b/src/app/services/events/11edit-event/edit-event-routing.module.ts
similarity index 100%
rename from src/app/services/events/edit-event/edit-event-routing.module.ts
rename to src/app/services/events/11edit-event/edit-event-routing.module.ts
diff --git a/src/app/services/events/edit-event/edit-event.module.ts b/src/app/services/events/11edit-event/edit-event.module.ts
similarity index 100%
rename from src/app/services/events/edit-event/edit-event.module.ts
rename to src/app/services/events/11edit-event/edit-event.module.ts
diff --git a/src/app/services/events/edit-event/edit-event.page.html b/src/app/services/events/11edit-event/edit-event.page.html
similarity index 100%
rename from src/app/services/events/edit-event/edit-event.page.html
rename to src/app/services/events/11edit-event/edit-event.page.html
diff --git a/src/app/services/events/edit-event/edit-event.page.scss b/src/app/services/events/11edit-event/edit-event.page.scss
similarity index 100%
rename from src/app/services/events/edit-event/edit-event.page.scss
rename to src/app/services/events/11edit-event/edit-event.page.scss
diff --git a/src/app/services/events/edit-event/edit-event.page.spec.ts b/src/app/services/events/11edit-event/edit-event.page.spec.ts
similarity index 100%
rename from src/app/services/events/edit-event/edit-event.page.spec.ts
rename to src/app/services/events/11edit-event/edit-event.page.spec.ts
diff --git a/src/app/services/events/edit-event/edit-event.page.ts b/src/app/services/events/11edit-event/edit-event.page.ts
similarity index 90%
rename from src/app/services/events/edit-event/edit-event.page.ts
rename to src/app/services/events/11edit-event/edit-event.page.ts
index 4ac7b984e..51743da43 100644
--- a/src/app/services/events/edit-event/edit-event.page.ts
+++ b/src/app/services/events/11edit-event/edit-event.page.ts
@@ -70,7 +70,7 @@ export class EditEventPage implements OnInit {
else{
this.pageId = paramMap.get('eventId');
eventid = paramMap.get('eventId');
-
+
}
if (paramMap.has("caller")){
@@ -158,28 +158,28 @@ export class EditEventPage implements OnInit {
Save()
{
- if (this.ionicForm.valid){
+ // if (this.ionicForm.valid){
- this.activatedRoute.paramMap.subscribe(paramMap =>{
- if (paramMap.has("profile")){
-
+ // this.activatedRoute.paramMap.subscribe(paramMap =>{
+ // if (paramMap.has("profile")){
- }
- });
- this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () =>
- {
- const alert = await this.alertController.create({
- cssClass: 'my-custom-class',
- header: 'Evento actualizado',
- buttons: ['OK']
- });
+ // }
+ // });
- setTimeout(()=>{
- alert.dismiss();
- }, 1500);
- });
- }
+ // this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () =>
+ // {
+ // const alert = await this.alertController.create({
+ // cssClass: 'my-custom-class',
+ // header: 'Evento actualizado',
+ // buttons: ['OK']
+ // });
+
+ // setTimeout(()=>{
+ // alert.dismiss();
+ // }, 1500);
+ // });
+ // }
}
loadAttachments()
@@ -187,7 +187,7 @@ export class EditEventPage implements OnInit {
this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => {
this.loadedEventAttachments = res;
-
+
},((erro) => {
console.error('loadAttchament', erro)
@@ -230,7 +230,7 @@ export class EditEventPage implements OnInit {
backdropDismiss: false
});
-
+
modal.onDidDismiss().then((data) => {
if (data['data'] != null)
diff --git a/src/app/services/events/event-detail/event-detail-routing.module.ts b/src/app/services/events/11event-detail/event-detail-routing.module.ts
similarity index 100%
rename from src/app/services/events/event-detail/event-detail-routing.module.ts
rename to src/app/services/events/11event-detail/event-detail-routing.module.ts
diff --git a/src/app/services/events/event-detail/event-detail.module.ts b/src/app/services/events/11event-detail/event-detail.module.ts
similarity index 100%
rename from src/app/services/events/event-detail/event-detail.module.ts
rename to src/app/services/events/11event-detail/event-detail.module.ts
diff --git a/src/app/services/events/event-detail/event-detail.page.html b/src/app/services/events/11event-detail/event-detail.page.html
similarity index 100%
rename from src/app/services/events/event-detail/event-detail.page.html
rename to src/app/services/events/11event-detail/event-detail.page.html
diff --git a/src/app/services/events/event-detail/event-detail.page.scss b/src/app/services/events/11event-detail/event-detail.page.scss
similarity index 100%
rename from src/app/services/events/event-detail/event-detail.page.scss
rename to src/app/services/events/11event-detail/event-detail.page.scss
diff --git a/src/app/services/events/event-detail/event-detail.page.spec.ts b/src/app/services/events/11event-detail/event-detail.page.spec.ts
similarity index 100%
rename from src/app/services/events/event-detail/event-detail.page.spec.ts
rename to src/app/services/events/11event-detail/event-detail.page.spec.ts
diff --git a/src/app/services/events/event-detail/event-detail.page.ts b/src/app/services/events/11event-detail/event-detail.page.ts
similarity index 90%
rename from src/app/services/events/event-detail/event-detail.page.ts
rename to src/app/services/events/11event-detail/event-detail.page.ts
index d5afa0596..7da123b0d 100644
--- a/src/app/services/events/event-detail/event-detail.page.ts
+++ b/src/app/services/events/11event-detail/event-detail.page.ts
@@ -70,7 +70,7 @@ export class EventDetailPage implements OnInit {
else{
this.pageId = paramMap.get('eventId');
eventid = paramMap.get('eventId');
-
+
}
if (paramMap.has("caller")){
@@ -93,7 +93,7 @@ export class EventDetailPage implements OnInit {
backdropDismiss: false
});
-
+
modal.onDidDismiss().then((data) => {
if (data['data'] != null)
@@ -158,28 +158,28 @@ export class EventDetailPage implements OnInit {
Save()
{
- if (this.ionicForm.valid){
+ // if (this.ionicForm.valid){
- this.activatedRoute.paramMap.subscribe(paramMap =>{
- if (paramMap.has("profile")){
-
+ // this.activatedRoute.paramMap.subscribe(paramMap =>{
+ // if (paramMap.has("profile")){
- }
- });
- this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () =>
- {
- const alert = await this.alertController.create({
- cssClass: 'my-custom-class',
- header: 'Evento actualizado',
- buttons: ['OK']
- });
+ // }
+ // });
- setTimeout(()=>{
- alert.dismiss();
- }, 1500);
- });
- }
+ // this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () =>
+ // {
+ // const alert = await this.alertController.create({
+ // cssClass: 'my-custom-class',
+ // header: 'Evento actualizado',
+ // buttons: ['OK']
+ // });
+
+ // setTimeout(()=>{
+ // alert.dismiss();
+ // }, 1500);
+ // });
+ // }
}
loadAttachments()
@@ -187,7 +187,7 @@ export class EventDetailPage implements OnInit {
this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => {
this.loadedEventAttachments = res;
-
+
},((erro) => {
console.error('loadAttchament', erro)
diff --git a/src/app/services/events/events-routing.module.ts b/src/app/services/events/events-routing.module.ts
index 5b2cbdb3c..bca181043 100644
--- a/src/app/services/events/events-routing.module.ts
+++ b/src/app/services/events/events-routing.module.ts
@@ -8,10 +8,10 @@ const routes: Routes = [
path: '',
component: EventsPage
},
- {
- path: 'event-detail',
- loadChildren: () => import('./event-detail/event-detail.module').then( m => m.EventDetailPageModule)
- },
+ // {
+ // path: 'event-detail',
+ // loadChildren: () => import('./event-detail/event-detail.module').then( m => m.EventDetailPageModule)
+ // },
{
path: 'attachments',
loadChildren: () => import('./attachments/attachments.module').then( m => m.AttachmentsPageModule)
@@ -24,10 +24,10 @@ const routes: Routes = [
path: 'event-detail-modal',
loadChildren: () => import('./event-detail-modal/event-detail-modal.module').then( m => m.EventDetailModalPageModule)
},
- {
- path: 'edit-event',
- loadChildren: () => import('./edit-event/edit-event.module').then( m => m.EditEventPageModule)
- }
+ // {
+ // path: 'edit-event',
+ // loadChildren: () => import('./edit-event/edit-event.module').then( m => m.EditEventPageModule)
+ // }
];
diff --git a/src/app/services/events/events.page.ts b/src/app/services/events/events.page.ts
index 29c7d2455..72d212440 100644
--- a/src/app/services/events/events.page.ts
+++ b/src/app/services/events/events.page.ts
@@ -5,7 +5,7 @@ import { EventsService } from 'src/app/services/events.service';
import { NavigationExtras, Router } from '@angular/router';
import { ActivatedRoute, NavigationEnd } from '@angular/router';
import { ModalController, Platform } from '@ionic/angular';
-import { EventDetailPage } from './event-detail/event-detail.page';
+// import { EventDetailPage } from './event-detail/event-detail.page';
import { ProcessesService } from '../../services/processes.service';
import { DailyWorkTask } from '../../models/dailyworktask.model';
import { LoginUserRespose } from 'src/app/models/user.model';
@@ -84,7 +84,7 @@ export class EventsPage implements OnInit {
public ThemeService: ThemeService,
) {
this.existingScreenOrientation = this.screenOrientation.type;
-
+
this.loggeduser = SessionStore.user;
@@ -92,7 +92,7 @@ export class EventsPage implements OnInit {
this.platform.resize.subscribe(async () => {
//
- //
+ //
});
@@ -137,7 +137,7 @@ export class EventsPage implements OnInit {
// Lock to portrait
lockToPortrait(){
this.screenOrientation.lock(this.screenOrientation.ORIENTATIONS.PORTRAIT);
-
+
}
// Lock to landscape
@@ -153,7 +153,7 @@ export class EventsPage implements OnInit {
checkScreenOrientation(){
if( window.innerWidth < 701) {
this.lockToPortrait();
-
+
}
else{
@@ -233,8 +233,8 @@ export class EventsPage implements OnInit {
let prOficialEvents= await this.eventService.getAllPrOficialEvents(start, end).toPromise();
let prPessoalEvents= await this.eventService.getAllPrPessoalEvents(start, end).toPromise();
this.eventsList = prOficialEvents.concat(prPessoalEvents);
-
-
+
+
if(this.eventsList.length > 0){
this.currentEvent = this.eventsList[0].Subject;
@@ -297,12 +297,12 @@ export class EventsPage implements OnInit {
changeProfile(){
if(this.profile == "mdgpr"){
-
+
this.profile ="pr";
this.RefreshEvents();
}
else{
-
+
this.profile ="mdgpr";
this.RefreshEvents();
}
@@ -315,26 +315,11 @@ export class EventsPage implements OnInit {
this.router.navigate(['/home/login']);
}
- async openEventDetail1(id:any){
-
- const modal = await this.modalController.create({
- component: EventDetailPage,
- componentProps: {
- eventId: id,
- },
- cssClass: 'event-detail',
- backdropDismiss: false
- });
-
- modal.onDidDismiss();
- await modal.present();
-
- }
LoadList() {
this.processes.GetTaskListExpediente(false).subscribe(result => {
-
+
const ExpedienteTask = result.map( e=> this.expedienteTaskPipe.transform(e))
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index b7c558d8b..a6975183f 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -366,7 +366,7 @@ export class EditEventPage implements OnInit {
try {
if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
- await this.eventsService.editEvent(this._postEvent, 2, 3).toPromise()
+ await this.eventsService.editEvent(this._postEvent, 2, 3, this._postEvent.CalendarId).toPromise()
if(this.initCalendarName != this._postEvent.CalendarName) {
let body = {
"EventId": this._postEvent.EventId,
@@ -380,6 +380,7 @@ export class EditEventPage implements OnInit {
this.showLoader = false;
this.httpErrorHandle.httpsSucessMessagge('Editar evento')
} else {
+ console.log(this._postEvent, 2, 3, this._postEvent.CalendarId)
await this.eventsService.editEvent(this._postEvent, 2, 3, this._postEvent.CalendarId).toPromise()
if(this.initCalendarName != this._postEvent.CalendarName) {
let body = {
@@ -542,7 +543,7 @@ export class EditEventPage implements OnInit {
SourceName: data.selected.Assunto,
ParentId: this._postEvent.EventId,
SourceId: data.selected.Id,
- Stakeholders: data.selected.Stakeholders | data.selected.EntidadeOrganicaNome,
+ Stakeholders: data.selected.EntidadeOrganicaNome | data.selected.Stakeholders,
ApplicationId: data.selected.ApplicationType.toString(),
CreateDate: data.selected.Data,
Id: 'add',
@@ -590,13 +591,13 @@ export class EditEventPage implements OnInit {
this.postEvent.IsAllDayEvent = this.allDayCheck;
this.postEvent.StartDate = this.setAlldayTime(this.postEvent.StartDate)
this.postEvent.EndDate = this.setAlldayTimeEndDate(this.postEvent.EndDate)
-
+
console.log('Recurso ativado!!');
} else {
this.postEvent.IsAllDayEvent = this.allDayCheck;
this.postEvent.EndDate = this.setAlldayTimeEndDateNotAlday(this.postEvent.EndDate)
console.log('Recurso desativado');
-
+
}
}
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 88a865d57..a42e49399 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -213,7 +213,7 @@
{{last ? scrollToBottom() : ''}}