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
e5a988b
Feat : Edit content of delete row dialog
doheez Jan 26, 2022
f58b6cd
Feat : Drop Study UID Table and arrow icon
doheez Jan 26, 2022
1ebc2b3
Feat : Make Non-Reference Dicom category invisible
doheez Jan 26, 2022
230d186
Feat : Allow to choose row only by the check box
doheez Jan 26, 2022
bb3fc82
Feat : Set disablePadding of first head cell
doheez Jan 27, 2022
337cfec
Feat : Connect api of dicom delete, download
doheez Jan 27, 2022
82fadd1
Feat : add loading page
BEOKS Jan 28, 2022
2a5a168
Fix : add dynamic hostlocation to RedirectionController
BEOKS Jan 28, 2022
f81494b
Feat : check login status
BEOKS Jan 28, 2022
3d699a6
Feat : replace login button in main page to logout
BEOKS Jan 28, 2022
74e05ff
Merge pull request #137 from BEOKS/DSM-136
BEOKS Jan 28, 2022
ea0a7e7
Merge branch 'dev' of https://github.com/BEOKS/DicomProject into DSM-130
doheez Jan 28, 2022
caa33d0
Feat : Redirect to OHIF Viewer by clicking row
doheez Jan 28, 2022
aaf3634
Fix : Solve 'Failed prop type' error
doheez Jan 28, 2022
554ffe1
Merge pull request #132 from BEOKS/DSM-130
doheez Jan 28, 2022
30e787b
Fix : set server configure local to prod
BEOKS Jan 28, 2022
64b32dc
Merge pull request #139 from BEOKS/hotfix
BEOKS Jan 28, 2022
db5a27d
Fix : replace ip address to DSN in application.yml
BEOKS Jan 28, 2022
3591b48
Update README.md
BEOKS Jan 29, 2022
a4eedf5
Hotfix : non referenced data come out when projectId is undefined
BEOKS Jan 29, 2022
f0136ba
Fix : expression bug
BEOKS Jan 29, 2022
f26a31f
Refactor : temporary transform unused function to comment
BEOKS Jan 29, 2022
7dc956d
Feat : update viewers status
BEOKS Jan 29, 2022
0147e7e
Feat : set create project dialog
BEOKS Jan 29, 2022
2ba70bc
Feat : add data loading page
BEOKS Jan 29, 2022
8ca0d4a
Feat : revise project list
BEOKS Jan 29, 2022
f59f4d6
Feat: WithMockUser test
hymi54 Jan 30, 2022
d1c4d97
Fix : change @WebMvcTset to @SpringBootTest
BEOKS Jan 30, 2022
dd2a70e
Fix : add profile propoerties in test resources
BEOKS Jan 30, 2022
b13888f
Fix : return to @WebMvcTest and add MockBean
BEOKS Jan 30, 2022
ae37df0
Fix: add MockBean
hymi54 Jan 30, 2022
5ff7408
Feat : upgrade csv parser
BEOKS Feb 1, 2022
0ea9000
Merge pull request #142 from BEOKS/DSM-138
BEOKS Feb 1, 2022
85726d3
Update README.md
BEOKS Feb 1, 2022
4915f0d
Fix : set dicom row cell style
BEOKS Feb 1, 2022
6c32a34
Fix : change table header align to center
BEOKS Feb 1, 2022
c3f245e
Feat : 메타데이터 리스트로 받아 한 트랜잭션 단위로 묶어서 처리하는 API 생성
LDEV4966 Feb 2, 2022
717d886
Merge pull request #144 from BEOKS/DSM-143
LDEV4966 Feb 2, 2022
9f5e40d
Refactor : 새로운 메타데이터 업로드 API 클라이언트 적용
BEOKS Feb 2, 2022
db88afe
Feat : Add patient id checker and update run_docker.sh
BEOKS Feb 3, 2022
d998097
Feat : add Circular Process when loading metadata
BEOKS Feb 3, 2022
6027122
Merge pull request #127 from BEOKS/dev
BEOKS Feb 3, 2022
b29bc32
Fix : 프론트 업로드 스낵바 버그 수정
BEOKS Feb 4, 2022
d21a30f
Merge pull request #147 from BEOKS/DSM-146
BEOKS Feb 4, 2022
e63beb5
Feat : 업로드 완료 메타데이터 다운로드 호출
BEOKS Feb 4, 2022
9841748
Merge branch 'dev' into DSM-145
BEOKS Feb 4, 2022
691ae54
Merge pull request #150 from BEOKS/DSM-145
BEOKS Feb 4, 2022
26cee1d
teat
BEOKS Feb 4, 2022
f17009b
branch protection test
BEOKS Feb 4, 2022
7e7a8c6
T
BEOKS Feb 4, 2022
58b911d
Test barch protection
BEOKS Feb 4, 2022
34ba335
Refactor : refactor delete all metadata by projectId
BEOKS Feb 7, 2022
3f201fa
Refactor : upload metadata list
BEOKS Feb 7, 2022
b5624ac
Merge pull request #153 from BEOKS/DSM-152
BEOKS Feb 7, 2022
83f8cc0
Fix : update possibility check condition
BEOKS Feb 7, 2022
8f98bff
Merge pull request #155 from BEOKS/DSM-154
BEOKS Feb 7, 2022
58b2393
Feat : metadata upload possibility
BEOKS Feb 8, 2022
79f9d77
Merge pull request #157 from BEOKS/DSM-156
BEOKS Feb 8, 2022
419c5db
Feat : CSV 다운로드 기능 추가
BEOKS Feb 9, 2022
64eb313
Merge pull request #159 from BEOKS/DSM-158
BEOKS Feb 9, 2022
25a4eb1
Feat : open OHIF link by new tab
doheez Feb 9, 2022
1bb54a0
Feat : set margin of upload dialog contents
doheez Feb 9, 2022
f0fff35
Feat : edit sx prop of upload dialog alert
doheez Feb 9, 2022
dcd344c
Merge pull request #161 from BEOKS/DSM-160
doheez Feb 9, 2022
9ba7fdf
Feat : block OHIF viewer opening when drag text
doheez Feb 9, 2022
9453cc9
Merge pull request #163 from BEOKS/DSM-162
doheez Feb 9, 2022
19e11dd
Feat : add kotlin plugin and create OrthancRestClient.kt
BEOKS Feb 10, 2022
8b73644
Refactor : OrthancRestClient.kt
BEOKS Feb 10, 2022
a1fcd51
Fix : OrthancRestClient.kt
BEOKS Feb 10, 2022
788a073
Fix : OrthancRestClient.kt side effect
BEOKS Feb 10, 2022
458d79f
HotFix : fix viewer host location bug
BEOKS Feb 11, 2022
fff4186
Fix : solve checkbox click problem
doheez Feb 11, 2022
79060ed
Merge pull request #167 from BEOKS/DSM-166
doheez Feb 11, 2022
9971c85
Feat : add install and run script fot entire project
BEOKS Feb 16, 2022
8f5933c
Merge pull request #172 from BEOKS/DSM-171
BEOKS Feb 16, 2022
6f5d47d
Merge pull request #165 from BEOKS/DSM-164
BEOKS Feb 16, 2022
60eb863
Merge branch 'dev' into DSM-158
BEOKS Feb 16, 2022
78645c0
Merge pull request #173 from BEOKS/DSM-158
BEOKS Feb 16, 2022
575c67a
Merge pull request #151 from BEOKS/dev
BEOKS Feb 16, 2022
6f1dc7e
Update README.md
BEOKS Feb 16, 2022
dfb1517
Update README.md
BEOKS Feb 16, 2022
dbc62c8
Fix : Viewer path
BEOKS Feb 16, 2022
e20e0fa
Merge pull request #174 from BEOKS/HotFix
BEOKS Feb 16, 2022
8cfe34c
Merge pull request #178 from BEOKS/main
BEOKS Feb 16, 2022
a7831d1
Feat : Add invite button and invite dialog base
doheez Feb 16, 2022
a735cc6
Feat : Add email list to invite dialog
doheez Feb 16, 2022
e621983
Feat: Naver Login 설정
hymi54 Feb 17, 2022
be9b3b2
Merge branch 'main' into DSM-176
hymi54 Feb 17, 2022
bbee225
Merge pull request #182 from BEOKS/DSM-176
hymi54 Feb 17, 2022
7f8e199
Feat : Validate email address, check already exist
doheez Feb 17, 2022
0fee34b
Feat : Project 초대 API 생성
LDEV4966 Feb 17, 2022
eb832f2
Feat : Project Oust(초대 방출) API 생성
LDEV4966 Feb 18, 2022
9fe1688
Feat : 초대된 프로젝트 조회 API 생성
LDEV4966 Feb 18, 2022
4f5037b
Merge pull request #183 from BEOKS/DSM-180
LDEV4966 Feb 18, 2022
dd3cf06
Merge branch 'dev' of https://github.com/BEOKS/DicomProject into DSM-177
doheez Feb 18, 2022
70cb216
Feat : Add delete invited user button to toolbar
doheez Feb 18, 2022
b2c8248
Feat : Connect user invitation api with view
doheez Feb 18, 2022
33d12de
Feat : Connect invited project get api with view
doheez Feb 18, 2022
6d09393
Feat : Add category name to project drawer
doheez Feb 18, 2022
1f3d8c7
Merge pull request #184 from BEOKS/DSM-175
doheez Feb 18, 2022
cd6a509
Merge branch 'dev' of https://github.com/BEOKS/DicomProject into DSM-177
doheez Feb 18, 2022
bffc1fb
Feat : Prevent adding email already invited
doheez Feb 18, 2022
a13dff0
Feat : 방문자 삭제 API 세분화
LDEV4966 Feb 18, 2022
2743579
Merge pull request #186 from BEOKS/DSM-180
LDEV4966 Feb 18, 2022
4142194
Feat : Add user delete dialog
doheez Feb 19, 2022
efc12d9
Merge branch 'dev' of https://github.com/BEOKS/DicomProject into DSM-177
doheez Feb 19, 2022
5c553f8
Feat : Connect user deletion api with view
doheez Feb 19, 2022
2b79935
Feat : Add project exit dialog
doheez Feb 19, 2022
0578707
Feat : Connect project exit api with view
doheez Feb 19, 2022
8e94b38
Merge pull request #179 from BEOKS/DSM-177
doheez Feb 19, 2022
c5e926d
Feat : Prevent user delete when select nothing
doheez Feb 20, 2022
7ee0f0f
Feat : 성공시 ResponseEntity 구성 완료
LDEV4966 Feb 20, 2022
2c6cfa9
Feat : Uncheck emails when click cancel button
doheez Feb 20, 2022
594f49d
Feat : 실패시 필요한 예외처리 인프라 구축 및 기본적인 예외 처리 핸들러 생성
LDEV4966 Feb 20, 2022
1b6566d
Fix : update submodule package version
BEOKS Feb 21, 2022
e1e3aff
Merge pull request #192 from BEOKS/HotFix
BEOKS Feb 21, 2022
43baf3e
Feat : 프로젝트 방문자 초대 및 삭제 시 이메일 중 존재하지 않는 사용자에 대한 Error 처리
LDEV4966 Feb 21, 2022
4cfc58b
Refactor : Project Invite,Oust API 호출 시 반환 타입 변경
LDEV4966 Feb 21, 2022
6546267
Merge pull request #190 from BEOKS/DSM-187
LDEV4966 Feb 21, 2022
da29cc0
Merge branch 'dev' of https://github.com/BEOKS/DicomProject into DSM-188
doheez Feb 22, 2022
feafc67
Feat : Connect modified api with view
doheez Feb 22, 2022
1d1c42e
Merge pull request #189 from BEOKS/DSM-188
doheez Feb 22, 2022
5c32161
Merge branch 'dev' into DSM-140
BEOKS Feb 23, 2022
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/deployment.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ jobs:
yarn install
yarn start:prod
cd ../server
echo ${{ secrets.PASSWORD }} | sudo -S sh run_docker.sh local
echo ${{ secrets.PASSWORD }} | sudo -S sh run_docker.sh prod

