| 00:17:58 | *** wyclif has joined #openmrs |
| 00:29:21 | *** k-joseph has quit IRC |
| 02:09:33 | *** travis-ci has joined #openmrs |
| 02:09:33 | <travis-ci> [travis-ci] [openmrs/openmrs-core] [1407979] [wluyima] The build passed. - http://travis-ci.org/openmrs/openmrs-core/builds/3834220 |
| 02:09:33 | *** travis-ci has left #openmrs |
| 02:09:37 | <OpenMRSBot> <http://ln-s.net/+Lsk> (at travis-ci.org) |
| 02:37:41 | *** jkeiper has joined #openmrs |
| 02:37:41 | *** ChanServ sets mode: +v jkeiper |
| 04:28:34 | *** harshadura has joined #openmrs |
| 04:29:50 | *** harshadura_ has joined #openmrs |
| 04:33:49 | *** harshadura has quit IRC |
| 04:59:23 | *** kishoreyekkanti has joined #openmrs |
| 05:01:38 | *** k-joseph has joined #openmrs |
| 05:10:54 | *** jkeiper has quit IRC |
| 05:58:58 | *** k-joseph has quit IRC |
| 06:05:34 | *** dkayiwa has joined #openmrs |
| 06:43:07 | *** kavuri has joined #openmrs |
| 06:53:24 | <kavuri> dkayiwa: hi |
| 06:54:13 | <dkayiwa> kavuri: can u give me 30mins |
| 06:54:19 | <kavuri> dkayiwa: sure |
| 06:54:35 | <dkayiwa> kavuri: ok thanks |
| 07:17:01 | *** harshadura_ has quit IRC |
| 07:24:22 | <dkayiwa> kavuri: ok ready :) |
| 07:25:08 | <kavuri> dkayiwa: alright :) I am trying to create a Rest Object as an extension to the webservices module |
| 07:25:18 | <dkayiwa> kavuri: ok |
| 07:25:53 | <kavuri> dkayiwa: I have created my own service that stores some data to the database and then provides an API that returns the values (as PageableResult) |
| 07:26:14 | <dkayiwa> kavuri: ok |
| 07:26:35 | <kavuri> dkayiwa: should I implement my Rest object as inherited from BaseRestController ? |
| 07:28:23 | <dkayiwa> kavuri: the controller or the resource? |
| 07:28:35 | <kavuri> dkayiwa: the resource |
| 07:28:44 | <kavuri> dkayiwa: the other question is, do I need a controller? |
| 07:28:55 | <kavuri> dkayiwa: and if yes, which class should it inherit from? |
| 07:29:35 | <dkayiwa> kavuri: you will need a controller for mapping handling the url to your resource |
| 07:31:46 | <dkayiwa> kavuri: base class for your resource will depend on the semantics of your resource |
| 07:40:31 | <kavuri> dkayiwa: semantics as in? |
| 07:40:53 | <dkayiwa> kavuri: like whether it supports delete, retire, purge, etc |
| 07:40:56 | <kavuri> dkayiwa: I have a DAO object that retrieves data from the database, which I need to serve using a webservice call |
| 07:41:11 | <kavuri> dkayiwa: ok, no, no delete, retrieve, purge etc. |
| 07:41:15 | <kavuri> dkayiwa: just retrieve |
| 07:41:39 | <dkayiwa> kavuri: ok |
| 07:45:59 | <kavuri> dkayiwa: will have to take a break for lunch. What do you suggest for implementing such a feature? |
| 07:46:12 | <kavuri> dkayiwa: can I get back to you in say 30mins? |
| 07:51:32 | *** kishoreyekkanti has quit IRC |
| 08:01:19 | <dkayiwa> kavuri: ok |
| 08:10:39 | <kavuri> dkayiwa: I am back |
| 08:47:52 | *** hudayanga has joined #openmrs |
| 08:48:53 | *** hudayanga has joined #openmrs |
| 08:49:13 | *** kishoreyekkanti has joined #openmrs |
| 08:52:47 | <dkayiwa> hi kavuri |
| 08:52:55 | <kavuri> dkayiwa: hi |
| 08:53:04 | <dkayiwa> kavuri: any progress? |
| 08:53:39 | <kavuri> dkayiwa: I am trying to look at the example-webservice |
| 08:54:13 | <dkayiwa> kavuri: ok |
| 09:22:26 | <kavuri> dkayiwa: was not able to get any help from the examples.. |
| 09:22:50 | <dkayiwa> kavuri: what were you looking for in the examples |
| 09:23:17 | <kavuri> dkayiwa: what I am trying to do is to modify the atom feed module to store the changes to the database rather than a file |
| 09:23:29 | <dkayiwa> kavuri: ok |
| 09:23:37 | <kavuri> dkayiwa: for this, I wanted to write a DAO object to store the changes to the database |
| 09:24:00 | <kavuri> dkayiwa: and whenever the user wants to get the changes, he/she can use a REST Url to retrieve the changes |
| 09:24:34 | <kavuri> dkayiwa: so for this, I have added a DAO object..and now I want to add a webservices object to serve the data in the database |
| 09:24:55 | <dkayiwa> kavuri: ok |
| 09:25:12 | <kavuri> dkayiwa: I am stuck at the webservices level |
| 09:25:34 | <dkayiwa> kavuri: have you already created the resource and controller for the web service? |
| 09:25:50 | <kavuri> dkayiwa: I have created the resource class |
| 09:25:58 | <dkayiwa> kavuri: and controller? |
| 09:26:08 | <kavuri> dkayiwa: no, did not |
| 09:26:18 | <dkayiwa> kavuri: can you create it too? |
| 09:27:44 | <kavuri> dkayiwa: I take back, even the resource class needs more work |
| 09:27:52 | <kavuri> dkayiwa: which class should the resource class extend from? |
| 09:30:12 | <dkayiwa> kavuri: it can be: BaseDelegatingResource |
| 09:30:48 | <kavuri> dkayiwa: and what would the object type be for T ? |
| 09:31:19 | <dkayiwa> kavuri: the one you are retrieving from the database |
| 09:32:37 | <kavuri> dkayiwa: would that be the DAO class? |
| 09:33:01 | <dkayiwa> kavuri: the domain object you are retrieving from the database |
| 09:33:20 | <dkayiwa> kavuri: you can look at the existing openmrs restws resource classes as examples |
| 09:37:53 | <kavuri> dkayiwa: should I be extending from BaseDelegatingResource even though I do not need to CRUD operations? |
| 09:38:47 | <dkayiwa> kavuri: i was looking for a lower class without them. but not yet seen any :) |
| 09:39:51 | <dkayiwa> kavuri: in those methods you can just do nothing :) |
| 09:40:01 | <kavuri> dkayiwa: yes |
| 09:40:12 | <kavuri> dkayiwa: how about the controller? |
| 09:40:58 | <dkayiwa> kavuri: BaseRestController |
| 09:42:16 | <dkayiwa> kavuri: and implement Retrievable |
| 09:46:18 | *** andro12390 has joined #openmrs |
| 09:53:10 | *** k-joseph has joined #openmrs |
| 09:53:39 | <kavuri> dkayiwa: in the resource class, I guess the SimpleObject takes a map as input to generate the json output, right? |
| 09:53:52 | <dkayiwa> kavuri: right |
| 09:54:09 | <kavuri> dkayiwa: and for an array? |
| 09:54:21 | <hudayanga> hi all |
| 09:54:33 | <dkayiwa> kavuri: all goes into the same |
| 09:54:38 | <dkayiwa> hi hudayanga |
| 09:55:26 | <k-joseph> hi every one |
| 09:55:28 | <k-joseph> dkayiwa: hi |
| 09:55:45 | <dkayiwa> k-joseph: hi |
| 09:56:17 | <dkayiwa> k-joseph: can you delete the branch, create a new one, then submit one pull request that has all changes for your ticket? |
| 09:56:28 | <dkayiwa> k-joseph: do you know how to do the above steps? |
| 09:57:52 | <k-joseph> dkayiwa: yes i know how to delete the branch using git commands, but still the record of the branch is kept |
| 09:58:17 | <k-joseph> dkayiwa: and i did this before the previous commits |
| 09:58:19 | <dkayiwa> k-joseph: do you know how to delete it locally and remotely? |
| 09:58:29 | <k-joseph> dkayiwa: yes i do |
| 09:58:43 | <dkayiwa> k-joseph: let me guide you step by step |
| 09:58:51 | <k-joseph> dkayiwa: ok please |
| 09:58:53 | <dkayiwa> k-joseph: backup all your changes some where |
| 09:59:06 | <k-joseph> dkayiwa: ok |
| 09:59:27 | <dkayiwa> k-joseph: e.g, keep a copy of your new classes somewhere on your file system. then tell me when you are done |
| 10:02:20 | <k-joseph> dkayiwa: i have finished backing the changes up |
| 10:02:47 | <dkayiwa> k-joseph: now reset all changes on openmrs-core |
| 10:02:52 | <dkayiwa> k-joseph: do you know how? |
| 10:03:05 | <k-joseph> dkayiwa: no |
| 10:03:18 | <k-joseph> dkayiwa: i dont know how |
| 10:03:31 | <k-joseph> dkayiwa: to reset the changes |
| 10:04:12 | <dkayiwa> k-joseph: right click on each project in eclipse and the select Team Reset |
| 10:04:19 | <dkayiwa> k-joseph: then choose Hard |
| 10:04:29 | <k-joseph> dkayiwa: ok |
| 10:06:02 | <k-joseph> dkayiwa: do i need to select the branch |
| 10:06:20 | <dkayiwa> k-joseph: how |
| 10:07:09 | <k-joseph> dkayiwa: am having alist of branches lisited under Local |
| 10:07:34 | <dkayiwa> k-joseph: how do you want to select the branch |
| 10:08:26 | <k-joseph> dkayiwa: TRUNK-3814 is initially selected, but still i have selected Hard from theh check box down |
| 10:09:10 | <k-joseph> dkayiwa: so should i select all the branches or go with that oone only? |
| 10:10:25 | <dkayiwa> k-joseph: only that one |
| 10:10:33 | <k-joseph> dkayiwa: ok |
| 10:10:42 | <dkayiwa> k-joseph: have you reset for each project? |
| 10:11:03 | <k-joseph> dkayiwa: no, for TRUNK-3814 only |
| 10:11:22 | <dkayiwa> k-joseph: am not meaning branch :) |
| 10:11:27 | <hudayanga> dkayiwa: i'm working for this ticket ,https://tickets.openmrs.org/browse/TRUNK-2758 not sure what i have do first.can you guid me on this..thanx |
| 10:12:00 | <k-joseph> dkayiwa: yes, i selected for all the six projects |
| 10:12:24 | <dkayiwa> k-joseph: now delete the branch locally and remotely |
| 10:12:33 | <k-joseph> dkayiwa: ok |
| 10:13:42 | <dkayiwa> hudayanga: have you first of all been able to reproduce the problem? |
| 10:21:13 | <k-joseph> dkayiwa: i have finished deleting the branch both locally and remotely |
| 10:21:36 | <dkayiwa> k-joseph: can you now do: git checkout master |
| 10:22:06 | <k-joseph> dkayiwa: already at branch master |
| 10:22:37 | <dkayiwa> k-joseph: now do: git branch TRUNK-3814 |
| 10:23:14 | <k-joseph> dkayiwa: finished |
| 10:23:26 | <dkayiwa> k-joseph: no errors? |
| 10:23:56 | <k-joseph> dkayiwa: not seen any |
| 10:24:10 | <dkayiwa> k-joseph: now do: git checkout TRUNK-3814 |
| 10:24:16 | <k-joseph> dkayiwa: ok |
| 10:24:45 | <k-joseph> dkayiwa: switched to it |
| 10:25:09 | <dkayiwa> k-joseph: can you now put in your changes? |
| 10:25:22 | <k-joseph> dkayiwa: ok |
| 10:29:54 | <k-joseph> dkayiwa: do need to delete and re-create the clases changed, they are still marked as though committed even when reset |
| 10:30:21 | <k-joseph> dkayiwa: in eclipse |
| 10:30:30 | <dkayiwa> k-joseph: do they have question marks? |
| 10:30:40 | <k-joseph> dkayiwa: no |
| 10:31:13 | <k-joseph> dkayiwa: cylinders |
| 10:31:18 | <dkayiwa> k-joseph: can you delete them? |
| 10:31:29 | <k-joseph> dkayiwa: ok |
| 10:32:10 | <dkayiwa> k-joseph: after deleting, then simply commit, create a pull request and send it to me. Then i will come back in 30 mins |
| 10:32:22 | <dkayiwa> k-joseph: do not put in your changes |
| 10:32:43 | <k-joseph> dkayiwa: ok |
| 10:32:44 | <dkayiwa> k-joseph: only delete the files, commit, push, and create a pull request for me |
| 10:33:03 | <k-joseph> dkayiwa:ok please |
| 10:34:45 | <k-joseph> dkayiwa: do i need to delete ValidateUtil.java which i hadn't created but modified |
| 10:35:09 | <dkayiwa> k-joseph: you need to remove your changes from that class |
| 10:35:10 | <k-joseph> dkayiwa: or i just delete out the changes? |
| 10:35:21 | <k-joseph> dkayiwa: ok please |
| 10:52:23 | *** andro12390 has quit IRC |
| 10:54:19 | *** rkorytkowski has joined #openmrs |
| 10:54:19 | *** ChanServ sets mode: +v rkorytkowski |
| 10:54:31 | *** rkorytkowski is now known as rafa |
| 10:56:30 | *** Mkop has quit IRC |
| 10:56:49 | *** Mkop has joined #openmrs |
| 10:56:49 | *** ChanServ sets mode: +v Mkop |
| 11:01:52 | <hudayanga> dkayiwa: i run the project several times but i cant understand how identyfire and identyfier type works in open mrs...? |
| 11:09:04 | <OpenMRSBot> Recent updates in the world of openmrs: OpenMRS Modules: Metadata Sharing 1.1.2 uploaded to OpenMRS Module Repository <https://modules.openmrs.org/modules/view.jsp?module=metadatasharing&version=&1.1.2> || OpenMRS Modules: Metadata Mapping 1.0.1 uploaded to OpenMRS Module Repository <https://modules.openmrs.org/modules/view.jsp?module=metadatamapping&version=&1.0.1> |
| 11:25:55 | <k-joseph> dkayiwa: |
| 11:38:38 | *** kavuri has quit IRC |
| 12:06:39 | *** hudayanga has quit IRC |
| 12:36:34 | *** harshadura has joined #openmrs |
| 12:38:36 | *** k-joseph has quit IRC |
| 12:41:09 | *** harshadura has quit IRC |
| 12:42:45 | *** harshadura has joined #openmrs |
| 12:57:25 | *** harshadura has quit IRC |
| 13:39:09 | *** bhashitha has joined #openmrs |
| 13:39:55 | <bhashitha> Hi |
| 13:40:07 | <dkayiwa> bhashitha: hi |
| 13:40:24 | <bhashitha> I'm new bee to OpenMRS and trying to playing arround the code |
| 13:41:52 | <dkayiwa> ok |
| 13:44:33 | <bhashitha> I can see there are similar jsp files both 'openmrs/webapp/src/main/webapp/WEB-INF/view' and 'openmrs-webapp/src/main/webapp/WEB-INF/view' directories |
| 13:44:57 | <bhashitha> can you let me know what is the different between those ? |
| 13:47:57 | <dkayiwa> bhashitha: i think the ones under openmrs/webapp/.... are just a mirror of the real ones |
| 13:48:18 | <dkayiwa> bhashitha: so you should deal with those under openmrs-webapp/.... |
| 13:48:56 | <bhashitha> Great |
| 13:49:04 | <bhashitha> thanks for the info |
| 13:55:31 | *** bhashitha has quit IRC |
| 14:14:59 | *** k-joseph has joined #openmrs |
| 14:19:12 | <k-joseph> dkayiwa: |
| 14:19:20 | <dkayiwa> k-joseph: hi |
| 14:19:26 | <k-joseph> dkayiwa: hi |
| 14:19:51 | <dkayiwa> k-joseph: can you now close the pull requests |
| 14:20:04 | <k-joseph> dkayiwa: ok |
| 14:20:05 | <dkayiwa> k-joseph: delete branch |
| 14:20:32 | <k-joseph> dkayiwa: remotely and locally again? |
| 14:20:38 | <dkayiwa> k-joseph: then git checkout master |
| 14:20:44 | <dkayiwa> k-joseph: yes |
| 14:20:50 | <k-joseph> dkayiwa: ok |
| 14:21:07 | <dkayiwa> k-joseph: and creat new branch with your chnages |
| 14:21:18 | <dkayiwa> k-joseph: then send pull request |
| 14:37:51 | *** abhishekp has joined #openmrs |
| 14:50:57 | *** pusakat has joined #openmrs |
| 15:04:21 | *** rafa has quit IRC |
| 15:09:33 | <dkayiwa> hi k-joseph |
| 15:10:04 | <k-joseph> dkayiwa: am finishing in 45 secs |
| 15:10:18 | <dkayiwa> k-joseph: are you the one who has created pull request 169? |
| 15:10:35 | <k-joseph> dkayiwa: yes |
| 15:10:52 | <dkayiwa> k-joseph: is that the current one where you have put your changes? |
| 15:11:05 | <k-joseph> dkayiwa: yes |
| 15:11:14 | <dkayiwa> k-joseph: but it has the old commits |
| 15:11:20 | <dkayiwa> k-joseph: which it should not have |
| 15:11:38 | <k-joseph> dkayiwa: am checking now |
| 15:11:44 | <dkayiwa> k-joseph: how did you delete the branch? |
| 15:12:09 | <dkayiwa> k-joseph: i expect a pull request that has only one commit |
| 15:12:46 | <k-joseph> dkayiwa: git branch -D TRUNK-3814, and git push origin :TRUNK-3814 |
| 15:12:56 | <k-joseph> dkayiwa: to delete the branch |
| 15:13:06 | <dkayiwa> k-joseph: and what was the next step after that? |
| 15:14:10 | <k-joseph> dkayiwa: then i added the changes to eclipse after git branch TRUNK-3814 and git checkout TRUNK-3814 |
| 15:14:18 | <dkayiwa> k-joseph: no |
| 15:14:34 | <dkayiwa> k-joseph: the next step should have been git checkout master |
| 15:15:15 | <dkayiwa> k-joseph: it is after checking out master, that you should then have done the git branch TRUNK-3814 etc |
| 15:15:27 | <dkayiwa> k-joseph: can you close the pull request, delete branches and do all again? |
| 15:15:38 | <k-joseph> dkayiwa: i did that, |
| 15:15:55 | <dkayiwa> k-joseph: did what? |
| 15:16:30 | <k-joseph> dkayiwa: deleted the branch while on another branch then checkout master and proceeded |
| 15:16:49 | <k-joseph> dkayiwa: with git branch TRUNK-3814 |
| 15:17:04 | <dkayiwa> k-joseph: but you have just told me that your next step was not git checkout master |
| 15:17:24 | <dkayiwa> k-joseph: and it is proved so by your pull request having the old commits |
| 15:19:14 | <k-joseph> dkayiwa: i did git checkout master after deleting TRUNK-3814 |
| 15:19:44 | <dkayiwa> k-joseph: but you have just told me that was not your next step |
| 15:20:07 | <k-joseph> dkayiwa: it was all like this |
| 15:20:24 | <dkayiwa> k-joseph: how many commits does your pull request have? |
| 15:21:27 | <k-joseph> dkayiwa: one, others are the previous |
| 15:22:09 | <dkayiwa> k-joseph: it should have only one, if you did the steps correctly |
| 15:22:10 | <k-joseph> dkayiwa: i have commited each contribution one at a time each has a pull request |
| 15:22:19 | <dkayiwa> k-joseph: no |
| 15:22:33 | <dkayiwa> k-joseph: you should have one commit and one pull request for that ticket |
| 15:23:11 | <dkayiwa> k-joseph: this is a small ticket that does not require several commits or pull requests |
| 15:23:24 | <dkayiwa> k-joseph: commit all your changes once, and then create one pull request |
| 15:23:52 | <k-joseph> dkayiwa: ok then, but again am thinking after the whole process i may again see the previous commits |
| 15:24:10 | <dkayiwa> k-joseph: it cannot happen |
| 15:24:19 | <k-joseph> dkayiwa: ok |
| 15:25:30 | <dkayiwa> k-joseph: this time keep an accurate record of the exact steps you have done |
| 15:25:51 | <k-joseph> dkayiwa: yes please. |
| 15:31:35 | <k-joseph> dkayiwa: cant delete TRUNK-3814 while on it, shouldn't i first checkout master then delete TRUNK-3814 |
| 15:32:39 | *** kishoreyekkanti has quit IRC |
| 15:33:04 | <dkayiwa> k-joseph: do a hard reset on it |
| 15:35:15 | <k-joseph> dkayiwa: finished that, then when i run: git branch -D TRUNK-3814, i get error: Cannot delete the branch 'TRUNK-3814' which you are currently on. |
| 15:35:40 | <dkayiwa> k-joseph: do checkout master first |
| 15:35:47 | <k-joseph> dkayiwa: ok |
| 15:45:26 | *** pusakat has quit IRC |
| 15:55:30 | *** basic has quit IRC |
| 15:58:43 | *** basic has joined #openmrs |
| 15:59:02 | *** abhishekp has quit IRC |
| 16:01:30 | <k-joseph> dkayiwa: see this commit after redoing the steps as directed, https://github.com/k-joseph/openmrs-core/commit/dc7864ee686932958f985b1690499b620a33ada3 |
| 16:01:35 | <OpenMRSBot> <http://ln-s.net/+M1B> (at github.com) |
| 16:01:46 | <dkayiwa> k-joseph: ok |
| 16:02:37 | <dkayiwa> k-joseph: did you note down the exact steps you did? |
| 16:02:49 | <k-joseph> dkayiwa: yes |
| 16:03:30 | <dkayiwa> k-joseph: can you create a pull request and i look at it? |
| 16:03:41 | <k-joseph> dkayiwa: ok |
| 16:05:53 | <k-joseph> dkayiwa: https://github.com/openmrs/openmrs-core/pull/172 |
| 16:05:57 | <OpenMRSBot> <http://ln-s.net/+M1F> (at github.com) |
| 16:06:29 | <dkayiwa> k-joseph: does it have only one commit for you? |
| 16:06:56 | <k-joseph> dkayiwa: all commits |
| 16:07:06 | <dkayiwa> k-joseph: which is not corret |
| 16:07:13 | <dkayiwa> k-joseph: how do you create a pull request? |
| 16:07:53 | <k-joseph> dkayiwa: while on the commit page i click on pull request button |
| 16:08:37 | <dkayiwa> k-joseph: now let me guide you step by step |
| 16:08:48 | <dkayiwa> k-joseph: start by closing that pull request |
| 16:09:14 | <k-joseph> dkayiwa: ofinished |
| 16:09:33 | <dkayiwa> k-joseph: now do a hard reset on all openmrs project in eclipse |
| 16:09:44 | <k-joseph> dkayiwa: ok |
| 16:10:35 | <k-joseph> dkayiwa: finished |
| 16:11:02 | <dkayiwa> k-joseph: now checkout master and paste here the exact command you have used |
| 16:11:42 | <k-joseph> D:\Projects\openMRS\openmrs-core>git checkout master |
| 16:11:42 | <k-joseph> Switched to branch 'master' |
| 16:11:42 | <k-joseph> Your branch is ahead of 'origin/master' by 6 commits. |
| 16:12:12 | <dkayiwa> k-joseph: ok, now delete the branch locally and remotely. remember to paste here the exact commands you have used |
| 16:12:13 | <k-joseph> dkayiwa: git checkout master |
| 16:13:36 | <k-joseph> dkayiwa: git branch -D TRUNK-3814 |
| 16:13:56 | <dkayiwa> k-joseph: aha |
| 16:14:54 | <k-joseph> dkayiwa: git push origin :TRUNK-3814 |
| 16:15:36 | <dkayiwa> k-joseph: now execute this: git pull upstream master |
| 16:16:48 | <k-joseph> dkayiwa: finished |
| 16:17:01 | <dkayiwa> k-joseph: did it get any changes? |
| 16:18:21 | <k-joseph> dkayiwa: out put at: http://pastebin.com/1vSQtvGq |
| 16:19:00 | <dkayiwa> k-joseph: in eclipse, do you still see your new files? |
| 16:19:37 | <k-joseph> dkayiwa: checking after refresh |
| 16:20:01 | <dkayiwa> k-joseph: ok |
| 16:20:57 | <k-joseph> dkayiwa: yes, and having (co) |
| 16:21:17 | <dkayiwa> k-joseph: what is co? |
| 16:21:38 | <k-joseph> dkayiwa: meaning they are still committed |
| 16:22:27 | <dkayiwa> k-joseph: can you create a branch named TRUNK-3814-2 |
| 16:22:38 | <k-joseph> dkayiwa: ok |
| 16:23:18 | <k-joseph> dkayiwa: finished: git branch TRUNK-3814-2 |
| 16:23:28 | <dkayiwa> k-joseph: can you check it out? |
| 16:23:34 | <k-joseph> dkayiwa: ok |
| 16:24:13 | <k-joseph> dkayiwa:done: git checkout TRUNK-3814-2 |
| 16:24:26 | <k-joseph> dkayiwa: finished |
| 16:24:34 | <dkayiwa> k-joseph: do you still see the new files in eclipse? |
| 16:25:18 | <k-joseph> dkayiwa: yes |
| 16:25:28 | <dkayiwa> k-joseph: with same icon? |
| 16:25:36 | <k-joseph> dkayiwa: yes |
| 16:25:58 | <k-joseph> dkayiwa: after refreshing |
| 16:26:21 | <dkayiwa> k-joseph: can you send me a screen shot of your eclipse with the new files displayed in project explorer? |
| 16:30:04 | <k-joseph> dkayiwa: sent it |
| 16:30:23 | <dkayiwa> k-joseph: ok |
| 16:35:58 | *** rafa has joined #openmrs |
| 16:35:58 | *** ChanServ sets mode: +v rafa |
| 16:44:27 | <k-joseph> dkayiwa: |
| 16:44:35 | <dkayiwa> k-joseph: yes on it |
| 16:44:43 | <k-joseph> dkayiwa: ok |
| 16:49:12 | <dkayiwa> hi rafa |
| 16:49:18 | <rafa> dkayiwa: hi |
| 16:49:58 | <dkayiwa> rafa: do you know of a git command which can revert all previous commits in my current checkout of master? |
| 16:50:30 | <rafa> dkayiwa: git reset --hard HEAD~5 will reset 5 last commits |
| 16:50:57 | <rafa> dkayiwa: good enough? |
| 16:51:44 | <dkayiwa> rafa: oh thanks. let me try that now :) |
| 16:51:51 | <rafa> dkayiwa: just to be sure |
| 16:51:59 | <dkayiwa> rafa: ok :) |
| 16:52:00 | <rafa> dkayiwa: you want to completely delete commits from the history |
| 16:52:07 | <dkayiwa> rafa: yes |
| 16:52:12 | <dkayiwa> hi k-joseph |
| 16:52:20 | <rafa> dkayiwa: ok then it's good |
| 16:52:22 | <k-joseph> dkayiwa: hi |
| 16:52:34 | <dkayiwa> k-joseph: do you see my conversation with Rafa? |
| 16:53:05 | <k-joseph> dkayiwa: yes |
| 16:53:13 | <k-joseph> dkayiwa: have been following up |
| 16:53:24 | <dkayiwa> k-joseph: can you do a git hard reset for like 10 commits? :) |
| 16:53:37 | <k-joseph> dkayiwa: ok |
| 16:55:55 | <dkayiwa> k-joseph: after which you will tell me if the new files go away |
| 16:56:21 | <k-joseph> dkayiwa: ok |
| 16:58:17 | *** rafa has quit IRC |
| 17:04:42 | <k-joseph> dkayiwa: run git reset --hard HEAD~10, still the record of TRUNK-3814 is at my github account: https://github.com/openmrs/openmrs-core/pull/163#issuecomment-11712190 |
| 17:04:47 | <OpenMRSBot> <http://ln-s.net/+M25> (at github.com) |
| 17:05:08 | <dkayiwa> k-joseph: does the new files show in eclipse? |
| 17:07:01 | <k-joseph> dkayiwa: no |
| 17:07:16 | <dkayiwa> k-joseph: so they have gone from eclipse? |
| 17:10:22 | <k-joseph> dkayiwa: should now checkout TRUNK-3814-2, and proceed? |
| 17:10:32 | <dkayiwa> k-joseph: yes |
| 17:10:36 | <k-joseph> dkayiwa: ok |
| 17:16:26 | <k-joseph> dkayiwa: you know what? it looks like i had not critically observed well the other time, the two files still exisit in eclipse |
| 17:17:05 | <dkayiwa> k-joseph: ok. checkout master |
| 17:17:20 | <k-joseph> dkayiwa: ok |
| 17:17:24 | <dkayiwa> k-joseph: then do another hard reset for 10 more commits and tell me if they still exist |
| 17:17:42 | <k-joseph> dkayiwa: ok |
| 17:19:58 | <k-joseph> dkayiwa: fine now, they have been deleted from eclpise |
| 17:24:01 | *** kishoreyekkanti has joined #openmrs |
| 17:29:06 | <k-joseph> dkayiwa: when i checkout master, the files are no where in eclipse, and then when i checkout TRUNK-3814-2, they are there, |
| 17:29:14 | <k-joseph> dkayiwa: but when i run git checkout TRUNK-3814-2 i get this first, http://pastebin.com/uLTcgLua i entered n |
| 17:30:15 | <dkayiwa> k-joseph: looking |
| 17:30:28 | <k-joseph> dkayiwa: ok |
| 17:30:41 | <dkayiwa> k-joseph: so the files are gone when you checkout master? |
| 17:30:56 | <k-joseph> dkayiwa: yes |
| 17:31:34 | <k-joseph> dkayiwa: but on TRUNK-3814-2, they again appear iin eclipse |
| 17:31:42 | <dkayiwa> k-joseph: delete the TRUNK-3814-2 branch |
| 17:31:49 | <k-joseph> dkayiwa: ok |
| 17:32:02 | <dkayiwa> k-joseph: and then create another branch named TRUNK-3814-3 |
| 17:32:21 | <dkayiwa> k-joseph: check it out and see if they still appear |
| 17:32:34 | <k-joseph> dkayiwa: ok |
| 17:36:40 | <k-joseph> dkayiwa: now not present in eclipse |
| 17:38:47 | <dkayiwa> k-joseph: ok good |
| 17:39:06 | <dkayiwa> k-joseph: now add your changes and make one commit and one pull request |
| 17:39:19 | <k-joseph> dkayiwa: fine |
| 17:59:09 | *** robbyoconnor has quit IRC |
| 17:59:40 | *** robbyoconnor has joined #openmrs |
| 17:59:40 | *** ChanServ sets mode: +v robbyoconnor |
| 18:01:46 | <k-joseph> dkayiwa: commit at: https://github.com/k-joseph/openmrs-core/commit/2568db7b2ac1464a7ed70441c9e3fdc4d7236e77 |
| 18:01:51 | <OpenMRSBot> <http://ln-s.net/+M2x> (at github.com) |
| 18:02:04 | <dkayiwa> k-joseph: ok checking |
| 18:03:28 | <dkayiwa> k-joseph: and pull request? |
| 18:03:53 | <k-joseph> dkayiwa: https://github.com/openmrs/openmrs-core/pull/173 |
| 18:03:57 | <OpenMRSBot> <http://ln-s.net/+M2y> (at github.com) |
| 18:04:57 | <dkayiwa> k-joseph: ok it has exactly one commit as i wanted |
| 18:08:40 | <k-joseph> dkayiwa: can i then switch to another ticket? waiting for your advise |
| 18:08:59 | <dkayiwa> k-joseph: correct |
| 18:09:35 | <k-joseph> dkayiwa: ok, how is TRUNK-3255 |
| 18:09:40 | <dkayiwa> k-joseph: do not forget to git checkout master before git branch to the new ticket number :) |
| 18:09:50 | <dkayiwa> !ticket TRUNK-3255 |
| 18:09:52 | <OpenMRSBot> dkayiwa: [#TRUNK-3255] Add a junit test for patientIdentifierType restrictions in PatientSearchCriteria.addIdentifierCriterias - OpenMRS JIRA - https://tickets.openmrs.org/browse/TRUNK-3255 |
| 18:10:56 | <dkayiwa> k-joseph: ok |
| 18:20:50 | <dkayiwa> hi k |
| 18:20:55 | <dkayiwa> hi k-joseph |
| 18:21:02 | <k-joseph> dkayiwa: hi |
| 18:23:45 | <dkayiwa> k-joseph: do you think you understand that ticket? |
| 18:25:08 | <k-joseph> dkayiwa: am thinking of appling junit to test, but am used to seeing junit applied for a whole class!!! |
| 18:28:01 | <dkayiwa> k-joseph: is rejectIfDuplicateMetadataName supposed to be check of one is trying to add a name that already exists in the database? |
| 18:29:38 | <k-joseph> dkayiwa: wait, replying.... |
| 18:29:48 | <dkayiwa> k-joseph: ok |
| 18:34:21 | <dkayiwa> k-joseph: are you replying on IRC? |
| 18:35:18 | <k-joseph> dkayiwa: yes, can you please repeat the question, it is not clear to me! |
| 18:35:43 | <dkayiwa> k-joseph: let me first go for another one |
| 18:36:03 | <dkayiwa> k-joseph: have you done all the validation mentioned on the ticket? |
| 18:36:11 | <dkayiwa> k-joseph: TRUNK-3814 |
| 18:36:45 | <k-joseph> dkayiwa: did one for aIsToB |
| 18:37:29 | <dkayiwa> k-joseph: what do you understand by this? It should have basic validation added (aIsToB and bIsToA need to be set). |
| 18:38:45 | <k-joseph> dkayiwa: that was in fact my major challange but |
| 18:38:55 | <k-joseph> dkayiwa: i understand it |
| 18:39:16 | <dkayiwa> k-joseph: can you answer my exact question? |
| 18:39:28 | <dkayiwa> k-joseph: i did not ask whether you understand or not |
| 18:40:38 | <k-joseph> dkayiwa: as: aIsToB and bIsToA, should be given a value |
| 18:41:02 | <dkayiwa> k-joseph: thats exactly the answer i wanted |
| 18:41:11 | <dkayiwa> k-joseph: so did you add validation for that? |
| 18:41:40 | <k-joseph> dkayiwa: yes |
| 18:41:58 | <dkayiwa> k-joseph: which line? (in the commit you last made) |
| 18:42:43 | <k-joseph> dkayiwa: checking |
| 18:44:36 | <k-joseph> dkayiwa: line 111 and 112 |
| 18:45:25 | <dkayiwa> k-joseph: paste those two lines here |
| 18:45:50 | <k-joseph> type.setaIsToB("test"); |
| 18:45:50 | <k-joseph> type.setbIsToA("retired"); |
| 18:46:08 | <dkayiwa> k-joseph: what do those two lines do? |
| 18:47:22 | <k-joseph> dkayiwa: set the the initial value of the two String variables |
| 18:49:03 | <dkayiwa> k-joseph: what happens when those values are not set? |
| 18:50:46 | <k-joseph> dkayiwa: not sure yet |
| 18:51:41 | <dkayiwa> k-joseph: what do you think the ticket requires you to do concerning those values in the validator? (RelationshipTypeValidator) |
| 18:53:13 | <k-joseph> dkayiwa: is it to validate them! |
| 18:53:49 | <dkayiwa> k-joseph: what exactly do you understand by it should validate them? |
| 18:54:35 | <k-joseph> dkayiwa: to confirm the values |
| 18:54:51 | <dkayiwa> k-joseph: what do you mean by confirm the values? |
| 18:56:46 | <k-joseph> dkayiwa: prove the values of aIsToB and bIsToA |
| 18:57:03 | <dkayiwa> k-joseph: what do you mean by prove the values? |
| 18:57:30 | <dkayiwa> k-joseph: do you mean something like prove the values are equal to "Joseph" or what? |
| 18:58:00 | <k-joseph> dkayiwa: yes, |
| 18:58:21 | <dkayiwa> k-joseph: so the value for those variables should be equal to "Joseph"? |
| 18:58:49 | <k-joseph> dkayiwa: no |
| 18:58:57 | <dkayiwa> k-joseph: but you said yes |
| 18:59:53 | <k-joseph> dkayiwa: i thougth you used "joseph" to represent a String |
| 19:00:08 | *** rafa has joined #openmrs |
| 19:00:08 | *** ChanServ sets mode: +v rafa |
| 19:00:16 | <dkayiwa> k-joseph: am trying to understand what you mean by prove the value? |
| 19:00:57 | <dkayiwa> k-joseph: what do you understand by? aIsToB and bIsToA need to be set |
| 19:46:25 | <k-joseph> dkayiwa: hi |
| 20:03:42 | <rafa> dkayiwa: wyclif: hey guys! |
| 20:03:56 | <rafa> how about we scrum? |
| 20:04:52 | <wyclif> hi |
| 20:06:14 | <rafa> wyclif: are you working today? |
| 20:07:03 | <wyclif> Thursday: |
| 20:07:04 | <wyclif> emails |
| 20:07:04 | <wyclif> reviewing and applying pull requests |
| 20:07:04 | <wyclif> pick a sprint ticket |
| 20:07:30 | <rafa> !scrumon rafa |
| 20:07:30 | * 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 rafa- you may begin when ready. |
| 20:07:43 | <rafa> wyclif: can you paste again? :) |
| 20:07:49 | <wyclif> Thursday: |
| 20:07:49 | <wyclif> emails |
| 20:07:49 | <wyclif> reviewing and applying pull requests |
| 20:07:49 | <wyclif> pick a sprint ticket |
| 20:08:12 | <wyclif> i.e community dev swimlane ticket |
| 20:08:33 | <rafa> wyclif: sounds good, anything blocking? |
| 20:08:40 | <wyclif> nope |
| 20:08:58 | <rafa> dkayiwa: seems to be afk |
| 20:09:06 | <rafa> so I'll go |
| 20:09:10 | <rafa> Monday: |
| 20:09:10 | <rafa> * Committed TRUNK-3853: Failing 20110825-1000-creating-providers-for-persons-from-encounter |
| 20:09:10 | <rafa> https://tickets.openmrs.org/browse/TRUNK-3853 |
| 20:09:10 | <rafa> * Completed RC-3: Add service method to search for similar persons and patients |
| 20:09:10 | <rafa> https://tickets.openmrs.org/browse/RC-3 |
| 20:09:11 | <rafa> No blockers. |
| 20:09:11 | <rafa> Tuesday & Wednesday: holidays |
| 20:09:12 | <rafa> Today: |
| 20:09:12 | <rafa> * Committed: |
| 20:09:13 | <rafa> + META-300: Dependencies not resolved in correct order for Facility Data module |
| 20:09:13 | <rafa> https://tickets.openmrs.org/browse/META-300 |
| 20:09:14 | <rafa> + META-302: Metadata mapping error with adding coded answer |
| 20:09:14 | <rafa> https://tickets.openmrs.org/browse/META-302 |
| 20:09:15 | <rafa> * Released MDS 1.1.2 |
| 20:09:15 | <rafa> * Started with RESTWS-310: RESTWS needs to keep an explicit registry of resources, which should be conditionally populated based on the OpenMRS version |
| 20:09:16 | <rafa> https://tickets.openmrs.org/browse/RESTWS-310 |
| 20:09:16 | <rafa> No blockers. |
| 20:10:00 | <rafa> I guess we're done then... ;) |
| 20:10:09 | <rafa> !scrumoff |
| 20:10:09 | * 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. |
| 20:10:28 | <rafa> wyclif: have a nice day! |
| 20:10:37 | <rafa> I'm signing off for today... |
| 20:11:53 | <wyclif> rafa, same to you |
| 20:12:03 | <wyclif> rafa, well then goodnight |
| 20:12:03 | <rafa> wyclif: btw if you're still using Eclipse I recommend you http://marketplace.eclipse.org/content/instasearch |
| 20:12:08 | <OpenMRSBot> <http://ln-s.net/+M5+> (at marketplace.eclipse.org) |
| 20:12:10 | <rafa> wyclif: very cool plugin! |
| 20:12:25 | <wyclif> rafa, cool thanks! |
| 20:12:40 | <rafa> cya! |
| 20:12:54 | *** rafa has quit IRC |
| 20:21:51 | *** kishoreyekkanti has quit IRC |
| 20:39:05 | *** djazayeri has joined #openmrs |
| 20:39:05 | *** ChanServ sets mode: +o djazayeri |
| 21:39:38 | *** dkayiwa has quit IRC |
| 22:03:44 | *** yony258 has joined #openmrs |
| 23:11:24 | *** upul` has joined #openmrs |
| 23:11:24 | *** ChanServ sets mode: +v upul` |
| 23:27:00 | *** k-joseph has quit IRC |