peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 05:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Peter Maquiran
2021-06-28 11:19:13 +01:00
parent a97ca61578 86ec762804
commit 0f57ca5c37
47 changed files with 183 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/edit-event/edit-event.page.html
+14 -14
View File
@@ -14,7 +14,7 @@
<ion-content>
<div class="main-content">
<div class="ion-item-container">
<ion-input placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
<ion-input placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
</div>
<div class="container-div">
<div class="ion-item-class-2 width-100 d-flex">
@@ -22,7 +22,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1">
<ion-input placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
<ion-input placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
</div>
</div>
<!-- Error messages -->
@@ -41,7 +41,7 @@
<div class="ion-input-class flex-grow-1">
<mat-form-field floatLabel="never" class="width-100" >
<mat-select placeholder="Selecione agenda" [(ngModel)]="postEvent.CalendarName" >
<mat-select placeholder="Selecione agenda*" [(ngModel)]="postEvent.CalendarName" >
<mat-option value="Oficial">
Oficial
</mat-option>
@@ -62,9 +62,9 @@
</div>
<div class="ion-input-class flex-grow-1">
<mat-form-field class="width-100" placeholder="Sample Type" required>
<mat-form-field floatLabel="never" class="width-100" required>
<!-- <input matInput type="text" > -->
<mat-select matInput [(value)]="postEvent.Categories[0]" >
<mat-select placeholder="Selecione o tipo de evento*" matInput [(ngModel)]="postEvent.Categories[0]" >
<mat-option value="Reunião">
Reunião
</mat-option>
@@ -91,7 +91,7 @@
</div>
<div class="ion-input-class flex-grow-1">
<mat-form-field class="date-hour-picker">
<mat-form-field floatLabel="never" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date"
[formControl]="dateControlStart"
@@ -119,7 +119,7 @@
</div>
<div class="ion-input-class flex-grow-1">
<mat-form-field class="date-hour-picker">
<mat-form-field floatLabel="never" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Choose a date"
[formControl]="dateControlEnd"
@@ -147,8 +147,8 @@
</div>
<div class="ion-input-class flex-grow-1">
<mat-form-field class="width-100" placeholder="Selecione repetição" value="false" interface="action-sheet" required>
<mat-select [(ngModel)]="postEvent.IsRecurring">
<mat-form-field floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
<mat-select placeholder="Selecione repetição*" [(ngModel)]="postEvent.IsRecurring">
<mat-option value="false">
Não se repete
</mat-option>
@@ -194,7 +194,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Como conhecido</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Com conhecimento</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -255,15 +255,15 @@
<ion-footer class="ion-no-border">
<ion-toolbar class="width-100 d-flex justify-space-between px-20">
<ion-buttons slot="start">
<ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
<button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
<ion-label>Cancelar</ion-label>
</ion-button>
</button>
</ion-buttons>
<ion-title></ion-title>
<ion-buttons slot="end">
<ion-button class="btn-ok" fill="clear" color="#fff" (click)="save()">
<button class="btn-ok" fill="clear" color="#fff" (click)="save()">
<ion-label>Gravar</ion-label>
</ion-button>
</button>
</ion-buttons>
</ion-toolbar>
</ion-footer>
src/app/shared/agenda/edit-event/edit-event.page.scss
+1 -1
View File
@@ -99,7 +99,7 @@ ion-content{
}
.list-people-title{
/* font-size: 13px; */
color: #797979;
color: #a3a3a3;
}
.attach-document{
font-size: 15px;
src/app/shared/agenda/new-event/new-event.page.scss
-1
View File
@@ -91,7 +91,6 @@
.list-people{
width: 256px;
float: left;
color: #ebebeb;
}
.add-people{
src/app/shared/agenda/view-event/view-event.page.ts
+1 -1
View File
@@ -53,7 +53,7 @@ export class ViewEventPage implements OnInit {
private processes: ProcessesService,
private modalController: ModalController,
public popoverController: PopoverController,
private toastService: ToastService
private toastService: ToastService,
)
{
this.isEventEdited = false;
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+6 -6
View File
@@ -16,7 +16,7 @@
<ion-item-sliding class="overflow-y-auto">
<div class="px-20">
<div class="ion-item-container width-100">
<ion-input placeholder="Assunto" [(ngModel)]="eventProcess.workflowInstanceDataFields.Subject"></ion-input>
<ion-input placeholder="Assunto*" [(ngModel)]="eventProcess.workflowInstanceDataFields.Subject"></ion-input>
</div>
<div class="container-div width-100">
<div class="ion-item-class-2">
@@ -24,7 +24,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-input placeholder="Localização" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
<ion-input placeholder="Localização*" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
</div>
</div>
<!-- Error messages -->
@@ -41,7 +41,7 @@
</div>
<div class="ion-input-class">
<ion-select disabled placeholder="Selecione agenda"
<ion-select disabled placeholder="Selecione agenda*"
class="d-block d-md-none"
selectedText="{{eventProcess.workflowInstanceDataFields.Agenda}}"
[(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda"
@@ -53,8 +53,8 @@
</ion-select>
<mat-form-field class="d-none d-md-block width-100" placeholder="Selecione agenda">
<mat-select [(value)]="eventProcess.workflowInstanceDataFields.Agenda" >
<mat-form-field class="d-none d-md-block width-100" >
<mat-select placeholder="Selecione agenda" [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" >
<mat-option value="Oficial">
Oficial
</mat-option>
@@ -194,7 +194,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes*</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/shared/gabinete-digital/expedients/expedients.page.html
+1 -1
View File
@@ -18,7 +18,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
<div class="width-100 overflow-y-auto height-100" *ngIf="taskslist">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+2 -2
View File
@@ -29,7 +29,7 @@
</ion-refresher>
<div class="width-100" [ngSwitch]="segment">
<div *ngIf="parecerList.length >= 1" class="overflow-y-auto height-100">
<div *ngIf="parecerList" class="overflow-y-auto height-100">
<ion-list *ngSwitchCase="'parecer'">
<!-- *ngFor = "let task of parecerList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -64,7 +64,7 @@
</ion-list>
</div>
<div *ngIf="deferimentoList.length >= 1" class="overflow-y-auto height-100">
<div *ngIf="deferimentoList" class="overflow-y-auto height-100">
<ion-list *ngSwitchCase="'deferimento'">
<ion-item
class="expediente ion-no-padding cursor-pointer"