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

icons changes

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-30 17:53:02 +01:00
parent f472d5ac0b
commit 64e463ab6f
7 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/task.service.ts
+1 -1
View File
@@ -318,7 +318,7 @@ export class TaskService {
for(let calendar of this.eventService.calendarNamesAry) {
if(calendar == 'Meu calendario') {
// color
let genericEvents = await this.processesbackend.GetTasksList('Agendar Evento', false).toPromise();
let genericEvents = await this.processesbackend.eventsToApprove(SessionStore.user.UserId, false).toPromise();
let eventsList
try {
eventsList = genericEvents
src/app/shared/agenda/event-list/event-list.page.ts
+6 -1
View File
@@ -106,7 +106,12 @@ export class EventListPage implements OnInit {
if(this.segment == 'Meu calendario') {
// color
this.color = 'mdgpr'
if(SessionStore.user.Profile == 'PR') {
this.color = 'pr'
} else {
this.color = 'mdgpr'
}
let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise()
try {
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+4 -1
View File
@@ -106,7 +106,7 @@
>
<div class="expediente" *ngIf="TaskService.filter(event, filterName)">
<!-- (click)="openApproveModal(event)" -->
<div class="event-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 d-flex">
<div class="event-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 d-flex flex-wrap">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
@@ -120,6 +120,9 @@
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(event.deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(event.taskReceiveDate)">Nova</span>
</div>
<div *ngIf="event.activityInstanceName" class="width-100 ml-40">
<div class="label-event-type font-13-rem"> {{ event.activityInstanceName }} </div>
</div>
</div>
</div>
</div>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+12
View File
@@ -258,3 +258,15 @@
width: 20px;
}
}
.label-event-type {
padding: 1px 7px;
display: inline-block;
background: #ffb703;
border-radius: 17px;
color: black;
font-size: rem(13);
}
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+7 -4
View File
@@ -176,14 +176,17 @@ export class EventsToApprovePage implements OnInit {
this.showLoader = true;
const segment = this.segment
if(SessionStore.user.Profile == 'PR') {
return false
}
if(this.segment == 'Meu calendario') {
// color
this.color = 'mdgpr'
if(SessionStore.user.Profile == 'PR') {
this.color = 'pr'
} else {
this.color = 'mdgpr'
}
let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise()
try {
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "0379b722c",
"SHA": "0379b722cf410a9a53b892b968d6ef44a0dafedf",
"shortSHA": "f472d5ac0",
"SHA": "f472d5ac0b3819bb8239a0b3512a53eff32df19b",
"branch": "developer-prod",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Wed Aug 30 17:11:31 2023 +0100'",
"lastCommitMessage": "change icons",
"lastCommitNumber": "5239",
"lastCommitTime": "'Wed Aug 30 17:14:59 2023 +0100'",
"lastCommitMessage": "merge",
"lastCommitNumber": "5244",
"change": "",
"changeStatus": "On branch developer-prod\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/delegar/delegar.page.html\n\tmodified: src/app/modals/document-detail/document-detail.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/agenda.page.html\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/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/events/edit-event/edit-event.page.html\n\tmodified: src/app/pages/events/event-detail-modal/event-detail-modal.page.html\n\tmodified: src/app/pages/events/event-detail/event-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/services/events/edit-event/edit-event.page.html\n\tmodified: src/app/services/events/event-detail-modal/event-detail-modal.page.html\n\tmodified: src/app/services/events/event-detail/event-detail.page.html\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html\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/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified: src/app/shared/header/header.page.ts",
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: workspace.code-workspace",
"changeAuthor": "peter.maquiran"
}
workspace.code-workspace
-3
View File
@@ -2,9 +2,6 @@
"folders": [
{
"path": "."
},
{
"path": "../srccccccccccccc/src"
}
],
"settings": {