Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1135 commits
Select commit Hold shift + click to select a range
923dba9
fix: correct positional parameters in HQL queries
garciaerin Oct 12, 2024
9fcb7b2
fix: update HQL queries to use correct positional parameter format
garciaerin Oct 15, 2024
412089f
fix: updated the HQL queries to use correct positional parameters format
garciaerin Oct 15, 2024
a16b3dd
fix: corrected positional parameters format
garciaerin Oct 15, 2024
2d32cc4
fix: reverted the changes in the BornTransmissionLogDaoImpl.java file
garciaerin Oct 15, 2024
75170bf
fix: reverted the changes in the file ClinincNbrDaoImpl.java file
garciaerin Oct 15, 2024
acb6e6a
fix: reverted the changes in ConusltResponseDaoImpl.java file
garciaerin Oct 15, 2024
437dfd8
fix: reverted the changes in ConsultRequestDaoImpl.java file
garciaerin Oct 15, 2024
32c0ade
fix: reverted the changes in CVCMedicationGTINDao.java file
garciaerin Oct 15, 2024
329b7cd
fix: added a } in line 106 in CustomFIlterDaoIMpl.java file
garciaerin Oct 15, 2024
7672977
fix: reverted the changes in CtlSpecialInstructionsDaoImpl.java file
garciaerin Oct 15, 2024
dfac91f
fix: revert the changes in DemographicDao.java file
garciaerin Oct 15, 2024
87fdd01
fix: reverted the changes in DemographicExtDao.java file
garciaerin Oct 15, 2024
f7d05a6
fix: reverted the changes in the DepartmentDaoImpl.java file
garciaerin Oct 15, 2024
a360379
fix: reverted the changes in DocumentResultsDaoImpl.java file
garciaerin Oct 15, 2024
e4ffa42
fix: updated the HQL queries to use correct positional parameters format
garciaerin Oct 15, 2024
67c4af2
fix: update HQL queries to use correct positional parameters format
garciaerin Oct 15, 2024
5f2ba89
fix: update the HQL queries to use correct positional parameters
garciaerin Oct 15, 2024
9536b91
fix: update HQL queries to use correct positional parameters
garciaerin Oct 15, 2024
6cc0b5b
fix revert the changes in the EyeformMacroDaoImpl.java file
garciaerin Oct 15, 2024
c655e20
fix: update the HQL queries to use correct positional parameters
garciaerin Oct 15, 2024
4174802
fix: update HQL queries to use correct positional parameters format
garciaerin Oct 15, 2024
35a4bfb
fix: revert the changes in the file Hsfo2RecommitScheduleDaoImpl.java…
garciaerin Oct 15, 2024
8b0ddb3
fix: revert the changes in the Icd10Dao.java file
garciaerin Oct 15, 2024
0d51934
fix: revert the changes in InstitutionDaoImpl.java file
garciaerin Oct 15, 2024
84a91e4
fix: reverted the changes in the IntegratorControlDaoImpl.java file
garciaerin Oct 15, 2024
cb73b8b
fix: update HQL queries to use correct positional parameter format
garciaerin Oct 15, 2024
e9291a0
fix: update HQL queries to use correct positional parameters
garciaerin Oct 15, 2024
c4e9c1c
fix: corrected the positional parameters
garciaerin Oct 16, 2024
4013dc6
fix: update HQL query to use correct positional parameter format
garciaerin Oct 17, 2024
577d53e
fix: update HQL query to use correct positional params
garciaerin Oct 17, 2024
cda8648
fix: reverted the changes back
garciaerin Oct 17, 2024
c5234ff
fix: corrected named parameters
garciaerin Oct 17, 2024
fd0c8c9
fix: converted the positional param to named param for "counter"
garciaerin Oct 17, 2024
1c535a3
fix: reverted the positional param to named param
garciaerin Oct 17, 2024
a6047c5
fix: corrected the positional params to named params
garciaerin Oct 17, 2024
3e5dbb8
fix: corrected the positional params to named params
garciaerin Oct 18, 2024
9943fcd
fix: update EFormDaoImpl to use positional parameters
sebastian-j-ibanez Oct 22, 2024
8dcd23a
refactor: remove index counter for readability
sebastian-j-ibanez Oct 22, 2024
3011f6b
refactor: rewrite findByProviderStatusAndDateRange to use positional …
sebastian-j-ibanez Oct 22, 2024
460d2ca
fix: removed odd breaks and spacings
garciaerin Oct 22, 2024
7bf3ed0
refactor: remove index counter in findByDemographicIdCurrent for read…
sebastian-j-ibanez Oct 22, 2024
7bb7026
fix: change query to use positional parameters instead of direct stri…
sebastian-j-ibanez Oct 22, 2024
2a86a7c
fix: remove unnecessary positional parameter in ConsentTypeDaoImpl
sebastian-j-ibanez Oct 22, 2024
b4a7130
fix: update HQL queries to use correct positional parameter format
garciaerin Oct 9, 2024
6bd5cea
fix: update HQL queries to use correct positional parameter format
garciaerin Oct 9, 2024
0e2b9a8
fix: corrected positional parameters format
garciaerin Oct 15, 2024
83cd0c5
fix: updated the HQL queries to use correct positional parameters format
garciaerin Oct 15, 2024
bbb6ef3
fix: update HQL queries to use correct positional parameters format
garciaerin Oct 15, 2024
787ae9a
fix: update HQL queries to use correct positional parameter format
garciaerin Oct 15, 2024
08fcd17
fix: corrected the positional parameters
garciaerin Oct 16, 2024
2f30d27
fix: reverted the changes back
garciaerin Oct 17, 2024
ad1d3ad
fix: corrected named parameters
garciaerin Oct 17, 2024
9cfeaad
fix: converted the positional param to named param for "counter"
garciaerin Oct 17, 2024
79b9b80
fix: reverted the positional param to named param
garciaerin Oct 17, 2024
f6f17a6
fix: corrected the positional params to named params
garciaerin Oct 17, 2024
7ef3f7b
fix: corrected the positional params to named params
garciaerin Oct 18, 2024
722cd99
refactor: remove index counter for readability
sebastian-j-ibanez Oct 22, 2024
6154ac6
refactor: rewrite findByProviderStatusAndDateRange to use positional …
sebastian-j-ibanez Oct 22, 2024
cd55238
fix: removed odd breaks and spacings
garciaerin Oct 22, 2024
57495ec
refactor: remove index counter in findByDemographicIdCurrent for read…
sebastian-j-ibanez Oct 22, 2024
d4e6e11
fix: remove unnecessary positional parameter in ConsentTypeDaoImpl
sebastian-j-ibanez Oct 22, 2024
c387558
fix: add missing `;` in ProviderDaoImpl
sebastian-j-ibanez Oct 23, 2024
327998d
fix: add missing '(' in PropertyDaoImpl
sebastian-j-ibanez Oct 23, 2024
7fb8024
fix: add query string to createQuery constructor
sebastian-j-ibanez Oct 23, 2024
54fb25d
fix: remove broken lombok import from ProgramAccess
sebastian-j-ibanez Oct 23, 2024
18e53ba
fix: remove invalid second argument from getQueryResultsList
sebastian-j-ibanez Oct 23, 2024
58f7bad
fix: remove positional parameters used for table names
sebastian-j-ibanez Oct 23, 2024
15c035e
fix: correct parameter indices in AdmissionDaoImpl queries
garciaerin Oct 23, 2024
5ce8183
fix: update HQL queries to use correct positional parameter format
garciaerin Oct 23, 2024
3a127f1
fix: update HQL queries to use correct positional parameters in Billi…
garciaerin Oct 23, 2024
8dc9be7
fix: corrected named params to positional params in BillingDaoImpl.java
garciaerin Oct 23, 2024
1f78c78
fix: update HQL queries to use numbered positional parameters in Bill…
garciaerin Oct 23, 2024
b9f65ae
fix: corrected the named params to positional params in BillingONPaym…
garciaerin Oct 23, 2024
4e30ab8
fix: update HQL queries to use correct positional parameter format in…
garciaerin Oct 23, 2024
648b89f
fix: update HQL queries to use correct positional parameter format in…
garciaerin Oct 23, 2024
5ae0c2b
fix: corrected named params to positional params in ConsultationReque…
garciaerin Oct 23, 2024
fefd1d4
fix: corrected a named param to positional in CtlBillingServicePremiu…
garciaerin Oct 23, 2024
87eb6f1
fix: corrected positional parameters in CtlDiagCodeDaoImpl.java
garciaerin Oct 23, 2024
2f0436b
fix: corrected named params to positional params in DemographicMerged…
garciaerin Oct 23, 2024
323cd64
fix: corrected named params to positional params in
garciaerin Oct 23, 2024
8cbe9b2
fix: corrected positional params in DemographicCustDaoImpl.java
garciaerin Oct 23, 2024
f572b81
fix: corrected named params to positional params in DemographicPharma…
garciaerin Oct 23, 2024
db116ce
fix: corrected named params to positional params in DiagnosticCodeDao…
garciaerin Oct 23, 2024
2ab8574
fix: corrected named params to positional params in DxresearchDAOImpl…
garciaerin Oct 23, 2024
2d4a77f
fix: corrected named params to positional params in EFormDocsDaoImpl.…
garciaerin Oct 23, 2024
43caeac
fix: corrected named params to positional params in EFormGroupDaoImpl…
garciaerin Oct 23, 2024
2319c62
fix: corrected named params to positional params in EpisodeDaoImpl.java
garciaerin Oct 23, 2024
588c57f
fix: named param to positional param in FaxClientLogDaoImpl.java
garciaerin Oct 23, 2024
00e3e55
fix: added a counter variable for the if statements in FaxJobDaoImpl.…
garciaerin Oct 23, 2024
f96c4b3
fix: corrected a named param to positional param in GroupMembersDaoIm…
garciaerin Oct 23, 2024
ba3d532
fix: corrected the positional param in Hl7TextMessageDaoImpl.java
garciaerin Oct 23, 2024
29f3e1e
fix: corrected a named param to positional param in Icd10DaoImpl.java
garciaerin Oct 23, 2024
afc03eb
fix: corrected named param to positional param in Icd9DaoImpl.java
garciaerin Oct 23, 2024
6a30d04
fix: corrected a named param to positional param in IchppccodeDaoImpl…
garciaerin Oct 23, 2024
07597ef
fix: corrected named params to positional params in IndicatorTemplate…
garciaerin Oct 23, 2024
75eae73
fix: update HQL queries to use correct positional parameter format IN…
garciaerin Oct 23, 2024
d4f4048
fix: changed a named param to positional param in MeasurementGroupDao…
garciaerin Oct 23, 2024
8147bb3
fix: changed a named param to positional param in MeasurementGroupSty…
garciaerin Oct 23, 2024
e918c17
fix: changed named params to positional params in MeasurementMapDaoIm…
garciaerin Oct 23, 2024
20135b5
fix: update HQL queries to use correct positional parameter format
garciaerin Oct 23, 2024
87213af
fix: moved the counter variable before building the query string
garciaerin Oct 23, 2024
b2b9b66
fix: fixed the positional param from ?1 to ?2
garciaerin Oct 23, 2024
c2f2212
fix: changed positional params to use counter variables in BillingDao…
garciaerin Oct 23, 2024
0828460
fix: changed the named params to ?
garciaerin Oct 23, 2024
230cd36
fix: update query positional parameter indexes in ProfessionalSpecial…
sebastian-j-ibanez Oct 24, 2024
03db78e
fix: update query positional parameter indexes in RScheduleDaoImpl
sebastian-j-ibanez Oct 24, 2024
61bedbc
fix: update query positional parameter indexes in ProgramTeamDAOImpl
sebastian-j-ibanez Oct 24, 2024
671035e
fix: add positional parameter index to query in ScheduleTemplateDaoImpl
sebastian-j-ibanez Oct 24, 2024
6365df6
fix: add positional parameter index to query in ScratchPadDaoImpl
sebastian-j-ibanez Oct 24, 2024
273000f
fix: remove space between ? and positional parameter index in Tickler…
sebastian-j-ibanez Oct 24, 2024
13a14dd
fix: add positional parameter indexes to queries in WorkFlowDaoImpl
sebastian-j-ibanez Oct 24, 2024
cce956c
refactor: rewrite findByProviderNoLimit query to use int based positi…
sebastian-j-ibanez Oct 24, 2024
2edf6e6
fix: update positional parameter from 1 to 2
sebastian-j-ibanez Oct 28, 2024
2d85970
Add selenium tests to some essential pages/window.
kateyang1998 Aug 16, 2024
fc04319
Create AddAppointmentTest.java
kateyang1998 Oct 28, 2024
0a568a0
feat(fix): Fixed "NoDefClassFound" error.
kateyang1998 Sep 24, 2024
e743f1e
feat(fix): Cleared up and reorganized the files.
kateyang1998 Sep 26, 2024
ff6de95
feat: add aider bash script
sebastian-j-ibanez Oct 2, 2024
35a5edf
feat: add aider powershell script
sebastian-j-ibanez Oct 2, 2024
4688111
chore: add verbose comments to scripts
sebastian-j-ibanez Oct 4, 2024
d91a2d2
feat(fix): Fixed the error on calendar-he-utf8.js and hostenv_jsc.js.
kateyang1998 Sep 26, 2024
9acbbf7
build: upgrade struts from 1.3.8 to 1.3.10 and fix related NPE issue
gongjian1981 Sep 30, 2024
cd13ff9
build: upgrade struts from 1.3.10 to 1.3.11
Oct 3, 2024
fbf104a
build: remove references to struts-menu library:
gongjian1981 Oct 10, 2024
5881acf
fix: update quatro daos to use hibernate5 intstead of hibernate3 library
sebastian-j-ibanez Oct 28, 2024
34183a8
fix: update springframework dependencies to 5.3.X
sebastian-j-ibanez Oct 28, 2024
f198f9d
build(deps): bump com.fasterxml.jackson.core:jackson-databind from 2.…
dependabot[bot] Oct 30, 2024
86120aa
fix: add 1 to parameters in getTicklers (query uses 1 based indexes)
sebastian-j-ibanez Oct 30, 2024
742c4cc
fix: remove duplicate indexes in messageTotal query
sebastian-j-ibanez Oct 30, 2024
4d1d5f7
fix: remove positional parameters before the WHERE clause in PatientL…
sebastian-j-ibanez Oct 30, 2024
1b50420
fix: add missing positional parameter index starting from 1
sebastian-j-ibanez Oct 30, 2024
38eeaff
fix: removed the incorrect positional param in ProviderDataDaoImpl.java
garciaerin Oct 31, 2024
0707ccf
build: remove references to struts-tiles library
gongjian1981 Oct 16, 2024
adf08fb
build: Removed all code using the html-el tags
gongjian1981 Oct 23, 2024
e33aa70
build: Removed all code using the bean-el tags
gongjian1981 Oct 24, 2024
3c0c71a
refactor: replace <logic> tags with JSTL equivalents in CreateMessage…
gongjian1981 Oct 24, 2024
9cb08de
remove
gongjian1981 Oct 29, 2024
b2c6b6f
fix: add createOnEDTOutboxDir method to ActionUtils, refactor tabs to…
sebastian-j-ibanez Nov 1, 2024
ad9c3ef
fix: change relationships deleted field to boolean
sebastian-j-ibanez Nov 1, 2024
7d987e8
fix: remove null check for boolean type in setDeleted call
sebastian-j-ibanez Nov 4, 2024
46f8541
fix: use fmt to set global.default key value
sebastian-j-ibanez Nov 4, 2024
b7d5a9c
fix: update tika-core to 1.28.5
sebastian-j-ibanez Nov 4, 2024
98cc19b
fix: update jasypt from 1.8 to 1.9.3
sebastian-j-ibanez Nov 4, 2024
8585bcb
fix: update commons-fileupload from 1.4 to 1.5
sebastian-j-ibanez Nov 4, 2024
95c66f9
fix: update log4j version for security
sebastian-j-ibanez Nov 4, 2024
a1ad1e1
fix: update jetty maven plugin for security
sebastian-j-ibanez Nov 4, 2024
436d14d
fix: remove redundant guava import
sebastian-j-ibanez Nov 4, 2024
f4c3e1b
fix: update jackson-databind, jackson-core, and jackson-annotations
sebastian-j-ibanez Nov 4, 2024
2584c39
fix: update imageio-jpeg to 3.7.1 for security
sebastian-j-ibanez Nov 4, 2024
41650e3
fix: fixed jsp compilation errors
kateyang1998 Nov 6, 2024
41dd1ac
update: updated jspc dependency to skip jsp compile when building
kateyang1998 Nov 7, 2024
d49f28b
fix: removed the unused codes in some .js files.
kateyang1998 Nov 19, 2024
c726359
clean: removed unreferenced custom .js files
garciaerin Nov 19, 2024
06795d0
fix: reverted tomcat to previous version with java11
garciaerin Nov 8, 2024
f22680e
fix: compilation errors when building the application
garciaerin Nov 8, 2024
0966c0b
fix: removed the maven.compiler property in pom.xml
garciaerin Nov 11, 2024
9c4b2c4
update: tomcat9.0.56 to tomcat 9.0.97
garciaerin Nov 13, 2024
57de9ab
fix: OpenJDK version of java 11
garciaerin Nov 13, 2024
42fda6e
fix: fixed some hibernate related issues
gongjian1981 Nov 26, 2024
a474877
fix: add null check to BaseLoginModule.logout()
sebastian-j-ibanez Nov 27, 2024
c00b730
test: comment out VacancyClientMatchDaoTest.testFindByClientIdAndVaca…
sebastian-j-ibanez Nov 28, 2024
a63bfdc
fix: remove duplicate jspc profile in pom
sebastian-j-ibanez Nov 29, 2024
4764b37
fix: fix DataUtils.java merge conflicts
sebastian-j-ibanez Nov 29, 2024
875e9d2
fix: modified the approach to retrieve the year-month-day, fixed the …
kateyang1998 Nov 20, 2024
2b12e04
fix: fix Edit.jsp merge conflict
sebastian-j-ibanez Dec 2, 2024
fe2d9b0
refactor: update struts
gongjian1981 Dec 7, 2024
14605fc
refactor: update struts 1
gongjian1981 Dec 3, 2024
3c637d3
refactor: fix action path in JSP
gongjian1981 Dec 7, 2024
62449d7
refactor: fix action path in JSP
gongjian1981 Dec 7, 2024
6985178
refactor: fix action path in JSP
gongjian1981 Dec 7, 2024
3dc51d9
fix: fix some bug cause by struts upgrade
gongjian1981 Dec 7, 2024
38bcde9
fix: set action response to method called
gongjian1981 Dec 9, 2024
31aeacb
fix: fix JSP compile issues
gongjian1981 Dec 9, 2024
6d7f7d1
fix: fix 404 error
gongjian1981 Dec 9, 2024
63c3f5a
fix: use parameter to make dynamic action
gongjian1981 Dec 9, 2024
3152c32
test: comment out VacancyClientMatchDaoTest.testFindByClientIdAndVaca…
sebastian-j-ibanez Nov 28, 2024
8c2461a
add: added the tmp directory for tests in InboxPopulatingTest class.
kateyang1998 Nov 11, 2024
8bab1d4
fix: add null check to BaseLoginModule.logout()
sebastian-j-ibanez Nov 27, 2024
4a19319
fix: fixed some hibernate related issues
sebastian-j-ibanez Dec 10, 2024
7e005be
feat: setup over ride config properties in make file
sebastian-j-ibanez Dec 11, 2024
e29b2d6
Merge branch 'develop/bullfrog' of github.com:cc-ar-emr/Open-O into i…
sebastian-j-ibanez Dec 11, 2024
e7a9b06
update: upgraded JDK version from 11 to 17
kateyang1998 Nov 22, 2024
318aa55
fix: added opens to bypass the security restrictions in Java 17
kateyang1998 Nov 26, 2024
434c5f0
update: upgraded JDK version from 17 to 21
kateyang1998 Nov 26, 2024
f2830d8
Merge pull request #47 from cc-ar-emr/issue-181-update-struts-1
yingbull Dec 11, 2024
ef09831
feat: add help command to make file
sebastian-j-ibanez Dec 11, 2024
09f4a9f
Merge pull request #49 from cc-ar-emr/issue-48-make-properties-file
yingbull Dec 11, 2024
7afce87
Merge pull request #53 from cc-ar-emr/issue-50-make-help
yingbull Dec 11, 2024
2d2ea8f
chore: refer to project as openosp
sebastian-j-ibanez Dec 11, 2024
2abf41b
Merge pull request #54 from cc-ar-emr/issue-48-make-properties-file
yingbull Dec 11, 2024
cb220f3
Merge pull request #45 from cc-ar-emr/java17-upg
yingbull Dec 11, 2024
0da5a8d
fix: use apache.commons.lang3 stringbuilder and reflectiontostringbui…
sebastian-j-ibanez Dec 13, 2024
1534572
fix: remove double ;;
sebastian-j-ibanez Dec 13, 2024
63a300c
update: target java 21 in maven compiler plugin
sebastian-j-ibanez Dec 13, 2024
908777a
Merge pull request #63 from cc-ar-emr/lang3-fixes
yingbull Dec 13, 2024
ba721c6
fix: fixed the 500 error, and css / js issues on Demographic Master R…
kateyang1998 Dec 13, 2024
7b58bd6
fix: fixed the 500 error on Rx page
kateyang1998 Dec 12, 2024
9421cda
fix: fixed jsp compilation errors
kateyang1998 Dec 13, 2024
d7a105b
fix: jsp error in ChartNotes and Surveillance
garciaerin Dec 13, 2024
680c295
fix: fixed receivePayment compilation error and CopyFavourites2 synta…
kateyang1998 Dec 13, 2024
149e450
fix: jsp compile errors
gongjian1981 Dec 13, 2024
44481a1
fix: jsp compile errors
gongjian1981 Dec 16, 2024
63d28e9
update: updated dependencies-lock.json
kateyang1998 Jan 6, 2025
c9bdd03
update: removed unused dependencies and upgraded some dependencies in…
kateyang1998 Jan 7, 2025
a41ef1c
update: added comments for Axis2 and Apache Santuario dependencies.
kateyang1998 Jan 7, 2025
ed4b1f2
feat:update struts
gongjian1981 Nov 21, 2024
f22c9e1
update struts.xml
gongjian1981 Nov 21, 2024
fc55b0f
refactor: replace <html> taglib with standard html
gongjian1981 Nov 5, 2024
b730358
fix: change the position of struts,xml
gongjian1981 Dec 2, 2024
f90870d
update: remove alll codes related to struts 1
gongjian1981 Dec 3, 2024
6abcd22
refactor: replace <bean> tags with JSTL equivalents in jsps
gongjian1981 Nov 3, 2024
72d1058
refactor: replace <bean> tags with JSTL equivalents in jsps 2
gongjian1981 Nov 4, 2024
75d943a
fix:adjust the position of struts 2 filter
gongjian1981 Dec 3, 2024
c4347f2
fix: compilation errors when building the application
garciaerin Nov 8, 2024
0be04b8
fix: removed the maven.compiler property in pom.xml
garciaerin Nov 11, 2024
01bfa6d
Merge pull request #25 from cc-ar-emr/java11-upg
yingbull Nov 19, 2024
8cc1f8b
refactor: update struts 1
gongjian1981 Dec 3, 2024
7246a0f
refactor: fix action path in JSP
gongjian1981 Dec 7, 2024
fe74b25
refactor: fix action path in JSP
gongjian1981 Dec 7, 2024
22a3862
fix: fix some bug cause by struts upgrade
gongjian1981 Dec 7, 2024
80d9cf1
fix: set action response to method called
gongjian1981 Dec 9, 2024
1b36937
fix: fix JSP compile issues
gongjian1981 Dec 9, 2024
3318fa8
fix: fix 404 error
gongjian1981 Dec 9, 2024
dbe3ee7
fix: use parameter to make dynamic action
gongjian1981 Dec 9, 2024
5aa301b
Merge branch 'develop/bullfrog' of github.com:cc-ar-emr/Open-O into i…
sebastian-j-ibanez Dec 11, 2024
256e92f
feat: setup over ride config properties in make file
sebastian-j-ibanez Dec 11, 2024
c0276c4
feat: add help command to make file
sebastian-j-ibanez Dec 11, 2024
a817c61
chore: refer to project as openosp
sebastian-j-ibanez Dec 11, 2024
a83f999
Merge pull request #47 from cc-ar-emr/issue-181-update-struts-1
yingbull Dec 11, 2024
bf8e27d
update: upgraded JDK version from 11 to 17
kateyang1998 Nov 22, 2024
a27f2b8
Merge pull request #49 from cc-ar-emr/issue-48-make-properties-file
yingbull Dec 11, 2024
b65df75
fix: added opens to bypass the security restrictions in Java 17
kateyang1998 Nov 26, 2024
49d550d
Merge pull request #53 from cc-ar-emr/issue-50-make-help
yingbull Dec 11, 2024
56b737f
update: upgraded JDK version from 17 to 21
kateyang1998 Nov 26, 2024
dac693f
Merge pull request #54 from cc-ar-emr/issue-48-make-properties-file
yingbull Dec 11, 2024
37abad9
fix: use apache.commons.lang3 stringbuilder and reflectiontostringbui…
sebastian-j-ibanez Dec 13, 2024
14c920d
Merge pull request #45 from cc-ar-emr/java17-upg
yingbull Dec 11, 2024
26ff290
fix: remove double ;;
sebastian-j-ibanez Dec 13, 2024
d155fba
update: target java 21 in maven compiler plugin
sebastian-j-ibanez Dec 13, 2024
fccd617
Merge pull request #63 from cc-ar-emr/lang3-fixes
yingbull Dec 13, 2024
e16cd16
fix: fixed the 500 error, and css / js issues on Demographic Master R…
kateyang1998 Dec 13, 2024
0416078
fix: fixed the 500 error on Rx page
kateyang1998 Dec 12, 2024
1864082
fix: fixed jsp compilation errors
kateyang1998 Dec 13, 2024
73229db
fix: jsp error in ChartNotes and Surveillance
garciaerin Dec 13, 2024
99ef1cd
Merge pull request #64 from cc-ar-emr/jsp-css-fix
yingbull Dec 13, 2024
e8aef79
Merge pull request #73 from cc-ar-emr/cleanup-pom-security
yingbull Jan 8, 2025
38ba8fc
fix: import DemographicManager class in efmformslistadd.jsp
sebastian-j-ibanez Jan 10, 2025
0a0379c
chore: update dependency lock
sebastian-j-ibanez Jan 10, 2025
783350a
fix: remove duplicate pom entries for jsoup and dependency-lock-maven…
sebastian-j-ibanez Jan 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
22 changes: 15 additions & 7 deletions .devcontainer/db/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM mariadb:10.5

# Labels
LABEL author="chitrank dave"
LABEL version=0.0.1
LABEL description="Oscar-db Docker Image for Development Environment"
LABEL author="OpenOSP"
LABEL version=0.0.2
LABEL description="OpenOSP-EMR Docker Image for Development Environment"

# Install required packages
RUN apt-get update && apt-get install -y dos2unix \
Expand All @@ -12,12 +12,20 @@ RUN apt-get update && apt-get install -y dos2unix \
&& apt-get autoremove

# Adding required files
ADD ./.devcontainer/db/scripts/populate_db.sh /docker-entrypoint-initdb.d/populate_db.sh
ADD ./database /database
ADD ./.devcontainer/development/config/shared/my.cnf /etc/mysql/my.cnf
# Currently this needs the database configuration for post-scripts from the OpenOSP-EMR
# repository it is building a database for; this build process could use fine tuning for
# building older versions with different DB schema. This works, but further work here is
# something for later.

COPY ./.devcontainer/db/scripts/populate_db.sh /docker-entrypoint-initdb.d/populate_db.sh
RUN mkdir /scripts
COPY ./.devcontainer/db/scripts/development.sql /scripts/development.sql
COPY ./database /database
COPY ./.devcontainer/development/config/shared/my.cnf /etc/mysql/my.cnf

# Change permissions
RUN chmod 644 /etc/mysql/my.cnf
RUN chmod 744 /etc/mysql/my.cnf
RUN chmod 755 /scripts

# Converting script files using dos2unix (Required for Windows)
RUN dos2unix /docker-entrypoint-initdb.d/populate_db.sh
Expand Down
Loading