Build: #2517 failed Changes by mogoodrich <mgoodrich@pih.org>

Stages & jobs

  1. Default Stage

  2. Release

    Requires a user to start manually

Code commits

Git

  • mogoodrich <mgoodrich@pih.org>

    mogoodrich <mgoodrich@pih.org> 990d71410c4c37454e6faafa0e3b1de18b27de46

    Merge branch 'approce-master'

  • mogoodrich <mgoodrich@pih.org>

    mogoodrich <mgoodrich@pih.org> ec2c8eca47c10e33888aed34c6858c1db6badc24 m

    matching patients fragment controller must include all patient properties in default template

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version ec2c8eca47c10e33888aed34c6858c1db6badc24)
    • omod/src/main/webapp/resources/scripts/registerPatient.js (version ec2c8eca47c10e33888aed34c6858c1db6badc24)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> d723157bfab1bc05941aff680153e284c073108d m

    Fix min width for identifiers container.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version d723157bfab1bc05941aff680153e284c073108d)
    • omod/src/main/webapp/pages/registerPatient.gsp (version d723157bfab1bc05941aff680153e284c073108d)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 732f40b2b3c4f73df84b3fe76a386be370223f05 m

    Fix incorrect determining mpiPatient property. In any case, how patient properties were determined, mpIpatient should be always be enabled. (Cause you can't treat with remote patient from MPI as with local patient).

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version 732f40b2b3c4f73df84b3fe76a386be370223f05)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 081b4fab2f2d9f39967516e201e9aa5f5046941d m

    Add possibility to determine which patient properties include to matched patient view. Return proper back-end execution from https://github.com/openmrs/openmrs-module-registrationapp/commit/0a218e3457fe90dc6bf3b5b06d8d2ed21ebf4efa commit.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version 081b4fab2f2d9f39967516e201e9aa5f5046941d)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 34b3cee07c14cdd61e3438416e9b4b95e480803e m

    Add determining count of matched users to show.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version 34b3cee07c14cdd61e3438416e9b4b95e480803e)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 0c52169bd40fd58ddba093cdb48def5f969203d6 m

    Merge remote-tracking branch 'upstream/master'
    # Conflicts:
    #        omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version 0c52169bd40fd58ddba093cdb48def5f969203d6)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 590a93fe164780da2334f1797a69c79fcef37374 m

    Merge remote-tracking branch 'upstream/master'
    # Conflicts:
    #        omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java
    #        omod/src/main/java/org/openmrs/module/registrationapp/page/controller/EditSectionPageController.java
    #        omod/src/main/webapp/pages/registerPatient.gsp
    #        omod/src/main/webapp/resources/scripts/registerPatient.js
    #        pom.xml

    • pom.xml (version 590a93fe164780da2334f1797a69c79fcef37374)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> c82b734b7c5e0956da85b56673fb1757dcc43c69 m

    Merge remote-tracking branch 'upstream/master'
    # Conflicts:
    #        omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java
    #        omod/src/main/java/org/openmrs/module/registrationapp/page/controller/EditSectionPageController.java
    #        omod/src/main/webapp/pages/registerPatient.gsp
    #        omod/src/main/webapp/resources/scripts/registerPatient.js
    #        pom.xml

  • Roman Zayats <seateq64@gmail.com>

    Roman Zayats <seateq64@gmail.com> 55116cf73d06c5323a8acd2c508a5a568fbb8e09 m

    Merge pull request #2 from approce/master1
    Master1

  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 75c80d42a5653a6e61abd81c208f32364bf5b732 m

    Refactor imports, remove wildcard import.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentController.java (version 75c80d42a5653a6e61abd81c208f32364bf5b732)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> fd001f33346cabfe183503582cb4aa3fdc75dacc m

    Refactor imports. Remove bulk imports.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/PersonNameFragmentController.java (version fd001f33346cabfe183503582cb4aa3fdc75dacc)
    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentController.java (version fd001f33346cabfe183503582cb4aa3fdc75dacc)
  • Roman Zayats <seateq64@gmail.com>

    Roman Zayats <seateq64@gmail.com> ed3e1510ed5426627077d0964ba927c4e389d563 m

    Merge pull request #1 from approce/master1
    Master1

  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> d3d6053b9fbd38804a5928462d33f92fdbca1c83 m

    Merge conflict files.

    • api/src/main/java/org/openmrs/module/registrationapp/RegistrationAppActivator.java (version d3d6053b9fbd38804a5928462d33f92fdbca1c83)
    • omod/src/main/webapp/pages/registerPatient.gsp (version d3d6053b9fbd38804a5928462d33f92fdbca1c83)
    • pom.xml (version d3d6053b9fbd38804a5928462d33f92fdbca1c83)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 3ec39baeb5cd9d336e4b38aca94ed7f5cb6acaac m

    Merge remote-tracking branch 'upstream/master' into master
    # Conflicts:
    #        omod/src/main/webapp/pages/registerPatient.gsp
    #        pom.xml

  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 0ed46a6594ebfe28d92260c7dfdee7305483d5d0 m

    Rename constant patient edit event name.

    • omod/src/main/java/org/openmrs/module/registrationapp/page/controller/EditSectionPageController.java (version 0ed46a6594ebfe28d92260c7dfdee7305483d5d0)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> e2c76c59b7c6fb7e15170a1a24bcd47216b1e70f m

    Perform hide button "show similar patients" for exact matches. Make matched patients expanded by default.

    • omod/src/main/webapp/resources/scripts/registerPatient.js (version e2c76c59b7c6fb7e15170a1a24bcd47216b1e70f)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> d5a686390aace0e9958cf2defb89ff1c1acca80e m

    Fix dependencies error.

    • omod/pom.xml (version d5a686390aace0e9958cf2defb89ff1c1acca80e)
    • pom.xml (version d5a686390aace0e9958cf2defb89ff1c1acca80e)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 249810b3c5ec2a079908f1af567501aafba2a190 m

    Perform fireEvent on "editPatient".

    • omod/src/main/java/org/openmrs/module/registrationapp/page/controller/EditSectionPageController.java (version 249810b3c5ec2a079908f1af567501aafba2a190)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 3f4c749f6777d7ef86372f7381303b96f78acee2 m

    Add event dependency to Registrationapp.

    • omod/pom.xml (version 3f4c749f6777d7ef86372f7381303b96f78acee2)
    • pom.xml (version 3f4c749f6777d7ef86372f7381303b96f78acee2)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> a9294b8a70ef78d178229207819b3c7daf2a7c7a m

    Improve showing similar and exact similar patients. Extract show matched patient function out.

    • omod/src/main/webapp/resources/scripts/registerPatient.js (version a9294b8a70ef78d178229207819b3c7daf2a7c7a)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> dbf343fabf638b82017821fdef05e0f0c210843b m

    Improve UI for "matched patients".

    • omod/src/main/webapp/pages/registerPatient.gsp (version dbf343fabf638b82017821fdef05e0f0c210843b)
    • omod/src/main/webapp/resources/scripts/registerPatient.js (version dbf343fabf638b82017821fdef05e0f0c210843b)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> f257057075b7253d251fcdc72bf08103ecab4b32 m

    Sort patient identifiers, so preferred identifier should be first in list.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version f257057075b7253d251fcdc72bf08103ecab4b32)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 8a42408b633c72f8e61bc2ef30c52a0597dd065a m

    Add identifiers to User simple object.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version 8a42408b633c72f8e61bc2ef30c52a0597dd065a)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> d88c31a7ab687974d3ce3a63a0fb5c9cc06b78bb m

    Change UI for "similar patients".

    • omod/src/main/webapp/pages/registerPatient.gsp (version d88c31a7ab687974d3ce3a63a0fb5c9cc06b78bb)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 6883638c2784aa503da4dd564891ab683047779c m

    Return list of identifiers to UI, not only "preferred one".

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version 6883638c2784aa503da4dd564891ab683047779c)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 3727ce34da60a619326b2fe22679134a7307d4b6 m

    Hide all "find patient" logic in registrationCoreService. Just get patients, simplify them and return.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version 3727ce34da60a619326b2fe22679134a7307d4b6)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 2de214fe81dee7441c7e89691bbe1299e63c391e m

    Implement using uuid instead of patientId.

    • omod/src/main/webapp/resources/scripts/registerPatient.js (version 2de214fe81dee7441c7e89691bbe1299e63c391e)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 2e3678bdc302353cb7bdc157ebc6eb428c7c2498 m

    Implement using uuid instead of patientId.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version 2e3678bdc302353cb7bdc157ebc6eb428c7c2498)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> be1f06242bf943d802af947287920cf9b3d06b8c m

    Return patient Uuid instead of patientId.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentController.java (version be1f06242bf943d802af947287920cf9b3d06b8c)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> d4c004a1ff959250f61aac76f6db91f2f52aaddc m

    Create function for querying to import patient and redirect to patient page on success.

    • omod/src/main/webapp/resources/scripts/registerPatient.js (version d4c004a1ff959250f61aac76f6db91f2f52aaddc)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> b0d44d73b331892f96e5f9c467b753babc0fe81a m

    Return out patientId of imported mpi patient.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentController.java (version b0d44d73b331892f96e5f9c467b753babc0fe81a)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> d9a4919343025dea9dfe5c2acd9946c35479641e m

    Move generating link block closer to generating buttons.

    • omod/src/main/webapp/resources/scripts/registerPatient.js (version d9a4919343025dea9dfe5c2acd9946c35479641e)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 0e8ae76730ee42e9a342ee312e67342a75a05e3d m

    Append OpenMRS identifier if it exist, if it doesn't: append "Empty".

    • omod/src/main/webapp/resources/scripts/registerPatient.js (version 0e8ae76730ee42e9a342ee312e67342a75a05e3d)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> ae2d8785e15b130af366207514cb8e74997a6d98 m

    Add "identifier preferred" field to patient Javascript model.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version ae2d8785e15b130af366207514cb8e74997a6d98)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 6ad7557cbe6d0e30f2e39b4e7203cd0e5c872340 m

    Create controller for importing patients.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentController.java (version 6ad7557cbe6d0e30f2e39b4e7203cd0e5c872340)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 1f1719552adcdade844587330f3d90c402d6b320 m

    Remove old code for creating matched patients.

    • omod/src/main/webapp/resources/scripts/registerPatient.js (version 1f1719552adcdade844587330f3d90c402d6b320)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 782de5e15c69e313448833ff755a7ac16d318e61 m

    Use template while creating HTML for matched patients.

    • omod/src/main/webapp/resources/scripts/registerPatient.js (version 782de5e15c69e313448833ff755a7ac16d318e61)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 6a4ca5312abc73ceefa573c71eaa2bce4e8bd24f m

    Create template for matched patient elements.

    • omod/src/main/webapp/pages/registerPatient.gsp (version 6a4ca5312abc73ceefa573c71eaa2bce4e8bd24f)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 11a186f33d01c71d1923e7b77154aa1c3795842a m

    Use slideToggle() instead of if case.

    • omod/src/main/webapp/resources/scripts/registerPatient.js (version 11a186f33d01c71d1923e7b77154aa1c3795842a)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 8029ff76780d6300cc7fa349e5b6a7740f3fa29e m

    Move div from similar patients out. Make it by default " "display:none".

    • omod/src/main/webapp/pages/registerPatient.gsp (version 8029ff76780d6300cc7fa349e5b6a7740f3fa29e)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 14ca4f2e8a51ad50c81688b87352ec2887e385d8 m

    Remove redundant (old) div for similar patients.

    • omod/src/main/webapp/pages/registerPatient.gsp (version 14ca4f2e8a51ad50c81688b87352ec2887e385d8)
    • omod/src/main/webapp/resources/scripts/registerPatient.js (version 14ca4f2e8a51ad50c81688b87352ec2887e385d8)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> c93cea5c03108746c9849caaa267553ad4768cdb m

    Implement "SlideDown" view for matched patients.

    • omod/src/main/webapp/pages/registerPatient.gsp (version c93cea5c03108746c9849caaa267553ad4768cdb)
    • omod/src/main/webapp/resources/scripts/registerPatient.js (version c93cea5c03108746c9849caaa267553ad4768cdb)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 1be3df1881c1f50d1199732bc6b348f5a542ed3d m

    Refactor button's width and padding.

    • omod/src/main/webapp/resources/scripts/registerPatient.js (version 1be3df1881c1f50d1199732bc6b348f5a542ed3d)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> f9c2f62fa06a7e9ce195cafe785f4a06d2eee361 m

    Fix small mistakes/bugs in UI appearance.

    • omod/src/main/webapp/resources/scripts/registerPatient.js (version f9c2f62fa06a7e9ce195cafe785f4a06d2eee361)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> fdcec5e4afec3c32f0b58e08d8bc679568bae561 m

    Implement UI for different matched patients: local and MPI.

    • omod/src/main/webapp/pages/registerPatient.gsp (version fdcec5e4afec3c32f0b58e08d8bc679568bae561)
    • omod/src/main/webapp/resources/scripts/registerPatient.js (version fdcec5e4afec3c32f0b58e08d8bc679568bae561)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> c00752c7650b4d640103648e417a397edde21c8b m

    Fix return result for similar patients. Use now querying to remote MPI server.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version c00752c7650b4d640103648e417a397edde21c8b)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> d7e3ebe3b5385ff17a4b7a5a28a46afe233c7481 m

    Implement querying to MPI server on "getSimilarPatients"

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version d7e3ebe3b5385ff17a4b7a5a28a46afe233c7481)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> a5b30a76904c36733cbc12f12cce65432c9a2b88 m

    Start to implement UI for MPI results.

    • api/src/main/resources/messages.properties (version a5b30a76904c36733cbc12f12cce65432c9a2b88)
    • omod/src/main/webapp/pages/registerPatient.gsp (version a5b30a76904c36733cbc12f12cce65432c9a2b88)
    • omod/src/main/webapp/resources/scripts/registerPatient.js (version a5b30a76904c36733cbc12f12cce65432c9a2b88)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> c1a0475a783d6584b44f9fac4c3b6bf62d9d9747 m

    Clean code in matching controller. Make methods easy to read.

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version c1a0475a783d6584b44f9fac4c3b6bf62d9d9747)
  • approce <seateq64@gmail.com>

    approce <seateq64@gmail.com> 04e67243df694f0cb73b97f8a9a8d90380adafb2 m

    User core app method to query remote MPI server. Change version in pom.xml

    • omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/MatchingPatientsFragmentController.java (version 04e67243df694f0cb73b97f8a9a8d90380adafb2)
    • pom.xml (version 04e67243df694f0cb73b97f8a9a8d90380adafb2)