This commit is contained in:
Peter Maquiran
2023-06-10 12:19:46 +01:00
parent ab43d697ea
commit de531bc550
7 changed files with 44 additions and 15 deletions
@@ -5,8 +5,6 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </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="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="content d-flex flex-column width-100">
<div class="main-header d-flex"> <div class="main-header d-flex">
+2 -2
View File
@@ -96,7 +96,7 @@
<ion-item class="item-hover cursor-pointer" lines="none" *ngFor="let event of listToPresent" <ion-item class="item-hover cursor-pointer" lines="none" *ngFor="let event of listToPresent"
(click)="goToEvent(event)" (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 class="schedule-time">
<div *ngIf="!event.IsAllDayEvent" class="time-start">{{event.StartDate | date: 'HH:mm'}}</div> <div *ngIf="!event.IsAllDayEvent" class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
@@ -109,7 +109,7 @@
<div class="schedule-details"> <div class="schedule-details">
<div class="description">{{event.Subject}}</div> <div class="description">{{event.Subject}}</div>
<div class="location"> <div class="location">
<p>{{event.Location}}</p> {{event.Location}}
</div> </div>
</div> </div>
</div> </div>
+11 -2
View File
@@ -437,7 +437,6 @@ ion-toolbar{
} }
.schedule-date{ .schedule-date{
margin-right: 10px; margin-right: 10px;
width: 22%;
color: #797979 !important; color: #797979 !important;
font-size: 13px; font-size: 13px;
} }
@@ -449,7 +448,6 @@ ion-toolbar{
.location{ .location{
font-family: Roboto; font-family: Roboto;
font-size: 15px; font-size: 15px;
font-weight: bold;
color: black; color: black;
width: 100%; width: 100%;
@@ -458,6 +456,7 @@ ion-toolbar{
width: 100%; width: 100%;
font-family: Roboto; font-family: Roboto;
font-size: 13px; font-size: 13px;
font-weight: bold;
//color: #0d89d1; //color: #0d89d1;
color: var(--title-text-color) color: var(--title-text-color)
} }
@@ -642,3 +641,13 @@ ion-title{
margin-right: 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"> <div *ngIf="hideSearchBtn">
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda"> <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" > <mat-option value="Para hoje" >
Para hoje Para hoje
@@ -159,7 +159,7 @@
class=" box-hover ion-no-padding cursor-pointer" class=" box-hover ion-no-padding cursor-pointer"
*ngFor = "let task of AllProcess" *ngFor = "let task of AllProcess"
(click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)"> (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 width-100">
<div class="item-top-detail"> <div class="item-top-detail">
<div class="item-subject"> <div class="item-subject">
@@ -212,7 +212,7 @@ export class GabineteDigitalPage implements OnInit {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase(); subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase()) return subject.includes(this.searchSubject.toLowerCase())
}) }).filter( task => this.TaskService.filter(task, this.filterName))
if(ordinance == this.ordinance) { if(ordinance == this.ordinance) {
+22
View File
@@ -305,6 +305,28 @@ export class EventsService {
} else { } else {
this.hasAnyCalendar = true 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);
}
}
})();
} }
} }
+5 -5
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "e57e48d9c", "shortSHA": "ab43d697e",
"SHA": "e57e48d9ce538cbaca45e8b38f19ff7d520b4462", "SHA": "ab43d697eacabe1b9ba3063422805328de10e95d",
"branch": "feature/gabinete-search", "branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Sat Jun 10 10:26:47 2023 +0100'", "lastCommitTime": "'Sat Jun 10 10:52:13 2023 +0100'",
"lastCommitMessage": "fix", "lastCommitMessage": "fix",
"lastCommitNumber": "4959", "lastCommitNumber": "4960",
"change": "", "change": "",
"changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/search/search.page.scss\n\tmodified: src/app/pages/search/search.page.ts\n\tnew file: src/assets/app.module.ts", "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\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/app/services/events.service.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }