some changes

This commit is contained in:
Eudes Inácio
2023-05-29 14:05:12 +01:00
64 changed files with 147 additions and 325 deletions
@@ -76,7 +76,6 @@ export class ApproveEventPage implements OnInit {
this.processes.GetTask(this.serialNumber).subscribe(res => {
this.loadedEvent = res;
// console.log(this.loadedEvent);
this.today = new Date(res.workflowInstanceDataFields.StartDate);
//
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
@@ -38,7 +38,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid && validateFrom ">
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
</div>
</div>
@@ -34,7 +34,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Location')?.invalid && validateFrom ">
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
</div>
</div>
<!-- Error messages -->
@@ -258,7 +258,6 @@ export class EditEventPage implements OnInit {
}
calculetedLastOccurrence(type:number){
// console.log(type);
var valor;
var opcao: boolean;
if (type == 0) {
@@ -66,7 +66,7 @@
</div>
<div class="ion-input-class flex-grow-1 width-100" [class.input-error]="Form?.get('Location')?.invalid && validateFrom " >
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" type="text" placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" type="text" placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
</div>
</div>
@@ -435,7 +435,7 @@ export class NewEventPage implements OnInit {
}
calculetedLastOccurrence(type:number){
// console.log(type);
var valor;
var opcao: boolean;
if (type == 0) {
@@ -542,7 +542,6 @@ export class NewEventPage implements OnInit {
},
error => {
console.log(error, 'error')
loader.remove()
this.showLoader = false
this.hhtpErrorHandle.httpStatusHandle(error)
@@ -670,15 +669,15 @@ export class NewEventPage implements OnInit {
selectedCalendarId () {
if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postEvent.CalendarName == 'Oficial') {
console.log('1')
return this.eventService.calendarNamesType[this.CalendarName]['OficialId']
} else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postEvent.CalendarName == 'Pessoal') {
console.log('2')
return this.eventService.calendarNamesType[this.CalendarName]['PessoalId']
} else {
console.log('1:1',this.eventService.calendarNamesType,'2', this.CalendarName)
return '11:11'
}
}
@@ -154,7 +154,6 @@ export class ViewEventPage implements OnInit {
{
text: 'Não',
handler: () => {
console.log('Let me think');
}
},
{
@@ -134,7 +134,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
}
ngOnInit() {
// console.log(this.roomId)
this.loggedUser = this.loggedUserChat;
//setTimeout(() => {
this.getRoomInfo()
@@ -375,7 +374,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
}
let room = await this.chatService.getRoomInfo(this.roomId).toPromise();
// console.log('ROOM',room)
this.room = room['room'];
if (this.room.name) {
try {
@@ -528,7 +526,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
});
await modal.present();
modal.onDidDismiss().then(res => {
console.log(res)
if (res.data == 'leave') {
this.getRoomInfo();
this.closeAllDesktopComponents.emit();
@@ -556,8 +554,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
try {
this.roomName = res.data.name.split('-').join(' ');
} catch (error) {
console.log(error);
console.log(res.data)
this.roomName = res.data.name
}
@@ -1094,8 +1090,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
console.log(msg)
if (msg.file.type == "application/img") {
const modal = await this.modalController.create({
component: ViewMediaPage,
@@ -385,8 +385,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}
async goToEvent(event: any) {
console.log(event.id)
console.log(event.calendarId)
let classs;
if (window.innerWidth < 701) {
classs = 'modal modal-desktop'
@@ -666,7 +664,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
});
const blob = this.dataURItoBlob('data:image/jpeg;base64,' + file.base64String)
console.log('data:image/jpeg;base64,' + file.base64String)
const formData = new FormData();
formData.append("blobFile", blob);
@@ -1003,7 +1000,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}
downloadFileFromBrowser(fileName: string, data: any): void {
console.log(fileName + data)
const linkSource = data;
const downloadLink = document.createElement("a");
downloadLink.href = linkSource;
@@ -1063,9 +1059,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
console.log('hello')
console.log(msg)
if (msg.file.type == "application/img") {
const modal = await this.modalController.create({
component: ViewMediaPage,
@@ -1100,12 +1093,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.audioPlay = new Howl({
src: [track.changingThisBreaksApplicationSecurity],
onplay: () => {
console.log('audio play')
this.isPlaying = true;
this.updateProgress()
},
onend: () => {
console.log('audio end')
this.isPlaying = false;
clearTimeout(this.audioTimer)
this.audioProgress = 0
@@ -1133,16 +1124,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
updateProgress() {
let seek = this.audioPlay.seek();
this.audioProgress = (seek / this.audioPlay.duration()) * 100 || 0;
console.log(this.audioDuration)
this.audioTimer = setTimeout(() => {
this.updateProgress()
}, 1000)
}
async getRoomInfo() {
// this.ChatSystemService.getGroupRoom(this.roomId).loadHistory({});
let room = await this.chatService.getRoomInfo(this.roomId).toPromise();
// console.log('ROOM',room)
this.room = room['room'];
if (this.room.name) {
try {
@@ -30,7 +30,7 @@ export class FingerprintPage implements OnInit {
// localizedReason: 'Please authenticate' //Only for iOS
// })
// .then((FingerPrintHash: any) => {
// console.log(FingerPrintHash)
// const storedFinderPrint = localStorage.getItem('FingerPrintHash')
// if(FingerPrintHash == storedFinderPrint) {
@@ -39,12 +39,11 @@ export class FingerprintPage implements OnInit {
// })
// .catch((error: any) => {
// console.log(error)
// });
}
close() {
/* console.log(this.isEventEdited); */
this.modalController.dismiss();
}
@@ -49,7 +49,6 @@ export class AllProcessesPage implements OnInit {
setTimeout(() => {
// console.log('this.TaskService.AllProcess', this.TaskService.AllProcess)
// this.miniSearch.addAll(this.TaskService.AllProcess)
// window['miniSearch'] = this.miniSearch
@@ -26,7 +26,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-input placeholder="Localização" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
<ion-input placeholder="Localização *" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
</div>
</div>
<!-- Error messages -->
@@ -179,12 +179,10 @@ export class EventsToApprovePage implements OnInit {
getFromDB() {
this.storage.get('event-to-aproveMD').then((events = []) => {
this.eventsMDGPRList = events
// console.log('DB',this.eventsMDGPRList)
})
this.storage.get('event-to-aprovePR').then((events) => {
this.eventsPRList = events
// console.log('DB',this.eventsPRList)
})
}
@@ -45,7 +45,7 @@ export class ExpedientsPage implements OnInit {
if(event.expedienteDetail == "update") {
this.LoadList();
}
console.log(event)
})
}
@@ -14,11 +14,16 @@
</div>
</div>
</div>
<div class="upper-content">
<div class="upper-content" >
<div class="content-details">
<ion-label>
<p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
<p><span class="color-red">{{ fulltask.workflowInstanceDataFields.DeadlineType }}</span></p>
<p><span class="date">{{customDate}}</span></p>
</ion-label>
<ion-label>
<p><span class="color-red">{{ task.Deadline }}</span></p>
</ion-label>
<ion-label>
<p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
</ion-label>
</div>
</div>
@@ -26,7 +31,7 @@
</ion-header>
<ion-content>
<div *ngIf="task" class="overflow-y-auto" style="margin-right: -20px; margin-right: -20px;">
<div *ngIf="task" class="overflow-y-auto height-100">
<div class="middle-content">
<h5 *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
@@ -54,7 +54,6 @@ ion-button{
.upper-content{
font-family: Roboto;
margin-top: 15px;
margin-left: 41px;
font-size: 18px;
-1
View File
@@ -62,7 +62,6 @@ export class HeaderPage implements OnInit {
if(event.notification == "recive") {
this.notificationLengthData()
}
console.log(event)
});
@@ -42,8 +42,7 @@ export class DeplomaOptionsPage implements OnInit {
}
ngOnInit() {
console.log(this.fulltask)
console.log(this.task)
}
async openAddNoteModal(actionName:string) {
@@ -270,7 +269,7 @@ export class DeplomaOptionsPage implements OnInit {
classs = 'modal modal-desktop showAsideOptions'
}
console.log("fulltask options", this.fulltask)
const modal = await this.modalController.create({
component: CreateProcessPage,
componentProps: {
@@ -58,7 +58,7 @@ export class OptsExpedientePage implements OnInit {
}
ngOnInit() {
console.log('SessionStore', SessionStore)
}
async openNewGroupPage(){
@@ -101,7 +101,6 @@ export class EditActionPage implements OnInit {
DateEnd: this.folder.DateEnd,
ActionType: this.folder.ActionType,
}
// dconsole.log(this.folder.DateEnd);
const loader = this.toastService.loading()
+2
View File
@@ -3,6 +3,7 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { IonicImageLoaderModule } from 'ionic-image-loader-v5';
import { TaskDetailsPage } from './gabinete-digital/generic/task-details/task-details.page';
// import { HeaderPage } from './header/header.page';
// import { HeaderPrPage } from './header-pr/header-pr.page';
// import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page';
@@ -30,6 +31,7 @@ import { IonicImageLoaderModule } from 'ionic-image-loader-v5';
// EmptyChatPage,
// BtnCriarPage,
// BtnAdicionarPage,
TaskDetailsPage
],
entryComponents:[],
declarations: [