peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Peter solved bug

Browse Source
This commit is contained in:
Eudes Inácio
2023-06-12 08:24:20 +01:00
parent d011b27493 e2cd5d0d8b
commit e8d0e1f553
20 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/guards/inactivity.guard.ts
+1 -1
View File
@@ -23,7 +23,7 @@ export class InactivityGuard implements CanActivate {
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
console.log('hire inactinity!', state.url)
// console.log('hire inactinity!', state.url)
if ( (this.platform.is('desktop') || this.platform.is('mobileweb')) ) {
src/app/pages/chat/chat.page.ts
+1 -1
View File
@@ -133,7 +133,7 @@ export class ChatPage implements OnInit {
if(event.notification == "recive") {
this.onSegmentChange()
}
console.log(event)
// console.log(event)
});
}
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+2 -2
View File
@@ -123,7 +123,7 @@ export class DespachoPrPage implements OnInit {
this.fulltask = res;
// this.updateProcessOnDB(res);
console.log('this.fulltask', this.fulltask)
// console.log('this.fulltask', this.fulltask)
let thedate = new Date(this.task.CreateDate);
this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]);
@@ -395,7 +395,7 @@ export class DespachoPrPage implements OnInit {
await this.generateDiploma(res.data.note, docs);
}
else if (actionName == 'Concluido') {
console.log('actionName', actionName)
// console.log('actionName', actionName)
await this.concluir(res.data.note, docs);
}
else if (actionName == 'Reexecução') {
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+1 -1
View File
@@ -492,7 +492,7 @@ export class DespachoPage implements OnInit {
await popover.present();
popover.onDidDismiss().then((res)=> {
console.log('res', res.data)
// console.log('res', res.data)
if(res.data == 'back') {
this.goBack();
}
src/app/pages/gabinete-digital/despachos/despachos.page.html
+8 -10
View File
@@ -59,18 +59,16 @@
</div>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<div class="main-content width-100 overflow-y-auto height-100">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<div >
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div class="height-100">
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+9 -16
View File
@@ -19,16 +19,17 @@
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<div class="main-content width-100 overflow-y-auto height-100">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div class="d-flex ion-justify-content-between ion-align-items-center" style="
@@ -136,14 +137,6 @@
<div class="main-content width-100 overflow-y-auto height-100">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<div >
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+1 -1
View File
@@ -384,7 +384,7 @@ export class DiplomaPage implements OnInit {
}
tempMethod(actionname) {
console.log(actionname)
// console.log(actionname)
}
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+2 -2
View File
@@ -112,7 +112,7 @@ export class ApproveEventPage implements OnInit {
this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
} catch(error) {
console.log(this.loadedEvent)
// console.log(this.loadedEvent)
throw(error)
}
@@ -136,7 +136,7 @@ export class ApproveEventPage implements OnInit {
this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
} catch(error) {
console.log(this.loadedEvent)
// console.log(this.loadedEvent)
throw(error)
}
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+2 -2
View File
@@ -147,7 +147,7 @@ export class BookMeetingModalPage implements OnInit {
if(!this.CalendarName) {
if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
this.CalendarName = 'Meu calendario';
console.log(this.eventService.calendarNamesAry)
// console.log(this.eventService.calendarNamesAry)
} else {
this.CalendarName = this.eventService.calendarNamesAry[0]
}
@@ -164,7 +164,7 @@ export class BookMeetingModalPage implements OnInit {
}
ngOnInit() {
console.log('TEsTEROLE',this.eventService.calendarNamesAry)
// console.log('TEsTEROLE',this.eventService.calendarNamesAry)
this.adding = "intervenient";
this.getAttachments();
this.setDefaultTime()
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+1 -1
View File
@@ -95,7 +95,7 @@ export class ExpedienteDetailPage implements OnInit {
public TaskService: TaskService
) {
this.loggeduser = SessionStore.user
console.log('SessionStore', SessionStore)
// console.log('SessionStore', SessionStore)
this.activatedRoute.paramMap.subscribe(params => {
if (params["params"].SerialNumber) {
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+1 -1
View File
@@ -59,7 +59,7 @@ export class ExpedientePage implements OnInit {
if(event.notification == "recive") {
this.refreshing();
}
console.log(event)
// console.log(event)
})
}
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+3 -3
View File
@@ -460,11 +460,11 @@ export class GabineteDigitalPage implements OnInit {
doRefreshAside() {
try {
window['gabinete-aside-refresh']()
} catch (error) {
}
} catch(error) {}
setTimeout(() => {
this.loadAllProcesses();
}, 1000)
src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+10 -9
View File
@@ -76,16 +76,17 @@
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<div class="main-content width-100 overflow-y-auto height-100">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<div class="width-100" [ngSwitch]="segment">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
src/app/pages/publications/publication-detail/publication-detail.page.html
+7 -5
View File
@@ -1,6 +1,12 @@
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="content-container">
<div *ngIf="publication.Title != ''">
<div class="title-content">
@@ -14,11 +20,7 @@
<p class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}</p>
</div>
</div>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="post-item">
<div *ngIf="publication.FileBase64.length > 30" class="post-img">
<img src="{{publication.FileBase64}}" alt="image" tappable (click)="openPreview(publication.FileBase64)">
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+1 -1
View File
@@ -35,7 +35,7 @@ export class PublicationDetailPage implements OnInit {
) {
this.activatedRoute.paramMap.subscribe(params => {
console.log(params["params"])
// console.log(params["params"])
if(params["params"]) {
this.folderId = params["params"].folderId;
this.publicationId = params["params"].publicationId;
src/app/pages/search/search.page.ts
+2 -2
View File
@@ -236,7 +236,7 @@ export class SearchPage implements OnInit {
gridSize: 15
},
);
console.log('set visualy')
// console.log('set visualy')
}, 300)
});
@@ -364,7 +364,7 @@ export class SearchPage implements OnInit {
this.showLoader = false;
// this.searchResult = "Registo não encontrado"
this.httpErrorhandle.httpStatusHandle(error)
console.log(error)
// console.log(error)
});
}
else if ( this.type == "AccoesPresidenciais & ArquivoDespachoElect") {
src/app/services/task.service.ts
+5
View File
@@ -109,6 +109,9 @@ export class TaskService {
}
overdueTask(isoDateString:string) {
if(!isoDateString) {
return false
}
return (new Date()).getTime() > (new Date(isoDateString)).getTime()
}
@@ -132,7 +135,9 @@ export class TaskService {
} else if (attribute == 'Não lidos') {
return !(item.TaskStatus == 'Open' || item.taskStatus == 'Open')
} else if (attribute == 'OverdueTasks') {
return this.overdueTask(item.Deadline || item.deadline)
}
return true
}
src/app/shared/agenda/event-list/event-list.page.ts
+1 -1
View File
@@ -106,7 +106,7 @@ export class EventListPage implements OnInit {
this.eventoaprovacaostore.save(segment, this.eventsList)
} else if(segment) {
console.log('segment', segment)
// console.log('segment', segment)
this.color = 'pr'
let allEvents = await this.processes.eventsToApprove(segment,'agenda desktop').toPromise()
src/environments/suport/oapr.ts
+2 -2
View File
@@ -32,7 +32,7 @@ export const oaprDev: Environment = {
apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
logoLabel: 'Presidente da República',
despachoLabel: 'Presidencial',
despachoLabel2: 'Despachos Presidenciais',
despachoLabel2: 'Despachos Presidênciais',
production: false,
domain: 'oapr.gov.ao',
defaultuser: 'gmanuel@oapr.gov.ao',
@@ -44,6 +44,6 @@ export const oaprDev: Environment = {
agendaVP: 'Agenda do MD',
PR: 'PR',
VP: '',
dispatchPR: 'Despachos Presidenciais',
dispatchPR: 'Despachos Presidênciais',
sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712',
};
version/git-version.ts
+7 -7
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "4f90a6649",
"SHA": "4f90a66493b84e3b8d78ff48c1c305531a9a9db2",
"shortSHA": "d011b2749",
"SHA": "d011b274930a49e44e2694619e5f5383be61ad7b",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Sun Jun 11 20:25:07 2023 +0100'",
"lastCommitMessage": "remove text",
"lastCommitNumber": "5001",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Mon Jun 12 08:20:48 2023 +0100'",
"lastCommitMessage": "Bug on refresh button solved",
"lastCommitNumber": "5002",
"change": "",
"changeStatus": "On branch feature/gabinete-search\nYour branch is behind 'origin/feature/gabinete-search' by 4 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/environments/suport/oapr.ts",
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 1 and 4 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/guards/inactivity.guard.ts\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/pages/publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/environments/suport/oapr.ts",
"changeAuthor": "eudes.inacio"
}