mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer
This commit is contained in:
@@ -0,0 +1,18 @@
|
|||||||
|
image: node:14.15.0
|
||||||
|
|
||||||
|
pipelines:
|
||||||
|
default:
|
||||||
|
- step:
|
||||||
|
caches:
|
||||||
|
- node
|
||||||
|
script:
|
||||||
|
- apt-get update; apt-get install -y gettext-base;
|
||||||
|
- echo 'deb http://dl.google.com/linux/chrome/deb/ stable main' > /etc/apt/sources.list.d/chrome.list
|
||||||
|
- wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
|
||||||
|
- set -x && apt-get update && apt-get install -y xvfb google-chrome-stable
|
||||||
|
- wget -q -O /usr/bin/xvfb-chrome https://bitbucket.org/atlassian/docker-node-chrome-firefox/raw/ff180e2f16ea8639d4ca4a3abb0017ee23c2836c/scripts/xvfb-chrome
|
||||||
|
- ln -sf /usr/bin/xvfb-chrome /usr/bin/google-chrome
|
||||||
|
- chmod 755 /usr/bin/google-chrome
|
||||||
|
- npm install
|
||||||
|
- ./node_modules/@angular/cli/bin/ng -v
|
||||||
|
- npm run test
|
||||||
@@ -44,11 +44,11 @@
|
|||||||
</ion-select>
|
</ion-select>
|
||||||
|
|
||||||
<mat-form-field appearance="fill" class="width-100 d-none d-md-block" floatLabel="never" appearance="none">
|
<mat-form-field appearance="fill" class="width-100 d-none d-md-block" floatLabel="never" appearance="none">
|
||||||
<mat-select placeholder="Prazo*" [(value)]="postData.Priority">
|
<mat-select placeholder="Prazo*" [(ngModel)]="postData.Priority">
|
||||||
<mat-option [value]="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</mat-option>
|
<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="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="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-option value="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</mat-option>
|
||||||
</mat-select>
|
</mat-select>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ export class CreateProcessPage implements OnInit {
|
|||||||
Priority: new FormControl(this.postData.Priority, [
|
Priority: new FormControl(this.postData.Priority, [
|
||||||
Validators.required,
|
Validators.required,
|
||||||
]),
|
]),
|
||||||
participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
|
participantes: new FormControl(this.taskParticipantsCc, [
|
||||||
// Validators.required
|
// Validators.required
|
||||||
]),
|
]),
|
||||||
selectedTypes: new FormControl(this.selectedTypes, [
|
selectedTypes: new FormControl(this.selectedTypes, [
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ import { FormControl } from '@angular/forms';
|
|||||||
import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
|
import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
|
||||||
import { ThemePalette } from '@angular/material/core';
|
import { ThemePalette } from '@angular/material/core';
|
||||||
|
|
||||||
import { HttpClient } from '@angular/common/http';
|
|
||||||
import { NgZone, ViewChild } from '@angular/core';
|
import { NgZone, ViewChild } from '@angular/core';
|
||||||
import { FormGroup, Validators } from '@angular/forms';
|
import { FormGroup, Validators } from '@angular/forms';
|
||||||
import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
|
import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
|
||||||
@@ -198,7 +197,6 @@ export class NewEventPage implements OnInit {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(this.postEvent.Attendees != null) {
|
if(this.postEvent.Attendees != null) {
|
||||||
this.postEvent.Attendees.forEach(e =>{
|
this.postEvent.Attendees.forEach(e =>{
|
||||||
if(e.IsRequired) {
|
if(e.IsRequired) {
|
||||||
|
|||||||
@@ -18,8 +18,6 @@ export class NewActionPage implements OnInit {
|
|||||||
folder: PublicationFolder;
|
folder: PublicationFolder;
|
||||||
segment:string;
|
segment:string;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public date: any;
|
public date: any;
|
||||||
public disabled = false;
|
public disabled = false;
|
||||||
public showSpinners = true;
|
public showSpinners = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user