Skip to content

Commit

Permalink
Merge branch 'informatici:develop' into OP-312-telemetry-module
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndreiDodu
AndreiDodu authored Sep 1, 2021
2 parents 2f4dda1 + 772ebd6 commit 11bf28e
Show file tree
Hide file tree
Showing 209 changed files with 5,977 additions and 5,894 deletions.
43 changes: 26 additions & 17 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Open Hospital - GUI
[![Java CI](https://github.com/informatici/openhospital-gui/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/informatici/openhospital-gui/actions?query=workflow%3A%22Java+CI+with+Maven%22)

This is the GUI component of [Open Hospital][openhospital]: it contains a graphical user interface (GUI) made with Java Swing.
This project depends on the [Core component][openhospital-core] for the business logic and the data abstraction layer.
This is the GUI component of [Open Hospital][openhospital]: it contains a graphical user interface (GUI) made with Java Swing.
This project depends on the [Core component][openhospital-core] for the business logic and the data abstraction layer.
An alternative user interface based on React and currently still work-in-progress is available [here][openhospital-ui].

## How to build
Expand All @@ -11,24 +11,33 @@ To build this project you'll need Java JDK 8+ and Maven.
Additionally, you'll need to build and install locally the [Core component][openhospital-core] of Open Hospital.
Once you do that, to build this project just issue:

mvn package
mvn package

To run the tests simply issue:

mvn test
mvn test

## How to launch Open Hospital

To launch Open Hospital GUI, use the scripts `startup.sh` (on Linux) or `startup.cmd` (on Windows).
To launch Open Hospital GUI, use the scripts `startup.sh` (on Linux) or `startup.cmd` (on Windows).
You will need a MySQL database running locally (e.g. the Docker container available in the Core project),
or any similar SQL database. Before running the application, you should change
`rsc/database.properties` accordingly.
or any similar SQL database (e.g. MariaDB).

For futher information, please refer to the Admin and User manuals in the [Doc project][openhospital-doc].
Before running the application, you should copy the distribution files and change them accordingly
(or use/modify `.sample` files with most common settings):

| Dist file | Property file | Properties to fill in |
|--------------------------|---------------------|---------------------------------------------------------------|
| database.properties.dist | database.properties | DBSERVER, DBPORT, DBNAME, DBUSER, DBPASS |
| dicom.properties.dist | dicom.properties | OH_PATH_SUBSTITUTE/DICOM_DIR, DICOM_SIZE |
| log4j.properties.dist | log4j.properties | LOG_DEST, DBSERVER, DBPORT, DBNAME, DBUSER, DBPASS, LOG_LEVEL |
| settings.properties.dist | settings.properties | OH_SET_LANGUAGE |

*For further information, please refer to the Admin and User manuals in the [Doc project][openhospital-doc].*

## How to contribute

You can find the contribution guidelines in the [Open Hospital wiki][contribution-guide].
You can find the contribution guidelines in the [Open Hospital wiki][contribution-guide].
A list of open issues is available on [Jira][jira].

## Community
Expand All @@ -51,9 +60,9 @@ For IntelliJ IDEA the process for importing the code style is:
* Go to *Scheme* at the top, click on the setting button by the side of the drop-down list
* Select *Import Scheme*
* Select *IntelliJ IDE code style XML*
* Navigate to the location of the file which relative to the project root is: `.ide-settings/idea/OpenHospital-code-style-configuration.xml`
* Navigate to the location of the file which relative to the project root is: `.ide-settings/idea/OpenHospital-code-style-configuration.xml`
* Select *OK*
* At this point the code style is stored as part of the IDE and is used for **all** projects opened in the editor. To restrict the settings to just this project again select the setting button by the side of the *Scheme* list and select *Copy to Project...*. If successful a notice appears in the window that reads: *For current project*.
* At this point the code style is stored as part of the IDE and is used for **all** projects opened in the editor. To restrict the settings to just this project again select the setting button by the side of the *Scheme* list and select *Copy to Project...*. If successful a notice appears in the window that reads: *For current project*.

</details>

Expand All @@ -66,14 +75,14 @@ For Eclipse the process requires loading the formatting style and the import ord
* Select *Code Style* and expand the menu
* Select *Formatter*
* Select the *Import...* button
* Navigate to the location of the file which relative to the project root is: `.ide-settings/eclipse/OpenHospital-Java-CodeStyle-Formatter.xml`
* Navigate to the location of the file which relative to the project root is: `.ide-settings/eclipse/OpenHospital-Java-CodeStyle-Formatter.xml`
* Select *Open*
* At this point the code style is stored and is applicable to all projects opened in the IDE. To restrict the settings just to this project select *Configure Project Specific Settings...* in the upper right. In the next dialog select the *openhospital* repository and select *OK*. In the next dialog select the *Enable project specific settings* checkbox. Finally select *Apply and Close*.
* At this point the code style is stored and is applicable to all projects opened in the IDE. To restrict the settings just to this project select *Configure Project Specific Settings...* in the upper right. In the next dialog select the *openhospital* repository and select *OK*. In the next dialog select the *Enable project specific settings* checkbox. Finally select *Apply and Close*.
* Back in the *Code Style* menu area, select *Organize Imports*
* Select *Import...*
* Navigate to the location of the file which relative to the project root is: `.ide-settings/eclipse/OpenHospital.importorder`
* Navigate to the location of the file which relative to the project root is: `.ide-settings/eclipse/OpenHospital.importorder`
* Select *Open*
* As with the formatting styles the import order is applicable to all projects. In order to change it just for this project repeat the same steps as above for *Configure Project Specific Settings...*
* As with the formatting styles the import order is applicable to all projects. In order to change it just for this project repeat the same steps as above for *Configure Project Specific Settings...*

</details>

Expand Down
1 change: 1 addition & 0 deletions bundle/language_ar.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ angal.medicalstockward.insertvalidage = إ
angal.medicalstockward.medical = دواء
angal.medicalstockward.outcomes = النتائج
angal.medicalstockward.packets = الحزم
angal.medicalstockward.packets.fmt = {0} الحزم
angal.medicalstockward.pieces = قطعة
angal.medicalstockward.pleaseselectanoutcomesmovementfirst = يرجى تحديد حركة مخرجات الأولى
angal.medicalstockward.rectify.instock = في المخزن
Expand Down
4 changes: 3 additions & 1 deletion bundle/language_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ angal.examination.respiratoryrateabbr.col
angal.examination.respiratoryrateunit = bpm
angal.examination.saturation = Saturation
angal.examination.saturationabbr.col = O2
angal.examination.savethechanges.msg = Save the changes?
angal.examination.temperature = Temperature
angal.examination.temperatureabbr.col = T
angal.examination.title = Patient Examination
Expand Down Expand Up @@ -771,11 +772,12 @@ angal.medicalstockward.newlot.btn
angal.medicalstockward.newlot.btn.key = N
angal.medicalstockward.outcomes = Outcomes
angal.medicalstockward.packets = packets
angal.medicalstockward.packets.fmt = {0} packets
angal.medicalstockward.patient.date.col = Date
angal.medicalstockward.patient.drug.col = Drug
angal.medicalstockward.patient.quantity.col = Quantity
angal.medicalstockward.patient.units.col = Units
angal.medicalstockward.pieces = \ pieces
angal.medicalstockward.pieces = pieces
angal.medicalstockward.pleaseselectanoutcomesmovementfirst = Please select an Outcomes movement first
angal.medicalstockward.rectify.actualquantity = Actual Quantity
angal.medicalstockward.rectify.btn = Rectify
Expand Down
2 changes: 2 additions & 0 deletions bundle/language_es.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ angal.examination.respiratoryrateabbr.col
angal.examination.respiratoryrateunit = Unidad de frecuencia respiratoria
angal.examination.saturation = Saturación
angal.examination.saturationabbr.col = O2
angal.examination.savethechanges.msg = ¿Guardar los cambios?
angal.examination.temperature = Temperatura
angal.examination.temperatureabbr.col = T
angal.examination.title = Examen
Expand Down Expand Up @@ -771,6 +772,7 @@ angal.medicalstockward.newlot.btn
angal.medicalstockward.newlot.btn.key = L
angal.medicalstockward.outcomes = Salidas
angal.medicalstockward.packets = Paquetes
angal.medicalstockward.packets.fmt = {0} paquetes
angal.medicalstockward.patient.date.col = Fecha
angal.medicalstockward.patient.drug.col = Fármaco
angal.medicalstockward.patient.quantity.col = Cantidad
Expand Down
2 changes: 2 additions & 0 deletions bundle/language_fr.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ angal.examination.respiratoryrateabbr.col
angal.examination.respiratoryrateunit = bpm
angal.examination.saturation = Saturation
angal.examination.saturationabbr.col = O2
angal.examination.savethechanges.msg = Enregistrer modification
angal.examination.temperature = Température
angal.examination.temperatureabbr.col = T
angal.examination.title = Examen Patient
Expand Down Expand Up @@ -771,6 +772,7 @@ angal.medicalstockward.newlot.btn
angal.medicalstockward.newlot.btn.key = N
angal.medicalstockward.outcomes = Sorties
angal.medicalstockward.packets = paquets
angal.medicalstockward.packets.fmt = {0} paquets
angal.medicalstockward.patient.date.col = Date
angal.medicalstockward.patient.drug.col = Drug
angal.medicalstockward.patient.quantity.col = Quantité
Expand Down
1 change: 1 addition & 0 deletions bundle/language_pt.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ angal.medicalstockward.insertvalidage = In
angal.medicalstockward.medical = Médica
angal.medicalstockward.outcomes = Saídas
angal.medicalstockward.packets = pacotes
angal.medicalstockward.packets.fmt = {0} pacotes
angal.medicalstockward.pieces = pieces
angal.medicalstockward.pleaseselectanoutcomesmovementfirst = Selecione primeiro um movimento de resultados
angal.medicalstockward.rectify.actualquantity = Quantidade real
Expand Down
1 change: 1 addition & 0 deletions bundle/language_sw.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ angal.medicalstockward.insertvalidage = We
angal.medicalstockward.medical = Dawa
angal.medicalstockward.outcomes = Zinazotoka
angal.medicalstockward.packets = pakiti
angal.medicalstockward.packets.fmt = {0} pakiti
angal.medicalstockward.pleaseselectanoutcomesmovementfirst = Tafadhali chagua muendelezo wa Zinazotoka kwanza
angal.medicalstockward.rectify.instock = kuwepo
angal.medicalstockward.rectify.medical = Utabibu
Expand Down
Loading

0 comments on commit 11bf28e

Please sign in to comment.