Build #116

Plan branch:
Builds, runs unit tests and deploys artifacts to nexus repo

Build: #116 was successful Changes by 6 people

Code commits

Git

  • Mark Goodrich <mgoodrich@pih.org>

    Mark Goodrich <mgoodrich@pih.org> 2742b9a577425f139a07b8a3f2240fecbb48a30f

    Merge pull request #67 from wesleysee/HTML-314
    Html 314: Upload and View File tag in HTMLForm Entry Module

  • Wesley Spencer See <wesleysee@gmail.com>

    Wesley Spencer See <wesleysee@gmail.com> eb8e18aee8d5c41819fe1eb7b3d2d75c87de11c4

    Merge branch 'master' into HTML-314

  • Wesley Spencer See <wesleysee@gmail.com>

    Wesley Spencer See <wesleysee@gmail.com> dd158bb3ef9b205e39d2417c4b842f61bb80ec7f

    forgot to put in multipart form submission
    fixed editing/replacing complex obs

    • api/src/main/java/org/openmrs/module/htmlformentry/element/ObsSubmissionElement.java (version dd158bb3ef9b205e39d2417c4b842f61bb80ec7f)
    • omod/src/main/webapp/htmlFormEntry.jsp (version dd158bb3ef9b205e39d2417c4b842f61bb80ec7f)
  • Wesley Spencer See <wesleysee@gmail.com>

    Wesley Spencer See <wesleysee@gmail.com> 4c0b18d0de2c86dd2f8bf901a664c4954cb6782b

    initial commit - Merged branch 'complex_obs_tag' with latest trunk - made various code improvements

  • Mark Goodrich <mgoodrich@pih.org>

    Mark Goodrich <mgoodrich@pih.org> b807ff2c0bf465498b20162e1ee0f91c28037f5a

    merged in latest trunk branch made various formatting changes

  • jibesh <goodboy007.pro@gmail.com>

    jibesh <goodboy007.pro@gmail.com> f780b6629a7b948c9d82f07865315a53412cd4fb

    Removing a small bug

    • omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java (version f780b6629a7b948c9d82f07865315a53412cd4fb)
  • jibesh <goodboy007.pro@gmail.com>

    jibesh <goodboy007.pro@gmail.com> bdbb6312e6d9f4a529c221fe5d650df1af718e55

    Everything running fine in openmrs 1.6, 1.8, 1.9 configurations

    • api/src/main/java/org/openmrs/module/htmlformentry/element/ObsSubmissionElement.java (version bdbb6312e6d9f4a529c221fe5d650df1af718e55)
    • api/src/test/resources/org/openmrs/module/htmlformentry/include/RegressionTest-data-openmrs-1.6.xml (version bdbb6312e6d9f4a529c221fe5d650df1af718e55)
    • api/src/test/resources/org/openmrs/module/htmlformentry/include/RegressionTest-data-openmrs-1.8.xml (version bdbb6312e6d9f4a529c221fe5d650df1af718e55)
    • api/src/test/resources/org/openmrs/module/htmlformentry/include/RegressionTest-data-openmrs-1.9.xml (version bdbb6312e6d9f4a529c221fe5d650df1af718e55)
    • omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/DownloadFileServlet.java (version bdbb6312e6d9f4a529c221fe5d650df1af718e55)
    • omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java (version bdbb6312e6d9f4a529c221fe5d650df1af718e55)
  • jibesh <goodboy007.pro@gmail.com>

    jibesh <goodboy007.pro@gmail.com> 3666441dbbaf6303096df8495deecaaf7ca6c11b

    Wrote the tests

    • api/src/main/java/org/openmrs/module/htmlformentry/element/ObsSubmissionElement.java (version 3666441dbbaf6303096df8495deecaaf7ca6c11b)
    • api/src/test/java/org/openmrs/module/htmlformentry/RegressionTest.java (version 3666441dbbaf6303096df8495deecaaf7ca6c11b)
    • api/src/test/resources/org/openmrs/module/htmlformentry/include/RegressionTest-data-openmrs-1.8.xml (version 3666441dbbaf6303096df8495deecaaf7ca6c11b)
    • api/src/test/resources/org/openmrs/module/htmlformentry/include/RegressionTest-data-openmrs-1.9.xml (version 3666441dbbaf6303096df8495deecaaf7ca6c11b)
    • api/src/test/resources/org/openmrs/module/htmlformentry/include/singleObsFormWithUploader.xml (version 3666441dbbaf6303096df8495deecaaf7ca6c11b)
  • Jibesh Patra <jibesh@localhost.localdomain>

    Jibesh Patra <jibesh@localhost.localdomain> 2d0ae6289f376559c81f6f52d915df8a640215ec

    TESTS running fine in with configuration 1.9 & 1.8

    • api/src/main/java/org/openmrs/module/htmlformentry/HtmlFormEntryUtil.java (version 2d0ae6289f376559c81f6f52d915df8a640215ec)
    • api/src/main/java/org/openmrs/module/htmlformentry/element/ObsSubmissionElement.java (version 2d0ae6289f376559c81f6f52d915df8a640215ec)
    • api/src/main/java/org/openmrs/module/htmlformentry/widget/WidgetFactory.java (version 2d0ae6289f376559c81f6f52d915df8a640215ec)
    • omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java (version 2d0ae6289f376559c81f6f52d915df8a640215ec)
  • Jibesh <jibesh@Gelid.(none)>

    Jibesh <jibesh@Gelid.(none)> 2bf88ff72d9b9d5a290067df3b00a490231e4882

    Merge remote-tracking branch 'upstream/master' into zephyr-updated
    Conflicts:
            api/src/main/java/org/openmrs/module/htmlformentry/FormEntryContext.java
            api/src/main/java/org/openmrs/module/htmlformentry/HtmlFormEntryUtil.java
            api/src/main/java/org/openmrs/module/htmlformentry/element/ObsSubmissionElement.java
            api/src/test/java/org/openmrs/module/htmlformentry/WidgetTest.java
            omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java
            omod/src/main/webapp/htmlFormEntry.jsp

  • jibesh <goodboy007.pro@gmail.com>

    jibesh <goodboy007.pro@gmail.com> 85d32c29ad45a050c743d42f673e4b55346f546c

    All types of files are getting uploaded & rendered correctly

    • api/src/main/java/org/openmrs/module/htmlformentry/element/ObsSubmissionElement.java (version 85d32c29ad45a050c743d42f673e4b55346f546c)
    • api/src/main/java/org/openmrs/module/htmlformentry/widget/UploadWidget.java (version 85d32c29ad45a050c743d42f673e4b55346f546c)
    • api/src/main/java/org/openmrs/module/htmlformentry/widget/WidgetFactory.java (version 85d32c29ad45a050c743d42f673e4b55346f546c)
    • api/src/test/java/org/openmrs/module/htmlformentry/WidgetTest.java (version 85d32c29ad45a050c743d42f673e4b55346f546c)
    • omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/DownloadFileServlet.java (version 85d32c29ad45a050c743d42f673e4b55346f546c)
    • omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java (version 85d32c29ad45a050c743d42f673e4b55346f546c)
    • omod/src/main/webapp/htmlFormEntry.jsp (version 85d32c29ad45a050c743d42f673e4b55346f546c)
    • omod/src/main/webapp/resources/htmlFormEntry.css (version 85d32c29ad45a050c743d42f673e4b55346f546c)
  • jibesh <jibesh>

    jibesh <jibesh> cc77b3e4a150719623dd3f1f6defbc121ce0b498

    Minor Changes regarding the filepath

    • omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java (version cc77b3e4a150719623dd3f1f6defbc121ce0b498)
  • jibesh <jibesh>

    jibesh <jibesh> 1ec6ea1d3812dfd7e4e77f85ade1e9b1a39e8206

    Merge branch 'zephyr' of https://github.com/jibesh/openmrs-module-htmlformentry into zephyr
    Conflicts:
            omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java

  • jibesh <jibesh>

    jibesh <jibesh> 786fda4dc75c81d625a81ff2b9bd98d7446ee0b0

    The Upload widget is being rendered correctly. Images are getting Uploaded to correct location. & few minor changes

    • api/src/main/java/org/openmrs/module/htmlformentry/FormEntryContext.java (version 786fda4dc75c81d625a81ff2b9bd98d7446ee0b0)
    • api/src/main/java/org/openmrs/module/htmlformentry/HtmlFormEntryUtil.java (version 786fda4dc75c81d625a81ff2b9bd98d7446ee0b0)
    • api/src/main/java/org/openmrs/module/htmlformentry/element/ObsSubmissionElement.java (version 786fda4dc75c81d625a81ff2b9bd98d7446ee0b0)
    • api/src/main/java/org/openmrs/module/htmlformentry/widget/UploadWidget.java (version 786fda4dc75c81d625a81ff2b9bd98d7446ee0b0)
    • api/src/main/java/org/openmrs/module/htmlformentry/widget/WidgetFactory.java (version 786fda4dc75c81d625a81ff2b9bd98d7446ee0b0)
    • omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java (version 786fda4dc75c81d625a81ff2b9bd98d7446ee0b0)
    • omod/src/main/webapp/htmlFormEntry.jsp (version 786fda4dc75c81d625a81ff2b9bd98d7446ee0b0)
    • omod/src/main/webapp/resources/htmlFormEntry.css (version 786fda4dc75c81d625a81ff2b9bd98d7446ee0b0)
  • jibesh <goodboy007.pro@gmail.com>

    jibesh <goodboy007.pro@gmail.com> c5dd814a1c9362c67a242754657dcee9f1b562b8

    The Upload widget is being rendered correctly. Images are getting Uploaded to correct location.

    • api/src/main/java/org/openmrs/module/htmlformentry/FormEntryContext.java (version c5dd814a1c9362c67a242754657dcee9f1b562b8)
    • api/src/main/java/org/openmrs/module/htmlformentry/HtmlFormEntryUtil.java (version c5dd814a1c9362c67a242754657dcee9f1b562b8)
    • api/src/main/java/org/openmrs/module/htmlformentry/element/ObsSubmissionElement.java (version c5dd814a1c9362c67a242754657dcee9f1b562b8)
    • api/src/main/java/org/openmrs/module/htmlformentry/widget/UploadWidget.java (version c5dd814a1c9362c67a242754657dcee9f1b562b8)
    • api/src/main/java/org/openmrs/module/htmlformentry/widget/WidgetFactory.java (version c5dd814a1c9362c67a242754657dcee9f1b562b8)
    • omod/src/main/java/org/openmrs/module/htmlformentry/web/controller/HtmlFormEntryController.java (version c5dd814a1c9362c67a242754657dcee9f1b562b8)
    • omod/src/main/webapp/htmlFormEntry.jsp (version c5dd814a1c9362c67a242754657dcee9f1b562b8)
    • omod/src/main/webapp/resources/htmlFormEntry.css (version c5dd814a1c9362c67a242754657dcee9f1b562b8)