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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-06-11 20:20:24 +01:00
parent 72f396a3b9 54182e77a2
commit 332125e40f
16 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/attendees/attendees.page.html
+1 -1
View File
@@ -90,7 +90,7 @@
</ion-buttons>
<ion-buttons class="flex-grow-1" slot="end">
<button class="btn-ok" fill="clear" color="#fff" (click)="save()">
<ion-label>Selecionar</ion-label>
<ion-label>Adicionar</ion-label>
</button>
</ion-buttons>
</ion-toolbar>
src/app/pages/events/events.page.html
+4 -4
View File
@@ -32,25 +32,25 @@
<div class="wrap d-flex float-left">
<div class="event-box pointer" (click)="goToAllTaskFilter('ForToDay')">
<!-- <p>correspondencia com prazo para hoje</p> -->
<p>Tarefas que terminam hoje</p>
<p>Correspondências com prazo para hoje</p>
<span>{{ TaskService.deadline }}</span>
</div>
<div class="event-box pointer" (click)="goToAllTaskFilter('OverdueTasks')">
<!-- <p>correspondencia em atraso</p> -->
<p>Tarefas em atraso</p>
<p>Correspondências em atraso</p>
<span>{{ TaskService.overdueTasks }}</span>
</div>
<div class="event-box pointer" (click)="goToAllTaskFilter('New')">
<!-- <p>Novas correspondencia</p> -->
<p>Novas tarefas</p>
<p>Novas Correspondências</p>
<span>{{ TaskService.new }}</span>
</div>
<div class="event-box pointer" (click)="goToAllTaskFilter('unread')">
<!-- <p>correspondencia não lidas</p> -->
<p>Tarefas não lidas</p>
<p>Correspondências não lidas</p>
<span>{{ TaskService.unread }}</span>
</div>
</div>
src/app/pages/events/events.page.scss
+2 -2
View File
@@ -580,8 +580,8 @@ ion-title{
}
.event-box {
background-color: #ffb81c2b;
width: 130px;
height: 73px;
width: 150px;
height: 90px;
margin:5px;
flex-direction: column;
display: flex;
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+1 -1
View File
@@ -235,6 +235,6 @@
<ion-footer>
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
<button class="btn-ok" shape="round" (click)="saveTask()">Enviar</button>
<button class="btn-ok" shape="round" (click)="saveTask()">Concluir</button>
</div>
</ion-footer>
src/app/pages/gabinete-digital/gabinete-digital.page.html
+2 -2
View File
@@ -427,8 +427,8 @@
<ion-icon src="assets/images/icons-agenda.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Eventos para Aprovação <br>
<span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length >=2">{{ TaskService.eventoaprovacaostore.newList.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length ==1">{{ TaskService.eventoaprovacaostore.newList.length}} correspondência nova</span>
<span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length >=2">{{ TaskService.eventoaprovacaostore.newList.length}} eventos novos</span>
<span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length ==1">{{ TaskService.eventoaprovacaostore.newList.length}} evento novo</span>
</p>
<p class="text-center exp-card-content">
{{TaskService.eventoaprovacaostore.countAll}}