Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
ad35c9b
chore:align API spec file
SilverD3 Nov 8, 2024
30dd005
chore:add settings state slice
SilverD3 Nov 9, 2024
0a97c92
fix:fix SettingDTO
SilverD3 Nov 11, 2024
9f8a887
feat:app settings management
SilverD3 Nov 12, 2024
789af41
Merge branch 'develop' of https://github.com/informatici/openhospital…
SilverD3 Nov 13, 2024
b24c680
Merge branch 'develop' of https://github.com/informatici/openhospital…
SilverD3 Nov 19, 2024
b2cccac
update: Add radiology component
Dec 5, 2024
37aed41
chore: Restore .env.development file
Dec 5, 2024
096ede8
chore: Add radiology state
Dec 5, 2024
0722848
fix: Fix build
Dec 5, 2024
1c202b2
feature(OH2-421): Add radiology section
Dec 5, 2024
fe1e3ae
feature(OH2-421): Add patient study summary
Dec 6, 2024
414c649
chore: Rename radiology state type
Dec 6, 2024
68cf5ca
chore: Update radiology and rename state reset methods
Dec 6, 2024
a38b37d
chore: Rename readiology state reset methods
Dec 6, 2024
fcfe85d
chore: Update parseNumericDate function to use moment
Dec 6, 2024
69fe9df
update: Update radiology routes and not found activity component
Dec 9, 2024
17c5c97
update: Add instance preview state
Dec 9, 2024
a89f977
feature(OH2-422): Add patient studies table
Dec 9, 2024
e4262cd
fix: Fix last study computation
Dec 10, 2024
2b5b7eb
chore: Update study title
Dec 10, 2024
1d6675b
fix: Fix study title
Dec 10, 2024
5aa3e45
chore: Remove console.log
Dec 10, 2024
16cc21e
fix: Wrap radiology api calls with token refresh wrapper
Dec 10, 2024
9ed92c2
styles: Fix studies component styles
Dec 10, 2024
32cb6bb
Merge pull request #1 from SteveGT96/feature/OH2-421-radiology-section
SilverD3 Dec 10, 2024
f45a3e2
Merge branch 'informatici:develop' into integrations/orthanc
SilverD3 Dec 10, 2024
d4ec56a
feature(OH2-422): Add study series table
Dec 10, 2024
a707ee0
chore: Add state to store series with instances
Dec 10, 2024
811d257
chore: Add instances table
Dec 10, 2024
26996f9
chore: Sort series instances
Dec 10, 2024
d525414
feature(OH2-422): Add instance preview
Dec 11, 2024
6025c81
update: Handle series details view
Dec 11, 2024
ce09808
chore: Apply requested changes
Dec 12, 2024
6f0861d
Merge pull request #2 from SteveGT96/feature/OH2-422-studies-series
SilverD3 Dec 12, 2024
eb7b6ba
Merge branch 'develop' of https://github.com/informatici/openhospital…
SilverD3 Jan 31, 2025
12ab2a3
add possibility to print examination
Mar 8, 2025
035b5e3
add button to save and print on the patientExaminationForm and starte…
Mar 10, 2025
17238a2
add possibility to save and print the patient examination
Mar 12, 2025
e62d237
update oh.yaml file
Mar 12, 2025
e688176
update oh.yaml file
Mar 12, 2025
a012f53
update PatientTriage accessorie
Mar 18, 2025
b90ca8d
fix bugs
Mar 18, 2025
fd870fc
fixed bug on examination edit
Mar 20, 2025
1e85edc
fix errror
Mar 21, 2025
cdc4feb
Merge branch 'develop' of https://github.com/ArnaudFofou/openhospital…
Apr 3, 2025
190ba5a
Merge branch 'develop' into OH2-455
ArnaudFofou Apr 14, 2025
bb3f3d0
Merge branch 'informatici:develop' into OH2-455
ArnaudFofou Jul 4, 2025
5f11773
Merge branch 'develop' of https://github.com/informatici/openhospital…
SilverD3 Jul 5, 2025
e437d3e
Merge branch 'OH2-455' of https://github.com/ArnaudFofou/openhospital…
Jul 6, 2025
c7f1f44
chore(OH-455):update PatientTriage
Jul 6, 2025
ed35caf
update(OH2-455): update the API to print triage to use pathvariable
Jul 9, 2025
3c6affd
Merge pull request #7 from uni2growcm/integrations/orthanc
SilverD3 Jul 14, 2025
002eeb8
Merge pull request #6 from ArnaudFofou/OH2-455
SilverD3 Jul 14, 2025
9f282be
chore(AT-441): fix error on ExamTable component
Jul 18, 2025
c923269
chore(AT-442): remove breack stype on the table
Jul 18, 2025
e14d3e9
update(AT-442): update src/state/summary/thunk.ts
Jul 19, 2025
ccad3ae
chore(AT-442): revert index.tsx
Jul 19, 2025
94f0ec9
chore(AT-442): update examOptionsSelector to show all the description…
Jul 21, 2025
596e463
chore(AT-442): fix issue on ExamForm and i18n/fr
Jul 21, 2025
91c3485
Merge pull request #9 from uni2growcm/AT-442-fix-lab-proc2-problem
SilverD3 Jul 21, 2025
480cada
update(AT-445): update the placehlder in i18n files
Jul 22, 2025
d5418eb
chore(AT-448): add button to print patient Summary
Jul 25, 2025
73ee6a4
chore(AT-445):change parm actual to current in fr bundle
Jul 25, 2025
103656c
Merge pull request #10 from uni2growcm/AT-445
SilverD3 Jul 25, 2025
50a238f
update(AT-448): collapse table when using print buton to print windows
Jul 25, 2025
18a361b
chore(AT-448): remove comment
Jul 25, 2025
70478ab
Update src/resources/i18n/en.json
ArnaudFonzam Jul 25, 2025
f559ea2
Update src/resources/i18n/fr.json
ArnaudFonzam Jul 25, 2025
8dcf48e
Merge pull request #11 from uni2growcm/update/AT-448-add-print-button
SilverD3 Jul 25, 2025
569ce20
feature(AT-452): add button to print exam request and the logic
Jul 29, 2025
65152ad
chore(AT-452): add style on triage button
Jul 30, 2025
01d5960
feat(OH2-466): add middleware to set user Language
Jul 30, 2025
e3c3a85
chore(OH2-466): remove comment
Jul 30, 2025
ebb5a5e
Update src/libraries/apiUtils/applyLanguageMiddleware.ts
ArnaudFonzam Jul 30, 2025
c16c92b
Update src/libraries/apiUtils/applyLanguageMiddleware.ts
ArnaudFonzam Jul 30, 2025
d5b946e
Update src/libraries/apiUtils/applyLanguageMiddleware.ts
ArnaudFonzam Jul 30, 2025
89f96b8
chore(OH2-466): check the value of lang if it is not define set en as…
Jul 30, 2025
40d719b
Merge branch 'OH2-466' of https://github.com/uni2growcm/openhospital-…
Jul 30, 2025
86aa095
Merge branch 'OH2-466' into AT-452
Jul 30, 2025
6a040d3
update(AT-452): fix conflict
Jul 30, 2025
0509ba2
chore(AT-452): fix conflict
Jul 30, 2025
ed0101b
chore(AT-452): fix conflict
Jul 30, 2025
09aadee
chore(AT-452): fix conflict after merge with develop
Jul 30, 2025
7c30ce0
chore(AT-452): revert the changes on indextsx
Jul 30, 2025
52e4d05
merge with develop branch
Jul 30, 2025
2e2f2fc
fix conflict and bugs
Jul 30, 2025
c2a0d9c
update ReportsApi class
Jul 30, 2025
322d5f5
Merge branch 'develop' into adwa
Jul 31, 2025
80ffe77
revert the changes
Jul 31, 2025
c4a0b25
update oh.yaml
Jul 31, 2025
51e3553
Merge pull request #14 from uni2growcm/align-with-develop
SilverD3 Jul 31, 2025
3491374
chore(AT-452): fix error after the merge with develop
Aug 2, 2025
d724ed5
add param for orthanc explorer url in .env and update useViewOrthanc.ts
Aug 5, 2025
28c5ab4
chore(AT-464): update .env files
Aug 5, 2025
309ed51
chore(AT-464): update .env files
Aug 5, 2025
fafb513
Update .env.gh-pages
ArnaudFonzam Aug 6, 2025
0833857
Update .env.prod
ArnaudFonzam Aug 6, 2025
5f09c2c
Update .env.staging
ArnaudFonzam Aug 6, 2025
6c741e5
Update src/components/accessories/radiology/hooks/useViewInOrthanc.ts
ArnaudFonzam Aug 6, 2025
0ba558a
Merge pull request #17 from uni2growcm/AT-464
SilverD3 Aug 6, 2025
30c50ff
Update src/resources/i18n/en.json
ArnaudFonzam Aug 6, 2025
4bb9734
Update src/resources/i18n/fr.json
ArnaudFonzam Aug 6, 2025
be33279
chore(AT-452): apply suggestion
Aug 6, 2025
78d5ce0
Merge branch 'AT-452' of https://github.com/uni2growcm/openhospital-u…
Aug 6, 2025
edbdbad
chore(AT-452): apply suggestion
Aug 7, 2025
ec0c38a
add utility file to download file
Aug 8, 2025
f5bdf03
chore(AT-452): use utility downloadBlod to download file
Aug 8, 2025
5278353
chore(AT-452): add catch bloc to avoid error after download the report
Aug 8, 2025
323094c
Update src/index.tsx
ArnaudFonzam Aug 8, 2025
314ba28
chore(AT-452): revert code in index.tsx
Aug 8, 2025
e29e3bb
chore(AT-452): apply suggestion
Aug 8, 2025
cdc1529
chore(AT-452): modified: src/mockServer/routes/labExamRequest.js
Aug 8, 2025
20b991f
chore(AT-452): update folder downloadUtils
Aug 8, 2025
36344a5
add new fonction toParse Date to DateTime and use it on ExamRequestForm
Aug 8, 2025
e5f7c6a
chore(AT-452):update the name of file to download
Aug 9, 2025
357e1b5
Merge pull request #15 from uni2growcm/AT-452
ArnaudFonzam Aug 12, 2025
6d88b31
Merge branch 'adwa' of https://github.com/uni2growcm/openhospital-ui …
SilverD3 Aug 13, 2025
d4e9cd2
fix:add fr translation for settings
SilverD3 Aug 13, 2025
b8a9697
Merge remote-tracking branch 'upstream/develop' into feature/OH2-425-…
Sep 15, 2025
eecaf43
refactor(OH2-425): Remove unrelated codes
Sep 19, 2025
7adcf2a
fix(OH2-425): Fix state
Sep 19, 2025
066db6d
chore(OH2-425): Remove unrelated code
Sep 19, 2025
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
4 changes: 3 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
REACT_APP_USE_MOCK_API=false
REACT_APP_ENABLE_PERMISSIONS=true
REACT_APP_ENABLE_PERMISSIONS=true
PUBLIC_URL=/
REACT_APP_BASE_PATH=http://localhost:8080
4 changes: 3 additions & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
REACT_APP_USE_MOCK_API=true
REACT_APP_ENABLE_PERMISSIONS=false
REACT_APP_ENABLE_PERMISSIONS=false
PUBLIC_URL=/
REACT_APP_BASE_PATH=http://localhost:8080=
4 changes: 3 additions & 1 deletion .env.gh-pages
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
REACT_APP_USE_MOCK_API=true
REACT_APP_ENABLE_PERMISSIONS=true
PUBLIC_URL=/openhospital-ui
REACT_APP_USE_MOCK_API=
REACT_APP_BASE_PATH=http://localhost:8080/oh-api
3 changes: 2 additions & 1 deletion .env.prod
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
REACT_APP_USE_MOCK_API=false
REACT_APP_USE_MOCK_API=false
REACT_APP_ENABLE_PERMISSIONS=true
PUBLIC_URL=/oh-ui
REACT_APP_BASE_PATH=http://localhost:8080/oh-api
REACT_APP_BASE_PATH=http://localhost:8080/oh-api
4 changes: 3 additions & 1 deletion .env.staging
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
REACT_APP_USE_MOCK_API=true
REACT_APP_ENABLE_PERMISSIONS=true
PUBLIC_URL=/oh20
REACT_APP_USE_MOCK_API=
REACT_APP_BASE_PATH=http://localhost:8080/oh-api
5 changes: 4 additions & 1 deletion .env.test
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
REACT_APP_USE_MOCK_API=true
REACT_APP_USE_MOCK_API=true
REACT_APP_ENABLE_PERMISSIONS=true
PUBLIC_URL=/
REACT_APP_BASE_PATH=http://localhost:8080/oh-api
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ node_modules

