mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
added MD as default interveninete when PR are creating events ou mettings
This commit is contained in:
@@ -69,7 +69,7 @@
|
|||||||
appearance="fill"
|
appearance="fill"
|
||||||
class="width-100 d-block"
|
class="width-100 d-block"
|
||||||
appearance="none">
|
appearance="none">
|
||||||
<mat-select [multiple]="false" [(ngModel)]="selectedTypes" placeholder="Selecione o tipo de assunto*">
|
<mat-select [multiple]="false" [(ngModel)]="selectedTypes" placeholder="{{placeholderSubject}}">
|
||||||
<mat-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</mat-option>
|
<mat-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</mat-option>
|
||||||
</mat-select>
|
</mat-select>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ export class CreateProcessPage implements OnInit {
|
|||||||
loadedAttachments: any;
|
loadedAttachments: any;
|
||||||
subjectTypes: any;
|
subjectTypes: any;
|
||||||
selectedTypes: string[] = [];
|
selectedTypes: string[] = [];
|
||||||
|
placeholderSubject: string;
|
||||||
|
|
||||||
postData: Despacho;
|
postData: Despacho;
|
||||||
dispatchFolder: Folder;
|
dispatchFolder: Folder;
|
||||||
@@ -125,7 +126,13 @@ export class CreateProcessPage implements OnInit {
|
|||||||
this.postData = new Despacho();
|
this.postData = new Despacho();
|
||||||
this.participants = this.participants = new Array();
|
this.participants = this.participants = new Array();
|
||||||
//Initialize SubjectTypes Array with the value "Indefinido"
|
//Initialize SubjectTypes Array with the value "Indefinido"
|
||||||
/* this.selectedTypes = ['99999850']; */
|
if(this.loggeduser.Profile == 'PR') {
|
||||||
|
this.selectedTypes = ['99999850'];
|
||||||
|
this.placeholderSubject = 'Indefinido'
|
||||||
|
} else {
|
||||||
|
this.placeholderSubject = 'Selecione o tipo de assunto*'
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
let NumberPDPP;
|
let NumberPDPP;
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import { SessionStore } from 'src/app/store/session.service';
|
|||||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||||
import { environment } from 'src/environments/environment';
|
import { environment } from 'src/environments/environment';
|
||||||
import { TaskService } from 'src/app/services/task.service'
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
import { ContactsService } from 'src/app/services/contacts.service';
|
||||||
|
|
||||||
|
|
||||||
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||||
@@ -75,8 +76,8 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
taskParticipants: EventPerson[] = [];
|
taskParticipants: EventPerson[] = [];
|
||||||
taskParticipantsCc: EventPerson[] = [];
|
taskParticipantsCc: EventPerson[] = [];
|
||||||
|
|
||||||
taskDocId:string;
|
taskDocId: string;
|
||||||
loadedAttachments:any;
|
loadedAttachments: any;
|
||||||
|
|
||||||
attachments: SearchList[] = [];
|
attachments: SearchList[] = [];
|
||||||
|
|
||||||
@@ -85,13 +86,13 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
postData: Event;
|
postData: Event;
|
||||||
|
|
||||||
formLocationSatus: boolean = false;
|
formLocationSatus: boolean = false;
|
||||||
showAttendees= false;
|
showAttendees = false;
|
||||||
loggeduser: LoginUserRespose;
|
loggeduser: LoginUserRespose;
|
||||||
emptyTextDescription = "Selecionar intervenientes";
|
emptyTextDescription = "Selecionar intervenientes";
|
||||||
|
|
||||||
document: SearchFolderDetails | SearchDocumentDetails | any;
|
document: SearchFolderDetails | SearchDocumentDetails | any;
|
||||||
subject: string;
|
subject: string;
|
||||||
docs:any[] = [];
|
docs: any[] = [];
|
||||||
|
|
||||||
eventPipe = new EventPipe()
|
eventPipe = new EventPipe()
|
||||||
CalendarName;
|
CalendarName;
|
||||||
@@ -99,10 +100,12 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
CalendarNamesOptions
|
CalendarNamesOptions
|
||||||
testeFormDefaul = "Eudes"
|
testeFormDefaul = "Eudes"
|
||||||
environment = environment
|
environment = environment
|
||||||
|
eventPersons: EventPerson[];
|
||||||
|
contacts: EventPerson[];
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private modalController: ModalController,
|
private modalController: ModalController,
|
||||||
private router:Router,
|
private router: Router,
|
||||||
private navParams: NavParams,
|
private navParams: NavParams,
|
||||||
authService: AuthService,
|
authService: AuthService,
|
||||||
private toastService: ToastService,
|
private toastService: ToastService,
|
||||||
@@ -111,15 +114,16 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
public _eventService: EventsService,
|
public _eventService: EventsService,
|
||||||
private httpErroHandle: HttpErrorHandle,
|
private httpErroHandle: HttpErrorHandle,
|
||||||
public TaskService: TaskService
|
public TaskService: TaskService,
|
||||||
|
private contactsService: ContactsService,
|
||||||
) {
|
) {
|
||||||
this.loggeduser = SessionStore.user;
|
this.loggeduser = SessionStore.user;
|
||||||
this.document = this.navParams.get('document')
|
this.document = this.navParams.get('document')
|
||||||
|
|
||||||
if(Array.isArray(this.document)) {
|
if (Array.isArray(this.document)) {
|
||||||
const E = this.document
|
const E = this.document
|
||||||
this.document = []
|
this.document = []
|
||||||
E.forEach((e)=> {
|
E.forEach((e) => {
|
||||||
this.document.push({
|
this.document.push({
|
||||||
ApplicationId: e.ApplicationId || e.ApplicationType,
|
ApplicationId: e.ApplicationId || e.ApplicationType,
|
||||||
Source: 1,
|
Source: 1,
|
||||||
@@ -151,7 +155,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(Array.isArray(this.document)) {
|
if (Array.isArray(this.document)) {
|
||||||
this.attachments = this.document
|
this.attachments = this.document
|
||||||
} else {
|
} else {
|
||||||
this.attachments = [this.document]
|
this.attachments = [this.document]
|
||||||
@@ -160,22 +164,22 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
this.subject = this.navParams.get('subject')
|
this.subject = this.navParams.get('subject')
|
||||||
|
|
||||||
this.postData = new Event();
|
this.postData = new Event();
|
||||||
this.postData.Body ={ BodyType : "1", Text : ""};
|
this.postData.Body = { BodyType: "1", Text: "" };
|
||||||
|
|
||||||
this.postData.Subject = this.subject
|
this.postData.Subject = this.subject
|
||||||
this.postData.CalendarName = "Oficial";
|
this.postData.CalendarName = "Oficial";
|
||||||
|
|
||||||
this.postData.Category = 'Reunião'
|
this.postData.Category = 'Reunião'
|
||||||
|
|
||||||
if(!this.CalendarName) {
|
if (!this.CalendarName) {
|
||||||
if(this._eventService.calendarNamesAry.includes('Meu calendario')) {
|
if (this._eventService.calendarNamesAry.includes('Meu calendario')) {
|
||||||
this.CalendarName = 'Meu calendario';
|
this.CalendarName = 'Meu calendario';
|
||||||
} else {
|
} else {
|
||||||
this.CalendarName = this._eventService.calendarNamesAry[0]
|
this.CalendarName = this._eventService.calendarNamesAry[0]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.taskParticipants.length == 0) {
|
if (this.taskParticipants.length == 0) {
|
||||||
this.taskParticipants = [
|
this.taskParticipants = [
|
||||||
// {
|
// {
|
||||||
// EmailAddress: SessionStore.user.Email,
|
// EmailAddress: SessionStore.user.Email,
|
||||||
@@ -194,6 +198,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
this.adding = "intervenient";
|
this.adding = "intervenient";
|
||||||
this.setDefaultTime()
|
this.setDefaultTime()
|
||||||
this.getRecurrenceTypes();
|
this.getRecurrenceTypes();
|
||||||
|
this.fetchContacts("")
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -203,15 +208,15 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
myInterval = setInterval(() => {
|
myInterval = setInterval(() => {
|
||||||
document.querySelectorAll('.ngx-mat-timepicker input').forEach((e :any) => {
|
document.querySelectorAll('.ngx-mat-timepicker input').forEach((e: any) => {
|
||||||
if(e) {
|
if (e) {
|
||||||
e.disabled = true;
|
e.disabled = true;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}, 1000);
|
}, 1000);
|
||||||
|
|
||||||
getRecurrenceTypes() {
|
getRecurrenceTypes() {
|
||||||
this.calendarService.getRecurrenceTypes().subscribe( res=> {
|
this.calendarService.getRecurrenceTypes().subscribe(res => {
|
||||||
this.recurringTypes = res;
|
this.recurringTypes = res;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -222,13 +227,13 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
setStartDate() {
|
setStartDate() {
|
||||||
if(!this.postData.StartDate) {
|
if (!this.postData.StartDate) {
|
||||||
this.postData.StartDate = this.roundTimeQuarterHour();
|
this.postData.StartDate = this.roundTimeQuarterHour();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setEndDate() {
|
setEndDate() {
|
||||||
if(!this.postData.EndDate) {
|
if (!this.postData.EndDate) {
|
||||||
this.postData.EndDate = this.roundTimeQuarterHourPlus15(this.postData.StartDate);
|
this.postData.EndDate = this.roundTimeQuarterHourPlus15(this.postData.StartDate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -242,7 +247,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get dateValid() {
|
get dateValid() {
|
||||||
return new Date(this.postData.StartDate).getTime() < new Date(this.postData.EndDate).getTime() ? 'ok': null
|
return new Date(this.postData.StartDate).getTime() < new Date(this.postData.EndDate).getTime() ? 'ok' : null
|
||||||
}
|
}
|
||||||
|
|
||||||
injectValidation() {
|
injectValidation() {
|
||||||
@@ -258,7 +263,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
CalendarName: new FormControl(this.postData.CalendarName, [
|
CalendarName: new FormControl(this.postData.CalendarName, [
|
||||||
// Validators.required
|
// Validators.required
|
||||||
]),
|
]),
|
||||||
Date: new FormControl( (this.dateValid), [
|
Date: new FormControl((this.dateValid), [
|
||||||
Validators.required
|
Validators.required
|
||||||
]),
|
]),
|
||||||
participantes: new FormControl(this.taskParticipants, [
|
participantes: new FormControl(this.taskParticipants, [
|
||||||
@@ -279,7 +284,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
|
|
||||||
this.CalendarNameShow = true
|
this.CalendarNameShow = true
|
||||||
|
|
||||||
if(this._eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this._eventService.calendarNamesType[this.CalendarName]?.['Pessoal']) {
|
if (this._eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this._eventService.calendarNamesType[this.CalendarName]?.['Pessoal']) {
|
||||||
|
|
||||||
this.CalendarNamesOptions = ['Oficial', 'Pessoal']
|
this.CalendarNamesOptions = ['Oficial', 'Pessoal']
|
||||||
|
|
||||||
@@ -300,10 +305,10 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
|
|
||||||
async saveTask() {
|
async saveTask() {
|
||||||
|
|
||||||
if(this.loggeduser.Profile == 'MDGPR') {
|
if (this.loggeduser.Profile == 'MDGPR') {
|
||||||
this.injectValidation()
|
this.injectValidation()
|
||||||
this.runValidation()
|
this.runValidation()
|
||||||
if(this.Form.invalid) return false
|
if (this.Form.invalid) return false
|
||||||
}
|
}
|
||||||
|
|
||||||
let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
|
let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
|
||||||
@@ -343,7 +348,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
}, (error) => {
|
}, (error) => {
|
||||||
laoder.remove();
|
laoder.remove();
|
||||||
this.httpErroHandle.httpStatusHandle(error)
|
this.httpErroHandle.httpStatusHandle(error)
|
||||||
}, ()=>{
|
}, () => {
|
||||||
laoder.remove();
|
laoder.remove();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -353,7 +358,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
|
|
||||||
this.adding = "intervenient";
|
this.adding = "intervenient";
|
||||||
|
|
||||||
if(window.innerWidth <= 801){
|
if (window.innerWidth <= 801) {
|
||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: AttendeesPageModal,
|
component: AttendeesPageModal,
|
||||||
componentProps: {
|
componentProps: {
|
||||||
@@ -367,7 +372,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
|
|
||||||
modal.onDidDismiss().then((data) => {
|
modal.onDidDismiss().then((data) => {
|
||||||
|
|
||||||
if(data) {
|
if (data) {
|
||||||
data = data['data'];
|
data = data['data'];
|
||||||
|
|
||||||
const newAttendees: EventPerson[] = data['taskParticipants'];
|
const newAttendees: EventPerson[] = data['taskParticipants'];
|
||||||
@@ -391,7 +396,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
|
|
||||||
this.adding = "CC";
|
this.adding = "CC";
|
||||||
|
|
||||||
if(window.innerWidth <= 800) {
|
if (window.innerWidth <= 800) {
|
||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: AttendeesPageModal,
|
component: AttendeesPageModal,
|
||||||
componentProps: {
|
componentProps: {
|
||||||
@@ -407,7 +412,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
|
|
||||||
modal.onDidDismiss().then((data) => {
|
modal.onDidDismiss().then((data) => {
|
||||||
|
|
||||||
if(data){
|
if (data) {
|
||||||
data = data['data'];
|
data = data['data'];
|
||||||
|
|
||||||
const newAttendees: EventPerson[] = data['taskParticipants'];
|
const newAttendees: EventPerson[] = data['taskParticipants'];
|
||||||
@@ -437,8 +442,8 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
modal.onDidDismiss().then((res)=> {
|
modal.onDidDismiss().then((res) => {
|
||||||
if(res){
|
if (res) {
|
||||||
const data = res.data;
|
const data = res.data;
|
||||||
this.attachments.push(data.selected);
|
this.attachments.push(data.selected);
|
||||||
}
|
}
|
||||||
@@ -450,17 +455,17 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
removeAttachment(index: number) {
|
removeAttachment(index: number) {
|
||||||
this.attachments = this.attachments.filter( (e, i) => index != i);
|
this.attachments = this.attachments.filter((e, i) => index != i);
|
||||||
}
|
}
|
||||||
|
|
||||||
validateFormInputs() {
|
validateFormInputs() {
|
||||||
let formLocation = this.postData.Location.trim();
|
let formLocation = this.postData.Location.trim();
|
||||||
if(!this.postData.Location && formLocation.length <= 0){
|
if (!this.postData.Location && formLocation.length <= 0) {
|
||||||
this.formLocationSatus = true;
|
this.formLocationSatus = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
selectedCalendarId () {
|
selectedCalendarId() {
|
||||||
|
|
||||||
if (this._eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') {
|
if (this._eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') {
|
||||||
return this._eventService.calendarNamesType[this.CalendarName]['OficialId']
|
return this._eventService.calendarNamesType[this.CalendarName]['OficialId']
|
||||||
@@ -474,7 +479,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
|
dynamicSetIntervenient({ taskParticipants, taskParticipantsCc }) {
|
||||||
this.taskParticipants = taskParticipants;
|
this.taskParticipants = taskParticipants;
|
||||||
this.taskParticipantsCc = taskParticipantsCc;
|
this.taskParticipantsCc = taskParticipantsCc;
|
||||||
}
|
}
|
||||||
@@ -497,7 +502,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
const minutes = date.getMinutes();
|
const minutes = date.getMinutes();
|
||||||
date.setSeconds(0);
|
date.setSeconds(0);
|
||||||
|
|
||||||
if(minutes % 15 != 0) {
|
if (minutes % 15 != 0) {
|
||||||
|
|
||||||
if (minutes > 45) {
|
if (minutes > 45) {
|
||||||
date.setMinutes(60)
|
date.setMinutes(60)
|
||||||
@@ -514,10 +519,10 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
return date
|
return date
|
||||||
}
|
}
|
||||||
|
|
||||||
roundTimeQuarterHourPlus15(date:Date) {
|
roundTimeQuarterHourPlus15(date: Date) {
|
||||||
const _date = new Date(date);
|
const _date = new Date(date);
|
||||||
const minutes = _date .getMinutes();
|
const minutes = _date.getMinutes();
|
||||||
_date .setMinutes(minutes + 15)
|
_date.setMinutes(minutes + 15)
|
||||||
return _date
|
return _date
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -525,5 +530,34 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
return this._eventService.calendarRole.includes(str);
|
return this._eventService.calendarRole.includes(str);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fetchContacts(filter: string) {
|
||||||
|
|
||||||
|
if (this.loggeduser.Profile == 'PR') {
|
||||||
|
this.contactsService.getContacts(filter).subscribe(result => {
|
||||||
|
if (this.eventPersons != null) {
|
||||||
|
this.eventPersons.forEach(attendee => {
|
||||||
|
const index: number = result.findIndex((cont) => {
|
||||||
|
return cont.EmailAddress.toLocaleLowerCase() == attendee.EmailAddress.toLocaleLowerCase()
|
||||||
|
});
|
||||||
|
|
||||||
|
result.splice(index, 1);
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
this.contacts = result;
|
||||||
|
console.log('Attendes Email', this.loggeduser.Email)
|
||||||
|
let filterLoggedUserEmail = this.contacts.filter(item => item.RoleDescription == "Ministro e Director do Gabinete do PR")
|
||||||
|
console.log('Attendes Email', filterLoggedUserEmail)
|
||||||
|
|
||||||
|
this.contacts = filterLoggedUserEmail;
|
||||||
|
const newAttendees: EventPerson[] = this.contacts;
|
||||||
|
|
||||||
|
this.setIntervenient(newAttendees);
|
||||||
|
console.log('Attendes Email', this.contacts)
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,5 +3,6 @@ export class EventPerson{
|
|||||||
Name: string;
|
Name: string;
|
||||||
IsRequired: boolean;
|
IsRequired: boolean;
|
||||||
UserType: string;
|
UserType: string;
|
||||||
IsPR: boolean
|
IsPR: boolean;
|
||||||
|
RoleDescription: string;
|
||||||
}
|
}
|
||||||
@@ -22,6 +22,7 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
|||||||
import { environment } from 'src/environments/environment';
|
import { environment } from 'src/environments/environment';
|
||||||
import { ProcessesService } from 'src/app/services/processes.service';
|
import { ProcessesService } from 'src/app/services/processes.service';
|
||||||
import { TaskService } from 'src/app/services/task.service'
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
import { ContactsService } from 'src/app/services/contacts.service';
|
||||||
|
|
||||||
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||||
parse: {
|
parse: {
|
||||||
@@ -93,6 +94,9 @@ export class NewEventPage implements OnInit {
|
|||||||
roomId: string;
|
roomId: string;
|
||||||
globalEnd = new Date('1999')
|
globalEnd = new Date('1999')
|
||||||
environment = environment
|
environment = environment
|
||||||
|
eventPersons: EventPerson[];
|
||||||
|
contacts: EventPerson[];
|
||||||
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private modalController: ModalController,
|
private modalController: ModalController,
|
||||||
@@ -105,7 +109,8 @@ export class NewEventPage implements OnInit {
|
|||||||
private chatMethodService: ChatMethodsService,
|
private chatMethodService: ChatMethodsService,
|
||||||
private hhtpErrorHandle: HttpErrorHandle,
|
private hhtpErrorHandle: HttpErrorHandle,
|
||||||
private processeService: ProcessesService,
|
private processeService: ProcessesService,
|
||||||
public TaskService: TaskService
|
public TaskService: TaskService,
|
||||||
|
private contactsService: ContactsService,
|
||||||
) {
|
) {
|
||||||
this.loggeduser = SessionStore.user;
|
this.loggeduser = SessionStore.user;
|
||||||
this.postEvent = new Event();
|
this.postEvent = new Event();
|
||||||
@@ -196,6 +201,7 @@ export class NewEventPage implements OnInit {
|
|||||||
this.checkRoleInArray()
|
this.checkRoleInArray()
|
||||||
this.changeAgenda()
|
this.changeAgenda()
|
||||||
|
|
||||||
|
this.fetchContacts("")
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnDestroy() {
|
ngOnDestroy() {
|
||||||
@@ -831,4 +837,33 @@ export class NewEventPage implements OnInit {
|
|||||||
|
|
||||||
return toAproveObject;
|
return toAproveObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fetchContacts(filter: string) {
|
||||||
|
|
||||||
|
if (this.loggeduser.Profile == 'PR') {
|
||||||
|
this.contactsService.getContacts(filter).subscribe(result => {
|
||||||
|
if (this.eventPersons != null) {
|
||||||
|
this.eventPersons.forEach(attendee => {
|
||||||
|
const index: number = result.findIndex((cont) => {
|
||||||
|
return cont.EmailAddress.toLocaleLowerCase() == attendee.EmailAddress.toLocaleLowerCase()
|
||||||
|
});
|
||||||
|
|
||||||
|
result.splice(index, 1);
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
this.contacts = result;
|
||||||
|
console.log('Attendes Email', this.loggeduser.Email)
|
||||||
|
let filterLoggedUserEmail = this.contacts.filter(item => item.RoleDescription == "Ministro e Director do Gabinete do PR")
|
||||||
|
console.log('Attendes Email', filterLoggedUserEmail)
|
||||||
|
|
||||||
|
this.contacts = filterLoggedUserEmail;
|
||||||
|
const newAttendees: EventPerson[] = this.contacts;
|
||||||
|
|
||||||
|
this.setIntervenient(newAttendees);
|
||||||
|
console.log('Attendes Email', this.contacts)
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+42
-6
@@ -23,6 +23,7 @@ import { RoleIdService } from 'src/app/services/role-id.service';
|
|||||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||||
import { environment } from 'src/environments/environment';
|
import { environment } from 'src/environments/environment';
|
||||||
import { TaskService } from 'src/app/services/task.service'
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
import { ContactsService } from 'src/app/services/contacts.service';
|
||||||
|
|
||||||
const moment = _rollupMoment || _moment;
|
const moment = _rollupMoment || _moment;
|
||||||
|
|
||||||
@@ -114,6 +115,9 @@ export class BookMeetingModalPage implements OnInit {
|
|||||||
|
|
||||||
sessionStore = SessionStore;
|
sessionStore = SessionStore;
|
||||||
environment = environment
|
environment = environment
|
||||||
|
loggeduser: LoginUserRespose;
|
||||||
|
eventPersons: EventPerson[];
|
||||||
|
contacts: EventPerson[];
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private modalController: ModalController,
|
private modalController: ModalController,
|
||||||
@@ -125,7 +129,8 @@ export class BookMeetingModalPage implements OnInit {
|
|||||||
public eventService: EventsService,
|
public eventService: EventsService,
|
||||||
public RoleIdService: RoleIdService,
|
public RoleIdService: RoleIdService,
|
||||||
private httpErroHandle: HttpErrorHandle,
|
private httpErroHandle: HttpErrorHandle,
|
||||||
public TaskService: TaskService
|
public TaskService: TaskService,
|
||||||
|
private contactsService: ContactsService,
|
||||||
|
|
||||||
|
|
||||||
) {
|
) {
|
||||||
@@ -136,7 +141,7 @@ export class BookMeetingModalPage implements OnInit {
|
|||||||
|
|
||||||
console.log('fulltask', this.fulltask)
|
console.log('fulltask', this.fulltask)
|
||||||
|
|
||||||
if(this.fulltask?.Documents) {
|
if (this.fulltask?.Documents) {
|
||||||
this.documents = this.fulltask.Documents
|
this.documents = this.fulltask.Documents
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -174,6 +179,7 @@ export class BookMeetingModalPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.changeAgenda();
|
this.changeAgenda();
|
||||||
|
this.loggeduser = SessionStore.user;
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
@@ -182,6 +188,7 @@ export class BookMeetingModalPage implements OnInit {
|
|||||||
this.getAttachments();
|
this.getAttachments();
|
||||||
this.setDefaultTime()
|
this.setDefaultTime()
|
||||||
this.getRecurrenceTypes();
|
this.getRecurrenceTypes();
|
||||||
|
this.fetchContacts("")
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -191,8 +198,8 @@ export class BookMeetingModalPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
myInterval = setInterval(() => {
|
myInterval = setInterval(() => {
|
||||||
document.querySelectorAll('.ngx-mat-timepicker input').forEach((e :any) => {
|
document.querySelectorAll('.ngx-mat-timepicker input').forEach((e: any) => {
|
||||||
if(e) {
|
if (e) {
|
||||||
e.disabled = true;
|
e.disabled = true;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -328,7 +335,7 @@ export class BookMeetingModalPage implements OnInit {
|
|||||||
ApplicationId: e.ApplicationType || e.ApplicationId,
|
ApplicationId: e.ApplicationType || e.ApplicationId,
|
||||||
Source: 1,
|
Source: 1,
|
||||||
SourceId: e.Id || e.DocId || e.SourceId,
|
SourceId: e.Id || e.DocId || e.SourceId,
|
||||||
SourceName:e.Assunto,
|
SourceName: e.Assunto,
|
||||||
Description: e.Assunto,
|
Description: e.Assunto,
|
||||||
Stakeholders: e.EntidadeOrganicaNome
|
Stakeholders: e.EntidadeOrganicaNome
|
||||||
}
|
}
|
||||||
@@ -417,7 +424,7 @@ export class BookMeetingModalPage implements OnInit {
|
|||||||
|
|
||||||
|
|
||||||
modal.onDidDismiss().then((data) => {
|
modal.onDidDismiss().then((data) => {
|
||||||
|
console.log('attenes return', data)
|
||||||
if (data) {
|
if (data) {
|
||||||
data = data['data'];
|
data = data['data'];
|
||||||
|
|
||||||
@@ -587,4 +594,33 @@ export class BookMeetingModalPage implements OnInit {
|
|||||||
this.postData.EndDate = this.postData.StartDate;
|
this.postData.EndDate = this.postData.StartDate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fetchContacts(filter: string) {
|
||||||
|
console.log(this.loggeduser)
|
||||||
|
if (this.loggeduser.Profile == 'PR') {
|
||||||
|
this.contactsService.getContacts(filter).subscribe(result => {
|
||||||
|
if (this.eventPersons != null) {
|
||||||
|
this.eventPersons.forEach(attendee => {
|
||||||
|
const index: number = result.findIndex((cont) => {
|
||||||
|
return cont.EmailAddress.toLocaleLowerCase() == attendee.EmailAddress.toLocaleLowerCase()
|
||||||
|
});
|
||||||
|
|
||||||
|
result.splice(index, 1);
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
this.contacts = result;
|
||||||
|
console.log('Attendes Email', this.loggeduser.Email)
|
||||||
|
let filterLoggedUserEmail = this.contacts.filter(item => item.RoleDescription == "Ministro e Director do Gabinete do PR")
|
||||||
|
console.log('Attendes Email', filterLoggedUserEmail)
|
||||||
|
|
||||||
|
this.contacts = filterLoggedUserEmail;
|
||||||
|
const newAttendees: EventPerson[] = this.contacts;
|
||||||
|
|
||||||
|
this.setIntervenient(newAttendees);
|
||||||
|
console.log('Attendes Email', this.contacts)
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -112,7 +112,7 @@
|
|||||||
appearance="fill"
|
appearance="fill"
|
||||||
class="width-100 d-block"
|
class="width-100 d-block"
|
||||||
appearance="none">
|
appearance="none">
|
||||||
<mat-select [multiple]="false" [(ngModel)]="selectedTypes" placeholder="Selecione o tipo de assunto*">
|
<mat-select [multiple]="false" [(ngModel)]="selectedTypes" placeholder="{{placeholderSubject}}">
|
||||||
<mat-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</mat-option>
|
<mat-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</mat-option>
|
||||||
</mat-select>
|
</mat-select>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|||||||
+7
-1
@@ -96,6 +96,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
|||||||
validateFrom = false;
|
validateFrom = false;
|
||||||
validateField = false;
|
validateField = false;
|
||||||
document: any
|
document: any
|
||||||
|
placeholderSubject: string;
|
||||||
|
|
||||||
get toppingsValues() {
|
get toppingsValues() {
|
||||||
return this.toppings.value;
|
return this.toppings.value;
|
||||||
@@ -150,7 +151,12 @@ export class ExpedientTaskModalPage implements OnInit {
|
|||||||
// console.log('this.document', this.document)
|
// console.log('this.document', this.document)
|
||||||
|
|
||||||
|
|
||||||
/* this.selectedTypes = ['99999850']; */
|
if(this.loggeduser.Profile == 'PR') {
|
||||||
|
this.selectedTypes = ['99999850'];
|
||||||
|
this.placeholderSubject = 'Indefinido'
|
||||||
|
} else {
|
||||||
|
this.placeholderSubject = 'Selecione o tipo de assunto*'
|
||||||
|
}
|
||||||
|
|
||||||
this.postData = new Despacho();
|
this.postData = new Despacho();
|
||||||
this.participants = this.participants = new Array();
|
this.participants = this.participants = new Array();
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
|
|||||||
import { Subject } from 'rxjs';
|
import { Subject } from 'rxjs';
|
||||||
|
|
||||||
import { TaskService } from 'src/app/services/task.service'
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
|
import { ContactsService } from 'src/app/services/contacts.service';
|
||||||
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||||
parse: {
|
parse: {
|
||||||
dateInput: "YYYY-MMMM-DD HH:mm"
|
dateInput: "YYYY-MMMM-DD HH:mm"
|
||||||
@@ -131,6 +132,8 @@ export class NewEventPage implements OnInit {
|
|||||||
|
|
||||||
CalendarNamesOptions = ['Oficial', 'Pessoal']
|
CalendarNamesOptions = ['Oficial', 'Pessoal']
|
||||||
environment = environment
|
environment = environment
|
||||||
|
eventPersons: EventPerson[];
|
||||||
|
contacts: EventPerson[] = [];
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private modalController: ModalController,
|
private modalController: ModalController,
|
||||||
@@ -142,7 +145,8 @@ export class NewEventPage implements OnInit {
|
|||||||
private chatMethodService: ChatMethodsService,
|
private chatMethodService: ChatMethodsService,
|
||||||
private hhtpErrorHandle: HttpErrorHandle,
|
private hhtpErrorHandle: HttpErrorHandle,
|
||||||
private processeService: ProcessesService,
|
private processeService: ProcessesService,
|
||||||
public TaskService: TaskService
|
public TaskService: TaskService,
|
||||||
|
private contactsService: ContactsService,
|
||||||
) {
|
) {
|
||||||
this.dateAdapter.setLocale('pt');
|
this.dateAdapter.setLocale('pt');
|
||||||
this.loggeduser = SessionStore.user;
|
this.loggeduser = SessionStore.user;
|
||||||
@@ -220,6 +224,7 @@ export class NewEventPage implements OnInit {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
console.log('Attendes',this.taskParticipants)
|
||||||
this.taskParticipants = removeDuplicate(this.taskParticipants);
|
this.taskParticipants = removeDuplicate(this.taskParticipants);
|
||||||
this.taskParticipantsCc = removeDuplicate(this.taskParticipantsCc);
|
this.taskParticipantsCc = removeDuplicate(this.taskParticipantsCc);
|
||||||
|
|
||||||
@@ -234,6 +239,7 @@ export class NewEventPage implements OnInit {
|
|||||||
|
|
||||||
this.injectValidation();
|
this.injectValidation();
|
||||||
this.changeAgenda()
|
this.changeAgenda()
|
||||||
|
this.fetchContacts("")
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -987,5 +993,34 @@ export class NewEventPage implements OnInit {
|
|||||||
return toAproveObject;
|
return toAproveObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fetchContacts(filter: string) {
|
||||||
|
|
||||||
|
if (this.loggeduser.Profile == 'PR') {
|
||||||
|
this.contactsService.getContacts(filter).subscribe(result => {
|
||||||
|
if (this.eventPersons != null) {
|
||||||
|
this.eventPersons.forEach(attendee => {
|
||||||
|
const index: number = result.findIndex((cont) => {
|
||||||
|
return cont.EmailAddress.toLocaleLowerCase() == attendee.EmailAddress.toLocaleLowerCase()
|
||||||
|
});
|
||||||
|
|
||||||
|
result.splice(index, 1);
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
this.contacts = result;
|
||||||
|
console.log('Attendes Email', this.loggeduser.Email)
|
||||||
|
let filterLoggedUserEmail = this.contacts.filter(item => item.RoleDescription == "Ministro e Director do Gabinete do PR")
|
||||||
|
console.log('Attendes Email', filterLoggedUserEmail)
|
||||||
|
|
||||||
|
this.contacts = filterLoggedUserEmail;
|
||||||
|
|
||||||
|
this.taskParticipants.push(this.contacts[0]);
|
||||||
|
this.setIntervenient.emit(this.taskParticipants);
|
||||||
|
console.log('Attendes Email', this.taskParticipants)
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,4 +4,4 @@ import { doneITProd } from './suport/doneIt'
|
|||||||
import { DevDev } from './suport/dev'
|
import { DevDev } from './suport/dev'
|
||||||
|
|
||||||
|
|
||||||
export const environment: Environment = oaprProd;
|
export const environment: Environment = DevDev;
|
||||||
|
|||||||
@@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt'
|
|||||||
import { DevDev } from './suport/dev'
|
import { DevDev } from './suport/dev'
|
||||||
|
|
||||||
|
|
||||||
export const environment: Environment = oaprDev
|
export const environment: Environment = DevDev
|
||||||
|
|||||||
Reference in New Issue
Block a user