Revize 25e66baf

Re #8858 - Testování aplikace

+ new tests to implemented use cases

e2e/src/1login/login.e2e-spec.ts

@@ -1 @@
-import {LoginPo} from './login.po';
-
-
-describe('Login Module', () => {
-  let loginPo: LoginPo;
-
-  beforeEach(() => {
-    loginPo = new LoginPo();
-  });
-
-  it('Check if login form displayed!', async () => {
-    await loginPo.navigateTo();
-    expect(await loginPo.getTitleText()).toEqual('Sign in');
-  });
-
-  it('Process login form!', async () => {
-    await loginPo.navigateTo();
-    await loginPo.processForm();
-    expect(await loginPo.dashboardPresent()).toEqual(true);
-    expect(await loginPo.loggedUser()).toEqual(' TESTINS');
-  });
-});

e2e/src/1login/login.po.ts

@@ -1 @@
-import { browser, by, element } from 'protractor';
-
-export class LoginPo {
-  async navigateTo(): Promise<unknown> {
-    return browser.get(browser.baseUrl);
-  }
-
-  async getTitleText(): Promise<string> {
-    return element(by.className('login-heading')).getText();
-  }
-
-  async processForm(): Promise<unknown> {
-    element(by.id('username')).sendKeys('testins');
-    element(by.id('password')).sendKeys('insert');
-    return element(by.id('loginButton')).click();
-  }
-
-  async dashboardPresent(): Promise<unknown> {
-    return element(by.className('dashboard')).isPresent();
-  }
-
-  async loggedUser(): Promise<string> {
-    return element(by.id('loggedUser')).getText();
-  }
-}

e2e/src/dashboard/dashboard.e2e-spec.ts

@@ -1 +1 @@
 import {DashboardPo} from './dashboard.po';
