00:20:04
|
*** mseaton has joined #openmrs
|
00:20:06
|
*** ChanServ sets mode: +v mseaton
|
00:22:55
|
<djazayeri> bwolfe: hey, do you know how, in a unit test for the mirebalais module, I can load the global properties defined in the patientregistration module?
|
00:23:17
|
<djazayeri> bwolfe: specifically, I'd like to sue a maven dependency to get the snapshot version of config.xml and create the GPs defined there.
|
01:02:20
|
*** rafa has joined #openmrs
|
01:02:20
|
*** ChanServ sets mode: +v rafa
|
01:05:45
|
*** rafa has quit IRC
|
01:18:58
|
*** madroach has quit IRC
|
01:20:32
|
*** madroach has joined #openmrs
|
01:32:14
|
*** robbyoconnor has joined #openmrs
|
01:32:15
|
*** ChanServ sets mode: +v robbyoconnor
|
01:32:37
|
*** robbyoconnor has quit IRC
|
01:54:08
|
*** robbyoconnor has joined #openmrs
|
01:54:09
|
*** ChanServ sets mode: +v robbyoconnor
|
01:55:49
|
*** sgithens has joined #openmrs
|
01:56:19
|
*** robbyoconnor has quit IRC
|
02:13:03
|
*** mseaton has quit IRC
|
03:01:51
|
*** suranga has joined #openmrs
|
03:21:51
|
*** suranga_ has joined #openmrs
|
03:22:44
|
*** lh has joined #openmrs
|
03:22:44
|
*** lh has joined #openmrs
|
03:22:58
|
*** lh has quit IRC
|
03:25:48
|
*** suranga has quit IRC
|
03:59:31
|
*** suranga_ has quit IRC
|
04:10:34
|
*** suranga has joined #openmrs
|
04:21:34
|
*** upul` has joined #openmrs
|
04:21:34
|
*** ChanServ sets mode: +v upul`
|
04:32:55
|
*** upul` has left #openmrs
|
04:33:02
|
*** upul` has joined #openmrs
|
04:33:02
|
*** ChanServ sets mode: +v upul`
|
04:39:42
|
*** robbyoconnor has joined #openmrs
|
04:39:42
|
*** ChanServ sets mode: +v robbyoconnor
|
04:40:06
|
*** robbyoconnor has quit IRC
|
04:46:22
|
*** robbyoconnor has joined #openmrs
|
04:46:22
|
*** ChanServ sets mode: +v robbyoconnor
|
04:49:58
|
*** robbyoconnor has quit IRC
|
04:50:45
|
*** robbyoconnor has joined #openmrs
|
04:50:45
|
*** ChanServ sets mode: +v robbyoconnor
|
04:55:14
|
*** robbyoconnor has quit IRC
|
05:31:47
|
*** harshadura has joined #openmrs
|
05:36:42
|
*** suranga has quit IRC
|
05:58:06
|
*** suranga has joined #openmrs
|
06:21:59
|
*** suranga has quit IRC
|
06:24:34
|
*** suranga has joined #openmrs
|
07:13:20
|
*** dkayiwa has joined #openmrs
|
07:25:50
|
*** kishoreyekkanti has joined #openmrs
|
08:49:28
|
*** suranga has quit IRC
|
08:50:14
|
*** kishoreyekkanti has quit IRC
|
08:58:24
|
*** suranga has joined #openmrs
|
09:36:36
|
*** walkandfish has quit IRC
|
09:38:27
|
*** walkandfish has joined #openmrs
|
09:42:37
|
*** suranga has quit IRC
|
09:43:59
|
*** suranga has joined #openmrs
|
10:01:28
|
*** suranga has quit IRC
|
10:16:40
|
*** suranga has joined #openmrs
|
10:20:54
|
*** suranga has quit IRC
|
10:32:54
|
*** goutham has joined #openmrs
|
10:48:22
|
*** harshadura has quit IRC
|
10:56:12
|
*** nathanleiby has joined #openmrs
|
11:00:44
|
*** goutham has quit IRC
|
11:03:24
|
*** mallan_ has joined #openmrs
|
11:04:12
|
<mallan_> hi every one thanks for the good work ,i want a link to download openmrs 1.6.3
|
11:04:32
|
<dkayiwa> mallan_: why that version
|
11:04:42
|
<dkayiwa> mallan_: why not 1.9.1
|
11:06:43
|
<mallan_> in uganda we are using express 1.6.3
|
11:09:26
|
<mallan_> please someone help
|
11:10:01
|
<dkayiwa> mallan_: can you include my name as you type?
|
11:10:19
|
<dkayiwa> mallan_: that way it will alert me to respond immediately
|
11:11:10
|
<dkayiwa> mallan_: here is the download link: http://sourceforge.net/projects/openmrs/files/releases/
|
11:11:15
|
<OpenMRSBot> <http://ln-s.net/$q-F> (at sourceforge.net)
|
11:12:17
|
<mallan_> dkayiwa: is the version you told me compatible with ugandan setup
|
11:12:50
|
<dkayiwa> mallan_: you can upgrade it
|
11:12:57
|
<mallan_> dkayiwa:version 1.9.1
|
11:13:24
|
<dkayiwa> mallan_: what is your full name
|
11:17:05
|
*** mallan_ has quit IRC
|
11:20:40
|
*** upul` has quit IRC
|
11:48:00
|
*** harshadura has joined #openmrs
|
11:53:29
|
*** bwolfe has quit IRC
|
12:15:54
|
*** wyclif has quit IRC
|
12:25:05
|
*** bwolfe has joined #openmrs
|
12:25:05
|
*** ChanServ sets mode: +o bwolfe
|
12:29:07
|
*** kishoreyekkanti has joined #openmrs
|
12:32:13
|
*** goutham has joined #openmrs
|
12:33:10
|
*** rafa has joined #openmrs
|
12:33:10
|
*** ChanServ sets mode: +v rafa
|
12:39:40
|
*** kishoreyekkanti has quit IRC
|
12:40:03
|
*** harshadura_ has joined #openmrs
|
12:40:16
|
*** harshadura has quit IRC
|
12:40:36
|
*** harshadura_ has quit IRC
|
12:40:45
|
*** harshadura has joined #openmrs
|
12:46:10
|
*** harshadura has quit IRC
|
12:46:10
|
*** rafa has quit IRC
|
12:49:37
|
*** harshadura has joined #openmrs
|
12:52:29
|
*** harshadura has quit IRC
|
12:52:42
|
*** harshadura has joined #openmrs
|
12:53:53
|
*** downey has joined #openmrs
|
12:53:53
|
*** ChanServ sets mode: +o downey
|
13:02:09
|
*** sgithens has quit IRC
|
13:04:17
|
*** rafa has joined #openmrs
|
13:04:17
|
*** ChanServ sets mode: +v rafa
|
13:05:50
|
*** goutham has quit IRC
|
13:06:02
|
*** wyclif has joined #openmrs
|
13:21:36
|
*** mseaton has joined #openmrs
|
13:21:37
|
*** ChanServ sets mode: +v mseaton
|
13:26:00
|
*** lh has joined #openmrs
|
13:26:00
|
*** lh has joined #openmrs
|
13:32:51
|
<bwolfe> djazayeri, latest of ui/app/etc/kenyaemr modules from your repos gives this error: "No viewProvider named pages"
|
13:34:18
|
<djazayeri> downey: can't check email now, did the form filtering video get uploaded?
|
13:35:03
|
<downey> djazayeri: i haven't received it yet
|
13:35:54
|
*** suranga has joined #openmrs
|
13:35:54
|
*** ChanServ sets mode: +v suranga
|
13:42:40
|
<djazayeri> bwolfe: don't use the latest UI Framework module
|
13:42:48
|
<djazayeri> bwolfe: kenyaemr hasn't been updated for that yet
|
13:42:54
|
<djazayeri> bwolfe: stick to 1.7
|
13:50:27
|
*** sgithens has joined #openmrs
|
13:55:36
|
<OpenMRSBot> Recent updates in the world of openmrs: On Twitter: OpenMRS: @sagarmukim Lots of possibilities here - best idea is check with other #OpenMRS implementers to see what they've done: http://t.co/K7AZJGbw <http://twitter.com/OpenMRS/statuses/248409822746259456>
|
14:01:04
|
*** cpower has joined #openmrs
|
14:01:21
|
<cpower> hello!
|
14:01:59
|
<mseaton> hi :)
|
14:02:00
|
*** andreapat has joined #openmrs
|
14:02:14
|
<cpower> Let's scrum
|
14:02:24
|
<cpower> !scrumon cpower
|
14:02:24
|
* OpenMRSBot says the DAILY SCRUM MEETING is STARTING. This meeting should not last longer than 15 minutes. Please hold other comments until the end of the meeting, or message someone privately. Thank you! ScrumMaster cpower- you may begin when ready.
|
14:02:58
|
<cpower> Order: Wyclif, dkayiwa, andreapat, suranga, rafa, mseation, djazayeri, bwolfe
|
14:03:21
|
<wyclif> Tuesday:
|
14:03:21
|
<wyclif> Complete PS-1 - Add Patient Dashboard Tab Extension for displaying one or more patient summaries
|
14:03:21
|
<wyclif> Wednesday:
|
14:03:21
|
<wyclif> PS-3 - Support a print-friendly view of a patient summary
|
14:03:21
|
<wyclif> design call
|
14:03:21
|
<wyclif> PS-9 - Create a custom ReportDefinition subclass to represent a PatientSummaryReportDefinition
|
14:03:23
|
<wyclif> Blockers: None
|
14:03:41
|
<dkayiwa> Committed: Support scripting in TextTemplateRenderer templates - REPORT-437
|
14:03:42
|
<dkayiwa> University Call
|
14:03:42
|
<dkayiwa> Working on: Add utility functions to the TextTemplateRenderer scripting Context - REPORT-441
|
14:03:42
|
<dkayiwa> No Blockers
|
14:04:41
|
<andreapat> Tuesday re Ben's advice commented out method encrypt_shouldEncryptShortAndLongText() in SecurityTest that was
|
14:04:41
|
<andreapat> causing tests to fail then was able to get successful build with tests. Was able to add people and
|
14:04:41
|
<andreapat> Add/Edit an Observations and see Odd change to message set as a void reason when
|
14:04:41
|
<andreapat> saving an obs (TRUNK-3701) in the log file.
|
14:04:41
|
<andreapat> Imported code into Eclipse. More Merck stuff. No blockers but a question later. Today import correct
|
14:04:43
|
<andreapat> branch and fix code for ticket.
|
14:05:30
|
<andreapat> and dev call
|
14:05:40
|
<bwolfe> !ticket TRUNK-3701
|
14:05:42
|
<OpenMRSBot> bwolfe: [#TRUNK-3701] Odd change to message set as a void reason when saving an obs - OpenMRS JIRA - https://tickets.openmrs.org/browse/TRUNK-3701
|
14:06:00
|
<andreapat> yes
|
14:06:19
|
<suranga> aaand me (?)
|
14:06:25
|
<suranga> Doing :
|
14:06:26
|
<suranga> enhancements to HL7query-55 (improve to manage all exception types)
|
14:06:26
|
<suranga> TO do:
|
14:06:26
|
<suranga> Update the regenstrief patientmatching server
|
14:06:26
|
<suranga> talk to Ben on design issue
|
14:06:26
|
<suranga> Need to find James to get correct ID / pssword to RG server
|
14:06:27
|
<bwolfe> andreapat, try to format your updates as a series of bulleted work items. :-) much easier to follow. best to just keep a notepad open during the day and update periodically.
|
14:06:28
|
<suranga> NO BLOCKERS
|
14:06:55
|
<andreapat> bwolfe, ok
|
14:07:00
|
<rafa> Today:
|
14:07:00
|
<rafa> * Completed META-245: Should allow classes in different packages to have the same simple name
|
14:07:00
|
<rafa> https://tickets.openmrs.org/browse/META-245 (not yet committed, waited for feedback)
|
14:07:00
|
<rafa> * Back ported and closed:
|
14:07:00
|
<rafa> + TRUNK-3151: NPE if Tomcat temp directory is missing
|
14:07:00
|
<rafa> https://tickets.openmrs.org/browse/TRUNK-3151
|
14:07:01
|
<rafa> + TRUNK-3463: Edit Drug Order fails
|
14:07:01
|
<rafa> https://tickets.openmrs.org/browse/TRUNK-3463
|
14:07:01
|
<rafa> + TRUNK-3123: Patients names which include a double quote (") are truncated after the double quote
|
14:07:02
|
<rafa> https://tickets.openmrs.org/browse/TRUNK-3123
|
14:07:03
|
<rafa> No blockers.
|
14:07:36
|
<mseaton> Reviewing patient summary tickets
|
14:07:36
|
<mseaton> Figuring out how to use git to handle pull requests
|
14:07:36
|
<mseaton> !ticket REPORT-362
|
14:07:36
|
<mseaton> !ticket REPORT-145
|
14:07:36
|
<mseaton> No blockers
|
14:07:36
|
<mseaton> Followup question for Wyclif - I don't see a pull request for PS-1. You say it is done?
|
14:07:38
|
<OpenMRSBot> mseaton: [#REPORT-362] Add web output for all reports - OpenMRS JIRA - https://tickets.openmrs.org/browse/REPORT-362
|
14:07:39
|
<OpenMRSBot> mseaton: [#REPORT-145] Require all renderer except for the standard web renderer to be explicitly enabled - OpenMRS JIRA - https://tickets.openmrs.org/browse/REPORT-145
|
14:07:58
|
<bwolfe> mseaton, is the git part a blocker? want some suggestions?
|
14:08:30
|
<mseaton> bwolfe, i'm following the instructions on the wiki (thanks rafa!), and talking with mark. i'll ping with questions.
|
14:08:35
|
<wyclif> mseaton, ran into a small issue with Html widgets when capturing parameter values
|
14:08:49
|
<mseaton> wyclif - let's discuss after scrum?
|
14:08:51
|
<bwolfe> djazayeri is up...
|
14:08:52
|
<wyclif> mseaton, i need to add html widgets
|
14:08:53
|
<rafa> mseaton: I improved them today a bit
|
14:09:01
|
<djazayeri> Today: calls, calls, calls
|
14:09:03
|
<djazayeri> No blockers
|
14:09:10
|
<bwolfe> blockers: calls
|
14:09:14
|
<djazayeri> true
|
14:09:21
|
<bwolfe> blockers: hold music
|
14:09:22
|
<cpower> I hear that.
|
14:09:34
|
<bwolfe> Tuesday
|
14:09:34
|
<bwolfe> email inbox trimming
|
14:09:34
|
<bwolfe> reviewed a few of Rafal's tickets
|
14:09:34
|
<bwolfe> commented on multiple tickets
|
14:09:34
|
<bwolfe> release 1.1 of restws
|
14:09:35
|
<bwolfe> backport TRUNK-3592
|
14:09:36
|
<bwolfe> install kenyaemr
|
14:09:38
|
<bwolfe> Wednesday
|
14:09:40
|
<bwolfe> triage a number of tickets
|
14:09:44
|
<bwolfe> curate a few tickets
|
14:09:46
|
<bwolfe> Univ call
|
14:09:48
|
<bwolfe> update docs on ui framework
|
14:09:50
|
<bwolfe> try out UIFR-44
|
14:09:52
|
<bwolfe> dev interview
|
14:09:54
|
<bwolfe> design call
|
14:09:56
|
<bwolfe> pm call
|
14:09:58
|
<bwolfe> blockers: ui framework documentation needing revamp
|
14:10:00
|
* bwolfe looks at djazayeri
|
14:10:15
|
<djazayeri> yes it does...
|
14:10:50
|
<cpower> Ok
|
14:11:20
|
<cpower> Blockers: Bwolfe: i framework documentation needing revamp
|
14:11:29
|
<cpower> @bwolfe> blockers: hold music
|
14:12:00
|
<cpower> Discussion topics
|
14:12:12
|
<cpower> seaton, is the git part a blocker? want some suggestions?
|
14:12:37
|
<cpower> S-1. You say it is done?
|
14:12:38
|
<mseaton> nope
|
14:13:01
|
<cpower> suranga> Need to find James to get correct ID / pssword to RG server
|
14:13:28
|
<cpower> !scrumoff
|
14:13:28
|
* OpenMRSBot says the DAILY SCRUM MEETING has ENDED. This channel is now returned to normal hacking operations. Post-scrum meeting follow-up conversations may now begin.
|
14:13:42
|
<andreapat> My question now?
|
14:14:14
|
<andreapat> Question:
|
14:14:14
|
<andreapat> See in log file:
|
14:14:14
|
<andreapat> / correct message
|
14:14:14
|
<andreapat> In method ObsService.saveObs. Arguments: Obs=Obs #4, String=Test TRUNK-3701,
|
14:14:40
|
<andreapat> / and odd message
|
14:14:41
|
<andreapat> In method ObsService.voidObs. Arguments: Obs=Obs #4, String=Test TRUNK-3701voidReason looks like (new obsId: 5),
|
14:14:58
|
<andreapat> But in code - only the correct message
|
14:14:59
|
<andreapat> String reason = changeMessage + " (new obsId: " + newObs.getObsId() + ")";
|
14:15:12
|
<andreapat> Not the odd message "line here in the code review: https://source.openmrs.org/cru/CR-TRUNK-570#CFR-16560"
|
14:15:12
|
<andreapat> String reason = changeMessage + "voidReason looks like" + " (new obsId: " + newObs.getObsId() + ")";
|
14:15:25
|
<andreapat> Seems code doesn't match log
|
14:16:20
|
<bwolfe> !seen james_rg
|
14:16:20
|
<OpenMRSBot> bwolfe: I have not seen james_rg.
|
14:16:20
|
<andreapat> was that hard to follow?
|
14:17:13
|
<bwolfe> andreapat, its not what is getting logged, its what is getting saved to the obs.voidReason
|
14:17:50
|
<andreapat> yes - but I see only the correct reason being set in code
|
14:18:12
|
<andreapat> but log comes out with both reasons
|
14:18:28
|
<bwolfe> andreapat, which line in which file is looking correct to you?
|
14:18:53
|
<andreapat> String reason = changeMessage + " (new obsId: " + newObs.getObsId() + ")";
|
14:19:53
|
<bwolfe> andreapat, line number and filename please. (I'm too lazy to open the review...best to give all info up front to debugging helpers anyway)
|
14:20:20
|
<andreapat> have to give you that later - on a different computer
|
14:22:15
|
<bwolfe> andreapat, short answer: the logging you are seeing is from the LoggingAdvice AOP class. When an obs is saved, it is not edited. rahter the old one is voided (voidObs) and the new one is created (saveObs)
|
14:22:23
|
<bwolfe> only the old one has a voidReason on it
|
14:22:28
|
<bwolfe> and right now that voidReason is wrong
|
14:22:29
|
*** rafa has quit IRC
|
14:22:49
|
<andreapat> bwolfe, I get it - thanks
|
14:24:00
|
<mseaton> wyclif - is there anything htmlwidgets related to discuss?
|
14:24:30
|
*** rafa has joined #openmrs
|
14:24:30
|
*** ChanServ sets mode: +v rafa
|
14:25:48
|
<wyclif> mseaton, i have added html widgets as a required module
|
14:26:04
|
<wyclif> mseaton, i added 1.6.1 as the required is that fine?
|
14:26:18
|
<wyclif> because it is the one reporting depends on
|
14:26:30
|
<mseaton> wyclif, might as well use the latest (i think 1.6.4) as it is in nexus and might have some enhancements
|
14:27:39
|
*** cpower has quit IRC
|
14:28:08
|
<wyclif> i hope that causes no conflicts of some sort with reporting
|
14:28:35
|
<wyclif> mseaton, let me do that and will push the code
|
14:29:27
|
<mseaton> wyclif, maybe i'll bump up the reporting one
|
14:31:29
|
<wyclif> mseaton, ok thanks
|
14:33:37
|
*** kdeeq has joined #openmrs
|
14:34:14
|
<dkayiwa> hi mseaton
|
14:34:36
|
<mseaton> hi dkayiwa
|
14:35:39
|
<dkayiwa> mseaton: for REPORT-441, if sortSpecification is not specified, should i assume that the objects implement Comparator, i should i assume they are OpenMRS objects with a name and hence sort by name
|
14:35:40
|
<dkayiwa> ?
|
14:35:51
|
<dkayiwa> !ticket REPORT-44
|
14:35:53
|
<OpenMRSBot> dkayiwa: [#REPORT-44] Unable to delete indicator definition parameters - Error 404 - OpenMRS JIRA - https://tickets.openmrs.org/browse/REPORT-44
|
14:37:18
|
<dkayiwa> !ticket REPORT-441
|
14:37:19
|
<OpenMRSBot> dkayiwa: [#REPORT-441] Add utility functions to the TextTemplateRenderer scripting Context - OpenMRS JIRA - https://tickets.openmrs.org/browse/REPORT-441
|
14:39:07
|
*** harshadura has quit IRC
|
14:39:16
|
*** nathanleiby has quit IRC
|
14:42:18
|
<mseaton> dkayiwa, if sortspecification is not specified, i would put the items into a list (List l = new ArrayList(c);), and then in a try/catch block, try doing Collections.sort(l). if this fails, just ignore the error, and then return the List. we can always add in enhancements to this method as needed down the road.
|
14:44:08
|
<dkayiwa> mseaton: ok
|
14:44:17
|
<mseaton> dkayiwa: for REPORT-437, would it be easier if i pulled your changes in as-is, and then tweaked them myself? or would you prefer i comment on your pull request and have you make changes as needed?
|
14:44:55
|
<dkayiwa> mseaton: yes i prefer you tweak them yourself :)
|
14:45:08
|
<mseaton> dkayiwa, that's what i figured. easier for me too :)
|
14:45:15
|
<dkayiwa> :)
|
14:47:18
|
*** sgithens has quit IRC
|
14:47:44
|
<mseaton> ok. bwolfe, git advice?
|
14:53:31
|
<mseaton> rafa / bwolfe. so daniel has a pull request for a topic branch in his fork. so the right practice is for me to create my own local topic branch, check out his branch into it, and then push this to upstream?
|
14:54:11
|
<mseaton> or i could just check out his topic branch directly, assuming i have him added as a remote?
|
14:54:24
|
<mseaton> and push this to upstream?
|
14:54:35
|
<rafa> mseaton: you don't need to add him as remote
|
14:54:39
|
<rafa> mseaton: https://wiki.openmrs.org/display/docs/Merging
|
14:54:39
|
<bwolfe> mseaton, you just pull it into your current branch
|
14:54:56
|
<rafa> mseaton: use fetch
|
14:55:07
|
<bwolfe> mseaton, pull in as a "rebase", then update with a "rebase" and push to upstream directly from your branch
|
14:55:08
|
<rafa> mseaton: it will create a topic branch for your from his branch
|
14:55:38
|
<mseaton> ok, so let's say i manage to do that and get his changes into the master repository. how does he know he can delete his topic branch?
|
14:55:57
|
<rafa> mseaton: the pull request should be closed
|
14:56:04
|
<rafa> mseaton: and he can delete the branch
|
14:56:27
|
<rafa> mseaton: the pull request will be closed automatically most of the time
|
14:57:03
|
<mseaton> rafa/bwolfe, so i _could_ just use the "Merge Pull Request" button on github, right? if i don't want to change anythign?
|
14:57:31
|
<rafa> mseaton: that will work as well
|
14:58:28
|
<mseaton> rafa - thanks for the link to the merging page. i had used this in the past with svn, but assumed this page was incorporated into the using git page. i guess not?
|
14:58:43
|
*** kishoreyekkanti has joined #openmrs
|
14:58:52
|
<rafa> mseaton: using git is more for devs sending pull requests
|
14:59:06
|
<rafa> mseaton: the merging page is for those who merge pull requests :)
|
14:59:25
|
<mseaton> rafa, right i see. would be nice to consolodate imho. i'm a newbie on both fronts.
|
15:00:12
|
<rafa> mseaton: you're probably right, they Merging and Backporting should be children of Using Git
|
15:02:25
|
<bwolfe> mseaton, the "Merging" page is new. rafa, any reason we can't call it something more descriptive?
|
15:02:41
|
<bwolfe> mseaton, you're thinking of the "Subversion Merging and Branching Techniques"
|
15:03:41
|
<rafa> bwolfe: feel free to change it if you have a better name :)
|
15:05:09
|
<rafa> bwolfe: meanwhile I've moved it under Using Git
|
15:05:29
|
<bwolfe> rafa, I had originally suggested to you "Git Merging Techniques" to tie it closely to the old subversion page...I assumed you went with something else intentionally
|
15:06:28
|
<rafa> bwolfe: nope, just used a shorter version ;)
|
15:07:37
|
<suranga> hi bwolfe , will u be around in about 1-2 hours time ? :)
|
15:08:12
|
<bwolfe> suranga, yes
|
15:08:43
|
<suranga> bwolfe, cool, thanks :)
|
15:10:38
|
<bwolfe> djazayeri, is there a module updated to use the latest uiframework I can look at?
|
15:13:37
|
<djazayeri> bwolfe: I don't think soâ¦ask mark if
|
15:13:42
|
<djazayeri> provider mgmt does
|
15:14:37
|
*** suranga has quit IRC
|
15:16:34
|
*** Amegere has joined #openmrs
|
15:16:50
|
<downey> Hi Amegere and welcome to the #openmrs IRC channel.
|
15:24:12
|
<Amegere> Hi dkayiwa:power went off as you were giving the download link for OpenMrs 1.6.3 and 1.9.1
|
15:24:24
|
<dkayiwa> Amegere: ok
|
15:24:56
|
<dkayiwa> Amegere: http://sourceforge.net/projects/openmrs/files/releases/
|
15:24:57
|
<OpenMRSBot> <http://ln-s.net/$q-F> (at sourceforge.net)
|
15:25:49
|
<Amegere> dkayiwa:thank you
|
15:26:35
|
*** mseaton has quit IRC
|
15:28:35
|
<bwolfe> rafa, looking at your changes to the Merging document: what is the advantage of doing it in a branch on yoru local? I just pull into my master, review, (discard
|
15:29:57
|
<rafa> bwolfe: it's more right. We should not be rebasing changes on master from a branch rather on a branch from master.
|
15:30:13
|
<rafa> bwolfe: otherwise we run into troubles you had before
|
15:30:17
|
<rafa> bwolfe: duplicated commits
|
15:32:35
|
<rafa> bwolfe: now you can also easily see only commits from the pull request when using log/diff
|
15:33:23
|
<bwolfe> rafa, "changes on master from a branch" ? I don't follow. my master is clean and up to date always. the dev used a branch. I see no advntage to another branch off my master
|
15:33:34
|
*** lh has quit IRC
|
15:34:51
|
<rafa> bwolfe: ok what happens if you do git pull --rebase BRANCH on master is that newest changes from master are replayed on changes from the branch which is not correct
|
15:35:39
|
<rafa> bwolfe: we want the other way
|
15:35:45
|
<bwolfe> thats not what I've seen
|
15:36:58
|
<bwolfe> my first attempt at merging did that duplicate thing. I don't remember what happened, but I didn't use rebase
|
15:37:09
|
<bwolfe> my most recent ones were using rebase and on my master
|
15:37:10
|
*** Amegere has quit IRC
|
15:37:20
|
<rafa> bwolfe: try doing rebase with https://github.com/openmrs/openmrs-core/pull/24
|
15:37:45
|
<rafa> bwolfe: git pulll --rebase https://github.com/jblaya/openmrs-core-1.git master
|
15:37:49
|
<rafa> bwolfe: on your master
|
15:37:55
|
<rafa> bwolfe: and then look at the log
|
15:38:42
|
* bwolfe will try after fetching some jj
|
15:39:17
|
<rafa> bwolfe: you will see that commits from master where mistakenly replied
|
15:39:32
|
<rafa> bwolfe: on top of changes from a branch
|
15:40:07
|
<rafa> bwolfe: it can be fixed when you do git pull --rebase upstream master
|
15:40:48
|
*** mseaton has joined #openmrs
|
15:40:49
|
*** ChanServ sets mode: +v mseaton
|
15:41:41
|
<rafa> bwolfe: there's some magic after you do that, which I don't entirely understand
|
15:41:52
|
<rafa> bwolfe: and I don't know if it is correct
|
15:42:42
|
<rafa> bwolfe: so I decided it is better to do it on a local branch
|
15:43:02
|
<rafa> bwolfe: wihtout using this trick
|
15:45:02
|
*** andreapat has quit IRC
|
15:52:57
|
<bwolfe> rafa, yes, I always so a pull --rebase upstream master. that was the trick that took me a few hours to find :-(
|
15:55:00
|
<rafa> bwolfe: correct, basically we now do what everyone recommends. Do not ever work on master, but use feature branches.
|
15:55:16
|
<rafa> bwolfe: even for merging
|
15:57:06
|
<bwolfe> seems like unnecessary extra commands
|
15:57:09
|
<bwolfe> :-)
|
15:57:17
|
<bwolfe> I want to be able to remember how to do it!
|
15:58:19
|
<rafa> bwolfe: I think it's the same number of steps, just they're reordered :)
|
15:58:49
|
<bwolfe> negative. no branch creation. no branch deletion
|
15:58:50
|
<bwolfe> etc
|
16:06:00
|
*** bwolfe has quit IRC
|
16:06:54
|
*** sgithens has joined #openmrs
|
16:06:58
|
*** lh has joined #openmrs
|
16:06:59
|
*** lh has joined #openmrs
|
16:16:45
|
*** rafa has quit IRC
|
16:21:43
|
*** bwolfe has joined #openmrs
|
16:21:43
|
*** ChanServ sets mode: +o bwolfe
|
16:30:16
|
*** piyushmadan has joined #openmrs
|
16:30:26
|
<downey> Hi piyushmadan and welcome to the #openmrs IRC channel.
|
16:31:28
|
*** piyushmadan has left #openmrs
|
16:38:44
|
*** kdeeq has quit IRC
|
16:41:01
|
*** kishoreyekkanti has quit IRC
|
17:12:29
|
*** sgithens has quit IRC
|
17:20:22
|
*** suranga has joined #openmrs
|
17:20:22
|
*** ChanServ sets mode: +v suranga
|
17:40:03
|
*** rafa has joined #openmrs
|
17:40:03
|
*** ChanServ sets mode: +v rafa
|
17:42:11
|
<suranga> howdy bwolfe :)
|
17:45:01
|
<djazayeri> hey bwolfe, downey (or anyone else), we're running into an error building the patient registration module under bamboo (but it builds fine on dev laptops running osx, linux, and windows)
|
17:45:08
|
<djazayeri> does this error look familiar?
|
17:45:21
|
<djazayeri> registerPatient_shouldNotCreateTwoRegistrationEncounters(org.openmrs.module.patientregistration.PatientRegistrationServiceTest): Already value [org.springframework.orm.hibernate3.SessionHolder@7de21f45] for key [org.hibernate.impl.SessionFactoryImpl@e0bbd78] bound to thread [main]
|
17:46:30
|
<djazayeri> bwolfe: the only thing that's unusual about this method is that we have an @Transactional method in the patient reg module calling an @Transactional method in EncounterService.
|
17:46:37
|
<djazayeri> but that should be allowed...
|
17:46:51
|
*** bwolfe has quit IRC
|
17:53:59
|
*** kdeeq has joined #openmrs
|
17:58:32
|
*** bwolfe has joined #openmrs
|
17:58:32
|
*** ChanServ sets mode: +o bwolfe
|
17:59:26
|
*** sgithens has joined #openmrs
|
18:05:21
|
*** bwolfe_ has joined #openmrs
|
18:05:21
|
*** ChanServ sets mode: +o bwolfe_
|
18:05:28
|
*** bwolfe has quit IRC
|
18:05:31
|
*** bwolfe_ is now known as bwolfe
|
18:20:36
|
*** kishoreyekkanti has joined #openmrs
|
18:37:18
|
*** suranga_ has joined #openmrs
|
18:38:37
|
*** suranga has quit IRC
|
19:15:09
|
*** bwolfe has quit IRC
|
19:15:26
|
*** dkayiwa has quit IRC
|
19:15:28
|
*** dkayiwa_ has joined #openmrs
|
19:33:01
|
*** sgithens has quit IRC
|
19:49:22
|
*** kishoreyekkanti has quit IRC
|
19:49:48
|
*** kishoreyekkanti has joined #openmrs
|
19:54:37
|
*** suranga_ has quit IRC
|
19:57:58
|
*** kdeeq has quit IRC
|
19:59:26
|
*** dkayiwa has joined #openmrs
|
19:59:39
|
*** dkayiwa_ has quit IRC
|
20:01:48
|
*** dkayiwa_ has joined #openmrs
|
20:01:49
|
*** dkayiwa has quit IRC
|
20:01:49
|
*** dkayiwa_ is now known as dkayiwa
|
20:03:32
|
*** sgithens has joined #openmrs
|
20:42:23
|
<OpenMRSBot> Recent updates in the world of openmrs: On Twitter: OpenMRS: RT @ekrub: A paradoxical commitment to OpenMRS⦠or perhaps a firm commitment to screen sharing. http://t.co/YZjlOtTp <http://twitter.com/OpenMRS/statuses/248512806213779456>
|
21:01:42
|
<downey> djazayeri: following up on your bamboo question, are you sure the jdk and other environment that bamboo is using, is the same?
|
21:02:43
|
<djazayeri> downey: djazayeri@bamboo:~$ java -version
|
21:02:43
|
<djazayeri> java version "1.6.0_24"
|
21:02:43
|
<djazayeri> OpenJDK Runtime Environment (IcedTea6 1.11.4) (6b24-1.11.4-1ubuntu0.12.04.1)
|
21:02:43
|
<djazayeri> OpenJDK 64-Bit Server VM (build 20.0-b12, mixed mode)
|
21:02:56
|
<djazayeri> not exactly the same as our desktops, but not sure what's different
|
21:03:20
|
<djazayeri> downey: any idea where bamboo checks out code to by default?
|
21:05:39
|
<downey> djazayeri: verify that JDK is actually used by the app at http://<bambooserver>/admin/agent/viewJdks.action
|
21:06:06
|
<downey> djazayeri: the working directory is BAMBOO_HOME/xml-data/build-dir/PLAN-JOB-KEY
|
21:06:35
|
<downey> where bamboo_home is your env var used by the bamboo app, and the latter is the key for the specific plan ID you're building with
|
21:17:54
|
*** sgithens has quit IRC
|
21:28:02
|
*** mseaton has left #openmrs
|
21:34:58
|
<djazayeri> downey: unfortunately trying to run the same build at the command line also fails.
|
21:35:44
|
<downey> djazayeri: did you do a clean check-out just for sanity sake?
|
21:35:56
|
<djazayeri> yeah, as a different user
|
21:36:02
|
<downey> hrmph.
|
21:36:13
|
<downey> what jdk are you using on your desktop?
|
21:36:21
|
<downey> er, laptop, whatever
|
21:37:07
|
<djazayeri> I'm on osk
|
21:37:08
|
<djazayeri> osx
|
21:37:34
|
<downey> djazayeri: so presumptively sun jdk?
|
21:37:44
|
<djazayeri> I'm using whatever osx packages
|
21:38:34
|
<djazayeri> but this has worked for people on their laptops with linux and windows too
|
21:38:44
|
<djazayeri> will check whether mike has sun or icedtea
|
21:39:40
|
<downey> that's my best guess for now
|
21:46:12
|
*** rafa has quit IRC
|
21:56:31
|
*** dkayiwa_ has joined #openmrs
|
21:58:27
|
*** dkayiwa has quit IRC
|
21:58:27
|
*** dkayiwa_ is now known as dkayiwa
|
22:03:07
|
*** wyclif has quit IRC
|
22:20:26
|
*** lh has quit IRC
|
22:31:06
|
*** dkayiwa has quit IRC
|
23:05:31
|
*** wyclif has joined #openmrs
|
23:07:03
|
*** lh has joined #openmrs
|
23:07:03
|
*** lh has joined #openmrs
|
23:56:54
|
*** mseaton has joined #openmrs
|
23:56:54
|
*** ChanServ sets mode: +v mseaton
|
23:57:07
|
*** mseaton has left #openmrs
|