Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 0 additions & 58 deletions .github/workflows/cypress.yml

This file was deleted.

11 changes: 10 additions & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ jobs:
run: |-
pipenv run ruff format --check .

- name: Install Playwright Browsers
run: |
pipenv run playwright install --with-deps

- name: Start Clima
run: |-
pipenv run python main.py &

- name: Test Clima
run: |-
pipenv run python -m pytest
cd tests
pipenv run pytest --base-url=http://127.0.0.1:8080
2 changes: 2 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ bump2version = "*"
black = "*"
ruff = "*"
pre-commit = "*"
pytest-playwright = "*"
pytest-xdist = "*"

[requires]
python_version = "3.11"
516 changes: 420 additions & 96 deletions Pipfile.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ This ongoing project results from the collaboration and contributions of the peo
* [Chun Him Lee](https://www.linkedin.com/in/chun-him-lee-01b553129/): Coding and review
* [Tu Minh Phuong Doan](https://www.linkedin.com/in/harry-doan-legopher/): Coding and review
* [Yixun Quan](https://www.linkedin.com/in/yixun-quan-929a661a3): Coding and review
* Yuqing Luo: Coding, code maintenance and review
* [Yuqing Luo](https://leo-5a2.pages.dev/): Coding, code maintenance and review
* Wenshu lyu: Coding, code maintenance and review
* Ziqi Liu: Coding, code maintenance and review
* Tianchi Liu: Coding, code maintenance and review
* Qian Liu: Coding, code maintenance and review
* [Qian Liu](https://www.linkedin.com/in/qian-liu-48b294342): Coding, code maintenance and review
* Feng Wang: Coding, code maintenance and review

## Acknowledgment
Expand Down
13 changes: 9 additions & 4 deletions docs/contributing/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,17 @@ Before submitting a Pull Request, please make sure:

```bash
pipenv sync --dev
pipenv run playwright install # Required to install browsers
```

- Run tests using pytest:

Start the app server:
```bash
pipenv run pytest
pipenv run python main.py
```
Then, from the root directory, run tests using pytest:
```bash
cd tests

pipenv run pytest --base-url=http://127.0.0.1:8080
```

## Submitting changes
Expand Down
14 changes: 14 additions & 0 deletions docs/version/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## Version 0.9.0\(2025-10-30)

Feat:

* Moved the top navigation bar to the left side
* Extracted the hours and months into a global filter and place it in the Sidebar
* Migrated testing framework from Cypress to Playwright

Fix:

* Fixed issues #249, #245, #159, #242: Code redundancy and CSS styling issues
* Fixed issues #248
* Fixed issues #236, #259: Sidebar issues

## Version 0.8.5 \(2023-04-12\)

Feat:
Expand Down
31 changes: 13 additions & 18 deletions pages/natural_ventilation.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,21 +161,16 @@ def inputs_tab(t_min, t_max, d_set):
),
],
),
dmc.CheckboxGroup(
dmc.Checkbox(
id=ElementIds.ENABLE_CONDENSATION,
value=[],
children=[
dmc.Checkbox(
label=(
"Avoid condensation with radiant systems: If the "
"outdoor dew point temperature is below the radiant "
"system surface temperature, the data point is not plot."
),
value=1,
size="sm",
w="70%",
)
],
label=(
"Avoid condensation with radiant systems: If the "
"outdoor dew point temperature is below the radiant "
"system surface temperature, the data point is not plot."
),
checked=False,
size="sm",
w="70%",
),
dmc.Button(
"Apply filter",
Expand Down Expand Up @@ -565,17 +560,17 @@ def nv_bar_chart(

@callback(
Output(ElementIds.NV_DPT_FILTER, "disabled"),
Input(ElementIds.ENABLE_CONDENSATION, "value"),
Input(ElementIds.ENABLE_CONDENSATION, "checked"),
)
def enable_disable_button_data_filter(state_checklist):
if len(state_checklist) == 1:
def enable_disable_button_data_filter(state_checkbox):
if state_checkbox:
return False
else:
return True


def enable_dew_point_data_filter(condensation_enabled):
if len(condensation_enabled) == 1:
if condensation_enabled:
return True
else:
return False
6 changes: 6 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import pytest


@pytest.fixture(scope="session")
def base_url(pytestconfig):
return pytestconfig.getoption("base_url")
12 changes: 0 additions & 12 deletions tests/node/cypress.config.js

This file was deleted.

2 changes: 0 additions & 2 deletions tests/node/cypress/.gitignore

This file was deleted.

128 changes: 0 additions & 128 deletions tests/node/cypress/e2e/spec.cy.js

This file was deleted.

5 changes: 0 additions & 5 deletions tests/node/cypress/fixtures/example.json

This file was deleted.

25 changes: 0 additions & 25 deletions tests/node/cypress/support/commands.js

This file was deleted.

Loading