Skip to content

Commit

Permalink
Merge branch 'release/14.4' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
openprojectci committed Aug 3, 2024
2 parents d37b50c + a596d10 commit f26c435
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 8 deletions.
7 changes: 7 additions & 0 deletions docker/dev/backend/scripts/setup-bim
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#!/bin/sh

# This script installs all the required dependencies and command line tools to convert IFC files into XKT files,
# so that the BIM models can be viewed via the Xeokit BIM viewer.
#
# Run this script on your worker container like this to enable your Docker based development setup to convert IFC
# files to XKT:
# $ docker compose exec -u root worker setup-bim

apt-get install -y wget unzip

# https://learn.microsoft.com/en-gb/dotnet/core/install/linux-debian#debian-12
Expand Down
24 changes: 24 additions & 0 deletions docs/development/development-environment-docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,36 @@ To get right into it and just start the application you can just do the followin
git clone https://github.com/opf/openproject.git
cd openproject
cp .env.example .env
```

Optional: In case you want to develop on the OpenProject *BIM Edition* you need to set the
environmental variable accordingly in your `.env` file.

```shell
OPENPROJECT_EDITION=bim
```

Then continue the setup:

```shell
cp docker-compose.override.example.yml docker-compose.override.yml
docker compose run --rm backend setup
docker compose run --rm frontend npm install
docker compose up -d frontend
```

Optional: In case you want to develop on the OpenProject *BIM Edition* you need
to install all the required dependencies and command line tools to convert IFC
files into XKT files, so that the BIM models can be viewed via the *Xeokit*
BIM viewer. As the conversions are done by background jobs you need install
those tools within the `worker` service:

```shell
docker compose exec -u root worker setup-bim
```

Please find below instructions on how to start and stop the workers.

Once the containers are done booting you can access the application under `http://localhost:3000`.

### Tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,41 @@ Work packages can have various status depending on their types, e.g. tasks can h

The status can be set at the top of the work package details view or in the table view in the corresponding column.

![Work packages status dropdown menu in OpenProject](openproject_system_guide_create_wp_stati_dropdown.png)The status field can be configured under *Administration ->* *Work packages* -> *Status*. You will see the list of all the existing work package status in the system. You can add new status or change the name and order of existing status.
![Work packages status dropdown menu in OpenProject](openproject_system_guide_create_wp_stati_dropdown.png)

The status field can be configured under *Administration ->* *Work packages* -> *Status*. You will see the list of all the existing work package statuses in the system. You can add new statuses or change the name and order of existing statuses.

![Work package status overview in OpenProject administration](openproject_system_guide_create_wp_status_overview.png)

To learn about the options for configuring the transition from one status to another navigate to [Manage work package workflows](../work-package-workflows).

## Create a new work package status

To create a new work package status click the green ***+ Status*** icon.


A new window will open, where you will be able to specify the following:

1. Name the new work package status.

2. The % Complete value in [Status-based progress calculation mode](../work-package-settings/).

> [!TIP]
>
> The value for % Complete can be set from 0 to 100.
>
3. Define if the new work package status closes a work package (e.g. relevant when filtering for closed for packages), e.g. a work package status "rejected" will set a work package technically on closed and it will not appear in the default work package table with Open Work packages.

4. Define if this status is set as default value when creating new work packages. BEWARE: If you decide to set the new status as default it will impact all work packages, existing and future ones. See more below.

5. Check if this status sets a **work package in read-only mode**. This means no work package attributes can be changed except the status.

6. Check **Exclude from calculation of totals in hierarchy** if you want work packages with this status to *not* be included in the calculation of totals in a hierarchy. This is useful for statuses like *rejected*.

7. Set a **color** for the work package status. The color appears in the status button of the work packages or in the work package table.

Save the new status by clicking **Create**.
Save the new status by clicking **Create**.

![Create a new work package status in OpenProject administration](openproject_system_guide_create_new_wp_status.png)

Expand All @@ -49,4 +66,5 @@ When you decide to set the new status as default status please note the followin

![Edit work package status in OpenProject administration](openproject_system_guide_edit_new_wp_status.png)

> **Note**: A new status needs to be activated in the [work package workflows](../work-package-workflows) in order to appear in the status drop down of a work package.
> [!NOTE]
> A new status needs to be activated in the [work package workflows](../work-package-workflows) in order to appear in the status drop down of a work package.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions frontend/src/global_styles/vendor/_enjoyhint.sass
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
-webkit-border-radius: 40px
border-radius: 40px


.enjoyhint_skip_btn
position: fixed
-webkit-border-radius: 40px
Expand Down Expand Up @@ -95,7 +94,7 @@
border: none
font: 400 100%/normal Arial, Helvetica, sans-serif
color: rgba(0, 0, 0, 1)
background: #fff
background: var(--font-color-on-primary)
text-shadow: none
-o-text-overflow: clip
text-overflow: clip
Expand All @@ -109,7 +108,7 @@
border: none
font: 400 100%/normal Arial, Helvetica, sans-serif
color: rgba(0, 0, 0, 1)
background: #fff
background: var(--font-color-on-primary)
text-shadow: none
-o-text-overflow: clip
text-overflow: clip
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

<%=
render Primer::OpenProject::PageHeader.new do |header|
header.with_title { I18n.t("two_factor_authentication.settings.title") }
header.with_title { I18n.t("two_factor_authentication.label_two_factor_authentication") }
header.with_breadcrumbs([{ href: admin_index_path, text: t(:label_administration) },
{ href: admin_settings_authentication_path, text: t(:label_authentication) },
I18n.t("two_factor_authentication.settings.title")])
I18n.t("two_factor_authentication.label_two_factor_authentication")])
end
%>

Expand Down

0 comments on commit f26c435

Please sign in to comment.