aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/formats/json
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PDSUI-2360'v0.12.0Jakob Odersky2017-10-302-32/+32
|\
| * Add REST implementation of RestPatientCriterionServiceJakob Odersky2017-10-301-21/+22
| * Implement REST layer for PatientLabelServiceJakob Odersky2017-10-301-11/+10
* | Rolling back some Refined codev0.11.2vlad2017-10-301-5/+2
* | Fixing Patients and Trials parsing, some refined to tryv0.11.1vlad2017-10-306-12/+180
|/
* Merge branch 'master' into PDSUI-2336Kseniya Tomskikh2017-10-276-27/+72
|\
| * Merge pull request #56 from drivergroup/PDSUI-2341v0.10.12Aleksandr2017-10-261-1/+1
| |\
| | * Implemented tests for MedicalRecord.Meta; Fixed MedicalRecord.Meta.Duplicate ...Aleksandr2017-10-241-1/+1
| * | Merge branch 'master' into PDSUI-2330Aleksandr2017-10-242-2/+4
| |\|
| | * Add PreCleaning formatJakob Odersky2017-10-231-0/+1
| | * Fixed update delivery methodv0.10.4Kseniya Tomskikh2017-10-231-2/+3
| * | Added field 'inclusion' to ExportTrialLabelCriterionAleksandr2017-10-241-23/+63
| * | Merge branch 'master' into PDSUI-2330Aleksandr2017-10-233-23/+6
| |\|
| | * Fix default version in ApiPartialDocumentJakob Odersky2017-10-201-1/+1
| * | Added 'inclusion' field to PatientCriterionAleksandr2017-10-232-4/+8
* | | PDSUI-2336 Deleted api classes of play format, userhistory and message servicesKseniya Tomskikh2017-10-2099-3147/+57
| |/ |/|
* | Merge branch 'master' into entity-list-responsesKseniya Tomskikh2017-10-207-15/+41
|\|
| * PDSUI-1088 Added labelVersion to documentsKseniya Tomskikh2017-10-193-8/+16
| * Merge pull request #49 from drivergroup/TRIAL-54v0.9.3Kseniya Tomskikh2017-10-195-7/+25
| |\
| | * TRIAL-54 Study designs as enumKseniya Tomskikh2017-10-185-7/+25
* | | Review fixesKseniya Tomskikh2017-10-201-1/+1
* | | Created list response for each entityKseniya Tomskikh2017-10-191-21/+4
|/ /
* / Fixed document and extracted data spray formatsAleksandr2017-10-172-15/+15
|/
* Resolved conflicts on merge with masterAleksandr2017-10-162-2/+2
* Corrected criterion implicit attrbutesAleksandr2017-10-131-2/+2
* Added swagger annotations for new entitiesAleksandr2017-10-132-2/+2
* Fixed criterion and intervention formatsAleksandr2017-10-132-22/+21
* Code is formattedAleksandr2017-10-121-21/+14
* Implemented format for EligibilityArmWithDiseases class; Fixed formats for ot...Aleksandr2017-10-125-32/+103
* Code is formattedAleksandr2017-10-121-6/+4
* Improved ListResponse classAleksandr2017-10-121-17/+15
* All merge conflicts are resolvedAleksandr2017-10-1219-42/+303
|\
| * Merge pull request #37 from drivergroup/add-slot-eligibility-armsv0.8.1Kseniya Tomskikh2017-10-1116-35/+289
| |\
| | * add diseaseList to ExportTrialArmv0.7.6Marvin Bertin2017-10-101-1/+1
| | * fix merge conflictsv0.7.5Marvin Bertin2017-10-1036-232/+317
| | |\
| | | * fix exports with EligibilityArmsMarvin Bertin2017-10-101-2/+2
| | | * update to eligibility arm idMarvin Bertin2017-10-101-1/+1
| | | * add disease list to ExportTrialArmMarvin Bertin2017-10-101-12/+5
| | | * fix merge conflicts with masterMarvin Bertin2017-10-1028-151/+148
| | | |\
| | | * \ Merge branch 'master' into trial-46-disease-entityMarvin Bertin2017-10-1015-59/+125
| | | |\ \
| | | * \ \ Merge branch 'add-slot-eligibility-arms' into trial-46-disease-entityMarvin Bertin2017-10-0327-441/+251
| | | |\ \ \
| | | * | | | update ApiPartialEligibilityArmMarvin Bertin2017-10-021-1/+1
| | | * | | | update ApiPartialEligibilityArmMarvin Bertin2017-10-021-3/+11
| | | * | | | update ApiCreateEligibilityArmMarvin Bertin2017-10-021-8/+16
| | | * | | | update ApiEligibilityArm with diseasesMarvin Bertin2017-10-021-17/+30
| | * | | | | add json format tests for Slot and Eligibility armsMarvin Bertin2017-10-102-0/+88
| | | |/ / / | | |/| | |
| | * | | | Merge branch 'master' into add-slot-eligibility-armsMarvin Bertin2017-10-0327-441/+251
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Removed condition from trialtimgushue2017-09-272-9/+0
| | * | | | Merge branch 'master' into add-slot-eligibility-armstimgushue2017-09-275-12/+54
| | |\ \ \ \
| | * | | | | fixing test in CriterionFormatSuitetimgushue2017-09-264-6/+4