-import {LoginPo} from '../1login/login.po';
-import {browser} from 'protractor';
+import {LoginPo} from '../login/login.po';
+import {browser, by, element} from 'protractor';
+import * as moment from 'moment-timezone';
+import {NavBarPo} from '../nav-bar/nav-bar.po';
 
 
 describe('Dashboard Module', () => {
   let dashboardPo: DashboardPo;
   let loginPo: LoginPo
+  let navBarPo: NavBarPo
+  let today = moment().format('YYYYMMDDHHMMSS').toString();
 
-  beforeEach(() => {
+  beforeEach(async () => {
     dashboardPo = new DashboardPo();
     loginPo = new LoginPo();
+    navBarPo = new NavBarPo();
+    await loginPo.navigateTo();
+    await loginPo.processForm();
   });
 
-  it('Add user!', async () => {
-    await dashboardPo.showUserInsert();
-    expect(await dashboardPo.popupShown()).toEqual(true);
-    await dashboardPo.sendUserForm();
-    expect(await dashboardPo.success()).toEqual(true);
+  afterEach(async () => {
+    await loginPo.logout();
   });
 
-  it('Add unit!', async () => {
-    await dashboardPo.showUnitInsert();
-    expect(await dashboardPo.popupShown()).toEqual(true);
-    await dashboardPo.sendUnitForm();
-    expect(await dashboardPo.success()).toEqual(true);
+  it('Show test unit sensors!', async () => {
+    expect(await dashboardPo.xpathIsVisible('//h4[contains(text(), \'test sensor Temp\')]')).toEqual(false);
+    await dashboardPo.clickToAccordionTab();
+    await browser.sleep(500);
+    expect(await dashboardPo.xpathIsVisible('//h4[contains(text(), \'test sensor Temp\')]')).toEqual(true);
   });
 
+  it('Add unit ' + today + ' !', async () => {
+    await navBarPo.showUnitInsert();
+    expect(await navBarPo.popupShown()).toEqual(true);
+    await navBarPo.sendUnitForm(today);
+    expect(await navBarPo.success()).toEqual(true);
+  });
+
+  it('Added unit ' + today + ' shown!', async () => {
+    expect(await dashboardPo.xpathIsVisible('//h3[contains(text(), \''+ today +'\')]')).toEqual(true);
+  });
+
+  it('Unit ' + today + ' manipulation buttons test!', async () => {
+    expect(await dashboardPo.buttonByTextIsVisible('Sensors graph')).toEqual(true);
+    await dashboardPo.clickManipulationUnitButton(today);
+    expect(await dashboardPo.xpathIsVisible('//span[contains(text(), \'Edit unit\')]')).toEqual(true);
+    expect(await dashboardPo.xpathIsVisible('//span[contains(text(), \'Insert position\')]')).toEqual(true);
+    expect(await dashboardPo.xpathIsVisible('//span[contains(text(), \'Delete unit\')]')).toEqual(true);
+    expect(await dashboardPo.xpathIsVisible('//span[contains(text(), \'Add sensor\')]')).toEqual(true);
+  });
+
+  it('Edit unit!', async () => {
+    await dashboardPo.clickManipulationUnitButton(today);
+    await dashboardPo.clickByXpath('//span[contains(text(), \'Edit unit\')]');
+    expect(await dashboardPo.xpathIsVisible('//div[contains(@class, \'p-dialog\')]')).toEqual(true);
+    expect(await dashboardPo.xpathIsVisible('//span[contains(text(), \'Edit unit\')]')).toEqual(true);
+    expect(await dashboardPo.xpathIsVisible('//span[contains(@class, \'p-dialog-title\')]')).toEqual(true);
+    today = today+'edit';
+    await dashboardPo.setUnitDescription('//input', today);
+    await dashboardPo.clickByXpath('//span[contains(text(), \'Save\')]');
+    expect(await navBarPo.success()).toEqual(true);
+    expect(await dashboardPo.xpathIsVisible('//h3[contains(text(), \''+ today +'\')]')).toEqual(true);
+  });
+
+  it('Insert position!', async () => {
+    await dashboardPo.clickManipulationUnitButton(today.substr(0, today.length-4));
+    await dashboardPo.clickByXpath('//span[contains(text(), \'Insert position\')]');
+    await dashboardPo.fillPosition();
+    await dashboardPo.clickByXpath('//span[contains(text(), \'Save\')]');
+    expect(await navBarPo.success()).toEqual(true);
+    expect(await dashboardPo.xpathIsVisible('//h3[contains(text(), \''+ today +'\')]')).toEqual(true);
+  });
+
+  it('Add sensor!', async () => {
+    const sensor = today.substr(0, today.length-4)
+    await dashboardPo.clickManipulationUnitButton(today.substr(0, today.length-4));
+    await dashboardPo.clickByXpath('//span[contains(text(), \'Add sensor\')]');
+    await browser.sleep(1000);
+    await dashboardPo.clickButtonByText('Add Sensor');
+    await browser.sleep(1000);
+    await dashboardPo.clickButtonByText('Add Sensor');
+    expect(await dashboardPo.numberOfxPaths('//input[contains(@id, \'sensorId\')]')).toEqual(3);
+    await dashboardPo.clickButtonByText('Remove last sensor');
+    await dashboardPo.clickButtonByText('Remove last sensor');
+    await dashboardPo.fillSensorForm(sensor);
+    await dashboardPo.clickByXpath('//span[contains(text(), \'Save\')]');
+    await browser.sleep(1000);
+    expect(await navBarPo.success()).toEqual(true);
+    await browser.sleep(5000);
+    expect(await dashboardPo.xpathIsVisible('//h3[contains(text(), \''+ sensor +'\')]')).toEqual(true);
+    await dashboardPo.clickToAccordionTabByXpath('(.//a[contains(@class, \'p-accordion-header-link\')])[last()]');
+    await browser.sleep(500);
+    expect(await dashboardPo.xpathIsVisible('//h4[contains(text(), \''+ sensor +'\')]')).toEqual(true);
+  });
+
+  it('Edit sensor!', async () => {
+    const sensor = today.substr(0, today.length-4)
+    await dashboardPo.clickToAccordionTabByXpath('(.//a[contains(@class, \'p-accordion-header-link\')])[last()]');
+    await browser.sleep(500);
+    await dashboardPo.clickManipulationUnitButton('sensor_'+sensor);
+    await browser.sleep(500);
+    await dashboardPo.clickByXpath('//span[contains(text(), \'Edit sensor\')]');
+    await dashboardPo.fillEditSensorForm(sensor+'_test');
+    await dashboardPo.clickByXpath('//span[contains(text(), \'Save\')]');
+    await browser.sleep(1000);
+    expect(await navBarPo.success()).toEqual(true);
+    expect(await dashboardPo.xpathIsVisible('//h4[contains(text(), \''+ sensor +'_test\')]')).toEqual(true);
+  });
+
+  it('Delete sensor!', async () => {
+    const sensor = today.substr(0, today.length-4)
+    await dashboardPo.clickToAccordionTabByXpath('(.//a[contains(@class, \'p-accordion-header-link\')])[last()]');
+    await browser.sleep(500);
+    await dashboardPo.clickManipulationUnitButton('sensor_'+sensor);
+    await browser.sleep(500);
+    await dashboardPo.clickByXpath('//span[contains(text(), \'Delete sensor\')]');
+    await dashboardPo.clickByXpath('//span[contains(text(), \'Yes\')]');
+    await browser.sleep(1000);
+    expect(await navBarPo.success()).toEqual(true);
+    expect(await element(by.xpath('//h4[contains(text(), \''+ sensor +'\')]')).isPresent()).toEqual(false);
+  });
+
+  it('Delete unit!', async () => {
+    await dashboardPo.clickManipulationUnitButton(today.substr(0, today.length-4));
+    await browser.sleep(500);
+    await dashboardPo.clickByXpath('//span[contains(text(), \'Delete unit\')]');
+    await dashboardPo.clickByXpath('//span[contains(text(), \'Yes\')]');
+    await browser.sleep(1000);
+    expect(await navBarPo.success()).toEqual(true);
+    expect(await element(by.xpath('//h3[contains(text(), \''+ today +'\')]')).isPresent()).toEqual(false);
+  });
 });

e2e/src/dashboard/dashboard.po.ts

@@ -1 @@
-import { browser, by, element } from 'protractor';
-import * as moment from 'moment-timezone';
+import {by, element, protractor} from 'protractor';
 
 export class DashboardPo {
-  async navigateTo(): Promise<unknown> {
-    return browser.get(browser.baseUrl);
+
+  async clickToAccordionTab(): Promise<unknown> {
+    return element(by.id('p-accordiontab-0')).click();
+  }
+
+  async clickButtonByText(text: string): Promise<unknown> {
+    return element(by.buttonText(text)).click();
   }
 
-  async showUserInsert(): Promise<unknown> {
-    return element(by.id('addUser')).click();
+  async xpathIsVisible(xPath: string): Promise<boolean> {
+    return element(by.xpath(xPath)).isDisplayed();
   }
 
-  async popupShown(): Promise<boolean> {
-    return element(by.className('p-dialog-resizable')).isPresent();
+  async buttonByTextIsVisible(buttonText: string): Promise<boolean> {
+    return element(by.buttonText(buttonText)).isDisplayed();
   }
 
-  async sendUserForm(): Promise<unknown> {
-    const today = moment().format('YYYYMMDDHHMMSS').toString();
-    element(by.id('username')).sendKeys(today);
-    element(by.id('password')).sendKeys('testuser');
-    element(by.id('userRealName')).sendKeys('testuser');
-    element(by.cssContainingText('option', 'testing units')).click();
-    element(by.cssContainingText('option', 'General user')).click();
-    return element(by.buttonText('Save')).click();
+  async clickManipulationUnitButton(id: string): Promise<unknown> {
+    return element(by.id('manipulation_'+id)).click();
   }
 
-  async success(): Promise<boolean> {
-    return element(by.cssContainingText('.p-toast-summary', 'Success')).isPresent();
+  async clickByXpath(xPath: string): Promise<unknown> {
+    return element(by.xpath(xPath)).click();
   }
 
-  async showUnitInsert(): Promise<unknown> {
-    return element(by.id('addUnit')).click();
+  async setUnitDescription(xPath: string, text: string): Promise<unknown> {
+    element(by.xpath(xPath)).clear()
+    return element(by.xpath(xPath)).sendKeys(text);
   }
 
-  async sendUnitForm() {
-    const today = moment().format('YYYYMMDDHHMMSS').toString();
-    element(by.id('unitId')).sendKeys(today);
-    element(by.id('unitDescription')).sendKeys(today);
-    element(by.id('lat')).sendKeys(10);
-    element(by.id('lon')).sendKeys(10);
-    await browser.sleep(3000)
-    element(by.buttonText('Add sensor')).click();
-    await browser.sleep(3000);
-    element(by.id('sensorId')).sendKeys(today);
-    element(by.id('sensorName')).sendKeys(today)
+  async fillPosition(): Promise<unknown> {
+    element(by.id('lat')).click()
+    element(by.id('lat')).sendKeys(protractor.Key.UP, '10');
+    element(by.id('lat')).sendKeys(protractor.Key.UP);
+    element(by.id('lat')).sendKeys(protractor.Key.UP);
+    element(by.id('lon')).click()
+    element(by.id('lon')).sendKeys(protractor.Key.UP);
+    element(by.id('lon')).sendKeys(protractor.Key.UP);
+    element(by.id('lon')).sendKeys(protractor.Key.UP);
+    element(by.id('alt')).sendKeys('10');
+    element(by.id('speed')).sendKeys('10');
+    return element(by.id('dop')).sendKeys('10');
+  }
+
+  async numberOfxPaths(xPath: string): Promise<unknown> {
+    return element.all(by.xpath(xPath)).count();
+  }
+
+  async fillSensorForm(text: string): Promise<unknown> {
+    element(by.id('sensorId')).clear();
+    element(by.id('sensorId')).sendKeys(text);
+    element(by.id('sensorName')).clear()
+    element(by.id('sensorName')).sendKeys(text)
     element(by.cssContainingText('option', 'test')).click();
-    element(by.cssContainingText('option', 'Strikes (  )')).click();
-    await browser.sleep(3000)
-    return element(by.buttonText('Save')).click();
+    return element(by.cssContainingText('option', 'Strikes (  )')).click();
+  }
+
+  async fillEditSensorForm(text: string): Promise<unknown> {
+    element(by.id('sensorName')).clear()
+    return element(by.id('sensorName')).sendKeys(text)
+  }
+
+  async clickToAccordionTabByXpath(xPath: string): Promise<unknown> {
+    return element(by.xpath(xPath)).click();
   }
 }

e2e/src/login/login.e2e-spec.ts

@@ +1 @@
+import {LoginPo} from './login.po';
+
+
+describe('Login Module', () => {
+  let loginPo: LoginPo;
+
+  beforeEach(() => {
+    loginPo = new LoginPo();
+  });
+
+  it('Check if login form displayed!', async () => {
+    await loginPo.navigateTo();
+    expect(await loginPo.getTitleText()).toEqual('Sign in');
+  });
+
+  it('Process login form!', async () => {
+    await loginPo.navigateTo();
+    await loginPo.processForm();
+    expect(await loginPo.dashboardPresent()).toEqual(true);
+    expect(await loginPo.loggedUser()).toEqual(' TESTINS');
+    await loginPo.logout();
+  });
+});

e2e/src/login/login.po.ts

@@ +1 @@
+import { browser, by, element } from 'protractor';
+
+export class LoginPo {
+  async navigateTo(): Promise<unknown> {
+    return browser.get(browser.baseUrl);
+  }
+
+  async getTitleText(): Promise<string> {
+    return element(by.className('login-heading')).getText();
+  }
+
+  async processForm(): Promise<unknown> {
+    element(by.id('username')).sendKeys('testins');
+    element(by.id('password')).sendKeys('insert');
+    return element(by.id('loginButton')).click();
+  }
+
+  async dashboardPresent(): Promise<unknown> {
+    return element(by.className('dashboard')).isPresent();
+  }
+
+  async loggedUser(): Promise<string> {
+    return element(by.id('loggedUser')).getText();
+  }
+
+  async logout(): Promise<unknown> {
+    return element(by.id('logOut')).click();
+  }
+}

e2e/src/nav-bar/nav-bar.e2e-spec.ts

@@ +1 @@
+import {LoginPo} from '../login/login.po';
+import {NavBarPo} from './nav-bar.po';
+
+
+describe('NavBar Module', () => {
+  let navBarPo: NavBarPo;
+  let loginPo: LoginPo
+
+  beforeEach(async () => {
+    navBarPo = new NavBarPo();
+    loginPo = new LoginPo();
+    await loginPo.navigateTo();
+    await loginPo.processForm();
+  });
+
+  afterEach(async () => {
+    await loginPo.logout();
+  });
+
+  it('Add user!', async () => {
+    await navBarPo.showUserInsert();
+    expect(await navBarPo.popupShown()).toEqual(true);
+    await navBarPo.sendUserForm();
+    expect(await navBarPo.success()).toEqual(true);
+  });
+});

e2e/src/nav-bar/nav-bar.po.ts

@@ +1 @@
+import { browser, by, element } from 'protractor';
+import * as moment from 'moment-timezone';
+
+export class NavBarPo {
+  async navigateTo(): Promise<unknown> {
+    return browser.get(browser.baseUrl);
+  }
+
+  async showUserInsert(): Promise<unknown> {
+    return element(by.id('addUser')).click();
+  }
+
+  async popupShown(): Promise<boolean> {
+    return element(by.className('p-dialog-resizable')).isPresent();
+  }
+
+  async sendUserForm(): Promise<unknown> {
+    const today = moment().format('YYYYMMDDHHMMSS').toString();
+    element(by.id('username')).sendKeys(today);
+    element(by.id('password')).sendKeys('testuser');
+    element(by.id('userRealName')).sendKeys('testuser');
+    element(by.cssContainingText('option', 'testing units')).click();
+    element(by.cssContainingText('option', 'General user')).click();
+    return element(by.buttonText('Save')).click();
+  }
+
+  async success(): Promise<boolean> {
+    return element(by.cssContainingText('.p-toast-summary', 'Success')).isPresent();
+  }
+
+  async showUnitInsert(): Promise<unknown> {
+    return element(by.id('addUnit')).click();
+  }
+
+  async sendUnitForm(today: string) {
+    element(by.id('unitId')).sendKeys(today);
+    element(by.id('unitDescription')).sendKeys(today);
+    element(by.id('lat')).sendKeys(10);
+    element(by.id('lon')).sendKeys(10);
+    element(by.buttonText('Add sensor')).click();
+    await browser.sleep(3000);
+    element(by.id('sensorId')).sendKeys(today);
+    element(by.id('sensorName')).sendKeys(today)
+    element(by.cssContainingText('option', 'test')).click();
+    element(by.cssContainingText('option', 'Strikes (  )')).click();
+    await browser.sleep(3000);
+    return element(by.buttonText('Save')).click();
+  }
+
+  async unitInList(today: string) {
+    return element(by.cssContainingText('#p-accordiontab-0 .unitName', today));
+  }
+}

e2e/src/sensor/sensor.e2e-spec.ts

@@ +1 @@
+import {LoginPo} from '../login/login.po';
+import {DashboardPo} from '../dashboard/dashboard.po';
+import {NavBarPo} from '../nav-bar/nav-bar.po';
+import {SensorPo} from './sensor.po';
+import {browser, by, element} from 'protractor';
+
+
+describe('Sensor Module', () => {
+  let loginPo: LoginPo;
+  let navBarPo: NavBarPo;
+  let sensorPo: SensorPo;
+  let dashboardPo: DashboardPo
+
+  beforeEach(async () => {
+    sensorPo = new SensorPo();
+    loginPo = new LoginPo();
+    navBarPo = new NavBarPo();
+    dashboardPo = new DashboardPo();
+    await loginPo.navigateTo();
+    await loginPo.processForm();
+  });
+
+  afterEach(async () => {
+    await loginPo.logout();
+  });
+
+  it('Display sensor page', async () => {
+    await dashboardPo.clickToAccordionTab();
+    await browser.sleep(500);
+    await sensorPo.clickById('test sensor Temp');
+    expect(await element(by.className('container graph')).isPresent()).toEqual(true);
+    expect(await element(by.id('view')).isPresent()).toEqual(true);
+    expect(await element(by.xpath('//div[contains(text(), \'test sensor Temp\')]')).isPresent()).toEqual(true);
+    expect(await element(by.xpath('//div[contains(@class, \'p-listbox-list-wrapper\')]')).isPresent()).toEqual(false);
+    expect(await element(by.xpath('//span[contains(text(), \'Get data\')]')).isPresent()).toEqual(false);
+    await sensorPo.setDateInXpath('//*[contains(@id, \'from\')]//input');
+    expect(await element(by.xpath('//div[contains(@class, \'p-listbox-list-wrapper\')]')).isPresent()).toEqual(true);
+    expect(await element(by.xpath('//span[contains(text(), \'Get data\')]')).isPresent()).toEqual(true);
+  });
+
+});

e2e/src/sensor/sensor.po.ts

@@ +1 @@
+import {browser, by, element} from 'protractor';
+
+export class SensorPo {
+  async clickByXpath(xPath: string): Promise<unknown> {
+    return element(by.xpath(xPath)).click();
+  }
+
+  async clickById(id: string): Promise<unknown> {
+    return element(by.id(id)).click();
+  }
+
+  async setDateInXpath(xPath: string): Promise<unknown> {
+    element(by.xpath(xPath)).click();
+    await browser.sleep(500);
+    element(by.className('p-datepicker-prev-icon')).click();
+    await browser.sleep(500);
+    return element(by.xpath('//td[contains(@class, \'ng-star-inserted\') and not(contains(@class, \'p-datepicker-other-month\'))]'))
+      .click();
+  }
+}

e2e/src/unit/unit.e2e-spec.ts

@@ +1 @@
+import {LoginPo} from '../login/login.po';
+import {DashboardPo} from '../dashboard/dashboard.po';
+import {NavBarPo} from '../nav-bar/nav-bar.po';
+import {browser, by, element} from 'protractor';
+import {UnitPo} from './unit.po';
+
+
+describe('Unit Module', () => {
+  let loginPo: LoginPo;
+  let navBarPo: NavBarPo;
+  let unitPo: UnitPo;
+  let dashboardPo: DashboardPo
+
+  beforeEach(async () => {
+    unitPo = new UnitPo();
+    loginPo = new LoginPo();
+    navBarPo = new NavBarPo();
+    dashboardPo = new DashboardPo();
+    await loginPo.navigateTo();
+    await loginPo.processForm();
+  });
+
+  afterEach(async () => {
+    await loginPo.logout();
+  });
+
+  it('Display Unit page', async () => {
+    await unitPo.clickById('test insert unit4');
+    expect(await element(by.className('container graph')).isPresent()).toEqual(true);
+    expect(await element(by.id('vega_container_10300')).isPresent()).toEqual(true);
+    expect(await element(by.id('vega_container_12300')).isPresent()).toEqual(true);
+    expect(await element(by.xpath('//div[contains(text(), \'test insert unit4\')]')).isPresent()).toEqual(true);
+    expect(await element(by.xpath('//div[contains(@class, \'p-listbox-list-wrapper\')]')).isPresent()).toEqual(false);
+    expect(await element(by.xpath('//span[contains(text(), \'Get data\')]')).isPresent()).toEqual(false);
+    await unitPo.setDateInXpath('//*[contains(@id, \'from\')]//input');
+    expect(await element(by.xpath('//div[contains(@class, \'p-listbox-list-wrapper\')]')).isPresent()).toEqual(true);
+    expect(await element(by.xpath('//span[contains(text(), \'Get data\')]')).isPresent()).toEqual(true);
+    expect(await element(by.id('1030001')).isPresent()).toEqual(true);
+    expect(await element(by.id('1230001')).isPresent()).toEqual(true);
+    await browser.sleep(500);
+    await unitPo.selectSensor('1030001');
+    expect(await element(by.xpath('//input[contains(@id, \'1030001\')]')).isSelected()).toEqual(true);
+    await unitPo.selectSensor('1230001');
+    await browser.sleep(500);
+    expect(await element(by.xpath('//input[contains(@id, \'1230001\')]')).isSelected()).toEqual(true);
+  });
+
+});

e2e/src/unit/unit.po.ts

@@ +1 @@
+import {browser, by, element} from 'protractor';
+
+export class UnitPo {
+  async clickByXpath(xPath: string): Promise<unknown> {
+    return element(by.xpath(xPath)).click();
+  }
+
+  async clickById(id: string): Promise<unknown> {
+    return element(by.id(id)).click();
+  }
+
+  async setDateInXpath(xPath: string): Promise<unknown> {
+    element(by.xpath(xPath)).click();
+    await browser.sleep(500);
+    element(by.className('p-datepicker-prev-icon')).click();
+    await browser.sleep(500);
+    return element(by.xpath('//td[contains(@class, \'ng-star-inserted\') and not(contains(@class, \'p-datepicker-other-month\'))]'))
+      .click();
+  }
+
+  async selectSensor(selectSensorId: string): Promise<unknown> {
+    return element(by.id(selectSensorId)).click();
+  }
+}

src/app/dashboard/components/dashboard.component.html

@@ -5 +5 @@
       <p-accordionTab *ngFor="let unit of units">
         <p-header [className]="'dashboard-unit-wrapper'">
           <div [className]="'row dashboard-unit'">
-            <div class="col-sm-5 col-md-7 col-xl-9"><h3>{{ unit.unit.description}}</h3></div>
+            <div class="col-sm-5 col-md-7 col-xl-9"><h3 class="unitName">{{ unit.unit.description}}</h3></div>
             <div class="col-sm-7 col-md-5 col-xl-3 dashboard-unit-heading">
-              <p-button label="Sensors graph" icon="pi pi-chart-line" [routerLink]="['/dashboard/unit', unit.unit.unitId]" [queryParams]="{unitDescription: unit.unit.description}"></p-button>
+              <p-button [id]="unit.unit.description" label="Sensors graph" icon="pi pi-chart-line" [routerLink]="['/dashboard/unit', unit.unit.unitId]" [queryParams]="{unitDescription: unit.unit.description}"></p-button>
               <div class="dashboard-button-separator"></div>
-              <p-button icon="pi pi-cog" styleClass="p-button-warning" (click)="showItems($event, unit.unit); menu.toggle($event)"></p-button>
+              <p-button [id]="'manipulation_'+unit.unit.unitId" icon="pi pi-cog" styleClass="p-button-warning" (click)="showItems($event, unit.unit); menu.toggle($event)"></p-button>
               <p-menu #menu [popup]="true" [model]="items" [appendTo]="'body'" [baseZIndex]="50"></p-menu>
             </div>
           </div>

src/app/dashboard/components/sensor-insert-popup/sensor-insert-popup.component.html

@@ -48 +48 @@
   <p-footer>
     <div class="popup-buttons-wrapper">
       <p-button type="button" (click)="addSensor()" class="pr-2">Add Sensor</p-button>
+      <p-button *ngIf="sensors > 1" type="button" (click)="removeSensor()" class="pr-2">Remove last sensor</p-button>
       <div>
         <p-button icon="pi pi-times" (click)="close()" label="Close" class="pr-2"></p-button>
         <p-button icon="pi pi-check" (click)="processSensorInsertion()" type="submit" label="Save" class="pr-2"></p-button>

src/app/dashboard/components/sensors/sensors.component.html

@@ -5 +5 @@
     </div>
   </div>
   <div class="col-sm-5 col-md-4 col-lg-3 col-xl-2 dashboard-sensor-heading">
-    <button pButton type="button" label="View graph" [routerLink]="['/dashboard/unit', unit.unitId, 'sensor', sensor.sensorId]" [queryParams]="{unitName: unit.description}" title="Sensor" icon="pi pi-chart-line"></button>
+    <button [id]="sensor.sensorName" pButton type="button" label="View graph" [routerLink]="['/dashboard/unit', unit.unitId, 'sensor', sensor.sensorId]" [queryParams]="{unitName: unit.description}" title="Sensor" icon="pi pi-chart-line"></button>
     <ng-container *ngIf="loggedUser?.userInfo?.rightsId == 0 || loggedUser?.userInfo?.rightsId == 1">
       <div class="dashboard-button-separator"></div>
-      <p-button icon="pi pi-cog" styleClass="p-button-warning" (click)="showItems($event, sensor); menu.toggle($event)"></p-button>
+      <p-button [id]="'manipulation_sensor_'+sensor.sensorId" icon="pi pi-cog" styleClass="p-button-warning" (click)="showItems($event, sensor); menu.toggle($event)"></p-button>
       <p-menu #menu [popup]="true" [model]="items" [appendTo]="'body'" [baseZIndex]="50"></p-menu>
     </ng-container>
   </div>

src/app/sensor/components/sensor.component.html

@@ -29 +29 @@
         <div class="input-group-prepend">
           <span class="input-group-text text-color-date background-date-color"><i class="fa fa-calendar-alt" aria-hidden="false"></i></span>
         </div>
-        <p-calendar [style]="{'width':'100%'}" [inputStyle]="{'width':'100%'}" [(ngModel)]="from" [showTime]="true" (onSelect)="aggregationShow()" [maxDate]="today" showButtonBar="true"></p-calendar>
+        <p-calendar id="from" [(ngModel)]="from" [showTime]="true" (onSelect)="aggregationShow()" [maxDate]="today" showButtonBar="true"></p-calendar>
       </div>
     </div>
     <div class="graph-range-dates-separator"></div>
@@ -38 +38 @@
         <div class="input-group-prepend">
           <span class="input-group-text text-color-date background-date-color"><i class="fa fa-calendar-alt" aria-hidden="false"></i></span>
         </div>
-        <p-calendar [style]="{'width':'100%'}" [inputStyle]="{'width':'100%'}" [(ngModel)]="to" [showTime]="true" (onSelect)="aggregationShow()" [maxDate]="today" showButtonBar="true"></p-calendar>
+        <p-calendar id="to" [(ngModel)]="to" [showTime]="true" (onSelect)="aggregationShow()" [maxDate]="today" showButtonBar="true"></p-calendar>
       </div>
     </div>
     <div>

src/app/shared/nav-bar/components/nav-bar.component.html

@@ -30 +30 @@
             <h2 id="loggedUser"><i class="fas fa-user"></i>&nbsp;<strong>{{loggedUser?.userInfo?.userName.toUpperCase()}}</strong></h2>
           </li>
           <li class="nav-item">
-            <a class='nav-link' [routerLink]="['/login']" (click)="logOut()"><h2><i class="fas fa-sign-out-alt"></i>&nbsp;Logout</h2></a>
+            <a class='nav-link' id="logOut" [routerLink]="['/login']" (click)="logOut()"><h2><i class="fas fa-sign-out-alt"></i>&nbsp;Logout</h2></a>
           </li>
         </ul>
       </div>

src/app/unit/components/unit.component.html

@@ -13 +13 @@
         <div class="input-group-prepend">
           <span class="input-group-text text-color-date background-date-color"><i class="fa fa-calendar-alt" aria-hidden="false"></i></span>
         </div>
-        <p-calendar [style]="{'width':'100%'}" [inputStyle]="{'width':'100%'}" [(ngModel)]="from" [showTime]="true" (onSelect)="aggregationShow()" [maxDate]="today" showButtonBar="true"></p-calendar>
+        <p-calendar id="from" [style]="{'width':'100%'}" [inputStyle]="{'width':'100%'}" [(ngModel)]="from" [showTime]="true" (onSelect)="aggregationShow()" [maxDate]="today" showButtonBar="true"></p-calendar>
       </div>
     </div>
     <div class="graph-range-dates-separator"></div>
@@ -22 +22 @@
         <div class="input-group-prepend">
           <span class="input-group-text text-color-date background-date-color"><i class="fa fa-calendar-alt" aria-hidden="false"></i></span>
         </div>
-        <p-calendar [style]="{'width':'100%'}" [inputStyle]="{'width':'100%'}" [(ngModel)]="to" [showTime]="true" (onSelect)="aggregationShow()" [maxDate]="today" showButtonBar="true"></p-calendar>
+        <p-calendar id="to" [style]="{'width':'100%'}" [inputStyle]="{'width':'100%'}" [(ngModel)]="to" [showTime]="true" (onSelect)="aggregationShow()" [maxDate]="today" showButtonBar="true"></p-calendar>
       </div>
     </div>
     <div>
@@ -50 +50 @@
       </div>
       <ng-container *ngFor="let sensor of sensors">
           <div *ngIf="sensor.sensorId.toString().slice(0, 5) === group" class="p-field-checkbox">
-            <p-checkbox name="{{group}}" [value]="sensor.sensorId.toString()" [(ngModel)]="selectedSensors" [inputId]="sensor.sensorId.toString()" (onChange)="addSensorToGraph(sensor.sensorId.toString(), $event)"></p-checkbox>
+            <p-checkbox [id]="sensor.sensorId" name="{{group}}" [value]="sensor.sensorId.toString()" [(ngModel)]="selectedSensors" [inputId]="sensor.sensorId.toString()" (onChange)="addSensorToGraph(sensor.sensorId.toString(), $event)"></p-checkbox>
             <label>{{sensor.sensorName}}</label>
           </div>
       </ng-container>