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

MEPTS-243: merge transformations for privileges, person-attribute-types and person-attributes #20

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

MEPTS-243: merge transformations for privileges, person-attribute-types and person-attributes #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9e34200
MEPTS-224: added merge person transformation
kaweesi Aug 20, 2019
3818886
MEPTS-224: adding merge-person.ktr to migrator pdiresources
kaweesi Aug 22, 2019
978688b
Merge branch 'develop' of github-jembi:esaude/openmrs-database-migrat…
kaweesi Aug 22, 2019
39033d3
MEPTS-224: Added functional person and user merge transformations
kaweesi Aug 29, 2019
4df690d
Merge branch 'develop' of github-jembi:esaude/openmrs-database-migrat…
kaweesi Aug 29, 2019
3e5250d
MEPTS-224: merged merging into merge transformation
kaweesi Aug 29, 2019
da25014
MEPTS-224: added merge users into pdiresources and made some few fixes
kaweesi Aug 29, 2019
977923a
MEPTS-224: Worked on concept_datatype, concept_class, concept, person…
kaweesi Sep 3, 2019
ea658e8
MEPTS-224: auto formatted code with spotess
kaweesi Sep 3, 2019
f7cfe4c
MEPTS-243: added merge transformations for privileges, person-attribu…
kaweesi Sep 3, 2019
546378d
MEPTS-243: disable merge transformation in control center job
kaweesi Sep 3, 2019
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
Empty file added =
View file
Open in desktop
Empty file.
11 changes: 11 additions & 0 deletions src/main/java/com/openmrs/migrator/Migrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,17 @@ private void executeSetupCommand() throws IOException, SQLException, SettingsExc
pdiFiles.add(
SettingsService.PDI_RESOURCES_DIR + "/transformations/validate-visit-attribute-types.ktr");
pdiFiles.add(SettingsService.PDI_RESOURCES_DIR + "/transformations/validate-visit-types.ktr");
pdiFiles.add(SettingsService.PDI_RESOURCES_DIR + "/transformations/merge-persons.ktr");
pdiFiles.add(SettingsService.PDI_RESOURCES_DIR + "/transformations/merge-users.ktr");
pdiFiles.add(
SettingsService.PDI_RESOURCES_DIR + "/transformations/merge-concept-datatypes.ktr");
pdiFiles.add(SettingsService.PDI_RESOURCES_DIR + "/transformations/merge-concept-classes.ktr");
pdiFiles.add(SettingsService.PDI_RESOURCES_DIR + "/transformations/merge-concepts.ktr");
pdiFiles.add(
SettingsService.PDI_RESOURCES_DIR + "/transformations/merge-person-attribute-types.ktr");
pdiFiles.add(
SettingsService.PDI_RESOURCES_DIR + "/transformations/merge-person-attributes.ktr");
pdiFiles.add(SettingsService.PDI_RESOURCES_DIR + "/transformations/merge-privileges.ktr");
pdiFiles.add(SettingsService.SETTINGS_PROPERTIES);
pdiFiles.add(SettingsService.PDI_PLUGINS_DIR + "/pdi-core-plugins-impl-8.2.0.7-719.jar");

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/pdiresources/jobs/control-center.kjb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@
<yloc>64</yloc>
<attributes_kjc/>
</entry>
<entry>
<entry>
<name>merge</name>
<description/>
<type>JOB</type>
Expand Down Expand Up @@ -466,7 +466,7 @@
<to>merge</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<enabled>N</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
Expand Down
Loading