39 changes: 39 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,47 @@
# Dicom Service Management Project
![example workflow](https://github.com/BEOKS/DicomProject/actions/workflows/deployment.dev.yml/badge.svg)
## :dart: Objective
Dicom 의료 영상 데이터를 저장, 관리하며 시각화 기능과 머신러닝 개발을 지원하는 SW개발
## :bar_chart: Success metrics
의료데이터 관리 및 시각화 지원 기능을 구현하여 v1.0 배포를 목표로 한다.(option 제외)
## Usage
### Prerequirement
1. 최신 버전의 도커를 설치해주세요. (docker-compose는 v2 버전으로 설치되어야 합니다, 리눅스의 경우 간혹 v1으로 설치되므로 업데이트가 필요합니다.)
2. java SDK (version. 17.0.1)을 설치합니다. (설치하지 않을 경우 spring 프로젝트 파일이 정상적으로 실행되지 않습니다.)
3. Node.js 가 설치되어 있지 않다면 v16.6.1버전으로 설치해야 합니다.
4. 최신 버전의 [yarn](https://classic.yarnpkg.com/lang/en/docs/install/#windows-stable)을 설치해주세요.

### Install Project
설치의 경우 프로젝트를 다운로드 한 후, 한번만 실행하면 됩니다. 프로젝트 코드가 갱신될 경우, 코드를 반영하기 위해서 다시 실행해야 합니다.
#### Common
1. 코드 다운로드
```sh
#clone all project with submodules
git clone --recurse-submodules https://github.com/BEOKS/DicomProject.git
cd DicomProject
```
2. 현재 프로젝트는 구글 로그인을 사용하고 있으므로 구글 API clientId와 secrect id가 필요합니다. 이를 발급받아 [application-oauth.yml.example](https://github.com/BEOKS/DicomProject/blob/main/server/DSMP/src/main/resources/application-oauth.yml.example)과 같은 형식을 작성하여 같은 파일 위치에 application-oauth.yml 파일을 생성해야 합니다.
#### Window
```sh
.\install_project.sh
```
#### Mac, Linux
```sh
sudo sh install_project.sh
```
### Run Project
#### Window
```sh
run_project.sh local # run project for development
#localhost:3000에서 서비스 이용가능
run_project.sh prod # run project for deploy
```
#### Mac, Linux
```sh
sudo sh run_project.sh local # run project for development
#localhost:3000에서 서비스 이용가능
sudo sh run_project.sh prod # run project for deploy
```
## 📓 Requirements
### 1. 의료 데이터 관리
Requirement | User Story | Notes | Priority
Expand Down
2 changes: 1 addition & 1 deletion Viewers
2 changes: 1 addition & 1 deletion client/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Usage
> 이 클라이언트는 Viewer 클라이언트를 참조하기 때문에 우선 Viewer클라이언트를 실행해야한다.
0. Node.js 가 설치되어 있지 않다면 [최신버전](https://nodejs.org/ko/download/)으로 설치해야 합니다.
0. Node.js 가 설치되어 있지 않다면 v16.6.1버전으로 ode.js를 설치해야 합니다.
1. 클라이언트 시작 전 [server/README.md](../server/README.md)를 참조하여 서버를 실행합니다.
2. Viewer 서브 모듈을 업데이트 합니다.
```
Expand Down
204 changes: 204 additions & 0 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading