Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OP-162 Result Set Pagination Prototype with Decorator #856

Open
wants to merge 23 commits into
base: develop
Choose a base branch
from
Open

OP-162 Result Set Pagination Prototype with Decorator #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a83a6fa
Commit for issue OP-162 #comment Prototype for Pagination #time 2d #i…
krganeshrajhan Apr 11, 2020
e4d29c1
Merge branch 'OP-162_ResultSet_Pagination_prototype' of
mwithi Aug 24, 2020
12b5d4f
Update maven.yml
mwithi Aug 24, 2020
819436a
Merge branch 'develop' into OP-162_ResultSet_Pagination_prototype
mwithi Aug 16, 2021
a65549c
Merge branch 'OP-162_ResultSet_Pagination_prototype' of https://githu…
mwithi Aug 16, 2021
d89ef25
Fix bundle like in develop branhc
mwithi Aug 16, 2021
a3cba2e
Fixes after merge develop
mwithi Aug 16, 2021
2712d75
Fix formatting
mwithi Aug 16, 2021
c8bab4d
Refactor one method
mwithi Aug 16, 2021
2eea26a
Using a table decorator
mwithi Aug 17, 2021
0730bf7
Simpler version of paginated decorator
mwithi Aug 17, 2021
15e053f
Full version of paginated decorator
mwithi Aug 17, 2021
73a26f2
Refactor ObjectTableModel class
mwithi Aug 17, 2021
c73ed23
Adding license header
mwithi Aug 17, 2021
1b707af
Fix indentation
mwithi Aug 17, 2021
94d9ce6
Fix imports
mwithi Aug 17, 2021
a75d7fe
Removed unused fields
mwithi Aug 17, 2021
64d2ec3
Fix formatting
mwithi Aug 17, 2021
81b3c7d
Upper case for static final
mwithi Aug 17, 2021
82e550e
Changed resultset limit size for warning
mwithi Aug 17, 2021
cb4f1ad
OP-162 Various improvements/formatting/etc. (#858)
dbmalkovsky Aug 18, 2021
23963fd
Compacted all decorator into one class, with Javadoc
mwithi Aug 18, 2021
fbd3cef
Fixes from review comments
mwithi Aug 18, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Checkout core
run: git clone --depth=50 --branch=develop https://github.com/informatici/openhospital-core.git openhospital-core
run: git clone --depth=50 --branch=OP-162_ResultSet_Pagination_prototype https://github.com/informatici/openhospital-core.git openhospital-core
mwithi marked this conversation as resolved.
Show resolved Hide resolved
- name: Install core
run: cd openhospital-core && mvn install -DskipTests=true && cd ..
- name: Set up JDK 1.8
Expand Down
2 changes: 2 additions & 0 deletions bundle/language_ar.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ angal.common.delete = ح
angal.common.edit = تعديل
angal.common.minutes = الدقائق
angal.common.minutesabbr = الدقائق
angal.common.page.range.fmt = صفحة {0} / {1}
angal.common.pagesize.label = مقاس الصفحه:
angal.common.patientID = رقم تعريف المريض
angal.common.save = حفظ
angal.dicom.delete.no = لا
Expand Down
3 changes: 3 additions & 0 deletions bundle/language_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@ angal.common.note.title
angal.common.note.txt = Note
angal.common.ok.btn = OK
angal.common.ok.btn.key = O
angal.common.page.range.fmt = Page {0} / {1}
angal.common.page.range.fmt.txt = Page
angal.common.pagesize.label = Page Size:
angal.common.patient.txt = Patient
angal.common.patientID = Pat. ID
angal.common.pleaseinsertacode.msg = Please insert a code.
Expand Down
2 changes: 2 additions & 0 deletions bundle/language_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ angal.common.note.title
angal.common.note.txt = Notas
angal.common.ok.btn = OK
angal.common.ok.btn.key = O
angal.common.page.range.fmt = Página {0} / {1}
angal.common.pagesize.label = Paginación
angal.common.patient.txt = Paciente
angal.common.patientID = ID.Pac.
angal.common.pleaseinsertacode.msg = Introduzca un código.
Expand Down
2 changes: 2 additions & 0 deletions bundle/language_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ angal.common.note.title
angal.common.note.txt = Remarque
angal.common.ok.btn = OK
angal.common.ok.btn.key = O
angal.common.page.range.fmt = Page {0} / {1}
angal.common.pagesize.label = Taille:
angal.common.patient.txt = Patient
angal.common.patientID = ID.Pat
angal.common.pleaseinsertacode.msg = Veuillez insérer un code.
Expand Down
2 changes: 2 additions & 0 deletions bundle/language_it.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ angal.common.note.title
angal.common.note.txt = Nota
angal.common.ok.btn = OK
angal.common.ok.btn.key = O
angal.common.page.range.fmt = Pagina {0} / {1}
angal.common.pagesize.label = Paginazione:
angal.common.patient.txt = Paziente
angal.common.patientID = ID Paz.
angal.common.pleaseinsertacode.msg = Si prega di inserire un codice.
Expand Down
2 changes: 2 additions & 0 deletions bundle/language_pt.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ angal.common.edit = Ed
angal.common.hours = Horas
angal.common.minutes = Minutos
angal.common.minutesabbr = Min
angal.common.page.range.fmt = Página {0} / {1}
angal.common.pagesize.label = Paginação
angal.common.patientID = ID.Pac.
angal.common.save = Salvar
angal.common.uom.bpm = bpm
Expand Down
2 changes: 2 additions & 0 deletions bundle/language_zh_CN.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ angal.admission.delivery.title = 康复（Delivery)
angal.admission.deliverydate.border = 康复（Delivery)日期
angal.admission.deliveryresultype.border = 康复（Delivery)原因及类型
angal.admission.deliverytype.border = 康复（Delivery)类型
angal.common.page.range.fmt = 页 {0} / {1}
angal.common.pagesize.label = 页面大小：
Loading