# testing
coverage
cypress/downloads

# production
build
Expand Down
178 changes: 173 additions & 5 deletions api/oh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,32 @@ paths:
$ref: "#/components/schemas/SupplierDTO"
security:
- bearerAuth: []
/settings/{code}:
put:
tags:
- Settings
operationId: updateSetting
parameters:
- name: code
in: path
required: true
schema:
type: string
requestBody:
content:
application/json:
schema:
$ref: "#/components/schemas/UpdateSettingDTO"
required: true
responses:
"200":
description: OK
content:
application/json:
schema:
$ref: "#/components/schemas/SettingDTO"
security:
- bearerAuth: []
/pricesothers/{id}:
put:
tags:
Expand Down Expand Up @@ -2501,6 +2527,20 @@ paths:
type: boolean
security:
- bearerAuth: []
/settings/reset:
post:
tags:
- Settings
operationId: resetAllSettings
responses:
"200":
description: OK
content:
application/json:
schema:
type: boolean
security:
- bearerAuth: []
/pricesothers:
get:
tags:
Expand Down Expand Up @@ -3807,6 +3847,63 @@ paths:
type: boolean
security:
- bearerAuth: []
/settings:
get:
tags:
- Settings
operationId: getAllSettings
responses:
"200":
description: OK
content:
application/json:
schema:
type: array
items:
$ref: "#/components/schemas/SettingDTO"
security:
- bearerAuth: []
/settings/{id}:
get:
tags:
- Settings
operationId: getSettingById
parameters:
- name: id
in: path
required: true
schema:
type: integer
format: int32
responses:
"200":
description: OK
content:
application/json:
schema:
$ref: "#/components/schemas/SettingDTO"
security:
- bearerAuth: []
/settings/code/{code}:
get:
tags:
- Settings
operationId: getSettingByCode
parameters:
- name: code
in: path
required: true
schema:
type: string
responses:
"200":
description: OK
content:
application/json:
schema:
$ref: "#/components/schemas/SettingDTO"
security:
- bearerAuth: []
/reports/exams-list:
get:
tags:
Expand Down Expand Up @@ -6281,13 +6378,13 @@ components:
format: int32
description: lock
example: 0
female:
pharmacy:
type: boolean
male:
type: boolean
opd:
female:
type: boolean
pharmacy:
opd:
type: boolean
required:
- beds
Expand Down Expand Up @@ -6715,6 +6812,77 @@ components:
required:
- supId
- supName
UpdateSettingDTO:
type: object
properties:
value:
type: string
description: The value of the setting
example: "FALSE"
SettingDTO:
type: object
properties:
id:
type: integer
format: int32
description: Setting ID
example: 1
code:
type: string
description: Setting code
example: AUTOMATICLOT_IN
maxLength: 50
minLength: 1
category:
type: string
description: Setting category
enum:
- general
- telemetry
- security
- imaging
- accounting
- reports
- pharmacy
- gui
- application
- integration
example: application
type:
type: string
description: value type
enum:
- bool
- number
- text
- select
example: bool
valueOptions:
type: string
description: Comma-separated list of possible values
maxLength: 500
defaultValue:
type: string
description: Default value
example: "TRUE"
minLength: 1
value:
type: string
description: The value of the setting
example: "FALSE"
description:
type: string
description: Description
maxLength: 500
needRestart:
type: boolean
description: Whether the app needs restart after the setting has been modified
example: true
required:
- category
- id
- needRestart
- type
PricesOthersDTO:
type: object
description: Class representing a price others
Expand Down Expand Up @@ -7021,11 +7189,11 @@ components:
type: string
description: "Flag record deleted, values are 'Y' OR 'N' "
example: "N"
fhu:
type: string
yprog:
type: integer
format: int32
fhu:
type: string
required:
- admDate
- admitted
Expand Down
Loading
Loading