Skip to content

Commit

Permalink
Merge branch 'develop' into Th0rst3nH-OP-1299
Browse files Browse the repository at this point in the history
  • Loading branch information
mwithi committed Nov 20, 2024
2 parents 449b3e8 + 95f9f2c commit 27719ec
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 307 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ For the moment, to build this project you should
- URL base: http://localhost:8080
- URL login: http://localhost:8080/auth/login
- URL patients: http://localhost:8080/patients
- URL swagger: http://localhost:8080/swagger-ui.html
- URL swagger: http://localhost:8080/swagger-ui/index.html

You can see Swagger API Documentation at: http://localhost:8080/swagger-ui/index.html

Expand Down Expand Up @@ -139,14 +139,14 @@ Make sure you have docker with docker-compose installed, then run the following
- (optional - demo data after set the database container, English only) run `docker compose run --rm oh-database-init`
- run `docker compose up backend`

When done successfully, head over at http://localhost:[API_PORT]/swagger-ui/
When done successfully, head over at http://localhost:[API_PORT]/swagger-ui/index.html

You can change the deployment branch using the .env file.

NOTE:

- API should be already available from LAN at http://your-server-ip:[API_PORT]
- Swagger will be available at http://[API_HOST]:[API_PORT]
- Swagger will be available at http://[API_HOST]:[API_PORT]/swagger-ui/index.html

## How to generate openapi specs

Expand Down
5 changes: 5 additions & 0 deletions openapi/oh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8286,6 +8286,11 @@ components:
description: The out-quantity
format: float
example: 89
lock:
type: integer
description: Lock
format: int32
example: 0
MedicalWardIdDTO:
required:
- medical
Expand Down
12 changes: 11 additions & 1 deletion src/main/java/org/isf/medicalstockward/dto/MedicalWardDTO.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Open Hospital (www.open-hospital.org)
* Copyright © 2006-2023 Informatici Senza Frontiere ([email protected])
* Copyright © 2006-2024 Informatici Senza Frontiere ([email protected])
*
* Open Hospital is a free and open source software for healthcare data management.
*
Expand Down Expand Up @@ -34,6 +34,9 @@ public class MedicalWardDTO {
@Schema(description = "The out-quantity", example = "89")
private float out_quantity;

@Schema(description = "Lock", example = "0")
private int lock;

public MedicalWardDTO() {
}

Expand Down Expand Up @@ -66,4 +69,11 @@ public void setIn_quantity(float in_quantity) {
public void setOut_quantity(float out_quantity) {
this.out_quantity = out_quantity;
}

public int getLock() {
return lock;
}
public void setLock(int lock) {
this.lock = lock;
}
}
Binary file removed static/swagger-ui/favicon-16x16.png
Binary file not shown.
Binary file removed static/swagger-ui/favicon-32x32.png
Binary file not shown.
60 changes: 0 additions & 60 deletions static/swagger-ui/index.html

This file was deleted.

68 changes: 0 additions & 68 deletions static/swagger-ui/oauth2-redirect.html

This file was deleted.

136 changes: 0 additions & 136 deletions static/swagger-ui/swagger-ui-bundle.js

This file was deleted.

1 change: 0 additions & 1 deletion static/swagger-ui/swagger-ui-bundle.js.map

This file was deleted.

22 changes: 0 additions & 22 deletions static/swagger-ui/swagger-ui-standalone-preset.js

This file was deleted.

1 change: 0 additions & 1 deletion static/swagger-ui/swagger-ui-standalone-preset.js.map

This file was deleted.

4 changes: 0 additions & 4 deletions static/swagger-ui/swagger-ui.css

This file was deleted.

1 change: 0 additions & 1 deletion static/swagger-ui/swagger-ui.css.map

This file was deleted.

9 changes: 0 additions & 9 deletions static/swagger-ui/swagger-ui.js

This file was deleted.

1 change: 0 additions & 1 deletion static/swagger-ui/swagger-ui.js.map

This file was deleted.

0 comments on commit 27719ec

Please sign in to comment.