From 99b151c532709bf8c330ae3ec6425247407b3b3e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 7 Jul 2021 18:42:21 +0100 Subject: [PATCH] Add pipeline --- bitbucket-pipelines.yml | 18 ++++++++++++++++++ .../create-process/create-process.page.html | 10 +++++----- .../create-process/create-process.page.ts | 2 +- .../shared/agenda/new-event/new-event.page.ts | 2 -- .../publication/new-action/new-action.page.ts | 2 -- 5 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 bitbucket-pipelines.yml diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml new file mode 100644 index 000000000..39b65a9b2 --- /dev/null +++ b/bitbucket-pipelines.yml @@ -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 \ No newline at end of file diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index ca6e19283..fa36fe6fb 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -44,11 +44,11 @@ - - Normal (4 dias para a execução da tarefa) - Urgente (2 dias para a execução da tarefa) - Muito Urgente (1 dia para a execução da tarefa) - Urgentíssimo (8 horas para a execução da tarefa) + + Normal (4 dias para a execução da tarefa) + Urgente (2 dias para a execução da tarefa) + Muito Urgente (1 dia para a execução da tarefa) + Urgentíssimo (8 horas para a execução da tarefa) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index bc178d265..8298ebf53 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -184,7 +184,7 @@ export class CreateProcessPage implements OnInit { Priority: new FormControl(this.postData.Priority, [ Validators.required, ]), - participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ + participantes: new FormControl(this.taskParticipantsCc, [ // Validators.required ]), selectedTypes: new FormControl(this.selectedTypes, [ diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 1cce4baee..b1ae586e9 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -21,7 +21,6 @@ import { FormControl } from '@angular/forms'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { ThemePalette } from '@angular/material/core'; -import { HttpClient } from '@angular/common/http'; import { NgZone, ViewChild } from '@angular/core'; import { FormGroup, Validators } from '@angular/forms'; 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) { this.postEvent.Attendees.forEach(e =>{ if(e.IsRequired) { diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index d8f4a15fe..16ff40939 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -18,8 +18,6 @@ export class NewActionPage implements OnInit { folder: PublicationFolder; segment:string; - - public date: any; public disabled = false; public showSpinners = true;