feature/gabinete-search

This commit is contained in:
Peter Maquiran
2023-05-26 14:23:37 +01:00
parent 0b3ffa3ea7
commit b2da8463b4
56 changed files with 98 additions and 186 deletions
+1 -2
View File
@@ -53,7 +53,6 @@ export class AppComponent {
window.screen.orientation.unlock(); window.screen.orientation.unlock();
} else if( this.platform.is("mobile")) { } else if( this.platform.is("mobile")) {
window.screen.orientation.lock('portrait'); window.screen.orientation.lock('portrait');
// console.log('Orientation locked')
} }
if (this.platform.is('desktop') || this.platform.is('mobileweb')) { if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
@@ -62,7 +61,7 @@ export class AppComponent {
try { try {
this.sqliteservice.databaseConn(); this.sqliteservice.databaseConn();
} catch (error) { } catch (error) {
console.error("Error creating local database: ", error)
} }
} }
-15
View File
@@ -23,18 +23,13 @@ export class AuthGuard implements CanActivate {
route: ActivatedRouteSnapshot, route: ActivatedRouteSnapshot,
state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree { state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
console.log('hire auth!', state.url)
// if user not active or no session // if user not active or no session
if(!SessionStore.user.Inactivity || !SessionStore.exist) { if(!SessionStore.user.Inactivity || !SessionStore.exist) {
// console.log('no session', !SessionStore.user.Inactivity, !SessionStore.exist)
// console.log(SessionStore.user)
if(SessionStore.user.LoginPreference == 'Pin') { if(SessionStore.user.LoginPreference == 'Pin') {
this.router.navigate(['/pin']); this.router.navigate(['/pin']);
} else { } else {
this.router.navigate(['/']); this.router.navigate(['/']);
// console.log('goto login page')
} }
return false return false
@@ -48,7 +43,6 @@ export class AuthGuard implements CanActivate {
return true; return true;
} else { } else {
this.router.navigate(['/login']); this.router.navigate(['/login']);
console.log('£1')
return false; return false;
} }
@@ -59,7 +53,6 @@ export class AuthGuard implements CanActivate {
return true; return true;
} else { } else {
this.router.navigate(['/login']); this.router.navigate(['/login']);
console.log('£2')
return false; return false;
} }
} }
@@ -67,8 +60,6 @@ export class AuthGuard implements CanActivate {
if(this.p.userPermission(this.p.permissionList.Chat.access)) { if(this.p.userPermission(this.p.permissionList.Chat.access)) {
return true; return true;
} else { } else {
console.log("no access to chat")
console.log('£3')
this.router.navigate(['/login']); this.router.navigate(['/login']);
return false; return false;
} }
@@ -76,7 +67,6 @@ export class AuthGuard implements CanActivate {
if(this.p.userPermission(this.p.permissionList.Actions.access)) { if(this.p.userPermission(this.p.permissionList.Actions.access)) {
return true return true
} else { } else {
console.log('£4')
this.router.navigate(['/login']); this.router.navigate(['/login']);
return false return false
} }
@@ -84,18 +74,13 @@ export class AuthGuard implements CanActivate {
if(SessionStore.user.OwnerCalendars.length >= 1 || this.p.userPermission([this.p.permissionList.Gabinete.access])) { if(SessionStore.user.OwnerCalendars.length >= 1 || this.p.userPermission([this.p.permissionList.Gabinete.access])) {
return true return true
} else { } else {
console.log('£5')
this.router.navigate(['/login']); this.router.navigate(['/login']);
return false return false
} }
} else if (pathname == '/') { } else if (pathname == '/') {
console.log('£6')
this.router.navigate(['/login']); this.router.navigate(['/login']);
console.log('no path')
return false return false
} else { } else {
console.log('£7')
console.log('pathname not match')
this.router.navigate(['/login']); this.router.navigate(['/login']);
return false return false
} }
-3
View File
@@ -21,9 +21,6 @@ export class LoginGuard implements CanActivate {
route: ActivatedRouteSnapshot, route: ActivatedRouteSnapshot,
state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree { state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
console.log('hire login!', state.url, SessionStore.user)
if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) { if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) {
// enter app // enter app
this.FirstEnterService.enter() this.FirstEnterService.enter()
+5 -6
View File
@@ -170,7 +170,6 @@ export class HomePage implements OnInit {
}) })
window.addEventListener('offline', () => { window.addEventListener('offline', () => {
// console.log('Became offline')
this.backgroundservice.offline() this.backgroundservice.offline()
}); });
@@ -245,11 +244,11 @@ export class HomePage implements OnInit {
updateList() { updateList() {
document.addEventListener('pause', function () { document.addEventListener('pause', function () {
// console.log('App going to background');
}); });
document.addEventListener('resume', function () { document.addEventListener('resume', function () {
// console.log('App coming to foreground');
}); });
} }
@@ -265,7 +264,7 @@ export class HomePage implements OnInit {
}); });
}) })
} catch (error) { } catch (error) {
console.log(error)
} }
try { try {
@@ -277,7 +276,7 @@ export class HomePage implements OnInit {
}); });
}) })
} catch (error) { } catch (error) {
console.log(error)
} }
try { try {
@@ -289,7 +288,7 @@ export class HomePage implements OnInit {
}); });
}) })
} catch (error) { } catch (error) {
console.log(error)
} }
this.sqliteservice.deleteAllTables(); this.sqliteservice.deleteAllTables();
@@ -104,7 +104,7 @@ export class CreateProcessPage implements OnInit {
this.loggeduser = SessionStore.user; this.loggeduser = SessionStore.user;
this.task = this.navParams.get('task'); this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask'); this.fulltask = this.navParams.get('fulltask');
console.log(this.task)
if (this.task.SerialNumber) { if (this.task.SerialNumber) {
this.task.serialNumber = this.task.SerialNumber this.task.serialNumber = this.task.SerialNumber
} }
@@ -157,7 +157,7 @@ export class CreateProcessPage implements OnInit {
/* By Default TypeDeadline should be 'Normal' */ /* By Default TypeDeadline should be 'Normal' */
this.postData.Priority = '99999861'; this.postData.Priority = '99999861';
/* Initialize 'Subject' with the title of the expedient */ /* Initialize 'Subject' with the title of the expedient */
console.log('Subject', this.fulltask)
this.postData.DispatchFolder.Subject = this.task?.workflowInstanceDataFields?.Subject || this.fulltask?.workflowInstanceDataFields?.Subject; this.postData.DispatchFolder.Subject = this.task?.workflowInstanceDataFields?.Subject || this.fulltask?.workflowInstanceDataFields?.Subject;
this.profile = this.navParams.get('profile'); this.profile = this.navParams.get('profile');
} }
@@ -283,8 +283,6 @@ export class CreateProcessPage implements OnInit {
this.dispatchFolder.SubjectTypes = this.selectedTypes; this.dispatchFolder.SubjectTypes = this.selectedTypes;
const loader = this.toastService.loading() const loader = this.toastService.loading()
console.log(this.fulltask, 'fulltask')
if (this.fulltask.activityInstanceName == "Assinar Diploma") { if (this.fulltask.activityInstanceName == "Assinar Diploma") {
this.postData = { this.postData = {
DistributionType: "Paralelo", DistributionType: "Paralelo",
@@ -308,7 +306,7 @@ export class CreateProcessPage implements OnInit {
} }
} else { } else {
console.log('1')
if (this.loggeduser.Profile != 'PR') { if (this.loggeduser.Profile != 'PR') {
switch (this.taskType) { switch (this.taskType) {
case '0': // Despacho case '0': // Despacho
@@ -396,7 +394,7 @@ export class CreateProcessPage implements OnInit {
} else if (this.loggeduser.Profile == 'PR') { } else if (this.loggeduser.Profile == 'PR') {
switch (this.taskType) { switch (this.taskType) {
case '0': // Despacho PR case '0': // Despacho PR
console.log('12')
this.postData = { this.postData = {
DistributionType: "Paralelo", DistributionType: "Paralelo",
CountryCode: 'AO', CountryCode: 'AO',
@@ -428,7 +426,6 @@ export class CreateProcessPage implements OnInit {
break; break;
case '1': // Pedido de Parecer case '1': // Pedido de Parecer
console.log('13')
this.postData = { this.postData = {
DistributionType: "Paralelo", DistributionType: "Paralelo",
CountryCode: 'AO', CountryCode: 'AO',
@@ -460,7 +457,7 @@ export class CreateProcessPage implements OnInit {
break; break;
case '2': // Pedido de Deferimento case '2': // Pedido de Deferimento
console.log('123')
this.postData = { this.postData = {
DistributionType: "Paralelo", DistributionType: "Paralelo",
CountryCode: 'AO', CountryCode: 'AO',
@@ -558,7 +555,7 @@ export class CreateProcessPage implements OnInit {
} }
} else { } else {
// console.log('unexpected error')
} }
@@ -721,7 +718,7 @@ export class CreateProcessPage implements OnInit {
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then((res) => { modal.onDidDismiss().then((res) => {
/* console.log('!refresh list'); */
}); });
} }
@@ -77,7 +77,7 @@ export class DocumentDetailPage implements OnInit {
} else if (document.ApplicationID == 8 || document.ApplicationId == 8) { } else if (document.ApplicationID == 8 || document.ApplicationId == 8) {
} else { } else {
// console.log('unexpected id')
} }
@@ -298,7 +298,6 @@ export class DocumentSetUpMeetingPage implements OnInit {
this.httpErroHandle.httpsSucessMessagge('new event'); this.httpErroHandle.httpsSucessMessagge('new event');
this.modalController.dismiss() this.modalController.dismiss()
}, (error) => { }, (error) => {
console.log('error', error)
laoder.remove(); laoder.remove();
this.httpErroHandle.httpStatusHandle(error) this.httpErroHandle.httpStatusHandle(error)
}, ()=>{ }, ()=>{
@@ -44,8 +44,6 @@ ngOnInit() {
this.image = this.navParams.get('image') this.image = this.navParams.get('image')
this.name = this.navParams.get('username') this.name = this.navParams.get('username')
this._updatedAt = this.navParams.get('_updatedAt') this._updatedAt = this.navParams.get('_updatedAt')
// console.log(this.image)
// this.image = this.myimage
} }
ionViewDidEnter(){ ionViewDidEnter(){
+3 -7
View File
@@ -57,7 +57,6 @@ export class ProfilePage implements OnInit {
if(event.notification == "recive") { if(event.notification == "recive") {
this.getNotificationData(); this.getNotificationData();
} }
console.log(event)
}); });
setTimeout(() => { setTimeout(() => {
@@ -150,7 +149,6 @@ export class ProfilePage implements OnInit {
notificatinsRoutes = (index, Service, Object, IdObject, FolderId) => { notificatinsRoutes = (index, Service, Object, IdObject, FolderId) => {
// console.log(index, Service, Object, IdObject, FolderId)
if (Service === "agenda" && IdObject.length > 10) { if (Service === "agenda" && IdObject.length > 10) {
this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda'])); this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda']));
@@ -210,13 +208,11 @@ export class ProfilePage implements OnInit {
deleteNotification(index) { deleteNotification(index) {
this.notificationdata = this.notificationdata.filter(item => item.index != index); this.notificationdata = this.notificationdata.filter(item => item.index != index);
console.log(this.notificationdata)
console.log(this.notificationdata)
this.storageservice.store("Notifications", this.notificationdata).then((store) => { this.storageservice.store("Notifications", this.notificationdata).then((store) => {
console.log(store)
this.storageservice.get("Notifications").then((value) => { this.storageservice.get("Notifications").then((value) => {
console.log(value)
}).catch((error) => { }).catch((error) => {
console.error('storage delete notification: ',error) console.error('storage delete notification: ',error)
}) })
@@ -239,7 +235,7 @@ export class ProfilePage implements OnInit {
if(this.logoutOut == false || pathBeforeGoOut == window.location.pathname) { if(this.logoutOut == false || pathBeforeGoOut == window.location.pathname) {
window.location.pathname = '/auth' window.location.pathname = '/auth'
} else { } else {
console.log('refresh')
} }
}, 500) }, 500)
} }
@@ -82,7 +82,6 @@ export class SetRoomOwnerPage implements OnInit {
} }
this.chatService.addGroupOwner(body).subscribe((res)=>{ this.chatService.addGroupOwner(body).subscribe((res)=>{
console.log(res);
this.close(); this.close();
this.toastService._successMessage('Operação realizada com sucesso'); this.toastService._successMessage('Operação realizada com sucesso');
}, (e) => { }, (e) => {
@@ -104,7 +104,7 @@ export class ViewDocumentPage implements OnInit {
} else if(res.data.component == 'openExpedientActionsModal') { } else if(res.data.component == 'openExpedientActionsModal') {
this.openExpedientActionsModal(res.data.taskAction) this.openExpedientActionsModal(res.data.taskAction)
} else { } else {
// console.log('not found')
} }
} }
+2 -2
View File
@@ -152,7 +152,7 @@ export class ViewEventPage implements OnInit {
} else { } else {
if(this.CalendarId) { if(this.CalendarId) {
console.log('calendar id')
this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => { this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => {
this.loadedEvent = res; this.loadedEvent = res;
this.addEventToDb(res); this.addEventToDb(res);
@@ -171,7 +171,7 @@ export class ViewEventPage implements OnInit {
loader.remove() loader.remove()
}); });
} else { } else {
console.log('no calendar id')
} }
} }
+1 -1
View File
@@ -37,7 +37,7 @@ export class ViewMediaPage implements OnInit {
} }
ngOnInit() { ngOnInit() {
// console.log(this.image)
this.base64Sanitize = this.sanitizer.bypassSecurityTrustResourceUrl(this.image); this.base64Sanitize = this.sanitizer.bypassSecurityTrustResourceUrl(this.image);
if (this.platform.is('desktop')) { if (this.platform.is('desktop')) {
+1 -12
View File
@@ -238,14 +238,6 @@ export class AgendaPage implements OnInit {
this.tigerUpdate() this.tigerUpdate()
window['year'] = this.changeYear
console.log('SessionStore.user', SessionStore.user)
setTimeout(() =>{
console.log(this.TimelineMDList);
}, 500)
} }
@@ -541,7 +533,7 @@ export class AgendaPage implements OnInit {
this.loadRangeEventRun(startTime, endTime) this.loadRangeEventRun(startTime, endTime)
} else { } else {
// console.log('dont call')
} }
} }
@@ -587,9 +579,6 @@ export class AgendaPage implements OnInit {
label = "pr" label = "pr"
} }
console.log('label', label)
// this.addEventToDB(response, label);
let eventsList = response; let eventsList = response;
this.CalendarStore.removeRangeForCalendar(startTime, endTime, label, selectedCalendar.CalendarId) this.CalendarStore.removeRangeForCalendar(startTime, endTime, label, selectedCalendar.CalendarId)
this.CalendarStore.pushEvent(eventsList, label); this.CalendarStore.pushEvent(eventsList, label);
@@ -38,7 +38,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div> </div>
<div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid && validateFrom "> <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)]="postEvent.Location"></ion-input> <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
</div> </div>
</div> </div>
</div> </div>
@@ -54,7 +54,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div> </div>
<div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid && validateFrom "> <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)]="postEvent.Location"></ion-input> <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
</div> </div>
</div> </div>
</div> </div>
+9 -5
View File
@@ -86,11 +86,7 @@ export class EventsPage implements OnInit {
(async () =>{ this.loadAllTask();
this.loadingAllTask = true
await this.TaskService.LoadTask()
this.loadingAllTask = false
})()
window['zipPhoneCallback'] = function (zipphone) { window['zipPhoneCallback'] = function (zipphone) {
@@ -135,6 +131,12 @@ export class EventsPage implements OnInit {
} }
async loadAllTask() {
this.loadingAllTask = true
await this.TaskService.LoadTask()
this.loadingAllTask = false
}
hideSearch() { hideSearch() {
if (this.router.url == '/home/events') { if (this.router.url == '/home/events') {
this.hideSearchBtn = true; this.hideSearchBtn = true;
@@ -149,8 +151,10 @@ export class EventsPage implements OnInit {
} catch(error) {} } catch(error) {}
}, 2000); }, 2000);
} }
this.RefreshEvents(); this.RefreshEvents();
this.LoadList(); this.LoadList();
this.loadAllTask();
} }
onSegmentChange() { onSegmentChange() {
@@ -17,7 +17,8 @@ import { TaskDetailsPageModule } from 'src/app/shared/gabinete-digital/generic/t
IonicModule, IonicModule,
DespachoPageRoutingModule, DespachoPageRoutingModule,
TaskDetailsPageModule TaskDetailsPageModule,
SharedModule
], ],
declarations: [ declarations: [
DespachoPage, DespachoPage,
@@ -85,10 +85,10 @@
<ion-list class="width-100 height-100" > <ion-list class="width-100 height-100" >
<div class="overflow-y-auto height-100"> <div class="overflow-y-auto height-100">
<ion-item-sliding> <ion-item-sliding>
<ion-item class="Rectangle cursor-pointer" lines="none" <ion-item class="Rectangle cursor-pointer " lines="none"
*ngFor="let event of eventoaprovacaostore.get(segment)" (click)="goToEventToApproveDetail(event.serialNumber)"> *ngFor="let event of eventoaprovacaostore.get(segment)" (click)="goToEventToApproveDetail(event.serialNumber)">
<div class="content-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100"> <div class="content-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 d-flex overflow-hidden">
<div class="approve-event-time"> <div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p> <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p> <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
@@ -58,7 +58,7 @@ ion-item-sliding{
overflow: auto; overflow: auto;
} }
.content-pr-Pessoal{ .content-pr-Pessoal{
background-color: var(--white); background-color: vfar(--white);
border-radius: 5px; border-radius: 5px;
border-right: 5px solid #958bfc; border-right: 5px solid #958bfc;
border-left: unset !important; border-left: unset !important;
@@ -77,9 +77,7 @@ ion-item-sliding{
overflow: auto; overflow: auto;
} }
.approve-event-time{
float: left;
}
.approve-event-time p{ .approve-event-time p{
width: 33px; width: 33px;
font-family: Roboto; font-family: Roboto;
@@ -94,7 +92,6 @@ ion-item-sliding{
padding: 0; padding: 0;
} }
.approve-event-detail{ .approve-event-detail{
float: left;
margin-left: 10px; margin-left: 10px;
} }
.approve-event-detail p{ .approve-event-detail p{
@@ -136,4 +133,9 @@ ion-item-sliding{
border-radius: 17px; border-radius: 17px;
color: white; color: white;
font-size: 10pt; font-size: 10pt;
}
.overflow-hidden {
overflow: hidden
} }
@@ -61,7 +61,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div> </div>
<div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid && validateFrom "> <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)]="postData.Location"></ion-input> <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="postData.Location"></ion-input>
</div> </div>
</div> </div>
</div> </div>
@@ -221,8 +221,6 @@ export class GabineteDigitalPage implements OnInit {
} }
} }
console.log('order', this.ordinance)
} }
ngOnInit() { ngOnInit() {
@@ -355,7 +353,7 @@ export class GabineteDigitalPage implements OnInit {
else if (activityName == 'Diploma Assinado') { else if (activityName == 'Diploma Assinado') {
this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']); this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
} else { } else {
console.log('no route!')
} }
} }
else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') { else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
-3
View File
@@ -72,7 +72,6 @@ export class AuthService {
this.SetSession(response, user) this.SetSession(response, user)
} }
} catch (error) { } catch (error) {
console.log(error)
this.httpErroHandle.httpStatusHandle(error) this.httpErroHandle.httpStatusHandle(error)
} finally { } finally {
return response return response
@@ -100,8 +99,6 @@ export class AuthService {
session.BasicAuthKey = user.BasicAuthKey session.BasicAuthKey = user.BasicAuthKey
SessionStore.reset(session) SessionStore.reset(session)
// console.log(session)
return true; return true;
} }
+1 -2
View File
@@ -94,7 +94,6 @@ export class ChatService {
} }
getAllUsers() { getAllUsers() {
// console.log(this.options)
return this.http.get(environment.apiChatUrl + 'users.list', this.options); return this.http.get(environment.apiChatUrl + 'users.list', this.options);
} }
getAllConnectedUsers() { getAllConnectedUsers() {
@@ -365,7 +364,7 @@ export class ChatService {
} }
} }
} catch (error) { } catch (error) {
console.log(error)
} }
} }
+2 -6
View File
@@ -334,13 +334,9 @@ export class ChatSystemService {
this.defaultSubtribe(id) this.defaultSubtribe(id)
} }
this.RochetChatConnectorService.streamNotifyLogged().then((subscription => { this.RochetChatConnectorService.streamNotifyLogged().then((subscription => {}))
console.log(subscription)
}))
this.RochetChatConnectorService.subStreamMessageUser().then((subscription => { this.RochetChatConnectorService.subStreamMessageUser().then((subscription => {}))
console.log(subscription)
}))
} }
/** /**
-4
View File
@@ -133,7 +133,6 @@ export class MessageService {
} else if( this.u.username == SessionStore.user.UserName) { } else if( this.u.username == SessionStore.user.UserName) {
this.u.name = SessionStore.user.FullName this.u.name = SessionStore.user.FullName
} else { } else {
// console.log(user.username, SessionStore.user.UserName)
} }
} }
@@ -290,7 +289,6 @@ export class MessageService {
clearTimeout(this.functionTimer); clearTimeout(this.functionTimer);
this.redefinedMessage(ChatMessage) this.redefinedMessage(ChatMessage)
// console.log()
} }
).catch((error) => { ).catch((error) => {
clearTimeout(this.functionTimer); clearTimeout(this.functionTimer);
@@ -369,7 +367,6 @@ export class MessageService {
if(!roomObject.isGroup) { if(!roomObject.isGroup) {
var memeberTosend = this.ChatSystemService.getRoomById(this.rid).membersExcludeMe var memeberTosend = this.ChatSystemService.getRoomById(this.rid).membersExcludeMe
console.log(ChatMessage)
this.notificationService.ChatSendMessageNotification(memeberTosend[0].username,ChatMessage.u.name,ChatMessage.msg,this.rid) this.notificationService.ChatSendMessageNotification(memeberTosend[0].username,ChatMessage.u.name,ChatMessage.msg,this.rid)
} else { } else {
var memeberTosend = this.ChatSystemService.getRoomById(this.rid).membersExcludeMe var memeberTosend = this.ChatSystemService.getRoomById(this.rid).membersExcludeMe
@@ -571,7 +568,6 @@ export class MessageService {
} else { } else {
this.earlySave = true this.earlySave = true
console.log('save change to early')
} }
} }
@@ -38,7 +38,6 @@ export class RochetChatConnectorService {
key:'ping-pong', key:'ping-pong',
funx:(message: any) => { funx:(message: any) => {
if(message.msg == "ping") { if(message.msg == "ping") {
// console.log(message)
this.ws.send({message:{msg:"pong"}, loginRequired: false}) this.ws.send({message:{msg:"pong"}, loginRequired: false})
} }
} }
@@ -799,8 +798,6 @@ export class RochetChatConnectorService {
this.wsMsgQueue[requestId] = {message, requestId, loginRequired} this.wsMsgQueue[requestId] = {message, requestId, loginRequired}
} else { } else {
let messageStr = JSON.stringify(message) let messageStr = JSON.stringify(message)
//
// console.log(messageStr)
this.socket.send(messageStr) this.socket.send(messageStr)
} }
return requestId return requestId
@@ -808,8 +805,6 @@ export class RochetChatConnectorService {
onmessage: async (event: any)=> { onmessage: async (event: any)=> {
const data = JSON.parse(event.data) const data = JSON.parse(event.data)
// console.log('data', data)
for (const [key, value] of Object.entries(this.wsCallbacks)) { for (const [key, value] of Object.entries(this.wsCallbacks)) {
if(value.type== 'Onmessage') { if(value.type== 'Onmessage') {
+4 -5
View File
@@ -722,7 +722,7 @@ export class RoomService {
this.registerSendMessage(offlineMessage) this.registerSendMessage(offlineMessage)
offlineMessage?.decryptMessage() offlineMessage?.decryptMessage()
offlineMessage.send() offlineMessage.send()
// console.log('send offline', ChatMessage)
} }
@@ -876,20 +876,19 @@ export class RoomService {
private async findMessageInDBByData({localReference, _id}) { private async findMessageInDBByData({localReference, _id}) {
// console.log('look')
const a = await MessageModel.filter({localReference: localReference}) const a = await MessageModel.filter({localReference: localReference})
if(a.length >= 1) { if(a.length >= 1) {
// console.log('localReference', localReference)
return true return true
} }
const c = await MessageModel.filter({_id: _id}) const c = await MessageModel.filter({_id: _id})
if(c.length >= 1) { if(c.length >= 1) {
// console.log('_id', _id)
return true return true
} }
// console.log('look not found')
return false return false
} }
@@ -26,9 +26,9 @@ export class NativeNotificationService {
} }
foregroundNotification() { foregroundNotification() {
console.log('Local notification foreground')
LocalNotifications.addListener('localNotificationReceived', (notification) => { LocalNotifications.addListener('localNotificationReceived', (notification) => {
console.log('Local Notification',notification)
}) })
} }
+1 -1
View File
@@ -24,7 +24,7 @@ export class NetworkServiceService {
}); });
this.onNetworkChange().subscribe((status) => { this.onNetworkChange().subscribe((status) => {
console.log(status)
}) })
} }
-1
View File
@@ -10,7 +10,6 @@ self.addEventListener('activate', function(event) {
self.addEventListener('notificationclick', function(event) { self.addEventListener('notificationclick', function(event) {
// Close the notification when it is clicked // Close the notification when it is clicked
event.notification.close(); event.notification.close();
// console.log(event)
}); });
+7 -14
View File
@@ -119,9 +119,9 @@ export class NotificationsService {
this.http.post<Tokenn>(`${geturl}`, body, { headers }).subscribe(data => { this.http.post<Tokenn>(`${geturl}`, body, { headers }).subscribe(data => {
this.active = true this.active = true
console.log(data)
}, (error) => { }, (error) => {
console.log(error)
}) })
} }
); );
@@ -146,13 +146,11 @@ export class NotificationsService {
return false return false
} }
console.log('foregrund');
PushNotifications.addListener('pushNotificationReceived', PushNotifications.addListener('pushNotificationReceived',
(notification: PushNotificationSchema) => { (notification: PushNotificationSchema) => {
this.active = true this.active = true
console.log(notification)
//this.DataArray.push(notification)
//console.log(this.DataArray)
this.storageService.get("Notifications").then((store) => { this.storageService.get("Notifications").then((store) => {
store.push(notification) store.push(notification)
@@ -177,11 +175,9 @@ export class NotificationsService {
return false return false
} }
console.log('fbackgrund');
PushNotifications.addListener('pushNotificationActionPerformed', PushNotifications.addListener('pushNotificationActionPerformed',
(notification: ActionPerformed) => { (notification: ActionPerformed) => {
this.active = true this.active = true
console.log(notification)
/* this.DataArray.push(notification.notification) /* this.DataArray.push(notification.notification)
this.storageService.store("Notifications", this.DataArray) this.storageService.store("Notifications", this.DataArray)
@@ -203,12 +199,10 @@ export class NotificationsService {
"IdObject": roomId "IdObject": roomId
} }
let id = 437 let id = 437
console.log(userID, title, bodymsg, roomId)
this.http.post<Tokenn>(geturl + `?username=${userID}&title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => { this.http.post<Tokenn>(geturl + `?username=${userID}&title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
this.active = true this.active = true
console.log(data)
}, (error) => { }, (error) => {
console.log(error)
}) })
} }
@@ -223,12 +217,11 @@ export class NotificationsService {
"IdObject": roomId "IdObject": roomId
} }
} }
console.log(usersID, title, bodymsg, roomId)
this.http.post<Tokenn>(geturl + `?title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => { this.http.post<Tokenn>(geturl + `?title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
this.active = true this.active = true
console.log(data)
}, (error) => { }, (error) => {
console.log(error)
}) })
} }
-2
View File
@@ -77,8 +77,6 @@ export class ProcessesService {
params = params.set("pageSize", 500); params = params.set("pageSize", 500);
params = params.set("userid", userid); params = params.set("userid", userid);
// console.log(userid, caller)
let options = { let options = {
headers: this.headers, headers: this.headers,
params: params params: params
@@ -76,7 +76,6 @@ export class ApproveEventPage implements OnInit {
this.processes.GetTask(this.serialNumber).subscribe(res => { this.processes.GetTask(this.serialNumber).subscribe(res => {
this.loadedEvent = res; this.loadedEvent = res;
// console.log(this.loadedEvent);
this.today = new Date(res.workflowInstanceDataFields.StartDate); this.today = new Date(res.workflowInstanceDataFields.StartDate);
// //
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); 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> <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div> </div>
<div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid && validateFrom "> <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>
</div> </div>
@@ -34,7 +34,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div> </div>
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Location')?.invalid && validateFrom "> <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>
</div> </div>
<!-- Error messages --> <!-- Error messages -->
@@ -258,7 +258,6 @@ export class EditEventPage implements OnInit {
} }
calculetedLastOccurrence(type:number){ calculetedLastOccurrence(type:number){
// console.log(type);
var valor; var valor;
var opcao: boolean; var opcao: boolean;
if (type == 0) { if (type == 0) {
@@ -66,7 +66,7 @@
</div> </div>
<div class="ion-input-class flex-grow-1 width-100" [class.input-error]="Form?.get('Location')?.invalid && validateFrom " > <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>
</div> </div>
@@ -435,7 +435,7 @@ export class NewEventPage implements OnInit {
} }
calculetedLastOccurrence(type:number){ calculetedLastOccurrence(type:number){
// console.log(type);
var valor; var valor;
var opcao: boolean; var opcao: boolean;
if (type == 0) { if (type == 0) {
@@ -542,7 +542,6 @@ export class NewEventPage implements OnInit {
}, },
error => { error => {
console.log(error, 'error')
loader.remove() loader.remove()
this.showLoader = false this.showLoader = false
this.hhtpErrorHandle.httpStatusHandle(error) this.hhtpErrorHandle.httpStatusHandle(error)
@@ -670,15 +669,15 @@ export class NewEventPage implements OnInit {
selectedCalendarId () { selectedCalendarId () {
if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postEvent.CalendarName == 'Oficial') { if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postEvent.CalendarName == 'Oficial') {
console.log('1')
return this.eventService.calendarNamesType[this.CalendarName]['OficialId'] return this.eventService.calendarNamesType[this.CalendarName]['OficialId']
} else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postEvent.CalendarName == 'Pessoal') { } else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postEvent.CalendarName == 'Pessoal') {
console.log('2')
return this.eventService.calendarNamesType[this.CalendarName]['PessoalId'] return this.eventService.calendarNamesType[this.CalendarName]['PessoalId']
} else { } else {
console.log('1:1',this.eventService.calendarNamesType,'2', this.CalendarName)
return '11:11' return '11:11'
} }
} }
@@ -154,7 +154,6 @@ export class ViewEventPage implements OnInit {
{ {
text: 'Não', text: 'Não',
handler: () => { handler: () => {
console.log('Let me think');
} }
}, },
{ {
@@ -134,7 +134,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
} }
ngOnInit() { ngOnInit() {
// console.log(this.roomId)
this.loggedUser = this.loggedUserChat; this.loggedUser = this.loggedUserChat;
//setTimeout(() => { //setTimeout(() => {
this.getRoomInfo() this.getRoomInfo()
@@ -375,7 +374,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
} }
let room = await this.chatService.getRoomInfo(this.roomId).toPromise(); let room = await this.chatService.getRoomInfo(this.roomId).toPromise();
// console.log('ROOM',room)
this.room = room['room']; this.room = room['room'];
if (this.room.name) { if (this.room.name) {
try { try {
@@ -528,7 +526,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then(res => { modal.onDidDismiss().then(res => {
console.log(res)
if (res.data == 'leave') { if (res.data == 'leave') {
this.getRoomInfo(); this.getRoomInfo();
this.closeAllDesktopComponents.emit(); this.closeAllDesktopComponents.emit();
@@ -556,8 +554,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
try { try {
this.roomName = res.data.name.split('-').join(' '); this.roomName = res.data.name.split('-').join(' ');
} catch (error) { } catch (error) {
console.log(error);
console.log(res.data)
this.roomName = res.data.name 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')) { if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
console.log(msg)
if (msg.file.type == "application/img") { if (msg.file.type == "application/img") {
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: ViewMediaPage, component: ViewMediaPage,
@@ -385,8 +385,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
} }
async goToEvent(event: any) { async goToEvent(event: any) {
console.log(event.id)
console.log(event.calendarId)
let classs; let classs;
if (window.innerWidth < 701) { if (window.innerWidth < 701) {
classs = 'modal modal-desktop' 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) const blob = this.dataURItoBlob('data:image/jpeg;base64,' + file.base64String)
console.log('data:image/jpeg;base64,' + file.base64String)
const formData = new FormData(); const formData = new FormData();
formData.append("blobFile", blob); formData.append("blobFile", blob);
@@ -1003,7 +1000,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
} }
downloadFileFromBrowser(fileName: string, data: any): void { downloadFileFromBrowser(fileName: string, data: any): void {
console.log(fileName + data)
const linkSource = data; const linkSource = data;
const downloadLink = document.createElement("a"); const downloadLink = document.createElement("a");
downloadLink.href = linkSource; downloadLink.href = linkSource;
@@ -1063,9 +1059,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
if (this.platform.is('desktop') || this.platform.is('mobileweb')) { if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
console.log('hello')
console.log(msg)
if (msg.file.type == "application/img") { if (msg.file.type == "application/img") {
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: ViewMediaPage, component: ViewMediaPage,
@@ -1100,12 +1093,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.audioPlay = new Howl({ this.audioPlay = new Howl({
src: [track.changingThisBreaksApplicationSecurity], src: [track.changingThisBreaksApplicationSecurity],
onplay: () => { onplay: () => {
console.log('audio play')
this.isPlaying = true; this.isPlaying = true;
this.updateProgress() this.updateProgress()
}, },
onend: () => { onend: () => {
console.log('audio end')
this.isPlaying = false; this.isPlaying = false;
clearTimeout(this.audioTimer) clearTimeout(this.audioTimer)
this.audioProgress = 0 this.audioProgress = 0
@@ -1133,16 +1124,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
updateProgress() { updateProgress() {
let seek = this.audioPlay.seek(); let seek = this.audioPlay.seek();
this.audioProgress = (seek / this.audioPlay.duration()) * 100 || 0; this.audioProgress = (seek / this.audioPlay.duration()) * 100 || 0;
console.log(this.audioDuration)
this.audioTimer = setTimeout(() => { this.audioTimer = setTimeout(() => {
this.updateProgress() this.updateProgress()
}, 1000) }, 1000)
} }
async getRoomInfo() { async getRoomInfo() {
// this.ChatSystemService.getGroupRoom(this.roomId).loadHistory({});
let room = await this.chatService.getRoomInfo(this.roomId).toPromise(); let room = await this.chatService.getRoomInfo(this.roomId).toPromise();
// console.log('ROOM',room)
this.room = room['room']; this.room = room['room'];
if (this.room.name) { if (this.room.name) {
try { try {
@@ -30,7 +30,7 @@ export class FingerprintPage implements OnInit {
// localizedReason: 'Please authenticate' //Only for iOS // localizedReason: 'Please authenticate' //Only for iOS
// }) // })
// .then((FingerPrintHash: any) => { // .then((FingerPrintHash: any) => {
// console.log(FingerPrintHash)
// const storedFinderPrint = localStorage.getItem('FingerPrintHash') // const storedFinderPrint = localStorage.getItem('FingerPrintHash')
// if(FingerPrintHash == storedFinderPrint) { // if(FingerPrintHash == storedFinderPrint) {
@@ -39,12 +39,11 @@ export class FingerprintPage implements OnInit {
// }) // })
// .catch((error: any) => { // .catch((error: any) => {
// console.log(error)
// }); // });
} }
close() { close() {
/* console.log(this.isEventEdited); */
this.modalController.dismiss(); this.modalController.dismiss();
} }
@@ -49,7 +49,6 @@ export class AllProcessesPage implements OnInit {
setTimeout(() => { setTimeout(() => {
// console.log('this.TaskService.AllProcess', this.TaskService.AllProcess)
// this.miniSearch.addAll(this.TaskService.AllProcess) // this.miniSearch.addAll(this.TaskService.AllProcess)
// window['miniSearch'] = this.miniSearch // window['miniSearch'] = this.miniSearch
@@ -26,7 +26,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div> </div>
<div class="ion-input-class"> <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>
</div> </div>
<!-- Error messages --> <!-- Error messages -->
@@ -179,12 +179,10 @@ export class EventsToApprovePage implements OnInit {
getFromDB() { getFromDB() {
this.storage.get('event-to-aproveMD').then((events = []) => { this.storage.get('event-to-aproveMD').then((events = []) => {
this.eventsMDGPRList = events this.eventsMDGPRList = events
// console.log('DB',this.eventsMDGPRList)
}) })
this.storage.get('event-to-aprovePR').then((events) => { this.storage.get('event-to-aprovePR').then((events) => {
this.eventsPRList = events this.eventsPRList = events
// console.log('DB',this.eventsPRList)
}) })
} }
@@ -45,7 +45,7 @@ export class ExpedientsPage implements OnInit {
if(event.expedienteDetail == "update") { if(event.expedienteDetail == "update") {
this.LoadList(); this.LoadList();
} }
console.log(event)
}) })
} }
@@ -14,11 +14,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="upper-content"> <div class="upper-content" >
<div class="content-details"> <div class="content-details">
<ion-label> <ion-label>
<p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p> <p><span class="date">{{customDate}}</span></p>
<p><span class="color-red">{{ fulltask.workflowInstanceDataFields.DeadlineType }}</span></p> </ion-label>
<ion-label>
<p><span class="color-red">{{ task.DeadlineType }}</span></p>
</ion-label>
<ion-label>
<p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
</ion-label> </ion-label>
</div> </div>
</div> </div>
@@ -26,7 +31,7 @@
</ion-header> </ion-header>
<ion-content> <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"> <div class="middle-content">
<h5 *ngIf="intervenientes">Intervenientes</h5> <h5 *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding"> <ion-item class="ion-no-margin ion-no-padding">
@@ -54,7 +54,6 @@ ion-button{
.upper-content{ .upper-content{
font-family: Roboto; font-family: Roboto;
margin-top: 15px;
margin-left: 41px; margin-left: 41px;
font-size: 18px; font-size: 18px;
-1
View File
@@ -62,7 +62,6 @@ export class HeaderPage implements OnInit {
if(event.notification == "recive") { if(event.notification == "recive") {
this.notificationLengthData() this.notificationLengthData()
} }
console.log(event)
}); });
@@ -42,8 +42,7 @@ export class DeplomaOptionsPage implements OnInit {
} }
ngOnInit() { ngOnInit() {
console.log(this.fulltask)
console.log(this.task)
} }
async openAddNoteModal(actionName:string) { async openAddNoteModal(actionName:string) {
@@ -270,7 +269,7 @@ export class DeplomaOptionsPage implements OnInit {
classs = 'modal modal-desktop showAsideOptions' classs = 'modal modal-desktop showAsideOptions'
} }
console.log("fulltask options", this.fulltask)
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: CreateProcessPage, component: CreateProcessPage,
componentProps: { componentProps: {
@@ -58,7 +58,7 @@ export class OptsExpedientePage implements OnInit {
} }
ngOnInit() { ngOnInit() {
console.log('SessionStore', SessionStore)
} }
async openNewGroupPage(){ async openNewGroupPage(){
@@ -101,7 +101,6 @@ export class EditActionPage implements OnInit {
DateEnd: this.folder.DateEnd, DateEnd: this.folder.DateEnd,
ActionType: this.folder.ActionType, ActionType: this.folder.ActionType,
} }
// dconsole.log(this.folder.DateEnd);
const loader = this.toastService.loading() const loader = this.toastService.loading()
+2
View File
@@ -3,6 +3,7 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular'; import { IonicModule } from '@ionic/angular';
import { IonicImageLoaderModule } from 'ionic-image-loader-v5'; 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 { HeaderPage } from './header/header.page';
// import { HeaderPrPage } from './header-pr/header-pr.page'; // import { HeaderPrPage } from './header-pr/header-pr.page';
// import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page'; // import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page';
@@ -30,6 +31,7 @@ import { IonicImageLoaderModule } from 'ionic-image-loader-v5';
// EmptyChatPage, // EmptyChatPage,
// BtnCriarPage, // BtnCriarPage,
// BtnAdicionarPage, // BtnAdicionarPage,
TaskDetailsPage
], ],
entryComponents:[], entryComponents:[],
declarations: [ declarations: [
+4 -4
View File
@@ -1327,19 +1327,19 @@ ngx-mat-datetime-content{
@media only screen and (max-width: 767px) { @media only screen and (max-width: 767px) {
.calendar-segment-mdgpr:not(.calendar-segment-pr-force) { .calendar-segment-mdgpr:not(.calendar-segment-pr-force) {
.calendar-pr-event-type-Oficial { .calendar-pr-event-type-Oficial {
border-right: 3px solid transparent !important; // border-right: 3px solid transparent !important;
} }
.calendar-pr-event-type-Pessoal { .calendar-pr-event-type-Pessoal {
border-bottom: 3px solid transparent !important; // border-bottom: 3px solid transparent !important;
} }
} }
.calendar-segment-pr { .calendar-segment-pr {
.calendar-mdgpr-event-type-Pessoal { .calendar-mdgpr-event-type-Pessoal {
border-top: 3px solid transparent !important; // border-top: 3px solid transparent !important;
} }
.calendar-mdgpr-event-type-Oficial { .calendar-mdgpr-event-type-Oficial {
border-left: 3px solid transparent !important; // border-left: 3px solid transparent !important;
} }
} }
} }
+5 -5
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "483ce54ed", "shortSHA": "0b3ffa3ea",
"SHA": "483ce54ed93d5ab3a2355b10e168055c356f2c5f", "SHA": "0b3ffa3ea7e094cc5fa08e542fc0bdc76917ddf1",
"branch": "feature/gabinete-search", "branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu May 25 16:24:18 2023 +0100'", "lastCommitTime": "'Fri May 26 10:08:35 2023 +0100'",
"lastCommitMessage": "fix", "lastCommitMessage": "fix",
"lastCommitNumber": "4942", "lastCommitNumber": "4943",
"change": "", "change": "",
"changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/services/auth.service.ts", "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/app.component.ts\n\tmodified: src/app/guards/auth.guard.ts\n\tmodified: src/app/guards/login.guard.ts\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/modals/document-detail/document-detail.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/preview-camera/preview-camera.page.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/modals/set-room-owner/set-room-owner.page.ts\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/modals/view-media/view-media.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/chat.service.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/rochet-chat-connector.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/native-notification.service.ts\n\tmodified: src/app/services/network-service.service.ts\n\tmodified: src/app/services/notification/sw.js\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/app/shared/fingerprint/fingerprint.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/publication/edit-action/edit-action.page.ts\n\tmodified: src/app/shared/shared.module.ts\n\tmodified: src/global.scss",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }