00:06:08
|
*** downey has quit IRC
|
00:11:07
|
*** lh has quit IRC
|
00:11:39
|
*** lh has joined #openmrs
|
00:11:47
|
*** lh has joined #openmrs
|
00:33:00
|
*** lh has quit IRC
|
00:37:03
|
*** lh has joined #openmrs
|
00:37:03
|
*** lh has joined #openmrs
|
00:37:06
|
<OpenMRSBot> Recent updates in the world of openmrs: On Twitter: OpenMRS: RT @djazayeri: I'd love to talk to someone who knows Backbone.js or Spine, about how we'd architect a next-gen #OpenMRS application in a ... <http://twitter.com/OpenMRS/statuses/231180316340015106>
|
01:02:14
|
*** lh has quit IRC
|
01:02:34
|
*** lh has joined #openmrs
|
01:02:50
|
*** suranga has joined #openmrs
|
01:02:50
|
*** ChanServ sets mode: +v suranga
|
01:07:07
|
*** lh has quit IRC
|
01:17:20
|
<suranga> hi bwolfe
|
01:17:29
|
<bwolfe> hi suranga
|
01:17:32
|
<suranga> bwolfe, are you around? :)\
|
01:17:35
|
<suranga> oh, hi
|
01:18:18
|
<suranga> bwolfe, sorry about yesterday, I was not feeling too well, so decided to sleep it out. Hence my no show last night :(
|
01:20:00
|
<bwolfe> np
|
01:20:07
|
<suranga> bwolfe, i was wondering, how do I respond to a commit, as opposed to a pull request ?
|
01:20:12
|
<suranga> bwolfe, see : https://github.com/dkayiwa/openmrs-module-hl7query/commit/f67a2f72c426c0173cf8a3f0a9ece0ae7e7bddde
|
01:20:18
|
<OpenMRSBot> <http://ln-s.net/$ZP7> (at github.com)
|
01:21:26
|
<bwolfe> suranga, I see a "comment" box at the bottom of that page you sent me... :-)
|
01:22:20
|
<suranga> bwolfe, so um.. this change has already gone into the OpenMRS github , right ?
|
01:23:04
|
<suranga> bwolfe, i thought it lives on Daniels github fork, and not ours...
|
01:23:42
|
<bwolfe> suranga, I don't know how to tell if that has been merged to the openmrs org github.
|
01:23:53
|
<bwolfe> that url has dkayiwa in it. so yes, it is daniel's fork
|
01:24:16
|
<suranga> bwolfe, should I ask him to make a pull request to us ?
|
01:25:10
|
<bwolfe> suranga, you should be able to "cherry pick" that commit into your checkout of the openmrs org hl7query master
|
01:25:32
|
<bwolfe> I don't know the command to do it, but you use the uuid of that commit (see the url) to be able to say "get this commit into my local repo"
|
01:25:38
|
<bwolfe> then you commit/push to openmrs org repo
|
01:25:56
|
<suranga> bwolfe, hmm... let me try that :)
|
01:26:05
|
<bwolfe> suranga, which branch of his is that in?
|
01:26:41
|
<suranga> bwolfe, daniel has openmrs-module-hl7query
|
01:26:55
|
<suranga> which was forked from our own Github module
|
01:26:59
|
<bwolfe> suranga, but then he has branches within that too.
|
01:27:09
|
<bwolfe> what you listed is his fork
|
01:27:22
|
<bwolfe> but his fork can have any number of branches for the tickets he is working on
|
01:28:04
|
<suranga> bwolfe, aha, this is it : https://github.com/dkayiwa/openmrs-module-hl7query/tree/HLQRY-21
|
01:28:08
|
<OpenMRSBot> <http://ln-s.net/$ZPF> (at github.com)
|
01:36:16
|
*** harshadura has quit IRC
|
01:36:38
|
*** jkeiper_ has joined #openmrs
|
01:48:11
|
*** deadpool has quit IRC
|
01:49:49
|
*** jkeiper_ has quit IRC
|
01:50:19
|
*** jkeiper_ has joined #openmrs
|
02:01:14
|
*** deadpool has joined #openmrs
|
02:01:22
|
<suranga> bwolfe, made some progress... not daniel's ticket yet, but others, just as importaint..
|
02:02:13
|
*** harshadura has joined #openmrs
|
02:03:41
|
<bwolfe> suranga, cool
|
02:04:00
|
<bwolfe> did you get hte cherry pick, or just find the pull request?
|
02:04:11
|
<suranga> bwolfe, would you encourage me closing tickets, or keeping them open in case other bugs occur ?
|
02:04:39
|
<bwolfe> if there are two reviews done on it, you can close it
|
02:04:47
|
<suranga> bwolfe, I cherry picked Uma's ticket. which for some reason had not gone in to the gitbug
|
02:04:55
|
<bwolfe> if you want another review, leave it in "post commit review" state
|
02:05:05
|
<bwolfe> gitbug?
|
02:05:06
|
<suranga> bwolfe, and re-open in the event of bug, isnt it ?
|
02:05:07
|
<bwolfe> :-p
|
02:05:15
|
<suranga> :D sory, github
|
02:05:19
|
<bwolfe> :-)
|
02:05:45
|
<bwolfe> suranga, I would guess uma was not able to push to github. she has issues with the vpn that her employer forces
|
02:06:30
|
<suranga> judy probably had about 5 reviews on her ticket so far (because we kept having new ideas on her tickets :P)
|
02:06:38
|
<bwolfe> heh
|
02:06:46
|
<suranga> bwolfe, working from home rocks, you dont even have a drass code !
|
02:06:55
|
<bwolfe> suranga, true
|
02:07:00
|
<bwolfe> but sometimes you forget to shower too
|
02:07:45
|
<suranga> bwolfe, :D
|
02:07:52
|
*** jkeiper_ has quit IRC
|
02:16:01
|
<suranga> hi bwolfe one question regarding :https://github.com/OpenMRS/openmrs-module-hl7query/pull/16/files
|
02:16:06
|
<OpenMRSBot> <http://ln-s.net/$ZQ8> (at github.com)
|
02:16:25
|
<suranga> bwolfe, im looking at ;https://github.com/OpenMRS/openmrs-module-hl7query/pull/16/files it seems that the call template method was not written ?
|
02:16:26
|
<OpenMRSBot> <http://ln-s.net/$ZQ8> (at github.com)
|
02:16:45
|
<bwolfe> suranga, stop putting hte ; in front, kills my links. :-p
|
02:17:02
|
<suranga> bwolfe, sorry :(
|
02:17:25
|
<suranga> bwolfe, https://github.com/OpenMRS/openmrs-module-hl7query/pull/16/files
|
02:17:26
|
<OpenMRSBot> <http://ln-s.net/$ZQ8> (at github.com)
|
02:17:34
|
<bwolfe> suranga, oh, I called it evaluateTemplate to match the server
|
02:17:42
|
<bwolfe> *service
|
02:18:33
|
<suranga> bwolfe, umm.. so i should update the ticket to ask them to call evaluateTemplate() method, and pass in the bindsings too ?
|
02:19:08
|
<suranga> bwolfe, and the result of this is a string like <PID.3>John</PID.3> ... etc >
|
02:19:46
|
<bwolfe> it returns the same thing that the service method does, yes
|
02:20:01
|
<suranga> bwolfe, i think what daniel is trying to do is get the xml template... not convert it, right ?
|
02:22:45
|
<bwolfe> suranga, I think he wants to render it. link me ot his code?
|
02:23:23
|
<suranga> bwolfe, this is where the comments were made on
|
02:23:24
|
<suranga> https://github.com/dkayiwa/openmrs-module-hl7query/diff_blob/aa5d573f41460efee8d23c08943c555794fc4653/api/src/test/resources/templates/PID.xml
|
02:23:29
|
<OpenMRSBot> <http://ln-s.net/$ZQB> (at github.com)
|
02:23:31
|
<suranga> its inside the PID.xml file...
|
02:24:01
|
<bwolfe> suranga, oh, strange. he's actually getting the template object. ...and then printing that object.
|
02:24:04
|
<bwolfe> thats all wrong
|
02:24:42
|
<suranga> bwolfe, I thought that the ORUR01 template build the entire thing out (by linking other segments) and then converted it to the real message...
|
02:25:08
|
<suranga> bwolfe, otherwise, the PID.3 template is not aware of the object, especilly if its called repeatedly, right ?
|
02:26:20
|
<suranga> bwolfe, for example, the Main ORUR01 template may decide to call a sub template any number of times based on other data. if so, only it will know what objects to pass into a sub template...
|
02:26:33
|
<suranga> the PID.xml segment itself wont know in advance :(
|
02:27:25
|
<bwolfe> orur01 template calls pid. pid calls name. the bindings are passed down as it goes
|
02:31:13
|
<suranga> bwolfe, um.. oooops
|
02:31:54
|
<suranga> bwolfe, p this changes things a bit, rather... hmm
|
02:33:48
|
<suranga> bwolfe, so, (let me try to get this right... all the sub templates call evaluatetemplate, and pass in the bindings map
|
02:34:25
|
<suranga> the evaluateTemplate methos knows which bindings object it should use to populate the data ?
|
02:34:58
|
<bwolfe> these calls are all at evaluate time.
|
02:35:02
|
<bwolfe> not sure what you are asking
|
02:35:19
|
<bwolfe> the PID knows what to pass as a binding/parameter to the subtemplates
|
02:35:26
|
<bwolfe> the orur01 knows what to pass to pid
|
02:36:06
|
<bwolfe> I think we should start a habit of putting a comment int he template at the top saying "this template expects a "patient" parameter and an "encounters" list of encounters parameter"
|
02:43:44
|
<suranga> bwolfe, o hi,
|
02:44:01
|
<suranga> bwolfe, I just mailed u a draft of what I want to send Rafa and Daniel .......
|
02:49:57
|
<bwolfe> suranga, replied
|
02:51:52
|
<suranga> bwolfe, thank,s you are a lifesaver !
|
02:57:42
|
<suranga> bwolfe, im not a very good sprint leader, am I ? :(
|
03:01:18
|
*** bwolfe has quit IRC
|
04:37:47
|
*** maurya has joined #openmrs
|
04:46:12
|
*** kishoreyekkanti has joined #openmrs
|
05:13:54
|
*** jordank has left #openmrs
|
05:34:41
|
*** robbyoconnor has joined #openmrs
|
05:34:41
|
*** ChanServ sets mode: +v robbyoconnor
|
05:43:09
|
*** mccallumg has quit IRC
|
05:43:53
|
*** jordank has joined #openmrs
|
06:05:22
|
*** Maurya_ has joined #openmrs
|
06:08:07
|
*** maurya has quit IRC
|
06:20:25
|
*** suranga has quit IRC
|
06:20:47
|
*** suranga has joined #openmrs
|
06:20:47
|
*** ChanServ sets mode: +v suranga
|
06:34:40
|
*** Maurya_ has quit IRC
|
06:53:24
|
*** rafa has joined #openmrs
|
06:53:24
|
*** ChanServ sets mode: +v rafa
|
07:17:17
|
<suranga> hi rafa
|
07:17:29
|
<suranga> rafa, im probably not too popular right now :)
|
07:18:00
|
<rafa> suranga: hi
|
07:18:14
|
<rafa> suranga: ?
|
07:18:22
|
<suranga> rafa, did you see my email ? :)
|
07:18:29
|
<rafa> suranga: yes, thx
|
07:18:49
|
<suranga> rafa, doesnt this affect your templates ?
|
07:18:55
|
<rafa> suranga: too much text in the morning ;)
|
07:19:05
|
<rafa> suranga: yes, one line
|
07:19:17
|
<rafa> suranga: one I wanted to change anyway :)
|
07:19:39
|
<suranga> rafa, you worked on which templates ? only on the OBX, is it ?
|
07:19:46
|
<rafa> suranga: yes obx
|
07:19:56
|
<rafa> suranga: and for the complete message
|
07:20:24
|
<rafa> suranga: no changes in obx
|
07:20:58
|
<suranga> rafa, yeps :) but Daniel is not going to like it too much :)
|
07:21:24
|
<rafa> suranga: it's nothing huge, no worries :)
|
07:21:50
|
<rafa> suranga: he wouldn't like it if you told him we are not writing templates in groovy, but in php ;)
|
07:22:18
|
<suranga> rafa, and also, if you fetch the latest changes from git, you will face a situation where the controller wont compile...
|
07:22:29
|
<rafa> suranga: that I don't like :P
|
07:22:33
|
<suranga> rafa, umm didnt get you.. d'you mean that he hates PHP ?
|
07:22:51
|
<rafa> suranga: no it would mean start from scratch :P
|
07:23:05
|
<suranga> rafa, its an unfortunate problem.. a pull request daniel made will fix that
|
07:23:15
|
<rafa> suranga: why don't you merge it?
|
07:23:29
|
<suranga> but that request has a few errors that we want to fix
|
07:23:44
|
<suranga> and also, it wont let me merge automatically (outdated)..
|
07:25:19
|
<rafa> suranga: :/
|
07:25:38
|
*** maurya has joined #openmrs
|
07:25:42
|
<suranga> rafa, its https://github.com/OpenMRS/openmrs-module-hl7query/pull/15
|
07:25:47
|
<OpenMRSBot> <http://ln-s.net/$ZW8> (at github.com)
|
07:26:18
|
<suranga> rafa, for now, of course you can comment out that single line in the controller, and it works... but...
|
07:26:26
|
<rafa> suranga: ok
|
07:26:46
|
<suranga> rafa, what do you intend to work on today ? :)
|
07:27:28
|
<rafa> suranga: I assume other templates are not ready to add them to the complete message?
|
07:28:01
|
<rafa> suranga: I'll go with a random ticket from the dashboard unless you point me to something
|
07:28:02
|
<suranga> rafa, thats the problem... but the good news is, most of the templates are unnessesary for the message to work
|
07:28:29
|
<suranga> rafa, if our controller class was working, we could have started testing by making requests....
|
07:29:06
|
<suranga> rafa, i was wondering, did Spencer attend yesterdays scrum ? i was out at a meeting at that time, so dont know what happened...
|
07:29:18
|
<rafa> suranga: I wasn't there either
|
07:29:23
|
<rafa> suranga: you can look at logs
|
07:29:40
|
<suranga> rafa, you too ? :D
|
07:29:56
|
<rafa> suranga: I was travelling
|
07:30:19
|
<rafa> suranga: relocated to my home town now
|
07:30:23
|
<rafa> suranga: visiting parents
|
07:30:34
|
<suranga> rafa, oh, I seee
|
07:30:44
|
<suranga> u used to be in Warsaw, right ?
|
07:30:47
|
<rafa> suranga: one question: is HL7TemplateFunctions automatically put in bindings to use in templates?
|
07:30:54
|
<rafa> suranga: no in Gdansk
|
07:31:05
|
<rafa> suranga: now 350 km from there
|
07:31:10
|
<suranga> oooops
|
07:31:32
|
*** dkayiwa has joined #openmrs
|
07:31:36
|
* suranga goes to look
|
07:33:21
|
<rafa> suranga: I think it does make sense to put it in bindings
|
07:33:26
|
<rafa> suranga: it'll be easier to use
|
07:33:33
|
<rafa> suranga: and not import org.openmrs.module.... needed
|
07:34:03
|
<suranga> rafa, it seems that it doesnt go into the bindings map at all...
|
07:36:07
|
<rafa> suranga: hmm actually it does
|
07:36:16
|
<rafa> link 90 in HL7QueryServiceImpl
|
07:36:24
|
*** judygichoya has joined #openmrs
|
07:36:25
|
<rafa> suranga: it's available under func
|
07:36:30
|
<suranga> rafa, i just saw that, was wondering how to break the news to you
|
07:36:45
|
<judygichoya> suranga hello
|
07:36:47
|
<rafa> suranga: good
|
07:36:50
|
<suranga> rafa that was written by Darius or Ben, so its gospel :)
|
07:37:02
|
<judygichoya> any bad news for me ?
|
07:37:28
|
<suranga> hi judygichoya !
|
07:37:49
|
<suranga> judygichoya, your're my number one dev at the moment. Both rafa and dkayiwa have buggies :D
|
07:38:00
|
<dkayiwa> :D
|
07:38:34
|
<suranga> judygichoya, we made a change to our design, you are safe, these two are not :)
|
07:38:58
|
<suranga> dkayiwa, I trust you read your email, and am hating me just a little bit :P
|
07:39:15
|
<dkayiwa> suranga: :D
|
07:39:54
|
<suranga> dkayiwa, actually, we have one other small merging problem....
|
07:40:04
|
<suranga> dkayiwa, I need to pull https://github.com/OpenMRS/openmrs-module-hl7query/pull/15
|
07:40:05
|
<OpenMRSBot> <http://ln-s.net/$ZW8> (at github.com)
|
07:40:19
|
<suranga> without this pull, there is an error in the controller (missing method)
|
07:40:40
|
<dkayiwa> suranga: the cause must be the complicated unnecesarily multistep git beast :D
|
07:41:14
|
<suranga> dkayiwa, this morning i called it git bug, and ben thought that I had miss-typed :D
|
07:41:46
|
<dkayiwa> suranga: hahahaha :)
|
07:42:19
|
<suranga> dkayiwa, are you intentionally putting sample-hl7.xml into openmrs/module/hl7query/api/impl, and not resources ?
|
07:43:46
|
<dkayiwa> suranga: i made a commit where i deleted it from there and put it in test recources
|
07:44:20
|
<suranga> dkayiwa, umm... did you make a pull request for that ?
|
07:44:39
|
<dkayiwa> i just added a commit to an existing pull request
|
07:44:56
|
<suranga> dkayiwa, umm.. could you please point it to me ?
|
07:45:13
|
<dkayiwa> suranga: i do not remember which one :)
|
07:45:14
|
<dkayiwa> suranga: thats another reason i wonder why we do not commit directly to the master branch??? We are wasting lots of time for no good reason as far as i have noticed so far
|
07:46:15
|
<dkayiwa> suranga: i have so far not yet seen the benefits of this so many steps procedures as compared to our svn old days
|
07:46:50
|
<dkayiwa> suranga: ofcourse the problem is not git, but having set ourselves so so many steps. fork, branch, merge, all that for what??? :)
|
07:47:34
|
<dkayiwa> suranga: now i have to waste another time looking for what you are asking for :)
|
07:48:50
|
<dkayiwa> suranga: looks like i now have touched your nerve :D
|
07:49:24
|
<judygichoya> ha ha ha
|
07:49:37
|
<judygichoya> thats me yesterday .. i hate GIT
|
07:49:48
|
<judygichoya> but learnt so much ...
|
07:49:53
|
*** goutham has joined #openmrs
|
07:50:03
|
<dkayiwa> judygichoya: i realised the problem is not git :)
|
07:50:24
|
<dkayiwa> judygichoya: we are the ones who have set ourselves so may complicated steps
|
07:50:26
|
<judygichoya> what is ?
|
07:50:45
|
<dkayiwa> judygichoya: we could still use git in a simple old svn style
|
07:51:04
|
<dkayiwa> judygichoya: but this bussiness of so many steps is our problem :D
|
07:52:28
|
<suranga> dkayiwa, hi, I was on my other chat window, with my other boss :)
|
07:52:44
|
<dkayiwa> suranga: as usual :)
|
07:52:47
|
<suranga> dkayiwa, wont it be easier to fetch the latest and give me a fresh pull request ?
|
07:53:22
|
<rafa> suranga: I don't see any task I can do right now aside from HLQRY-2
|
07:53:33
|
<rafa> suranga: but it has the lowest priority
|
07:54:35
|
<suranga> rafa, this might be a better choice, because then we can be ready with it when daniel completes Pv1 + pid
|
07:54:38
|
<suranga> rafa, https://tickets.openmrs.org/browse/HLQRY-35
|
07:55:24
|
<rafa> suranga: why I dont' see that as available on the dashboard? :P
|
07:56:22
|
<suranga> rafa, that is possible something stupid I did :(
|
07:56:27
|
<suranga> rafa, will check it :)
|
07:56:38
|
<rafa> suranga: are there more tickets that we don't see?
|
07:56:51
|
<rafa> suranga: what query did you use to find it?
|
07:57:07
|
<suranga> rafa for now, the fastest way to check this is :project = "HL7 Query"
|
07:57:14
|
<suranga> in the jira
|
07:57:17
|
<rafa> suranga: ok
|
08:05:09
|
<suranga> dkayiwa, ummm I see you have made several commits ( i have several links... umm are you making a pull request with the latest ? :(
|
08:05:43
|
<dkayiwa> suranga: can you just merge those commits? :)
|
08:06:03
|
<suranga> dkayiwa, umm... whcih one is the problem ... :)
|
08:06:17
|
<dkayiwa> suranga: none :)
|
08:07:26
|
<suranga> dkayiwa, we are quite messed up with git, while rafa is having a cool time ;)
|
08:07:56
|
<rafa> suranga: hehe, yes I don't understand you guys :P
|
08:08:02
|
<dkayiwa> suranga: all i did is what i was told. Request Pull, then make followup commits on the same pull request
|
08:08:29
|
<judygichoya> ha ha
|
08:08:32
|
<dkayiwa> suranga: so did i do anything differently from what i was supposed to do? :)
|
08:08:32
|
<suranga> dkayiwa, oh ,sorry, what I ment above was, which of your commits is the right one for me ?
|
08:08:40
|
<dkayiwa> suranga: all of them
|
08:08:44
|
<dkayiwa> :)
|
08:08:54
|
<suranga> rafa, you are obvously a robot !
|
08:08:58
|
<dkayiwa> suranga: you should merge all my commits :)
|
08:09:19
|
<dkayiwa> suranga: if you leave out any, that is work lost :)
|
08:09:19
|
<suranga> dkayiwa, but some of them have changes to be made, right ?
|
08:09:25
|
<suranga> fixes and improvements ?
|
08:10:02
|
<dkayiwa> suranga: like which one?
|
08:10:46
|
<dkayiwa> suranga: judygichoya rafa Rafal's girlfriend is GIT :)
|
08:11:40
|
<judygichoya> he already admitted it
|
08:11:58
|
<dkayiwa> judygichoya: by the silence :)
|
08:12:08
|
<judygichoya> no h actually said it...
|
08:12:18
|
<dkayiwa> judygichoya: hahaha :)
|
08:12:23
|
<judygichoya> dkayiwa time for a second wife
|
08:12:24
|
<rafa> dkayiwa: haha leave alone my love :P
|
08:12:25
|
<judygichoya> :)
|
08:12:47
|
<dkayiwa> rafa: :D
|
08:12:52
|
<judygichoya> so not sure of what ticket to work on
|
08:14:15
|
<suranga> judygichoya, at the moment im unsure as to what suites you best
|
08:14:24
|
<dkayiwa> judygichoya: just pick any :)
|
08:14:28
|
<suranga> judygichoya, did you take a look at the outstanding ones ?
|
08:16:44
|
<dkayiwa> suranga: you can merge all my pull requests and close them. i guess i can always open a new one incase there is anything i need to change. not so???
|
08:16:44
|
<suranga> have you guys ever faced this problem ? :Oops! OpenMRS/master is already up-to-date with OpenMRS/master Try a different branch?
|
08:17:11
|
<suranga> dkayiwa, thats right . i need to do a manual merge. but seem to get that error :
|
08:17:22
|
<suranga> OpenMRS/master is already up-to-date with OpenMRS/master Try a different branch?
|
08:17:32
|
<judygichoya> ha ha ha ...
|
08:17:48
|
<dkayiwa> suranga: i get: Already up-to-date.
|
08:18:22
|
<suranga> dkayiwa, um... we are in hot water... umm... hi rafa , r u there ?
|
08:18:55
|
<dkayiwa> suranga: ya because cold water is not friendly for bathing :)
|
08:20:16
|
<suranga> rafa, dkayiwa, any idea how to create a new branch for me to add your changes to that ? :)
|
08:21:13
|
<dkayiwa> suranga: git branch SURANGA-BRANCH-NAME :)
|
08:21:30
|
<dkayiwa> suranga: git checkout SURANGA-BRANCH-NAME :)
|
08:21:40
|
<suranga> dkayiwa, and does that do into my online github repo too ?
|
08:22:09
|
<dkayiwa> suranga: if i understand what you are asking, maybe yes :)
|
08:22:15
|
<rafa> suranga: no
|
08:22:21
|
<rafa> suranga: it creates it only locally
|
08:22:28
|
<suranga> dkayiwa, rafa ah...
|
08:22:32
|
<rafa> suranga: you need to push it to github
|
08:22:36
|
<suranga> rafa, how to push it to git ?
|
08:22:43
|
<dkayiwa> suranga: i had given you poison :D
|
08:22:55
|
<rafa> suranga: git push upstream SURANGA-BRANCH-NAME
|
08:23:09
|
<rafa> suranga: "upstream" is at OpenMRS
|
08:23:21
|
<rafa> suranga: "origin" is most likely your fork
|
08:23:30
|
<suranga> rafa, my upstream is OpenMRS git account, right ?
|
08:24:12
|
<rafa> suranga: yes, most likely
|
08:24:35
|
<dkayiwa> rafa: not sure???? :)
|
08:24:53
|
<rafa> dkayiwa: only git is sure
|
08:25:06
|
<rafa> suranga: you can check that with: git remote -v
|
08:25:06
|
<dkayiwa> rafa: :D
|
08:25:34
|
<rafa> suranga: it will list you your configured remotes with urls
|
08:25:53
|
<dkayiwa> judygichoya: by the way, you are the only African Lady OpenMRS code that i know :D
|
08:27:11
|
<rafa> suranga: btw why are you doing this?
|
08:27:23
|
*** maurya has quit IRC
|
08:27:35
|
<suranga> rafa, daniels code is out of sync, so i need to pull manually
|
08:27:49
|
<dkayiwa> suranga: :(
|
08:27:55
|
<suranga> to do that, i ned a new branch, because I already made a pull from my existing branch..
|
08:28:10
|
<rafa> suranga: dkayiwa should make sure it's in sync :)
|
08:28:11
|
*** dawn_ has joined #openmrs
|
08:28:15
|
*** ChanServ sets mode: +v dawn_
|
08:28:33
|
<suranga> rafa, we're both noobs here :)
|
08:28:34
|
<dkayiwa> rafa: what could i have done to desync it? :)
|
08:28:58
|
<rafa> dkayiwa: most likely you didn't pulled changes from upstream frequently enough
|
08:29:33
|
<rafa> dkayiwa: let's try together
|
08:29:41
|
<rafa> dkayiwa: which branch do you want to sync?
|
08:29:53
|
<dkayiwa> rafa: i do that like every hour. but this is what i found out. so pushes take long to be merged and by the time they are, they are already out of sync with so many others :)
|
08:30:34
|
<dkayiwa> rafa: for instance some pull requests have taken like 3 days and more before being merged
|
08:30:39
|
<rafa> dkayiwa: yeah that's why I suggested to merge pull request yourself
|
08:30:46
|
<judygichoya> ha ha dkayiwa
|
08:30:54
|
<judygichoya> i hope you are keeping safe from ebola..
|
08:31:03
|
<rafa> dkayiwa: I did that for many of my pull requests
|
08:31:03
|
<dkayiwa> judygichoya: oh yes :)
|
08:31:37
|
<dkayiwa> rafa: is that a change of our policy? :)
|
08:32:14
|
<rafa> dkayiwa: I asked both suranga and ben if it's ok and they let me :D
|
08:32:36
|
<judygichoya> i had a similar git problem yesterda
|
08:32:41
|
<judygichoya> y and i
|
08:32:50
|
<judygichoya> created a new branch
|
08:32:56
|
<judygichoya> updated it from upstream master
|
08:32:59
|
<dkayiwa> rafa: was that breaking the policy? :)
|
08:33:00
|
<judygichoya> and added my changes
|
08:33:01
|
<suranga> judygichoya, tha last one you made finally worked. I was so happy :)
|
08:33:07
|
<rafa> dkayiwa: not at all ;)
|
08:33:21
|
<rafa> but in such a case pull requests doesn't make much sense
|
08:33:30
|
<dkayiwa> rafa: so when do you merge?
|
08:33:43
|
<dkayiwa> rafa: immediately after the pull request? :)
|
08:33:43
|
<judygichoya> and checked if there were updates on git master
|
08:33:48
|
<judygichoya> there were none...
|
08:33:54
|
<rafa> dkayiwa: if I feel like my job is done I merge
|
08:34:00
|
<judygichoya> so i pushed and made a pull request immeldiately
|
08:34:13
|
<dkayiwa> rafa: thats what i feel like by the time i make a pull request :)
|
08:34:16
|
<rafa> dkayiwa: If I want just to share progress I send a pull request, but not merge until I'm done
|
08:34:19
|
*** goutham has quit IRC
|
08:34:20
|
<judygichoya> the merge is so crazy and all manual changes i made ..were rejected by suranga..
|
08:34:31
|
*** goutham has joined #openmrs
|
08:34:43
|
<dkayiwa> rafa: for me, i only make a pull request of all i know of is done
|
08:34:44
|
<judygichoya> but rafa should tell us more about his girlfriend
|
08:34:54
|
<rafa> judygichoya: haha
|
08:34:58
|
<dkayiwa> rafa: so should i then immediately merge after my pull request?
|
08:35:02
|
<suranga> judygichoya, not actually rejected.. I hadent the expertise to manually marge, like Im still trying to do :(
|
08:35:21
|
<rafa> dkayiwa: yes, I would immediately merge
|
08:35:24
|
<judygichoya> although i agree with danielâ¦the git issue just takes too much time away from the real coding problems
|
08:35:35
|
<judygichoya> I know suranga .. just giving you a hard time
|
08:35:49
|
<judygichoya> or rather .. cold water as stated by dkayiwa
|
08:35:50
|
<rafa> dkayiwa: and then send another pull request if changes needed
|
08:35:54
|
<dkayiwa> rafa: am going to start doing that immediately. if any one asks me, i will say you gave me the go ahead :D
|
08:36:28
|
<rafa> dkayiwa: haha ok blame me
|
08:36:45
|
<dkayiwa> rafa: so for a workflow like mine, what is the purpose of the pull request?
|
08:36:47
|
<rafa> dkayiwa: I'd rather we have job done than fight with git :D
|
08:37:06
|
<dkayiwa> rafa: i completely agree. :D
|
08:37:07
|
<rafa> dkayiwa: it allows to see all commits as one diff
|
08:37:22
|
<rafa> dkayiwa: so it's easier to review in github
|
08:37:35
|
<dkayiwa> rafa: am not even interest is seeing that, so is the pull request still necessary for me??? :)
|
08:37:47
|
<dkayiwa> not interested in seeing
|
08:37:49
|
<rafa> dkayiwa: haha you're not, but the reviewer is :D
|
08:38:22
|
<rafa> dkayiwa: there are other ways like squashing commits into one
|
08:38:24
|
<dkayiwa> rafa: in my case since am merging immediately, cant he/she review my merge?
|
08:39:06
|
<rafa> dkayiwa: yes, that would also work
|
08:39:17
|
<dkayiwa> rafa: am trying to avoid falling into the trap of painful but simply NICE TO HAVE (not used) things :)
|
08:39:39
|
<rafa> dkayiwa: yes, I'm all with you
|
08:39:46
|
<rafa> dkayiwa: I don't like the current workflow either
|
08:39:54
|
<rafa> dkayiwa: though I can live with it ;)
|
08:40:09
|
<dkayiwa> rafa: for me, painfully :)
|
08:40:13
|
<rafa> dkayiwa: I think that pull requests are more like patches
|
08:40:34
|
<rafa> dkayiwa: and we never sent patches working on a sprint :D
|
08:40:59
|
<dkayiwa> rafa: so since that would work for my workflow, then why do i even have to merge? why don't i just directly commit to the master branch? :)
|
08:41:05
|
<rafa> dkayiwa: it doesn't work well with many people touching the same code
|
08:41:15
|
<dkayiwa> rafa: why?
|
08:41:37
|
<rafa> dkayiwa: the last sentetence was a continuation of my previous sentence ;)
|
08:41:55
|
<dkayiwa> rafa: oh i see :)
|
08:42:14
|
<dkayiwa> rafa: because i see suranga wasting his time with merges whose benefits we have not realized :)
|
08:42:40
|
<rafa> dkayiwa: I think we do want to merge ourselves
|
08:43:05
|
<dkayiwa> rafa: i agree with that. but for a workflow like mine, why do i even have to merge?
|
08:43:05
|
<suranga> rafa, dkayiwa I would love to let you do that :)
|
08:43:33
|
<dkayiwa> rafa: why dont i just commit to the master straight away? :)
|
08:43:45
|
<rafa> dkayiwa: you do want to work on a branch let's say HLQRY-7
|
08:43:55
|
*** goutham has quit IRC
|
08:44:04
|
<dkayiwa> rafa: why do i even need the branch? :)
|
08:44:22
|
<dkayiwa> rafa: why not do it the way we used to in svn?
|
08:44:44
|
<dkayiwa> rafa: atleast core devs never needed to go through patches, merging, etc :)
|
08:44:49
|
*** goutham has joined #openmrs
|
08:44:56
|
<dkayiwa> rafa: and did we get any problem with that???
|
08:45:11
|
<rafa> dkayiwa: because you can commit to your branch and at some point you are tired of HLQRY-7 and create a new branch HLQRY-8
|
08:45:31
|
<rafa> dkayiwa: and you work on HLQRY-8
|
08:45:44
|
<dkayiwa> rafa: what do i lose by not branching?
|
08:45:44
|
<rafa> dkayiwa: you can switch between your tasks any time you want
|
08:45:54
|
<dkayiwa> rafa: for me i work on one task at a time
|
08:46:07
|
<dkayiwa> rafa: that is why i emphasized , MY WORKFLOW :)
|
08:46:40
|
<judygichoya> lol dkayiwa ...
|
08:46:49
|
<rafa> dkayiwa: even then you can do many commits within a task
|
08:46:50
|
<judygichoya> i would like to see your face now...
|
08:46:58
|
<dkayiwa> rafa: why do i need to suffer unnecessary steps for the sake of other peoples'w workflows??
|
08:46:59
|
<rafa> dkayiwa: and they end up only in the branch
|
08:47:14
|
<rafa> dkayiwa: so you don't spoil the master with your random commits
|
08:47:28
|
<rafa> dkayiwa: only when you are ready you merge to the master
|
08:47:30
|
<dkayiwa> rafa: did we spoil svn before git???
|
08:47:45
|
<rafa> dkayiwa: no, because you haven't committed as often
|
08:47:57
|
<rafa> dkayiwa: you would only commit when ready
|
08:48:03
|
<dkayiwa> rafa: i actually committed as often as i wanted :)
|
08:48:24
|
<dkayiwa> rafa: i never felt like committing any time but could not :)
|
08:48:57
|
<dkayiwa> rafa: you know what is normally called ARTITICIAL PROBLEMS? :)
|
08:49:02
|
<rafa> dkayiwa: hmm have you never written a test case that fails and wanted to commit it before fixing?
|
08:49:28
|
<dkayiwa> rafa: i never wanted to commit a test case that was failing :)
|
08:49:33
|
<dkayiwa> rafa: maybe others :)
|
08:49:50
|
<dkayiwa> rafa: how about having some flexibility of having both options?
|
08:50:01
|
<rafa> dkayiwa: your needs are indeed very simple :D
|
08:50:35
|
<dkayiwa> rafa: those who want the multistep pain, can do it. But for me who does not, i can just directly do what fits in my workflow :D
|
08:50:56
|
<rafa> dkayiwa: I always say: whatever works for you
|
08:51:13
|
<rafa> dkayiwa: personally I don't mind you commiting directly to master
|
08:51:22
|
<dkayiwa> rafa: if a time comes when i need those nice to have things, ofcourse i will have no option but swich to the multistep process
|
08:51:25
|
<rafa> dkayiwa: I do it many times in my module
|
08:51:34
|
<rafa> dkayiwa: especially if it's a simple fix
|
08:51:40
|
<dkayiwa> rafa: but then i would do it with lost of love because it solves a problem that i will then have
|
08:52:18
|
<dkayiwa> rafa: but now that i see no use for it, it tortures me alot psychologically :)
|
08:52:25
|
<rafa> dkayiwa: haha
|
08:52:33
|
<rafa> dkayiwa: I totally understand you
|
08:52:53
|
<rafa> dkayiwa: it's too much steps for me too, though I love multitasking and switching between branches :D
|
08:53:04
|
<dkayiwa> rafa: by the way, am very thankful for you time to explain to me all this, and more so, for your openness and flexibility :D
|
08:53:17
|
<rafa> dkayiwa: but even that takes less steps than pull requests
|
08:53:30
|
<dkayiwa> rafa: i think am going to complain one of these days on the dev list :D
|
08:53:58
|
<rafa> dkayiwa: I'll complain with you :D
|
08:54:07
|
<dkayiwa> rafa: hahaha :D
|
08:54:22
|
<rafa> dkayiwa: but leave my love alone :D
|
08:54:35
|
<rafa> dkayiwa: git is great, but the workflow is not perfect ;)
|
08:54:44
|
<judygichoya> dkayiwa need a doctor?
|
08:54:47
|
<dkayiwa> rafa: PERFECT!!!! :D
|
08:54:56
|
<dkayiwa> judygichoya: hahahahaha :D
|
08:55:14
|
<dkayiwa> rafa: infact i will use that as our email subject :)
|
08:55:39
|
<rafa> dkayiwa: GIT is great, but the workflow is not :D ?
|
08:56:05
|
<dkayiwa> rafa: correct!!! :D
|
09:08:11
|
*** snoppy has joined #openmrs
|
09:18:21
|
<dkayiwa> hi suranga
|
09:18:29
|
<suranga> dkayiwa, helooo
|
09:18:48
|
<dkayiwa> suranga: do we really have the callTemplate function in HL7TemplateFunctions?
|
09:19:07
|
<suranga> dkayiwa, aha..
|
09:19:16
|
<suranga> dkayiwa, i think it may have been renamed :(
|
09:19:16
|
<dkayiwa> suranga: Ben told me to use it instead. but i do not see it
|
09:19:23
|
<dkayiwa> suranga: to what?
|
09:19:32
|
<suranga> dkayiwa, its umm...
|
09:19:35
|
<suranga> dkayiwa, evaluateTemplate
|
09:19:49
|
<suranga> String evaluateTemplate(HL7Template template, Map<String, Object> bindings)
|
09:19:54
|
<dkayiwa> suranga: ok
|
09:20:09
|
<dkayiwa> suranga: thanks
|
09:32:51
|
*** applecool has joined #openmrs
|
09:32:51
|
*** ChanServ sets mode: +v applecool
|
09:34:59
|
*** goutham has quit IRC
|
09:35:09
|
*** goutham has joined #openmrs
|
09:36:01
|
<applecool> hi rafa good afternoon :)
|
09:38:35
|
*** dkayiwa has quit IRC
|
09:47:58
|
*** dawn_ has quit IRC
|
09:52:46
|
*** goutham has quit IRC
|
09:53:48
|
*** goutham has joined #openmrs
|
09:59:16
|
*** dkayiwa has joined #openmrs
|
10:09:25
|
<dkayiwa> hi suranga
|
10:09:41
|
<suranga> dkayiwa, heloooooo
|
10:09:56
|
<dkayiwa> suranga: is HLQRY-26 actually being worked on?
|
10:10:47
|
<suranga> dkayiwa, uma did take it on, I guess she's working on it...
|
10:10:57
|
*** rram_ has joined #openmrs
|
10:11:15
|
*** rram_ has left #openmrs
|
10:11:17
|
<dkayiwa> suranga: are sure she is still working on it?
|
10:11:46
|
*** rram_ has joined #openmrs
|
10:12:36
|
<suranga> dkayiwa, it has been four days since she picked it up.. :(
|
10:12:52
|
<dkayiwa> suranga: i doubt if she is
|
10:13:11
|
<dkayiwa> suranga: you may want to give it away
|
10:13:16
|
<suranga> dkayiwa, we should ask her, bbut should we start work on it while she has claimed it ?
|
10:13:27
|
<suranga> shall I comment on it asking her about it ?
|
10:13:30
|
<dkayiwa> suranga: first ask her
|
10:13:37
|
<dkayiwa> on the ticket
|
10:13:40
|
<suranga> dkayiwa, cool, will do
|
10:13:48
|
<suranga> dkayiwa, umm.. have you run out of tickets ? :)
|
10:13:59
|
<dkayiwa> suranga: almost :)
|
10:14:30
|
<suranga> dkayiwa, will you be sending me a pull request ? :-):-):-):-):-):-):-):-):-)
|
10:15:06
|
<dkayiwa> suranga: which one???
|
10:15:42
|
<suranga> dkayiwa, um. regarding the ccommits you sent., I had assumed that you were going to send me a pull for those :(
|
10:15:46
|
*** bwolfe has joined #openmrs
|
10:15:46
|
*** ChanServ sets mode: +o bwolfe
|
10:15:54
|
<suranga> dkayiwa, wow, ben is awake already !
|
10:15:59
|
<dkayiwa> suranga: which commits
|
10:16:15
|
<suranga> dkayiwa, i mean, the commits we were dicscussing this morning...
|
10:16:28
|
<suranga> dkayiwa, the ones i was trying to merge maanually .. :(
|
10:16:31
|
<dkayiwa> suranga: like which one
|
10:17:18
|
<dkayiwa> suranga: what was the commit about
|
10:17:31
|
<suranga> dkayiwa, one minute please :)
|
10:17:45
|
<bwolfe> suranga, I'm always awake this early. I just usually am not online
|
10:17:49
|
<bwolfe> had to check something though
|
10:17:57
|
<bwolfe> but now going offline again, see you guys in an hour
|
10:18:10
|
<suranga> bwolfe, :)
|
10:18:16
|
<dkayiwa> bwolfe: was about to say it was Andy on your laptop :)
|
10:18:16
|
<suranga> dkayiwa, like this one ? https://github.com/dkayiwa/openmrs-module-hl7query/commit/4852433c59f06d3d8b294dba0255779b7157ba73
|
10:18:22
|
<OpenMRSBot> <http://ln-s.net/$ZY_> (at github.com)
|
10:19:46
|
<applecool> rafa: there? got a minute?
|
10:20:09
|
<dkayiwa> suranga: https://github.com/OpenMRS/openmrs-module-hl7query/pull/32
|
10:20:14
|
<OpenMRSBot> <http://ln-s.net/$ZYb> (at github.com)
|
10:20:30
|
<suranga> dkayiwa, awesomeeee !
|
10:20:55
|
<dkayiwa> suranga: This pull request cannot be automatically merged.
|
10:21:03
|
<suranga> dkayiwa, umm.. yes... :(
|
10:21:41
|
<dkayiwa> suranga: what should we do?
|
10:22:12
|
<suranga> dkayiwa, at the moment, im multi tasking. but im trying to get a hang of merging manually
|
10:22:27
|
<dkayiwa> suranga: i can redo it from scratch :)
|
10:22:51
|
<suranga> dkayiwa, could you get a latest copy of those files, and paste in the changes ?
|
10:22:54
|
*** bwolfe has quit IRC
|
10:23:13
|
<suranga> dkayiwa, that would be awesomesome if you could :)
|
10:23:16
|
<dkayiwa> suranga: a workflow that is making us unproductive :)
|
10:24:12
|
<suranga> dkayiwa, I suspect we might both be more productive if we were familiar with this thing... but at the moment, I have a looming project delivery deadline on my other job too :(
|
10:24:39
|
<dkayiwa> suranga: i disagree :)
|
10:30:34
|
*** kishoreyekkanti has quit IRC
|
10:30:54
|
*** kishoreyekkanti has joined #openmrs
|
10:31:49
|
<dkayiwa> hi rafa
|
10:32:11
|
<rafa> dkayiwa: yes?
|
10:32:26
|
<dkayiwa> rafa: what do you propose i do to help suranga on that?
|
10:33:03
|
<rafa> dkayiwa: meaning?
|
10:33:12
|
<rafa> dkayiwa: help with what?
|
10:33:25
|
<dkayiwa> rafa: Pull request cannot be merged automatically
|
10:33:38
|
<dkayiwa> rafa: https://github.com/OpenMRS/openmrs-module-hl7query/pull/32
|
10:33:39
|
<OpenMRSBot> <http://ln-s.net/$ZYb> (at github.com)
|
10:34:02
|
<rafa> dkayiwa: I suggest you fix it :)
|
10:34:12
|
<rafa> dkayiwa: run
|
10:34:12
|
<dkayiwa> rafa: how?
|
10:34:23
|
<rafa> git checkout HLQRY-6
|
10:34:31
|
<dkayiwa> rafa: ok
|
10:34:34
|
<rafa> git pull upstream master
|
10:34:39
|
<dkayiwa> rafa: ok
|
10:34:59
|
<rafa> dkayiwa: let me know what you see
|
10:35:06
|
<dkayiwa> rafa: ok
|
10:37:01
|
<suranga> i appreciate this guys, im rather stuck from both ends here.... im not being much of a help, im afraid :(
|
10:37:25
|
<rafa> suranga: np, we'll fix it soon :)
|
10:37:28
|
<dkayiwa> rafa: Automatic merge failed; fix conflicts and then commit the result.
|
10:38:15
|
<rafa> dkayiwa: ok
|
10:38:18
|
<dkayiwa> rafa: rafa i just noticed that liquibase.xml in master has none of our template tickets liquibase changes
|
10:38:31
|
<dkayiwa> rafa: am sure that will result into conflicts
|
10:38:46
|
<dkayiwa> rafa: because each of our tickets has liquibase changes
|
10:38:51
|
<rafa> dkayiwa: run: git status
|
10:39:39
|
<dkayiwa> rafa: lots of output
|
10:39:53
|
<rafa> dkayiwa: it should list you files where you have conflicts
|
10:39:59
|
<dkayiwa> rafa: yes
|
10:40:24
|
<dkayiwa> rafa: one of them is liquibase.xml
|
10:40:35
|
<rafa> dkayiwa: acutally run now: git diff
|
10:41:02
|
<dkayiwa> rafa: lots of output
|
10:41:18
|
<rafa> dkayiwa: you need to go through these files and resolve conflicts
|
10:41:40
|
<dkayiwa> rafa: are you aware that you are all most likely going to do the same?
|
10:41:52
|
<dkayiwa> rafa: none of our liquibase changes is in master
|
10:41:52
|
<rafa> dkayiwa: no, I'm not :)
|
10:41:59
|
<dkayiwa> rafa: lets see :)
|
10:42:02
|
<rafa> dkayiwa: I was pulling and merging frequently
|
10:42:41
|
<rafa> dkayiwa: you should be able to see conflicts in eclipse
|
10:42:53
|
<rafa> dkayiwa: see http://wiki.eclipse.org/EGit/User_Guide#Resolving_a_merge_conflict
|
10:42:57
|
<OpenMRSBot> <http://ln-s.net/$ZYw> (at wiki.eclipse.org)
|
10:43:05
|
<dkayiwa> rafa: am just going to put my changes dirrectly in master :)
|
10:43:26
|
<rafa> dkayiwa: not sure what you mean?
|
10:43:34
|
<dkayiwa> rafa: commit to master :)
|
10:43:58
|
<rafa> dkayiwa: so you don't want to resolve conflicts?
|
10:44:11
|
<dkayiwa> rafa: its a pain i do not want to get into :)
|
10:44:32
|
<rafa> dkayiwa: is that many of them?
|
10:44:38
|
<dkayiwa> rafa: yes
|
10:44:55
|
<rafa> dkayiwa: heh then it's your call
|
10:45:11
|
<rafa> dkayiwa: if you think it's faster to do the work again then do it
|
10:45:20
|
<dkayiwa> rafa: sure thanks :D
|
10:46:54
|
<rafa> dkayiwa: I was afraid we'll end up here with so many pending pull requests :(
|
10:47:10
|
<dkayiwa> rafa: correct
|
10:47:38
|
<dkayiwa> rafa: do you remember when you did the first liquibase changes of creating the templates table?
|
10:47:52
|
<rafa> dkayiwa: why?
|
10:48:06
|
<dkayiwa> rafa: since then, the liquibase.xml file has never changed in master
|
10:48:13
|
<rafa> dkayiwa: it was probably on Monday
|
10:48:21
|
<rafa> dkayiwa: no
|
10:48:27
|
<dkayiwa> rafa: meaning all our liquibase changes for insterting templates are not merged in
|
10:48:35
|
<rafa> dkayiwa: you're master is not up to date
|
10:49:00
|
<dkayiwa> rafa: how do i make it up to date?
|
10:49:02
|
<rafa> dkayiwa: https://github.com/OpenMRS/openmrs-module-hl7query/blob/master/api/src/main/resources/liquibase.xml
|
10:49:06
|
<rafa> see it's there
|
10:49:08
|
<OpenMRSBot> <http://ln-s.net/$ZZ3> (at github.com)
|
10:49:47
|
<rafa> dkayiwa: git checkout master
|
10:49:47
|
<dkayiwa> rafa: must be using a not upto date master
|
10:49:55
|
<dkayiwa> rafa: ok
|
10:50:51
|
<rafa> dkayiwa: git pull upstream master
|
10:53:00
|
*** rram_ has quit IRC
|
10:53:29
|
*** rram__ has joined #openmrs
|
10:53:31
|
*** deadpool has quit IRC
|
10:55:00
|
<dkayiwa> rafa: you were right. thanks :)
|
10:55:00
|
<rafa> dkayiwa: you're welcome
|
10:55:03
|
*** deadpool_ has joined #openmrs
|
11:02:34
|
*** kishoreyekkanti_ has joined #openmrs
|
11:05:14
|
*** kishoreyekkanti has quit IRC
|
11:06:14
|
*** kishoreyekkanti_ has quit IRC
|
11:06:32
|
*** kishoreyekkanti has joined #openmrs
|
11:14:39
|
<applecool> hey rafa
|
11:16:27
|
<rafa> applecool: hey
|
11:16:41
|
<applecool> busy? or have some time ? :)
|
11:17:14
|
<rafa> applecool: have some time
|
11:17:20
|
<applecool> great
|
11:17:39
|
<applecool> i have some questions regarding the METAREPO-6
|
11:18:07
|
<applecool> page which allows a user to see all fields of a package ?
|
11:18:11
|
<applecool> all fields?
|
11:18:21
|
<applecool> meaning the name,desc,version?
|
11:18:24
|
<applecool> or more?
|
11:18:27
|
<rafa> applecool: more
|
11:18:31
|
<rafa> applecool: all meaning all :)
|
11:18:44
|
<applecool> oh!
|
11:19:34
|
<applecool> all meaning ? name,desc,version,openmrs version,url, the fields present in the metadatapackage.java
|
11:19:52
|
<rafa> applecool: yes
|
11:19:58
|
<applecool> so the page should look like the uploadDisplay.jsp right
|
11:20:11
|
<rafa> applecool: yes
|
11:23:25
|
<applecool> so should i tweak the uploadDisplay to view package
|
11:23:33
|
<applecool> or should i create a new page
|
11:23:49
|
<rafa> applecool: rename it to viewPackage.jsp
|
11:23:57
|
<applecool> okay!
|
11:24:24
|
<applecool> we can view the package details without logging in also right?
|
11:25:05
|
<dkayiwa> rafa: does commandline git push upstream master also ask you for a password/username?
|
11:26:05
|
<applecool> rafa: And in the Actions column the order should be "edit","download"and "view package" or "edit","viewpackage" and "download"
|
11:26:21
|
<applecool> dkayiwa: it asks generally
|
11:26:27
|
<dkayiwa> rafa: ok
|
11:26:28
|
<rafa> applecool: right
|
11:26:33
|
<dkayiwa> applecool: ok :)
|
11:26:48
|
<applecool> rafa: order?
|
11:26:51
|
<rafa> applecool: download, view, edit
|
11:27:00
|
<applecool> okay! :)
|
11:27:18
|
<rafa> dkayiwa: just password
|
11:27:27
|
<dkayiwa> rafa: and username
|
11:27:42
|
<rafa> dkayiwa: if you put urls like https://dkayiwa@github.com/OpenMRS...
|
11:27:48
|
<rafa> dkayiwa: then it'll only ask for a password
|
11:27:57
|
<rafa> dkayiwa: you're on mac right?
|
11:28:03
|
<dkayiwa> rafa: yes
|
11:28:05
|
<applecool> true! :)
|
11:28:10
|
*** harshadura has quit IRC
|
11:28:17
|
<rafa> dkayiwa: so it shoul be possible to use a certificate
|
11:28:25
|
<dkayiwa> rafa: ok
|
11:28:38
|
<rafa> dkayiwa: there's a description on github.com
|
11:28:42
|
<rafa> dkayiwa: how to set that up
|
11:28:56
|
<dkayiwa> rafa: ok
|
11:29:11
|
*** james_regen has joined #openmrs
|
11:29:11
|
*** ChanServ sets mode: +v james_regen
|
11:29:54
|
<applecool> dkayiwa: if the url is different like https://rkorytkowski@github.com/OpenMRS... then while pushing it asks for both username and password :)
|
11:30:04
|
<dkayiwa> rafa: oh i see :)
|
11:30:17
|
<dkayiwa> rafa: is my github acount the same as JIRA?
|
11:30:26
|
<dkayiwa> rafa: i do not remember having created it :)
|
11:30:48
|
*** shortend has joined #openmrs
|
11:31:19
|
<rafa> dkayiwa: you must have created it
|
11:31:37
|
<rafa> dkayiwa: github is not connected with our jira
|
11:31:47
|
<rafa> dkayiwa: I mean accounts
|
11:32:04
|
<dkayiwa> rafa: :)
|
11:35:47
|
*** bwolfe has joined #openmrs
|
11:35:47
|
*** ChanServ sets mode: +o bwolfe
|
11:41:37
|
*** shortend has quit IRC
|
11:43:24
|
*** shortend has joined #openmrs
|
11:43:48
|
*** djazayeri has joined #openmrs
|
11:43:48
|
*** ChanServ sets mode: +o djazayeri
|
11:44:24
|
*** maurya has joined #openmrs
|
11:44:35
|
*** rram__ has quit IRC
|
11:45:00
|
*** ChanServ sets mode: +v maurya
|
11:45:31
|
*** dkayiwa has quit IRC
|
11:49:26
|
*** rram_ has joined #openmrs
|
11:57:34
|
*** dkayiwa has joined #openmrs
|
11:59:09
|
<suranga> hi bwolfe
|
11:59:14
|
<suranga> bwolfe, good morninggg
|
11:59:23
|
<bwolfe> hey
|
12:01:02
|
<suranga> bwolfe, mm... got a minute ?
|
12:02:21
|
*** rram_ has quit IRC
|
12:04:26
|
<bwolfe> yep
|
12:07:50
|
<suranga> bwolfe, mm.. i was having a small problem merging :(
|
12:08:24
|
<suranga> I create new branches (one branch per pull request, right? ) but I fail to link it to my github account :(
|
12:09:40
|
*** jkeiper_ has joined #openmrs
|
12:10:03
|
<bwolfe> suranga, this is for your merging or for you own coding?
|
12:10:13
|
<suranga> bwolfe, merging :(
|
12:11:14
|
<bwolfe> suranga, (I THINK this is how it would work, I haven't done it yet) merging you should just do into the main checkout. its easiest that way. then you just commit/push to master. no pull request needed
|
12:11:26
|
<bwolfe> clone openmrs/openmrs-module-hl7query
|
12:11:45
|
<bwolfe> set the "upstream" on it
|
12:11:52
|
<suranga> ok...
|
12:12:05
|
<bwolfe> then merge the pull requests onto it. then commit. then push to openmrs org
|
12:12:12
|
<bwolfe> suranga, you might want to look up "best practices" though
|
12:12:30
|
<bwolfe> but I'm 99% sure that as the person merging, you do NOT want to create branches for each
|
12:12:34
|
<suranga> bwolfe, when you say "merge the pull requests onto it" you mean "cherry picking, right ?
|
12:14:02
|
<bwolfe> suranga, I think there is a more formal way to do true merges. "cherry picking" is when you pick a single commit out of someone else's fork/branch
|
12:14:21
|
<bwolfe> "merging" is when you take their pull request (maybe make some slight modifications to it) then push it to the main repo
|
12:15:00
|
<suranga> bwolfe, what i think i'll have to do is copy paste the new code into my local opy , and commit that, right ?
|
12:15:15
|
<bwolfe> no
|
12:15:20
|
<bwolfe> you should be able to use their tools
|
12:15:43
|
<suranga> bwolfe, in the case of pulls i cant do automatically ?
|
12:15:52
|
<bwolfe> there should be a command like this (I am making htis up right now) "git merge dkayiwa/hl7query pullrequest16"
|
12:16:02
|
<bwolfe> suranga, pulls?
|
12:16:37
|
<suranga> bwolfe, I ment pulls that have bcome outdated, etc ?
|
12:16:50
|
<suranga> bwolfe, I see... let me have a go.... :)
|
12:17:01
|
<judygichoya> suranga did you see ?HLQRY38
|
12:17:06
|
<judygichoya> was picked up already?
|
12:17:46
|
<suranga> judygichoya, not really. Would u like to pick it up :):):)
|
12:17:54
|
<bwolfe> you mean "in case of merges that can't do automatically"
|
12:17:58
|
<judygichoya> what do u mean not really?
|
12:18:02
|
<judygichoya> yes or no :)
|
12:18:55
|
<suranga> judygichoya, you are wellcome to pick up that ticket :P
|
12:19:33
|
<suranga> bwolfe, in some cases, I get commits (not pull requests) then Im rather stuck as to what to do...
|
12:20:26
|
<bwolfe> suranga, in what case?
|
12:20:38
|
<bwolfe> suranga, if someone has not initiated a pull request, maybe they are not done with it!
|
12:20:58
|
*** wyclif has quit IRC
|
12:21:45
|
<suranga> bwolfe, this, for instance https://github.com/dkayiwa/openmrs-module-hl7query/commit/4852433c59f06d3d8b294dba0255779b7157ba73
|
12:21:46
|
<OpenMRSBot> <http://ln-s.net/$ZY_> (at github.com)
|
12:22:15
|
<suranga> bwolfe, I know that they are done, beause the comment says so..
|
12:22:28
|
<suranga> bwolfe, git bug has a steep learning curve. it is messy
|
12:22:42
|
<dkayiwa> suranga: problem is not git
|
12:22:51
|
<dkayiwa> suranga: it is our workflow :)
|
12:23:02
|
<bwolfe> dkayiwa, very true
|
12:23:17
|
<bwolfe> we must adjust our thinking as to how we work and the steps needed
|
12:23:23
|
<suranga> bwolfe, if everyone got to commit, instead of making pulls, we wont get stale code anywhere
|
12:23:30
|
<bwolfe> and the literal jira workflow will need to be updated
|
12:23:56
|
<bwolfe> suranga, there would be just as much! except all devs would be dealing with it instead of just one (you)
|
12:24:15
|
<bwolfe> suranga, and if there were 10x the files, there would be less collisions
|
12:24:24
|
<bwolfe> but this is a small module, so everyone is modifying similar files
|
12:24:28
|
<bwolfe> (like liquibase.xml)
|
12:24:34
|
<suranga> bwolfe, :)
|
12:25:03
|
<suranga> bwolfe, for example, now I need to take daniels commit from his github account, and push it into ours...
|
12:25:36
|
<dkayiwa> suranga: i have tried to manually redo my changes from above and committed. do you now see them in master?
|
12:25:57
|
<bwolfe> suranga, if there have been a lot of commits to master since his pull request, tell him to "update from upstream, test, commit, then push". then you can merge automatically
|
12:26:24
|
<suranga> dkayiwa, umm.. I dont think I I got an alert on that one :(
|
12:26:52
|
<dkayiwa> suranga: i do not know why. may be i did it wrong. can you update your master? :)
|
12:27:09
|
<dkayiwa> bwolfe: we have had pull request that have lasted like 3-4 days without being merged
|
12:27:22
|
<dkayiwa> bwolfe: resulting into lost of conflicts
|
12:27:29
|
*** rram_ has joined #openmrs
|
12:27:42
|
<dkayiwa> bwolfe: but now rafa gave me a secret :)
|
12:28:15
|
<dkayiwa> which is, just merge your changes immediately after pull request :D
|
12:29:01
|
<dkayiwa> in otherwards, do not wait for a reviewer :)
|
12:29:13
|
*** jkeiper_ has quit IRC
|
12:29:42
|
<dkayiwa> that way you do not have to go through the resolve conflicts pain :)
|
12:30:11
|
<dkayiwa> suranga: so no problems from my pull requests :)
|
12:30:22
|
<dkayiwa> suranga: atleast not any more :)
|
12:30:29
|
<suranga> dkayiwa, can I have as much as possible, please :)
|
12:30:44
|
<dkayiwa> suranga: as much what??
|
12:32:12
|
<suranga> dkayiwa, umm.. did you do ome for this pull ? https://github.com/OpenMRS/openmrs-module-hl7query/pull/19
|
12:32:17
|
<OpenMRSBot> <http://ln-s.net/$Za1> (at github.com)
|
12:33:02
|
<dkayiwa> suranga: if the other one worked, i can do another for it right now
|
12:33:13
|
<dkayiwa> suranga: did you get changes in master for the other one?
|
12:33:38
|
<bwolfe> dkayiwa, yes, I suppose you could merge immediately. then you close your branch and create a new one from the updated master when changes are requested...
|
12:33:50
|
<dkayiwa> bwolfe: ok
|
12:33:52
|
<suranga> dkayiwa, let me do that first... give me about 5 minutes (my other boss calls)
|
12:34:02
|
<dkayiwa> suranga: sure
|
12:34:54
|
<rafa> bwolfe: no need to create a new branch... you can send a new pull request for the old branch
|
12:35:04
|
<dkayiwa> rafa: correct
|
12:38:20
|
<rafa> dkayiwa: is PID ready ready?
|
12:38:40
|
<dkayiwa> rafa: it should. did i miss out anything?
|
12:38:46
|
<rafa> dkayiwa: I don't see a test
|
12:39:14
|
*** sunbiz has joined #openmrs
|
12:39:14
|
*** ChanServ sets mode: +v sunbiz
|
12:39:16
|
<dkayiwa> rafa: hahaha, let me check its pull request and see if it was merged
|
12:39:18
|
<rafa> dkayiwa: and it doesn't work actually ;)
|
12:39:37
|
<dkayiwa> rafa: the test? :)
|
12:39:43
|
<rafa> dkayiwa: no there's no test :)
|
12:39:47
|
<rafa> dkayiwa: but the template :D
|
12:39:57
|
<rafa> dkayiwa: I've just evaluated it with my eyes :D
|
12:40:05
|
<dkayiwa> rafa: hahaha, i think they merged it partially :)
|
12:40:13
|
*** downey has joined #openmrs
|
12:40:13
|
*** ChanServ sets mode: +o downey
|
12:40:13
|
*** OpenMRSBot sets mode: +o downey
|
12:40:18
|
<dkayiwa> rafa: how does it look like? :)
|
12:41:13
|
<rafa> dkayiwa: https://github.com/OpenMRS/openmrs-module-hl7query/blob/master/api/src/test/resources/templates/PID.xml
|
12:41:18
|
<OpenMRSBot> <http://ln-s.net/$ZaE> (at github.com)
|
12:41:46
|
<rafa> dkayiwa: you don't call evaluateTemplate anywhere :)
|
12:41:50
|
<suranga> dkayiwa, your results have come back positive. https://github.com/OpenMRS/openmrs-module-hl7query/pull/33/files
|
12:41:53
|
<OpenMRSBot> <http://ln-s.net/$ZaH> (at github.com)
|
12:41:55
|
<suranga> is now in our repo !!!
|
12:42:32
|
<dkayiwa> rafa: oh yes that is true. was looking for the function named: callTemplate as ben told me in the review comments
|
12:42:57
|
<dkayiwa> rafa: suranga has just told me it was renamed
|
12:43:18
|
<rafa> dkayiwa: see complete_orur01.xml for an example
|
12:43:26
|
<dkayiwa> rafa: ok thanks
|
12:43:31
|
<djazayeri> rafa: hey, per the email I sent you yesterday, do you know of anything special I would have to do in a unit test for a module that calls MDS to ensure that MDS knows it's in 1.9-mode?
|
12:43:33
|
<rafa> dkayiwa: and also HL7Complete...Test how to write a test
|
12:43:39
|
<dkayiwa> suranga: what do you mean by that?
|
12:43:47
|
*** Tukenmann has joined #openmrs
|
12:43:54
|
<rafa> djazayeri: hey
|
12:44:01
|
<downey> Hi Tukenmann and welcome to the #openmrs IRC channel.
|
12:44:02
|
<dkayiwa> rafa: i had done a test for it. i think it was just not merged
|
12:44:04
|
<rafa> djazayeri: sorry forgot about the te-mail
|
12:44:20
|
<djazayeri> rafa: that's why we have IRC. :-)
|
12:44:42
|
<Tukenmann> Thanks. I am trying to use the Webservices module to download the list of patients in a cohort
|
12:44:47
|
<rafa> djazayeri: do you run tests in 1.9 on the classpaht?
|
12:44:49
|
<Tukenmann> and the related encounters for each of them
|
12:44:55
|
<rafa> djazayeri: *with 1.9
|
12:45:06
|
<djazayeri> rafa: my module depends on 1.9.0 and includes that in its pom, yes
|
12:45:30
|
<Tukenmann> i was wondering if any of you guys could point me to the right URLs for getting the entire list of patients from a cohort
|
12:46:01
|
<rafa> djazayeri: hmm ok, do you depend on metadatasharing-api?
|
12:46:10
|
<djazayeri> Tukenmann: look for cohort on https://wiki.openmrs.org/x/sgc3AQ
|
12:46:41
|
<djazayeri> rafa: yes, on metadatasharing-api
|
12:46:53
|
<suranga> dkayiwa, hi, sorry, didnt get you... you were saying... ?
|
12:47:04
|
<djazayeri> rafa: 1.0.8 is the latest version, that's supposed to mostly work with OpenMRS 1.9, right?
|
12:47:05
|
<rafa> djazayeri: can you run mvn resolve:dependencies?
|
12:47:16
|
<Tukenmann> yes I did, for instance if I had a cohort named as TestCohort, my URL was GET http://dev.sana.csail.mit.edu/openmrs/ws/rest/v1/patient?q=TestCohort which didn't quite seem to work
|
12:47:20
|
<rafa> djazayeri: see if metadatasharing-api-1.9 is there?
|
12:47:20
|
<OpenMRSBot> <http://ln-s.net/$ZaV> (at dev.sana.csail.mit.edu)
|
12:47:56
|
<suranga> dkayiwa, I wonrder if you can also do the same for https://github.com/OpenMRS/openmrs-module-hl7query/pull/15/files :)
|
12:47:59
|
<OpenMRSBot> <http://ln-s.net/$ZaX> (at github.com)
|
12:48:05
|
<suranga> dkayiwa, since your first attempt worked so well :)
|
12:48:05
|
<rafa> djazayeri: sorry dependencies:resolve
|
12:48:13
|
<djazayeri> was about to try that
|
12:48:29
|
<djazayeri> actually dependency:resolve
|
12:48:36
|
<rafa> djazayeri: right!
|
12:48:37
|
<Tukenmann> any pointers guys? sorry to interrupt
|
12:48:56
|
<dkayiwa> suranga: ok :)
|
12:49:08
|
<djazayeri> Tukenmann: where are you creating the cohorts? You're talking about cohorts with fixed members, right, not cohort definitions from the reporting module?
|
12:49:36
|
<Tukenmann> Well I created a cohort for a particular set of patients, say based on Location
|
12:49:47
|
<djazayeri> rafa: yeah, all 3
|
12:49:47
|
<djazayeri> INFO] org.openmrs.module:metadatasharing-api:jar:1.0.8:provided
|
12:49:48
|
<djazayeri> [INFO] org.openmrs.module:metadatasharing-api-1.9:jar:1.0.8:provided
|
12:49:48
|
<djazayeri> [INFO] org.openmrs.module:metadatasharing-api-1.7:jar:1.0.8:provided
|
12:49:49
|
<Tukenmann> and i'm trying to get a list of all these patients who belong to this cohort
|
12:49:57
|
<djazayeri> Tukenmann: how did you create the cohort?
|
12:50:01
|
<djazayeri> Tukenmann: what technology
|
12:50:28
|
<Tukenmann> using Cohort builder in the browser
|
12:50:37
|
<Tukenmann> i mean by accessing OpenMRS in the browser
|
12:50:46
|
<rafa> djazayeri: hmm so in theory it should work
|
12:51:04
|
<djazayeri> Tukenmann: okay, and did you save the *definition* (with the icon on the right side of the search) or the *list of patient* from the icon at the bottom of the screen?
|
12:51:05
|
<Tukenmann> i'd have thought so
|
12:51:32
|
<rafa> djazayeri: can you try injecting in your test @Autowired private ConceptMap19Handler handler;
|
12:51:38
|
<rafa> djazayeri: seeing if it's not null?
|
12:52:44
|
<rafa> djazayeri: actually going back to your e-mail
|
12:53:12
|
<rafa> djazayeri: what may help is adding to ConceptMap19Handler:
|
12:53:18
|
<djazayeri> rafa: it does get autowired, and it is not null
|
12:53:20
|
<rafa> if (object.getConceptMapType() != null) {
|
12:53:20
|
<rafa> result.add(object.getConceptMapType());
|
12:53:20
|
<rafa> }
|
12:54:17
|
<djazayeri> rafa: ah, and then I'll need to re-export my package?
|
12:54:25
|
<djazayeri> re-generate a new version, I mean
|
12:54:29
|
<rafa> djazayeri: no need to re--export your package
|
12:54:50
|
<rafa> djazayeri: ordering is resolved on the fly during import
|
12:55:07
|
<djazayeri> Tukenmann: which one of those two things did you do?
|
12:55:33
|
<Tukenmann> djazayeri: Is the definition icon on the right and the list of patients icon on the bottom the same ?
|
12:55:46
|
<Tukenmann> I did the one on the right
|
12:56:03
|
<djazayeri> Tukenmann: no, the one on the right side of each row saves the *query*, and the one at the bottom saves the *results*
|
12:56:24
|
<djazayeri> Tukenmann: the problem is that right now the RESTWS module only has a resource for the fixed list of results
|
12:56:59
|
<Tukenmann> could you elaborate a bit further please ? as in what you mean by "the fixed list of results"
|
12:57:03
|
<djazayeri> Tukenmann: if you need the query to be dynamic, you can create it using the reporting module (not reportingcompatibility, which has cohortbuilder), and try using the reportingrest module
|
12:57:36
|
<djazayeri> Tukenmann: the icon on the right saves a "PatientSearch" and the icon at the bottom saves a "Cohort"
|
12:57:55
|
<djazayeri> Tukenmann: RESTWS only handles Cohorts (which are effectively a Set<Integer> patientIds
|
12:58:20
|
<Tukenmann> so techinically i should be able to get a list of the IDs then ?
|
12:58:52
|
<djazayeri> rafa: okay, I'll try that
|
12:59:04
|
<djazayeri> Tukenmann: yes, but you have to save the list using the icon at the bottom of cohrot builder
|
12:59:35
|
<Tukenmann> thanks djazayeri I did that and now would you think the URL is correct or would you recommend something else?
|
12:59:36
|
<rafa> djazayeri: good, becasue it seems that mds is correcty setup in your tests
|
13:00:08
|
<rafa> djazayeri: so the missing part is saving conceptMapType before conceptMap
|
13:00:09
|
<djazayeri> Tukenmann: oh, that url is wrong
|
13:00:18
|
<djazayeri> Tukenmann: change "patient" for "cohort"
|
13:01:13
|
<djazayeri> rafa: thanks
|
13:01:43
|
<rafa> djazayeri: np
|
13:02:29
|
<djazayeri> rafa: is it since 1.9 that we need to start calculating dependency order on the client side instead of the server side?
|
13:02:53
|
<rafa> djazayeri: no it was always like that
|
13:02:56
|
<Tukenmann> Thanks very much djazayeri. Pardon me for clarifying this- so i'm querying a particular cohort which I've saved before, and that should give me the list of patient UUIDs
|
13:02:58
|
<djazayeri> hmm, okay
|
13:03:03
|
<djazayeri> Tukenmann: yes
|
13:04:15
|
<rafa> djazayeri: I thought ConceptMapTypes are hard coded and you typically won't introduce new
|
13:04:43
|
<djazayeri> rafa: I think that's true. but I don't think they're included in the standardTestDataset.xml
|
13:04:51
|
<rafa> djazayeri: ohh right
|
13:04:53
|
<djazayeri> rafa: so this probably would have worked against a production db
|
13:05:58
|
<djazayeri> yay tdd
|
13:06:34
|
*** djazayeri has quit IRC
|
13:06:57
|
<Tukenmann> Can i add ?v=full to the query (../openmrs/ws/rest/v1/cohort?q=TestCohort2?v=full) because I only get something like ( 0.7512161results0.7512163uuid62d2005e-2d45-45e5-a8f2-4995d2abb956displayTestCohort2linksselfhttp://blahblah/openmrs/ws/rest/v1/cohort/62d2005e-2d45-45e5-a8f2-4995d2abb956falsefalse ) which doesn't seem to have the UUID!
|
13:08:16
|
<Tukenmann> anyone still there?!
|
13:08:30
|
<rafa> Tukenmann: &v=full
|
13:08:57
|
<rafa> Tukenmann: v1/cohort?q=TestCohort2&v=full
|
13:09:45
|
*** rfriedman has joined #openmrs
|
13:09:59
|
<rfriedman> downey, hi, you there?
|
13:10:15
|
<downey> hi rfriedman
|
13:10:53
|
<rfriedman> downey, is the room and board for the OpenMRS conf separate from the registration? how much will it cost?
|
13:11:04
|
<rfriedman> i just need an estimate for now
|
13:11:12
|
<downey> rfriedman: it is, stand by
|
13:12:22
|
<downey> rfriedman: anywhere between 1200 and 7000 PhP per night, which is $29-168
|
13:12:41
|
<downey> those are rooms on-site at the conference center, hotels nearby are similar
|
13:13:00
|
* downey will check to see why that didn't get posted online. :)
|
13:13:10
|
<rfriedman> downey, tks, any decisions on surrounding events?
|
13:13:36
|
<downey> there will be site visits and it sounds like a hackathon ⦠some discussions were yesterday but i haven't got the full update yet. bwolfe might know
|
13:13:53
|
<Tukenmann> thanks rafa
|
13:14:12
|
<applecool> rafa: what does this mean? PageNotFound.noHandlerFound(947)
|
13:14:12
|
<bwolfe> downey, is that estimate published anywhere?
|
13:14:21
|
<bwolfe> rfriedman, yes, site visits, yes hackathon room the week before
|
13:14:47
|
<rfriedman> bwolfe, ok, tks
|
13:15:26
|
<rafa> applecool: do you have a controller for that url?
|
13:15:36
|
<applecool> no
|
13:16:44
|
*** goutham has quit IRC
|
13:16:59
|
<rafa> applecool: then it's your answer, you need to have one
|
13:17:50
|
<applecool> hmm.
|
13:18:11
|
<rafa> applecool: you can add a method to PackageFormController
|
13:18:25
|
<applecool> yup! sure! got it :) Thanks
|
13:18:38
|
*** judygichoya has left #openmrs
|
13:21:58
|
*** wyclif has joined #openmrs
|
13:23:55
|
*** shortend has quit IRC
|
13:24:09
|
*** shortend has joined #openmrs
|
13:27:05
|
*** jkeiper_ has joined #openmrs
|
13:27:33
|
<downey> rfriedman: the host committee met yesterday to get the details set, if they are (sounds like they are) they will be announced quite soon
|
13:29:11
|
<suranga> downey, may I make a recomendation ? that this year there will be extra tee shirts for us to purchase ? :-)
|
13:29:42
|
<downey> suranga: hmm, no one has mentioned that but it seems like a possibility. i will pass your idea on
|
13:30:50
|
<downey> suranga: would you be OK specifying or ordering in advance?
|
13:31:02
|
<suranga> downey, sure :)
|
13:31:18
|
<suranga> downey, but a tee shirt that fits, please :)
|
13:31:32
|
<downey> suranga: hahah. we will try to do better. also i think the t-shirts will be made locally in manila
|
13:31:49
|
<downey> (or at least printed locally)
|
13:33:04
|
*** pushkar has joined #openmrs
|
13:33:13
|
<pushkar> bwolfe, Hi
|
13:33:15
|
<bwolfe> hey
|
13:33:17
|
<applecool> downey, suranga : it sounds very interesting :)
|
13:33:25
|
<downey> applecool: t-shirt?
|
13:33:45
|
<applecool> not only the tshirt ! even the conference too ;)
|
13:34:45
|
<downey> :)
|
13:37:44
|
<pushkar> bwolfe, I was able get the templates from the server but the page loads very slow because of the templates
|
13:38:35
|
<bwolfe> pushkar, you should only download the images if the user chooses to use one of them
|
13:40:29
|
<pushkar> bwolfe, are you suggesting that I download the templates when the user clicks on open templates button ?
|
13:41:33
|
<bwolfe> pushkar, yes, then. although even better would be to only get thumbnails or filenames there. and only download full image when clicked to use/draw on
|
13:41:46
|
<pushkar> bwolfe, or I provide a list of names and if he clicks on the name I download the image and set it as the background of the canvas ?
|
13:42:00
|
<bwolfe> right, also an option
|
13:46:13
|
*** harshadura has joined #openmrs
|
13:46:57
|
*** goutham has joined #openmrs
|
13:53:34
|
*** skathol has joined #openmrs
|
13:55:40
|
<rfriedman> downey, polo shirts can be cheaply embroidered in Manila also
|
13:57:14
|
*** pushkar_ has joined #openmrs
|
13:58:32
|
<downey> rfriedman suranga I know there are a few people over there looking at shirt options but i haven't heard the latest
|
13:59:30
|
<bwolfe> polo++
|
13:59:39
|
<bwolfe> tanktop++
|
13:59:59
|
<bwolfe> downfilledjacket++
|
14:00:08
|
*** pushkar has quit IRC
|
14:00:21
|
<downey> barong++
|
14:01:06
|
*** djazayeri has joined #openmrs
|
14:01:06
|
*** ChanServ sets mode: +o djazayeri
|
14:01:45
|
*** pushkar has joined #openmrs
|
14:03:07
|
*** cpower has quit IRC
|
14:03:16
|
*** cpower has joined #openmrs
|
14:03:22
|
*** lakkarau has joined #openmrs
|
14:03:23
|
<cpower> Good morning everyone
|
14:03:41
|
<lakkarau> suranga:hi
|
14:04:01
|
*** pushkar_ has quit IRC
|
14:04:12
|
<cpower> Are we ready to Scrum?
|
14:04:46
|
<bwolfe> when are we not ready? :-p
|
14:04:53
|
<cpower> that's the spirit!
|
14:05:08
|
<cpower> ;-)
|
14:05:20
|
<cpower> !scrumon cpower
|
14:05:20
|
* 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:06:33
|
<cpower> Order: Wyclif, skathol, lakkarau, kishoreyekkanti, jkeiper, dkayiwa, suranga, rafa, djazayeri, bwolfe and anyone else who wants to share.
|
14:07:20
|
<wyclif> Thursday:
|
14:07:20
|
<wyclif> dev call
|
14:07:20
|
<wyclif> Revistited FORM-44 - FormEntry XSLTs should not be duplicated
|
14:07:20
|
<wyclif> FORM-121 - Modify code and admin pages to support form resources
|
14:07:20
|
<wyclif>
|
14:07:21
|
<wyclif> Friday:
|
14:07:23
|
<wyclif> Read about CustomDatatypes to get up to speed
|
14:07:25
|
<wyclif> FORM-121 - Modify code and admin pages to support form resources
|
14:07:27
|
<wyclif> pick another ticket i can get done in the remaining time
|
14:07:29
|
<wyclif> Blockers: None
|
14:07:37
|
<skathol> done: Completed HLQRY-5 template for MSH Template
|
14:07:39
|
<skathol> will do: Test MSH template
|
14:07:40
|
<skathol> blockers: How to test template from liquibase.xml
|
14:07:49
|
<lakkarau> Thursday:
|
14:07:49
|
<lakkarau> Worked on HLQRY26 ,studied the documentation.
|
14:07:49
|
<lakkarau> Friday:
|
14:07:49
|
<lakkarau> need to disscuss and start working on HLQRY26.
|
14:07:49
|
<lakkarau> no blockers.
|
14:08:30
|
<bwolfe> wyclif, I really want to see that ticket (or both) done before you end bug fixing this week. please prioritize as much as possible and work as quickly as possible
|
14:08:47
|
<cpower> Kishore if you want to update go for it, otherwise jkeiper you are up!
|
14:08:52
|
<wyclif> bwolfe, sure
|
14:09:56
|
<cpower> and with that silence we move on to dkayiwa
|
14:10:19
|
<suranga> cpower, add me to last, please (in a discussion)
|
14:10:24
|
<cpower> k
|
14:10:39
|
<dkayiwa> Fighting with out new git workflow processes
|
14:10:39
|
<dkayiwa> Manual Merge for: Create a groovy template to create the PID segment of an ORUR01 message - HLQRY-6
|
14:10:40
|
<dkayiwa> Blocker: Deleted (locally and remotely) an existing branch (HLQRY-6), recreated it, but after commit, cannot see it at: https://github.com/dkayiwa/openmrs-module-hl7query/
|
14:10:45
|
<OpenMRSBot> <http://ln-s.net/$ZcW> (at github.com)
|
14:10:50
|
<dkayiwa> out = our
|
14:11:10
|
<cpower> Rafa...hi
|
14:11:12
|
<rafa> Yesterday: (missed scrum)
|
14:11:12
|
<rafa> * Worked on HLQRY-32: Create ORUR01 template which produces the complete ORUR01 message
|
14:11:12
|
<rafa> https://tickets.openmrs.org/browse/HLQRY-32
|
14:11:12
|
<rafa> Today:
|
14:11:12
|
<rafa> * Reworked HLQRY-32 (still waiting for all templates to be ready/merged)
|
14:11:12
|
<rafa> * Worked on HLQRY-35: Create a hl7 PATIENT segment which combines the PID and PV1 segments.
|
14:11:12
|
<rafa> https://tickets.openmrs.org/browse/HLQRY-35
|
14:11:13
|
<rafa> Blockers: none
|
14:11:53
|
<cpower> djazayeri, you are up!
|
14:11:54
|
<djazayeri> All week:
|
14:11:57
|
<djazayeri> * PIH stuff
|
14:11:59
|
<djazayeri> * ITECH stuff
|
14:12:10
|
<djazayeri> * askin rafa about MDS bugs and features
|
14:12:23
|
<cpower> and finally the wolfe
|
14:12:30
|
<djazayeri> * TODO: send an email about 3 different testing strategies, and ask for opinoins
|
14:12:32
|
<djazayeri> no blockers
|
14:12:56
|
<bwolfe> Thursday
|
14:12:56
|
<bwolfe> update call with philippins about conf
|
14:12:56
|
<bwolfe> reviewed 2 tickets
|
14:12:56
|
<bwolfe> dev call
|
14:12:56
|
<bwolfe> annual review with B/P
|
14:12:57
|
<bwolfe> leadership call
|
14:12:58
|
<bwolfe> codejam review call with australia
|
14:13:00
|
<bwolfe> Friday
|
14:13:02
|
<bwolfe> email catchup
|
14:13:04
|
<bwolfe> lots of reviews of hl7query tickets/design
|
14:13:06
|
<bwolfe> (half day)
|
14:13:08
|
<bwolfe> no blockers
|
14:13:12
|
<bwolfe> (apologies for missing scrum yesterday)
|
14:13:20
|
<suranga> aaand me
|
14:13:23
|
<suranga> today
|
14:13:23
|
<suranga> 1) reviewing / commenting / merging
|
14:13:23
|
<suranga> 2) trying to point people to importaint tikets
|
14:13:23
|
<suranga> 3) general all around worry, and annoyimng people
|
14:13:23
|
<suranga> to do
|
14:13:24
|
<suranga> Try to get a basic flow of control working for us (end to end)
|
14:13:49
|
<cpower> blockers...
|
14:14:06
|
<suranga> none , other than meagre knowlege of GIT :(
|
14:14:21
|
<djazayeri> discussion question: how goes the sprint? how close are we to producing the first message end-to-end? any chance suranga can send an email to the dev list around the end of today saying "halfway through the scrum, we did X, here's some sample output"?
|
14:14:21
|
<cpower> anyone else like to share?
|
14:14:46
|
*** rram_ has quit IRC
|
14:14:46
|
<suranga> djazayeri, that would be a very good idea
|
14:15:56
|
<bwolfe> suranga, even if it is from a unit test, that is fine
|
14:16:05
|
<bwolfe> (although the controller is done, so it should be working...)
|
14:16:06
|
<suranga> :-)
|
14:16:21
|
<bwolfe> (and even if you have to write a very simple template or use a very simple pipe message, thats ok)
|
14:16:23
|
<suranga> bwolfe, I ment to put some time in to testing this today, if possible :(
|
14:16:53
|
<bwolfe> suranga, TODO: create a ticket to add a "formatDate(Date d)" method to TemplateFunctions.
|
14:17:06
|
<bwolfe> dkayiwa, nothing gets to the github server until you do a "git push"
|
14:17:14
|
<cpower> Ok, Blockers: Meager knowlege of Git, dkayiwa: deleting a branch locally and remotely and can not fix it in Github, (see a trend here), how to test liquibase.xml with skathol
|
14:17:16
|
<bwolfe> dkayiwa, "git commit" means "commit to my local repo"
|
14:17:45
|
<bwolfe> skathol, update to latest and see daniel's unit tests. he copies the template xml to a file and calls that file from the unit test
|
14:17:46
|
<dkayiwa> bwolfe: i did git push
|
14:18:07
|
<skathol> bwolfe, ok i'll try that
|
14:18:30
|
<suranga> skathol, nice ! I missed your update earlier
|
14:18:41
|
<rafa> dkayiwa: you need to specify the branch that you want to push
|
14:18:46
|
<bwolfe> dkayiwa, http://stackoverflow.com/questions/2003505/how-do-i-delete-a-git-branch-both-locally-and-in-github
|
14:18:50
|
<suranga> skathol, you should definitely compare yours with the latest tests :)
|
14:18:50
|
<OpenMRSBot> <http://ln-s.net/$Zcm> (at stackoverflow.com)
|
14:18:51
|
<rafa> dkayiwa: git push master SOME_BRANCH
|
14:18:53
|
<suranga> skathol, nice work :):)
|
14:18:55
|
<cpower> Discussion: Git, a mid Sprint update email pro/con for Suranga, Producing a first message end to end and so on.
|
14:19:01
|
<rafa> dkayiwa: sorry git push origin SOME_BRANCH
|
14:19:16
|
*** shortend has quit IRC
|
14:19:17
|
<dkayiwa> rafa: including the work origin?
|
14:19:24
|
<skathol> suranga: thanks
|
14:19:27
|
<cpower> !scrumoff
|
14:19:27
|
* 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:19:36
|
<rafa> dkayiwa: origin means your fork
|
14:19:50
|
*** shortend has joined #openmrs
|
14:20:29
|
<skathol> so, essentially there are two identical templates - one in liquibase, another in a standalone xml file?
|
14:20:55
|
*** pushkar_ has joined #openmrs
|
14:21:14
|
<lakkarau> suranga:do i need design the jsp with all the 19 fields required for the for the MSH.or i am missing some thing.
|
14:21:21
|
<dkayiwa> rafa: thanks. it had skipped "origin"
|
14:22:15
|
*** pushkar__ has joined #openmrs
|
14:22:54
|
<rfriedman> bwolfe, annual review with B/P? is this just a Regenstief formality or do they take it seriously?
|
14:23:04
|
<suranga> lakkarau, hi, what was that ticket number again ? :)
|
14:23:20
|
<lakkarau> suranga:hlqry26
|
14:23:37
|
*** pushkar has quit IRC
|
14:25:23
|
<lakkarau> thank god github did not give any security problem today.
|
14:25:33
|
*** pushkar_ has quit IRC
|
14:27:38
|
<bwolfe> rfriedman, both
|
14:28:37
|
*** kishoreyekkanti has quit IRC
|
14:31:53
|
<lakkarau> suranga:http://www.corepointhealth.com/resource-center/hl7-resources/hl7-msh-message-header is the link i am following to set the global fields in the admin page .
|
14:31:54
|
<OpenMRSBot> <http://ln-s.net/93rK> (at www.corepointhealth.com)
|
14:34:11
|
<rfriedman> bwolfe, took you to the woodshed, eh?
|
14:34:59
|
<bwolfe> rfriedman, indeed.
|
14:36:30
|
*** rafa has quit IRC
|
14:38:43
|
<djazayeri> bwolfe, etc: hey, after I have created a topic branch for ticket, completed it, issued a pull request, had that pulled, and the ticket is closed, what is the standard way to close that branch?
|
14:38:50
|
<djazayeri> I notice we don't document this on the Using Git wiki page.
|
14:40:21
|
<bwolfe> djazayeri, dkayiwa was just going through that as well. rafa said you delete locally and then the final push is "git push origin branchnameyoudeleted"
|
14:40:49
|
<dkayiwa> bwolfe: djazayeri i think you delete both locally and remotely
|
14:41:07
|
<lakkarau> suranga:??
|
14:41:47
|
<dkayiwa> locally with: git branch -D BRANCH-NAME
|
14:42:03
|
<suranga> lakkarau, sorry, I got tied up in a call :(
|
14:42:11
|
<suranga> lakkarau, give me a second :(
|
14:42:27
|
<dkayiwa> and remotely with: git push origin BRANCH-NAME
|
14:43:02
|
<suranga> hi bwolfe
|
14:43:11
|
<djazayeri> dkayiwa: not quite. error: src refspec META-238 does not match any.
|
14:43:14
|
<bwolfe> hi suranga
|
14:43:19
|
<dkayiwa> sorry i meant: git push origin :BRANCH-NAME
|
14:43:29
|
<suranga> bwolfe, could you take a loog at this, and please suggest what segment s (other than MSH) should go oin as global properties?
|
14:43:36
|
<dkayiwa> djazayeri: which command did you use?
|
14:43:43
|
<bwolfe> suranga, which?
|
14:43:47
|
<suranga> bwolfe, we have the message type ( XML or pipe delimited)
|
14:43:51
|
<djazayeri> dkayiwa: adding the : fixed it
|
14:43:58
|
<djazayeri> I'll update the wiki page
|
14:43:58
|
<dkayiwa> djazayeri: ok
|
14:44:02
|
<djazayeri> dkayiwa: thanks!
|
14:44:03
|
<suranga> bwolfe, sorry https://tickets.openmrs.org/browse/HLQRY-26
|
14:44:27
|
<lakkarau> suranga:can i have your skype id so that when ever you get time can discuss.
|
14:44:45
|
<suranga> lakkarau, sure, im surangakas
|
14:44:55
|
<bwolfe> suranga, lakkarau: that page doesn't have to worry about what is actually getting set. the GlobalPropertyTag takes in a prefix. pass in "hl7query." and it will show all Global Properties defined
|
14:46:08
|
<suranga> bwolfe, ah, so its basically a 'view' for our specific global props !
|
14:46:10
|
<suranga> bwolfe, cool
|
14:46:27
|
<bwolfe> suranga, I don't know any off the top of my head that we should add as a GP (and to the module config.xml file) but I don't think there should be many from MSH. maybe "sending facility" and "sending application"
|
14:46:50
|
<suranga> bwolfe, totally agree :)
|
14:47:03
|
<lakkarau> http://www.corepointhealth.com/resource-center/hl7-resources/hl7-msh-message-header
|
14:47:04
|
<OpenMRSBot> <http://ln-s.net/93rK> (at www.corepointhealth.com)
|
14:47:06
|
<suranga> bwolfe, at the moment (for the first run) we will hard code :)
|
14:47:34
|
<suranga> lakkarau, the idea will be that this page will be a display screen for all our tags
|
14:48:32
|
<bwolfe> djazayeri, can you think of a module that has a settings page that uses the GP taglib ?
|
14:48:38
|
<suranga> lakkarau, if someone defines a global property as hl7query.XXXYYY, this tag will display it for us. am I right, bwolfe ?
|
14:48:54
|
<bwolfe> yes
|
14:49:50
|
<suranga> lakkarau, https://wiki.openmrs.org/display/docs/How+to+Use+the+Global+Properties+Portlet
|
14:49:52
|
<lakkarau> suranga:bwolfe:ok ...got it
|
14:50:18
|
<djazayeri> bwolfe: not sure. I remember it as a GP portlet, not a GP taglib
|
14:50:58
|
<suranga> lakkarau, theres an example of this in the formimportexport module
|
14:51:10
|
<bwolfe> djazayeri, ah, right.
|
14:51:11
|
*** kishoreyekkanti has joined #openmrs
|
14:51:11
|
<bwolfe> lakkarau, https://wiki.openmrs.org/display/docs/How+to+Use+the+Global+Properties+Portlet
|
14:53:39
|
*** suranga has quit IRC
|
14:54:07
|
<lakkarau> bwolfe:if i am able to set it for MSH segment then i think it will not take mch tme with the other segments
|
14:54:39
|
<bwolfe> lakkarau, your code for this page doesn't have to know what the properties are
|
14:54:54
|
<bwolfe> lakkarau, the jsp just calls that Global Properties portlet that I linked to on the wiki above
|
14:56:00
|
<lakkarau> bwolfe:ok.
|
14:57:04
|
*** lakkarau has quit IRC
|
14:59:59
|
*** goutham has quit IRC
|
15:03:31
|
*** harshadura has quit IRC
|
15:05:03
|
*** kishoreyekkanti has quit IRC
|
15:06:35
|
*** jordank has joined #openmrs
|
15:25:46
|
*** sandeep_ has joined #openmrs
|
15:25:52
|
<downey> Hi sandeep_ and welcome to the #openmrs IRC channel.
|
15:26:54
|
<sandeep_> Hi..
|
15:30:16
|
*** deadpool_ is now known as deadpool
|
15:32:04
|
<dkayiwa> hi ra
|
15:37:38
|
*** dkayiwa has left #openmrs
|
15:43:54
|
*** bwolfe has quit IRC
|
15:44:42
|
*** skathol has quit IRC
|
15:49:31
|
*** maro has joined #openmrs
|
15:55:50
|
*** Maurya_ has joined #openmrs
|
15:55:53
|
*** sunbiz has quit IRC
|
15:56:37
|
*** sunbiz has joined #openmrs
|
15:56:37
|
*** ChanServ sets mode: +v sunbiz
|
15:58:44
|
*** maurya has quit IRC
|
15:59:07
|
<maro> hi djazayeri
|
16:02:06
|
<djazayeri> hi maro
|
16:02:46
|
<maro> djazayeri, i've got some code snippets over here -> http://pastebin.com/5C7s3WkD
|
16:04:20
|
<maro> djazayeri, i want to retrieve some datasetdefinition types into a page but nothing gets rendered. i have tested the List to be not null
|
16:08:14
|
<djazayeri> maro: is its size > 0?
|
16:08:53
|
<maro> djazayeri, yes ( i have three items in my DB)
|
16:09:01
|
<djazayeri> maro: and the list contains those?
|
16:11:41
|
<maro> djazayeri, yes, i did for (DataSetDefinition d : datasetDefinitionList) { System.out.println("dataset " + d.name); } . And the right values were printed to the debugging console for tomcat
|
16:13:12
|
<maro> djazayeri, kind of weird that it's not working in the jsp. However, the <c:forEach> for List<BirtReport> with "reports" works. Same idea.
|
16:13:55
|
*** pushkar_ has joined #openmrs
|
16:16:36
|
*** sandeep_ has quit IRC
|
16:17:14
|
*** pushkar__ has quit IRC
|
16:18:52
|
*** nadee has joined #openmrs
|
16:22:27
|
<nadee> hi all, i have a little issue regarding uuids of our openmrs tables
|
16:22:49
|
<nadee> as for my knowlege, each uuid on each row should be unique
|
16:23:23
|
<nadee> but for 2 instances, for the role table and some more tables, I have the same uuid repeating on the 2 databases
|
16:24:44
|
<nadee> is this the expected behaviour? I mean, isn't the uuid unique for each row, for any table of any database?
|
16:27:00
|
*** jordank_ has joined #openmrs
|
16:27:10
|
<nadee> for the role table.. following uuids repeat on any database. Just wanna clarify if this is expected
|
16:27:29
|
<djazayeri> nadee: this is not expected. I think there is a mysql bug that sometimes causes this
|
16:27:34
|
<djazayeri> nadee: I don't know more than that though
|
16:27:50
|
<nadee> i see
|
16:29:28
|
<nadee> checked with another mate too
|
16:29:45
|
<nadee> role table has repeating uuids on that database too :-/
|
16:30:02
|
*** jordank has quit IRC
|
16:30:02
|
*** jordank_ is now known as jordank
|
16:36:23
|
<jordank> hi nadee! I'm looking at mine too. I only have four rows in the role table but the uuids are unique from the others...
|
16:36:53
|
<jordank> that probably doesn't help you much lol
|
16:40:04
|
<applecool> !seen rafa
|
16:40:04
|
<OpenMRSBot> applecool: rafa was last seen in #openmrs 2 hours, 20 minutes, and 28 seconds ago: <rafa> dkayiwa: origin means your fork
|
16:40:12
|
*** pushkar_ has quit IRC
|
16:40:37
|
*** pushkar_ has joined #openmrs
|
16:44:34
|
*** lh has joined #openmrs
|
16:53:28
|
<djazayeri> wyclif: do you have time to release calculation module?
|
16:53:41
|
<wyclif> djazayeri, today
|
16:53:45
|
<wyclif> djazayeri, today?
|
16:53:55
|
<djazayeri> wyclif: I don't strictly require it.
|
16:54:29
|
<wyclif> djazayeri, how soon do you want it, i've actually wanted to to it
|
16:54:47
|
<wyclif> djazayeri, can we do it on monday?
|
16:55:33
|
<djazayeri> wyclif: sure, I was just realizing that I'm still using 1.0-SNAPSHOT, but there's no need for that
|
16:56:12
|
<djazayeri> wyclif: I don't have a specific deadline, just you'd mentioned wanting to release it. So "sooner rather than later" makes sense.
|
16:56:55
|
<djazayeri> for me. Next week is fine.
|
16:57:01
|
*** cpower has quit IRC
|
16:57:05
|
<wyclif> djazayeri, ok
|
16:58:23
|
<nadee> @jordank: hey jordan! Nah.. what I mean was, when you take two openmrs databases, the same 4 uuids that you have on the role table, repeats on the other database's role table too :)
|
16:58:50
|
<nadee> jordank: sorry, just now saw your chat
|
16:59:13
|
<jordank> nadee: oh! I see
|
17:01:50
|
<djazayeri> nadee: ah, that's expected
|
17:02:52
|
<djazayeri> nadee: we expect that core data (e.g. Unknown Location, Authenticated role, etc) intentionally have the same UUID across servers, because they're identical.
|
17:03:43
|
*** applecool has quit IRC
|
17:08:27
|
*** goutham has joined #openmrs
|
17:10:24
|
*** rfriedman has quit IRC
|
17:11:47
|
<nadee> djazayeri : ohh ok.. so that was intentional then
|
17:12:07
|
<nadee> table order_type is also the same ?
|
17:17:30
|
*** pushkar_ has quit IRC
|
17:17:53
|
*** pushkar_ has joined #openmrs
|
17:18:05
|
*** suranga has joined #openmrs
|
17:18:06
|
*** ChanServ sets mode: +v suranga
|
17:22:10
|
*** maro has quit IRC
|
17:26:34
|
<djazayeri> nadee: yes, order_type is the same
|
17:32:05
|
<nadee> djazayeri: alright, thanks darius..
|
17:34:02
|
*** shortend has quit IRC
|
17:34:39
|
*** jriley has joined #openmrs
|
17:35:46
|
<jriley> Hi jordank, did you get anywhere with your view issue?
|
17:36:21
|
<jordank> jriley: not really. I think I narrowed down the culprit though.
|
17:38:41
|
<jordank> jriley: remember when we changed the showPage method to return a String? I got the same issue then, but in that case, I just changed it back to returning void⦠now the preview method returns a String in order to redirect back to the chooseConcepts page when it needs too (which works)
|
17:39:12
|
<jriley> hmm
|
17:39:56
|
<jriley> jordank , so if it returns "preview" or "preview.form" , it doesn't work?
|
17:40:34
|
<jriley> I'm not sure whether to tell it .form , .htm , or leave no extension
|
17:40:55
|
<jordank> I think I tried "preview.form" and "/module/mergeconcepts/preview", but maybe I didn't try just returning "preview"
|
17:41:09
|
<jriley> try "preview" and "preview.htm "
|
17:41:15
|
<jordank> I also tried "" - it didn't like that either :P
|
17:41:29
|
<jordank> I will try those now...
|
17:41:35
|
<jriley> Too Zen for it, I guess. Behold, the View which is no-view
|
17:41:46
|
<jriley> you blew it's tiny mind
|
17:42:47
|
<jriley> jordank - with the redirect, it's telling the browser to redirect (make a new call to the server) to chooseConcept.form , so it goes through the controller's choose concept method
|
17:42:53
|
<jriley> redirect:chooseConcept.form
|
17:43:43
|
<jriley> when you just return a view, you're telling Spring's dispatcher what view to display. It might prefer a different extension
|
17:43:59
|
<jordank> right. I also tried not returning a string, and just calling chooseConcepts method⦠didn't work, but I didn't really know what I was doing
|
17:44:42
|
*** lakkarau has joined #openmrs
|
17:45:28
|
<jriley> If you don't return anything, the dispatcher defaults to a view. If the request was to preview.form, it knows to translate that to the preview.jsp file. I haven't been able to find where that's configured
|
17:45:34
|
<jriley> You could also try preview.jsp .
|
17:46:23
|
<jordank> hmm okay
|
17:48:45
|
<jordank> jriley: the request was to preview.form and I get "/openmrs/module/mergeconcepts/preview.form" cannot be found regardless of what I'm returning in the preview method⦠haven't tried everything yet
|
17:49:23
|
<jriley> If you point your browser to â¦./openmrs/module/mergeconcepts/preview.htm does it show anything?
|
17:50:36
|
<jordank> HTTP Status 500 - â¦â¦. probably because it doesn't have any concept ids?
|
17:50:36
|
*** Maurya_ has quit IRC
|
17:51:08
|
*** Maurya_ has joined #openmrs
|
17:51:11
|
<jordank> jriley: "IllegalArgumentException: id to load is required for loading"
|
17:51:35
|
<jordank> that's better than 404 error right? :)
|
17:51:52
|
<jriley> yeah, because .htm goes right for the JSP without consulting a controller. Yes! We know that preview.jsp is there where it can be found
|
17:53:32
|
<jriley> Ok. So looking at the ShortPatientFormController , in core openMRS , you should return "preview" . Not .form, not .htm .
|
17:54:54
|
<jordank> jriley: aw. I just tried that. so, the problem must be somewhere else�
|
17:56:24
|
<jriley> jordank - Well, all I know is that wasn't the problem. More experimenting⦠what happens if you add a method to the controller that maps a url of 'showPreview', and all it does is return "preview" ? It'll either say 404 (boo) or 500 (yay)
|
17:58:17
|
<jordank> so⦠@RequestMapping("/module/mergeconcepts/preview") on a new method?
|
17:58:51
|
<jordank> should I comment out the request mapping on my current preview method?
|
17:59:56
|
<jordank> ^jriley
|
18:00:42
|
<jriley> jordank , I was thinking make a separate method with a new requestMapping url. Easy to delete when you're done with the experiment
|
18:01:25
|
<jordank> jriley: what happens if two methods have the same requestMapping url though?
|
18:02:13
|
<jriley> jordank , that's why I'd use a different one. Some kind of kaboom .
|
18:02:31
|
<jriley> So, @RequestMapping(".module/mergeconcepts/experiment"), and have it return "preview"
|
18:03:10
|
<jordank> then have my preview form action = module/mergeconcepts/experiment?
|
18:03:54
|
*** Maurya_ has quit IRC
|
18:04:08
|
<jriley> no, then open a new browser window and go to yourserver/openmrs/module/mergeconcepts/experiment
|
18:05:55
|
<jordank> oooh
|
18:06:06
|
*** downey has quit IRC
|
18:06:20
|
*** downey has joined #openmrs
|
18:06:20
|
*** ChanServ sets mode: +o downey
|
18:06:20
|
*** OpenMRSBot sets mode: +o downey
|
18:07:30
|
*** maurya has joined #openmrs
|
18:09:00
|
<jriley> As I understand the problem: the preview() controller method used to return void, and went to the right page. You changed it to return a String. When you make it go through the user-sent-bad-arg scenarios, it correctly redirects to chooseConcepts. When you go down the happy path it can't find preview any more. So my first thought is, you aren't giving it the right string for it to find the view.
|
18:10:05
|
<jordank> jriley: makes sense⦠"/openmrs/module/mergeconcepts/experiment" cannot be found.
|
18:10:06
|
<jriley> What does it want? You tried a bunch of ideas. I'm not sure what it wants, so let's make a really simple method and try again.
|
18:10:49
|
<jriley> hmmm, you repackaged the mod and deployed it? that's weird.
|
18:10:54
|
<jordank> ya
|
18:11:03
|
<jriley> Did I describe the problem right?
|
18:11:09
|
<jordank> yep
|
18:11:45
|
<jriley> And if you un-did those changes to return a string -- you set it back to void and commented out the redirect: bits, it goes back to doing the right thing?
|
18:12:30
|
<jriley> ⦠and you do all the superstitious things and run mvn clean â¦
|
18:12:35
|
<jordank> last time I checked. I'll try again.
|
18:12:47
|
<jordank> and⦠ya I did last night :/
|
18:15:06
|
<jordank> jriley: on the bright side, my error messages look nice
|
18:15:18
|
*** sunbiz has quit IRC
|
18:16:47
|
<jordank> jriley: when I comment out the redirects and set it back to return void, it does go back to doing the right thing
|
18:16:50
|
<jriley> The next iteration I'd try is change preview() to return a string, and add a line at the beginning of the method that returned "preview" . Make it show you it can go to the view
|
18:17:43
|
<jriley> Ok. So we know if we let Spring do its default resolution, it figures out it should show "preview.jsp". It can find preview.jsp, it can render it, and it COULD work, if only ⦠?
|
18:21:04
|
<jriley> ⦠looking at the visit controllers in core OpenMRS...
|
18:22:03
|
<jriley> You might try returning "/module/mergeconcepts/preview" . It seems brittle to have to give it your module path, so I'm going to grep for an example in another module
|
18:22:33
|
<jordank> hmm ok
|
18:25:57
|
*** suranga has quit IRC
|
18:25:57
|
*** lh has quit IRC
|
18:25:57
|
*** snoppy has quit IRC
|
18:26:30
|
*** suranga has joined #openmrs
|
18:26:30
|
*** lh has joined #openmrs
|
18:26:30
|
*** snoppy has joined #openmrs
|
18:26:30
|
*** zelazny.freenode.net sets mode: +v suranga
|
18:27:05
|
*** Tukenmann has quit IRC
|
18:28:25
|
<jordank> jriley: returning "/module/mergeconcepts/preview" worked to show the page
|
18:28:28
|
<jordank> I'm happy
|
18:28:39
|
<jriley> WOOOO! GREEN LIGHT!
|
18:28:48
|
<jordank> :D
|
18:29:19
|
<jordank> thank you thank you!
|
18:29:40
|
<jriley> Could you do a search in source.openmrs.org in the modules repository, and see if any other module is returning "/module" ?
|
18:30:51
|
<jriley> Returning a view name seems like something a lot of modules are going to do, and having to specify this hardocded module path of /module/mymodulename seems like something that's very tightly coupled to a configuration decision. Therefore, it makes me wonder if there isn't a nice utility class around that would be able to tell you what the path is for your module.
|
18:31:46
|
<jriley> If there is, that's the more proper way to do it. But for this week's iteration, hardcoding is ok
|
18:36:05
|
*** maurya has quit IRC
|
18:36:06
|
*** Echidna has quit IRC
|
18:36:06
|
*** Mkop has quit IRC
|
18:36:09
|
*** downey has quit IRC
|
18:36:10
|
*** deadpool has quit IRC
|
18:36:13
|
<jriley> My work here is done. I'm going to ride into the sunset and get a tea.
|
18:36:26
|
<lakkarau> suranga:hi
|
18:37:00
|
*** james_regen has quit IRC
|
18:37:06
|
<jriley> jordank, have a good weekend. *cue the cowboy music* clip-clop clip-clop
|
18:37:08
|
*** jriley has left #openmrs
|
18:37:18
|
*** maurya has joined #openmrs
|
18:37:18
|
*** downey has joined #openmrs
|
18:37:18
|
*** deadpool has joined #openmrs
|
18:37:18
|
*** Echidna has joined #openmrs
|
18:37:18
|
*** Mkop has joined #openmrs
|
18:37:18
|
*** zelazny.freenode.net sets mode: +ovv downey Echidna Mkop
|
18:37:18
|
*** OpenMRSBot sets mode: +o downey
|
18:38:21
|
*** mvorobey has joined #openmrs
|
18:38:26
|
<mvorobey> hi all
|
18:40:00
|
*** goutham has quit IRC
|
18:40:50
|
*** nadee has quit IRC
|
18:46:32
|
<lakkarau> djazayeri:hi
|
18:53:58
|
*** downey has quit IRC
|
18:54:49
|
<suranga> lakkarau, helllo
|
18:54:59
|
<suranga> lakkarau, sorry, I waz away.. :(
|
18:55:37
|
<lakkarau> suranga:<openmrs:globalPropertykey="msh.sending.application"var=""/> what should be the var value
|
18:55:54
|
*** lh is now known as lh_afk
|
18:56:02
|
* suranga goes to check
|
18:56:47
|
<OpenMRSBot> Recent updates in the world of openmrs: OpenMRS Kenya Project: Once in a blue moon <http://openmrskenya.blogspot.com/2012/08/once-in-blue-moon.html>
|
18:57:05
|
<lakkarau> suranga:just i wanted to know is there any standard we are following
|
18:58:00
|
<lakkarau> suranga:like for each field what the var value should be they are around 19 fields related to MSH Segment
|
19:01:38
|
<suranga> lakkarau, hmm.. In not sure if there is an exact convention that we are following....
|
19:01:49
|
<suranga> lakkarau, may I have a look at how the page looks right now ? :)
|
19:02:37
|
<lakkarau> suranga: nothing much the above single lined code ,coped and pasted for rest of the fields
|
19:04:19
|
<lakkarau> suranga: i can push the branch
|
19:04:23
|
<suranga> lakkarau, I can point you to what is looks like :
|
19:04:33
|
<suranga> lakkarau, we would like something like this - https://wiki.openmrs.org/display/docs/FormImportExport+Module
|
19:04:57
|
<lakkarau> Suranga:thanks for giving me some light.
|
19:05:17
|
<suranga> lakkarau, where everything which starts with hl7query.* gets automatically pulled in, and displayed
|
19:05:33
|
<suranga> lakkarau, you might find it easier if u looked at that code too :)
|
19:05:53
|
<lakkarau> suranga:i am looking into the doc.
|
19:08:59
|
*** downey has joined #openmrs
|
19:08:59
|
*** ChanServ sets mode: +o downey
|
19:08:59
|
*** OpenMRSBot sets mode: +o downey
|
19:09:46
|
<lakkarau> suranga:form the previous line every thing that starts with HL7query ---example please
|
19:10:21
|
<lakkarau> hl7query.msh like that
|
19:10:33
|
<suranga> lakkarau, if you look at our global properties page, u'll see that all the props start with the module name
|
19:10:49
|
<lakkarau> Suranga:ok..i missed it
|
19:10:50
|
<suranga> lakkarau, so if you see any property that start with hl7query
|
19:10:55
|
<suranga> thats ours :)
|
19:11:13
|
<lakkarau> suranga:ok got it.
|
19:11:23
|
<suranga> lakkarau, cool, no worrie
|
19:11:24
|
<suranga> s
|
19:12:43
|
*** pushkar_ has quit IRC
|
19:13:52
|
*** sunbiz has joined #openmrs
|
19:13:52
|
*** ChanServ sets mode: +v sunbiz
|
19:30:19
|
*** goutham has joined #openmrs
|
19:37:05
|
*** goutham has quit IRC
|
19:38:58
|
*** snoppy has left #openmrs
|
19:52:12
|
*** downey has quit IRC
|
19:52:17
|
*** downey_ has joined #openmrs
|
19:52:17
|
*** ChanServ sets mode: +o downey_
|
19:54:01
|
<mvorobey> .ÐÐШÐ
|
19:54:05
|
*** mvorobey has quit IRC
|
20:00:01
|
*** jkeiper_ has quit IRC
|
20:15:42
|
*** jordank has left #openmrs
|
20:15:54
|
*** sunbiz has left #openmrs
|
20:39:43
|
*** jordank has joined #openmrs
|
20:51:29
|
*** lh_afk is now known as lh
|
20:57:53
|
*** skathol has joined #openmrs
|
21:02:22
|
*** Mkop has quit IRC
|
21:03:49
|
*** lh has quit IRC
|
21:04:36
|
*** djazayeri has quit IRC
|
21:07:46
|
*** skathol has quit IRC
|
21:07:53
|
*** downey_ has quit IRC
|
21:15:35
|
*** wyclif has quit IRC
|
21:39:18
|
*** lh has joined #openmrs
|
21:39:18
|
*** lh has joined #openmrs
|
22:06:13
|
*** lh has quit IRC
|
22:06:45
|
*** lh has joined #openmrs
|
22:11:33
|
*** suranga has quit IRC
|
22:14:30
|
*** lh has quit IRC
|
22:14:52
|
*** lh has joined #openmrs
|
22:14:52
|
*** lh has joined #openmrs
|
22:16:20
|
*** wyclif has joined #openmrs
|
22:29:18
|
*** skathol has joined #openmrs
|
22:34:15
|
*** lh has quit IRC
|
22:35:24
|
*** lh has joined #openmrs
|
22:42:42
|
*** lh has quit IRC
|
22:45:59
|
*** lh has joined #openmrs
|
22:53:34
|
*** maurya has quit IRC
|
22:59:30
|
*** lh has quit IRC
|
23:10:52
|
*** jordank has quit IRC
|