mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
improve
This commit is contained in:
@@ -5,8 +5,6 @@
|
||||
</ion-refresher-content>
|
||||
</ion-refresher>
|
||||
|
||||
{{ loadedEvent.HasAttachments | json}}
|
||||
|
||||
<div class="main-content d-flex height-100" [className]="isModal ? '_main-content d-flex height-100 ma-0 px-20 pt-30 pb-20 background-white' : 'main-content d-flex height-100'">
|
||||
<div class="content d-flex flex-column width-100">
|
||||
<div class="main-header d-flex">
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
<ion-item class="item-hover cursor-pointer" lines="none" *ngFor="let event of listToPresent"
|
||||
(click)="goToEvent(event)"
|
||||
>
|
||||
<div class="d-flex content-{{sessoStore.user.Profile}}-{{event.CalendarName}}">
|
||||
<div class="d-flex event-box-content content-{{sessoStore.user.Profile}}-{{event.CalendarName}}">
|
||||
|
||||
<div class="schedule-time">
|
||||
<div *ngIf="!event.IsAllDayEvent" class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
|
||||
@@ -109,7 +109,7 @@
|
||||
<div class="schedule-details">
|
||||
<div class="description">{{event.Subject}}</div>
|
||||
<div class="location">
|
||||
<p>{{event.Location}}</p>
|
||||
{{event.Location}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -437,7 +437,6 @@ ion-toolbar{
|
||||
}
|
||||
.schedule-date{
|
||||
margin-right: 10px;
|
||||
width: 22%;
|
||||
color: #797979 !important;
|
||||
font-size: 13px;
|
||||
}
|
||||
@@ -449,7 +448,6 @@ ion-toolbar{
|
||||
.location{
|
||||
font-family: Roboto;
|
||||
font-size: 15px;
|
||||
font-weight: bold;
|
||||
color: black;
|
||||
width: 100%;
|
||||
|
||||
@@ -458,6 +456,7 @@ ion-toolbar{
|
||||
width: 100%;
|
||||
font-family: Roboto;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
//color: #0d89d1;
|
||||
color: var(--title-text-color)
|
||||
}
|
||||
@@ -641,4 +640,14 @@ ion-title{
|
||||
margin-left: 0px !important;
|
||||
margin-right: 0px !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
.item-exp {
|
||||
justify-content: flex-start !important;
|
||||
}
|
||||
|
||||
.event-box-content {
|
||||
justify-content: flex-start !important;
|
||||
}
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
|
||||
<div *ngIf="hideSearchBtn">
|
||||
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
|
||||
<mat-select [(value)]="filterName">
|
||||
<mat-select [(value)]="filterName" (change)="dynamicSearch()">
|
||||
|
||||
<mat-option value="Para hoje" >
|
||||
Para hoje
|
||||
@@ -159,7 +159,7 @@
|
||||
class=" box-hover ion-no-padding cursor-pointer"
|
||||
*ngFor = "let task of AllProcess"
|
||||
(click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
|
||||
<div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
|
||||
<div class="item-wrapper">
|
||||
<div class="item width-100">
|
||||
<div class="item-top-detail">
|
||||
<div class="item-subject">
|
||||
|
||||
@@ -212,7 +212,7 @@ export class GabineteDigitalPage implements OnInit {
|
||||
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
|
||||
subject = subject.toLowerCase();
|
||||
return subject.includes(this.searchSubject.toLowerCase())
|
||||
})
|
||||
}).filter( task => this.TaskService.filter(task, this.filterName))
|
||||
|
||||
|
||||
if(ordinance == this.ordinance) {
|
||||
|
||||
@@ -305,6 +305,28 @@ export class EventsService {
|
||||
} else {
|
||||
this.hasAnyCalendar = true
|
||||
}
|
||||
|
||||
|
||||
(() => {
|
||||
const keys = {}
|
||||
|
||||
for (let e of SessionStore.user.OwnerCalendars) {
|
||||
if(!keys[e.CalendarId]) {
|
||||
keys[e.CalendarId] = e.CalendarId
|
||||
} else {
|
||||
throw(`Calendar ${e.CalendarId} is repeated for user `+ SessionStore.user.FullName);
|
||||
}
|
||||
}
|
||||
|
||||
for (let e of SessionStore.user.SharedCalendars) {
|
||||
if(!keys[e.CalendarId]) {
|
||||
keys[e.CalendarId] = e.CalendarId
|
||||
} else {
|
||||
throw(`Calendar ${e.CalendarId} is repeated for user `+ SessionStore.user.FullName);
|
||||
}
|
||||
}
|
||||
})();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user