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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-24 15:04:10 +01:00
parent ad610c5dee 4d80054c95
commit c7bdb51607
6 changed files with 62 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/create-process/create-process.page.html
+13 -11
View File
@@ -38,17 +38,17 @@
<mat-form-field class="width-100 d-none d-md-block" placeholder="Sample Type" required>
<mat-select matInput [(value)]="postData.Priority" >
<mat-option value="Reunião">
Reunião
<mat-option value="99999861">
Normal
</mat-option>
<mat-option value="Viagem">
Viagem
<mat-option value="99999862">
Urgente
</mat-option>
<mat-option value="Conferência">
Conferência
<mat-option value="99999863">
Muito Urgente
</mat-option>
<mat-option value="Encontro">
Encontro
<mat-option value="99999864">
Urgentíssimo
</mat-option>
</mat-select>
</mat-form-field>
@@ -64,9 +64,11 @@
<div class="ion-input-class">
<mat-form-field appearance="fill" class="width-100">
<mat-label>Toppings</mat-label>
<mat-select [formControl]="toppings" multiple>
<mat-option *ngFor="let topping of toppingList" [value]="topping">{{topping}}</mat-option>
<mat-select [formControl]="toppings">
<mat-option [value]="99999861">Normal</mat-option>
<mat-option [value]="99999862">Urgente</mat-option>
<mat-option [value]="99999863">Muito Urgente</mat-option>
<mat-option [value]="99999864">Urgentíssimo</mat-option>
</mat-select>
</mat-form-field>
src/app/pages/chat/chat.page.html
+1 -1
View File
@@ -90,7 +90,7 @@
</ion-list>
</div>
<button (click)="sendMsg()">Send message</button>
<button (click)="sendMsg()" style="height: 41px;">Send message</button>
</div>
</div>
<!-- Aside right -->
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+6 -17
View File
@@ -42,21 +42,12 @@
<ion-select-option value="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</ion-select-option>
</ion-select>
<mat-form-field class="width-100 d-none d-md-block" placeholder="Sample Type" required>
<!-- <input matInput type="text" > -->
<mat-select >
<mat-option value="Reunião">
Reunião
</mat-option>
<mat-option value="Viagem">
Viagem
</mat-option>
<mat-option value="Conferência">
Conferência
</mat-option>
<mat-option value="Encontro">
Encontro
</mat-option>
<mat-form-field appearance="fill" class="width-100 d-none d-md-block">
<mat-select [(value)]="postData.Priority">
<mat-option [value]="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</mat-option>
<mat-option [value]="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</mat-option>
<mat-option [value]="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</mat-option>
<mat-option [value]="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</mat-option>
</mat-select>
</mat-form-field>
@@ -71,7 +62,6 @@
<div class="ion-input-class">
<ion-item
class="ion-no-border ion-no-padding ion-no-margin d-md-none">
<ion-label>Tipo de assunto</ion-label>
<ion-select
[(ngModel)]="selectedTypes"
(ngModelChange)="onSelectedTypesChanged($event)"
@@ -83,7 +73,6 @@
<mat-form-field
appearance="fill"
class="width-100 d-none d-md-block">
<mat-label>Toppings</mat-label>
<mat-select [formControl]="toppings" multiple>
<mat-option *ngFor="let type of subjectTypes" [value]="type.Code">{{type.Description}}</mat-option>
</mat-select>
src/app/shared/agenda/new-event/new-event.page.ts
+2
View File
@@ -68,6 +68,8 @@ export class NewEventPage implements OnInit {
public stepSecond = 5;
public color: ThemePalette = 'primary';
james: any
@Input() profile:string;
@Input() selectedSegment: string;
@Input() selectedDate: Date;
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+22 -26
View File
@@ -68,26 +68,6 @@
</div>
</div>
<!-- <div class="container-div width-100">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select placeholder="Selecione tipo"
[(ngModel)]="postEvent.Categories[0]"
selectedText="{{postEvent.Categories[0]}}"
interface="action-sheet"
Cancel-text="Cancelar" required>
<ion-select-option value="Reunião">Reunião</ion-select-option>
<ion-select-option value="Viagem">Viagem</ion-select-option>
<ion-select-option value="Conferência">Conferência</ion-select-option>
<ion-select-option value="Encontro">Encontro</ion-select-option>
</ion-select>
</div>
</div>
</div> -->
<div class="container-div width-100">
<div class="ion-item-class-2 width-100">
<div class="ion-icon-class">
@@ -173,7 +153,9 @@
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select placeholder="Selecione repetição"
<ion-select
placeholder="Selecione repetição"
class="d-block d-md-none"
[(ngModel)]="eventProcess.workflowInstanceDataFields.IsRecurring"
selectedText="{{isRecurring}}"
interface="action-sheet"
@@ -181,6 +163,24 @@
<ion-select-option value="false">Não se repete</ion-select-option>
<ion-select-option value="true">Repete</ion-select-option>
</ion-select>
<mat-form-field
class="width-100 d-none d-md-block"
placeholder="Selecione repetição"
value="false"
interface="action-sheet"
required
>
<mat-select [(value)]="eventProcess.workflowInstanceDataFields.IsRecurring">
<mat-option value="false">
Não se repete
</mat-option>
<mat-option value="true">
Repete
</mat-option>
</mat-select>
</mat-form-field>
</div>
</div>
</div>
@@ -257,8 +257,7 @@
</ion-label>
</ion-item>
</ion-list>
</div>
</div>
<div class="container-div d-flex width-100">
<div class="ion-item-class-2 d-flex width-100">
@@ -272,9 +271,6 @@
</div>
</div>
</ion-item-sliding>
</div>
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+18
View File
@@ -12,11 +12,29 @@ import { EventsService } from 'src/app/services/events.service';
import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service';
import { Event } from '../../../models/event.model';
import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
parse: {
dateInput: "YYYY-MMMM-DD HH:mm"
},
display: {
dateInput: "DD MMM YYYY H:mm",
monthYearLabel: "MMM YYYY",
dateA11yLabel: "LL",
monthYearA11yLabel: "MMMM YYYY"
}
}
@Component({
selector: 'app-edit-event',
templateUrl: './edit-event.page.html',
styleUrls: ['./edit-event.page.scss'],
providers: [
{ provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS },
]
})
export class EditEventToApproveComponent implements OnInit {