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

improve

Browse Source
This commit is contained in:
Peter Maquiran
2023-04-13 16:15:46 +01:00
parent 7671705193
commit 5aca929c3d
26 changed files with 226 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+1 -1
View File
@@ -41,7 +41,7 @@
<div class="item width-100 expedientes">
<div class="exp-top-detail">
<div class="subject d-flex align-center">
<ion-label>{{ task.Folio }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
</div>
src/app/pages/gabinete-digital/despachos/despachos.page.html
+1 -1
View File
@@ -40,7 +40,7 @@
<div class="item width-100 expediente">
<div class="exp-top-detail">
<div class="subject d-flex align-center">
<ion-label>{{ task.Folio }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
</div>
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+1 -1
View File
@@ -68,7 +68,7 @@
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject d-flex align-center">
<ion-label>{{ task.Folio || task.workflowInstanceDataFields.Subject }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.workflowInstanceDataFields.Subject }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
</div>
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+1 -1
View File
@@ -43,7 +43,7 @@
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject d-flex align-center">
<ion-label>{{ task.Folio }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
</div>
src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+1 -1
View File
@@ -65,7 +65,7 @@
<div class="item width-100 expediente">
<div class="exp-top-detail">
<div class="subject d-flex align-center">
<ion-label>{{ task.Folio }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
</div>
src/app/pages/gabinete-digital/expediente/expediente.page.html
+1 -1
View File
@@ -62,7 +62,7 @@
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject d-flex align-center">
<ion-label>{{ task.Subject }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Subject }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
</div>
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+1 -1
View File
@@ -61,7 +61,7 @@
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject d-flex align-center">
<ion-label>{{ task.Subject }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Subject }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.html
+4 -2
View File
@@ -301,8 +301,8 @@
<ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Dispatches'" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-despachos-presidente-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Despachos<br>
<span class="new-task-count" *ngIf="deplomasStore.diplomasReviewListNewCount.length >=2">{{ despachoStore.newList.length}} Despachos novos</span>
<span class="new-task-count" *ngIf="deplomasStore.diplomasReviewListNewCount.length ==1">{{ despachoStore.newList.length}} Despacho novo</span>
<span class="new-task-count" *ngIf="despachoStore.newList.length >=2">{{ despachoStore.newList.length}} Despachos novos</span>
<span class="new-task-count" *ngIf="despachoStore.newList.length ==1">{{ despachoStore.newList.length}} Despacho novo</span>
</p>
<p class="text-center exp-card-content"> {{despachoStore.count}} <span class="title1">Documentos</span> </p>
</div>
@@ -369,6 +369,8 @@
<span class="new-task-count" *ngIf="pendentesstore.newList.length >=2">{{ pendentesstore.newList.length}} Meus Pendente</span>
<span class="new-task-count" *ngIf="pendentesstore.newList.length ==1">{{ pendentesstore.newList.length}} Meu Pendent</span>
</p>
<p class="text-center exp-card-content"> <span class="number">{{pendentesstore.count}} </span> <span class="title1">Documentos</span></p>
</div>
src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+1 -1
View File
@@ -77,7 +77,7 @@
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject d-flex align-center">
<ion-label>{{ task.Folio }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
</div>
src/app/services/task.service.ts
+9 -5
View File
@@ -35,15 +35,19 @@ export class TaskService {
filter(item, attribute) {
if(attribute == 'Para hoje') {
return this.deadlineIsToday(item.TaskStartDate)
return this.deadlineIsToday(item.TaskStartDate || item.taskStartDate)
} else if (attribute == 'Novos') {
return this.lessThen24Hours(item.TaskStartDate)
return this.lessThen24Hours(item.TaskStartDate || item.taskStartDate)
} else if (attribute == 'Lidos') {
return item.TaskStatus == 'open'
return item.TaskStatus == 'Open' || item.taskStatus == 'Open'
} else if (attribute == 'Não lidos') {
return item.TaskStatus != 'open'
return item.TaskStatus != 'Open' && item.taskStatus != 'Open'
}
return true
}
seen(item) {
return item.TaskStatus == 'Open' || item.taskStatus == 'Open'
}
}
src/app/shared/gabinete-digital/all-processes/all-processes.module.ts
+26 -1
View File
@@ -8,12 +8,37 @@ import { AllProcessesPageRoutingModule } from './all-processes-routing.module';
import { AllProcessesPage } from './all-processes.page';
import { MatInputModule } from '@angular/material/input';
import { MatNativeDateModule } from '@angular/material/core';
import {
NgxMatDatetimePickerModule,
NgxMatNativeDateModule,
NgxMatTimepickerModule
} from '@angular-material-components/datetime-picker';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatSelectModule } from '@angular/material/select';
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
AllProcessesPageRoutingModule
AllProcessesPageRoutingModule,
//
MatInputModule,
MatNativeDateModule,
NgxMatDatetimePickerModule,
NgxMatTimepickerModule,
NgxMatNativeDateModule,
NgxMatMomentModule,
MatSelectModule,
MatButtonModule,
],
exports: [AllProcessesPage],
declarations: [AllProcessesPage]
src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+76 -43
View File
@@ -2,11 +2,39 @@
<!-- <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> -->
<div class="title">
<div class="thetitle"><ion-label >Todas as tarefas</ion-label></div>
<!-- <div class="theicon">
<button title="Atualizar" class="btn-no-color" (click)="refreshing()">
<div class="theicon">
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
<mat-select [(value)]="filterName">
<mat-option value="Para hoje" >
Para hoje
</mat-option>
<mat-option value="Novos" >
Novos
</mat-option>
<mat-option value="Lidos" >
Lidos
</mat-option>
<mat-option value="Não Lidos" >
Não lidos
</mat-option>
<mat-option value="Todos" >
Todos
</mat-option>
</mat-select>
</mat-form-field>
</div>
<!-- <button title="Atualizar" class="btn-no-color" (click)="refreshing()">
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div> -->
</button> -->
</div>
</div>
</ion-header>
<ion-content>
@@ -28,54 +56,59 @@
<div class="listview">
<ion-list *ngIf="AllProcess">
<div
class="item-wrapper item-hover ion-no-padding cursor-pointer"
class="item-hover ion-no-padding cursor-pointer"
*ngFor = "let task of AllProcess"
(click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName|| task.workflowDisplayName , task.activityInstanceName)">
<div class="item width-100">
<div class="item-top-detail">
<div class="item-subject">
<!-- {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName || task.workflowDisplayName }} {{ task.activityInstanceName }} -->
<ion-label>{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}</ion-label>
<div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
<div class="item width-100 " >
<div class="item-top-detail">
<div class="item-subject d-flex">
<!-- {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName || task.workflowDisplayName }} {{ task.activityInstanceName }} -->
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline || task.deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate || task.taskStartDate)">Nova</span>
</div>
<div *ngIf="task.DocumentsQty != 0" class="item-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label>{{task.DocumentsQty || task.totalDocuments}}</label>
</div>
</div>
<div *ngIf="task.DocumentsQty != 0" class="item-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label>{{task.DocumentsQty || task.totalDocuments}}</label>
<div class="item-middle-detail">
<div class="item-remetente">
<ion-label *ngIf="task.Senders">{{task.Senders }}</ion-label>
<ion-label *ngIf="task.workflowInstanceDataFields">{{ task.workflowInstanceDataFields.Sender }}</ion-label>
</div>
</div>
</div>
<div class="item-middle-detail">
<div class="item-remetente">
<ion-label *ngIf="task.Senders">{{task.Senders }}</ion-label>
<ion-label *ngIf="task.workflowInstanceDataFields">{{ task.workflowInstanceDataFields.Sender }}</ion-label>
<div *ngIf="task.Agenda" class="item-middle-detail">
<div class="item-remetente">
<ion-label>{{task.customDate}}</ion-label>
</div>
</div>
</div>
<div *ngIf="task.Agenda" class="item-middle-detail">
<div class="item-remetente">
<ion-label>{{task.customDate}}</ion-label>
<div *ngIf="task.Agenda" class="item-middle-detail-extra">
<div class="item-middle-detail-extra-text">
<ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
<!-- Agenda {{task.Agenda}} do Presidente da República -->
Agenda {{task.Agenda}} do Titular
</ion-label>
<ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'">
A sua agenda {{task.Agenda}}
</ion-label>
</div>
</div>
</div>
<div *ngIf="task.Agenda" class="item-middle-detail-extra">
<div class="item-middle-detail-extra-text">
<ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
<!-- Agenda {{task.Agenda}} do Presidente da República -->
Agenda {{task.Agenda}} do Titular
</ion-label>
<ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'">
A sua agenda {{task.Agenda}}
</ion-label>
</div>
</div>
<div class="item-bottom-detail d-flex align-items-center">
<div class="item-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="item-date">
<ion-label>{{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
<div class="item-bottom-detail d-flex align-items-center">
<div class="item-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="item-date">
<ion-label>{{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div>
</div>
</div>
</div>
</div>
</ion-list>
</div>
src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
+4
View File
@@ -164,3 +164,7 @@ ion-list{
}
}
}
.new-task {
height: 23px;
}
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+5 -3
View File
@@ -11,7 +11,7 @@ import { DespachosprStore } from 'src/app/store/despachospr-store.service';
import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
import { PedidosStore } from 'src/app/store/pedidos-store.service';
import { SessionStore } from 'src/app/store/session.service';
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-all-processes',
@@ -35,10 +35,12 @@ export class AllProcessesPage implements OnInit {
deplomasStore = DeplomasStore
AllProcess = []
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
constructor(
private router: Router,
public ThemeService: ThemeService
public ThemeService: ThemeService,
public TaskService: TaskService
) {
this.loggeduser = SessionStore.user;
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+1 -1
View File
@@ -63,7 +63,7 @@
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject">
<ion-label>{{ task.Folio || task.workflowInstanceDataFields.Subject }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.workflowInstanceDataFields.Subject }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+1 -1
View File
@@ -59,7 +59,7 @@
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject">
<ion-label>{{ task.Folio }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+1 -1
View File
@@ -58,7 +58,7 @@
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject">
<ion-label>{{ task.Folio }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts
+25 -1
View File
@@ -7,13 +7,37 @@ import { IonicModule } from '@ionic/angular';
import { EventsToApprovePageRoutingModule } from './events-to-approve-routing.module';
import { EventsToApprovePage } from './events-to-approve.page';
import { MatInputModule } from '@angular/material/input';
import { MatNativeDateModule } from '@angular/material/core';
import {
NgxMatDatetimePickerModule,
NgxMatNativeDateModule,
NgxMatTimepickerModule
} from '@angular-material-components/datetime-picker';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatSelectModule } from '@angular/material/select';
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
EventsToApprovePageRoutingModule
EventsToApprovePageRoutingModule,
//
MatInputModule,
MatNativeDateModule,
NgxMatDatetimePickerModule,
NgxMatTimepickerModule,
NgxMatNativeDateModule,
NgxMatMomentModule,
MatSelectModule,
MatButtonModule,
],
declarations: [EventsToApprovePage],
exports: [EventsToApprovePage]
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+44 -13
View File
@@ -3,9 +3,34 @@
<div class="title width-100">
<div class="title-container d-flex justify-space-between">
<span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
<!-- <button title="Atualizar" title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
<ion-icon class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button> -->
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
<mat-select [(value)]="filterName">
<mat-option value="Para hoje" >
Para hoje
</mat-option>
<mat-option value="Novos" >
Novos
</mat-option>
<mat-option value="Lidos" >
Lidos
</mat-option>
<mat-option value="Não Lidos" >
Não lidos
</mat-option>
<mat-option value="Todos" >
Todos
</mat-option>
</mat-select>
</mat-form-field>
</div>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
@@ -40,16 +65,22 @@
*ngFor="let event of eventoaprovacaostore.get(segment)"
(click)="goToEventDetail(event)"
>
<!-- (click)="openApproveModal(event)" -->
<div class="event-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 expediente">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
</div>
<div class="approve-event-detail">
<p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
<div class="expediente" *ngIf="TaskService.filter(event, filterName)">
<!-- (click)="openApproveModal(event)" -->
<div class="event-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 d-flex">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
</div>
<div class="approve-event-detail">
<div class="p" *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</div>
<div class="p" *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</div>
<div class="h3">{{event.workflowInstanceDataFields.Subject}}</div>
</div>
<div>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(event.deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(event.taskStartDate)">Nova</span>
</div>
</div>
</div>
</div>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+2 -3
View File
@@ -70,7 +70,7 @@
float: left;
margin-left: 10px;
}
.approve-event-detail p{
.approve-event-detail .p{
//width: 250px;
font-family: Roboto;
font-size: 13px;
@@ -83,8 +83,7 @@
margin: 0;
padding-bottom: 10px;
}
.approve-event-detail h3{
width: 250px;
.approve-event-detail .h3{
font-family: Roboto;
font-size: 15px;
font-weight: bold;
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+5 -2
View File
@@ -12,7 +12,7 @@ import { Storage } from '@ionic/storage';
import { SessionStore } from 'src/app/store/session.service';
import { EventsService } from 'src/app/services/events.service';
import { environment } from 'src/environments/environment';
import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-events-to-approve',
@@ -35,7 +35,9 @@ export class EventsToApprovePage implements OnInit {
color: 'pr' | 'mdgpr'
eventoaprovacaostore = EventoAprovacaoStore;
environment = environment
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
constructor(
private processes:ProcessesService,
private modalController: ModalController,
@@ -44,6 +46,7 @@ export class EventsToApprovePage implements OnInit {
private sortService: SortService,
private storage: Storage,
public eventService: EventsService,
public TaskService: TaskService
)
{}
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+1 -1
View File
@@ -47,7 +47,7 @@
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject">
<ion-label>{{ task.Subject }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Subject }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default'" src="assets/images/icons-expediente-attachment.svg"></ion-icon>
src/app/shared/gabinete-digital/expedients/expedients.page.html
+1 -1
View File
@@ -56,7 +56,7 @@
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject">
<ion-label>{{ task.Subject }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Subject }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
</div>
src/app/shared/gabinete-digital/generic/task-list/task-list.page.html
+1 -1
View File
@@ -13,7 +13,7 @@
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail">
<div class="subject d-flex align-center">
<ion-label>{{ task.Folio }}</ion-label>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
</div>