Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Commit

Permalink
feat(models): add billed flag to report models
Browse files Browse the repository at this point in the history
  • Loading branch information
Yelinz authored and Stefan committed Apr 15, 2021
1 parent 1313d9a commit c64ba39
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
8 changes: 1 addition & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,7 @@ If you have a running [backend](https://github.com/adfinis-sygroup/timed-backend
or
- `yarn start`

If you are using docker-compose you can start the frontend and backend by running the following in the backend project

```
docker-compose up -d --build
```

The frontend will be under [http://timed.local](http://timed.local) and the backend [http://timed.local/admin/](http://timed.local/admin/)
If you are using docker-compose you can start a static frontend and the backend by following the instructions in the [backend](https://github.com/adfinis-sygroup/timed-backend)

### Running Tests

Expand Down
1 change: 1 addition & 0 deletions app/models/report-intersection.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default Model.extend({
comment: attr("string"),
notBillable: attr("boolean", { allowNull: true, defaultValue: null }),
review: attr("boolean", { allowNull: true, defaultValue: null }),
billed: attr("boolean", { allowNull: true, defaultValue: null }),
verified: attr("boolean", { allowNull: true, defaultValue: null }),

customer: belongsTo("customer"),
Expand Down
8 changes: 8 additions & 0 deletions app/models/report.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ export default Model.extend({
*/
notBillable: attr("boolean", { defaultValue: false }),

/**
* Whether the report has been marked as billed
*
* @property {Boolean} billed
* @public
*/
billed: attr("boolean", { defaultValue: false }),

/**
* The task
*
Expand Down

0 comments on commit c64ba39

Please sign in to comment.