Merging ID Dashboard GCI 2014 contributions

Have the contributions from GCI been difficult to merge well? Is the state of the GCI contributions slowing down @plypy’s work for GSoC? I’m sure @r0bby has a better idea than I do of what will work best here, but it might be a good idea to try to:

  1. take the current production version of OpenMRS ID
  2. apply the winning GCI contributions one by one (with someone making design + integration tweaks as they go along)
  3. have @plypy work off of the current production version, not the GCI submissions
  4. once GCI is completely sorted out, then merge all at once onto master

In essence we’d be treating GCI like a feature branch of the dashboard.

If you think it’d be helpful, I can start working on this myself. Is there some complexity to the state of the OpenMRS ID repo that I am missing?

huhhh… Actually I don’t know how hard it will be, and how far it has gone so far, as I haven’t touched these yet. Mostly I have done is related with backend function & performance stuff.

AFAIK, GCI contributions seem to focus on frontend, and they shouldn’t contradict against my works I think.

@elliott, I respectfully disagree with your approach, we’d make more of a mess this way.

I’ve done all of the merging thus far except for the sign up page – all contributions and the current version we have deployed suffered some bad reflow bugs that I couldn’t tolerate.

What @plypy needs to do is the following:

  • Update the sign up page to the new wireframes which you and @hannah came up with…I kinda like the old one but the reflow bugs need to be fixed.
  • Update the validation code to use bootstrap – I kinda like theirs better.
  • REMOVE the old css – I don’t even understand the point of some of that – it’s not an attack on anyone, just we shouldn’t use it and instead use bootstrap where ever it is feasible. That said, custom css isn’t forbidden, just prefer it be used conservatively.

If he doesn’t do it – it falls onto one of us (which isn’t a problem)

For GCI 2015:

  • We need to make a feature branch and have all students do pull requests against that branch and close any pull requests against master; I believe this approach will get rid of the mess I created…

All this said: it’s not that unstable – it still works…There’s some loose ends that need to be tied up. @elliott and @plypy can both view the list i created on the wiki – not linking it here, though by now students know which ones were chosen and which ones were not

I don’t really know what the reflow bug is, can you kindly elaborate more on this.

And I think we can first put this off a little. After we had embraced keystone, I want to do this along with transforming ejs to less, which could make things tighter.

How do you think?

1 Like

@r0bby Sounds good to me. You know way more about merging the GCI work than I do so I trust that. Just let me know if I can help in some way. Is master up to date with what’s current?

1 Like

master has a few issues but overall it’s stable – it has a few issues I just want fixed before we release…we haven’t updated the sign up page – we should just fix the reflow issues…and improve the validation logic.

@plypy – go look at the sign up page and resize your browser – you’ll what I mean…make your browser window width small.

The reflow is not a high priority unless something has changed and it actually prevents someone from signing in on mobile devices.

That said, it’s nice to have, but given our actual usage let’s not let it get in the way of doing other things.

There was no change on the signup page and the reflow prevents me from seeing the first and last name fields…it’s a small fix – I don’t mind the sign up page design itself…it’s the inf

Here is what I see, that hint should be with username not overlaying the name fields…

That’s a bit annoying. I assume it goes away after tapping out of that field, right?

The log in page is higher priority on mobile between log in and sign up … since people might want to sign in for Talk access.

It does go away but it basically jumps to the next field…it’s really annoying – it needs to be fixed. Sign in page works (or at least should – I checked for reflow bugs when reviewing the GCI contributions).

For reference, I checked on Samsung Galaxy S5; my Nexus 7 is out of commission, I have other stuff that’s taking priority – otherwise I’d fix that and check on there as well

1 Like