search

HTBox / crisischeckin

Crisischeckin Humanitarian Toolbox repository
Apache License 2.0
173 stars 157 forks source link

(WIP) Request page in the Mobile App displays data from server. #681

Closed quietjoy closed 8 years ago

quietjoy commented 8 years ago

Expanded the API to return requests assigned to a user when the Requests page in the mobile application is displayed. A basic Master-Detail displays the requests. Assigned requests can be completed from the mobile app.

This PR does not give the functionality to assign requests from the mobile app. That is currently only possible in the web app. This PR does not display all requests, just the assigned ones.

@BillWagner - I need some Git help. I'm not positive, but I think what happened was that while waiting for my last PR to be accepted, I went ahead and branched locally because I wanted to use my changes that were in a pending PR. I think everything up to commit 68469c5 was included my last PR. Would rebasing be the solution?

BillWagner commented 8 years ago

@andrewhart098 Yes, rebasing this would be the easiest solution.

If you need help rebasing, let me know. And, let me know what git client you use. Different ones use different names for the upstream repos.

quietjoy commented 8 years ago

Thanks @BillWagner. I use the Git Bash client for windows.

I used the following commands: git fetch upstream git rebase -i upstream/master

Are you familiar with the '-i' option? This option pulled up a vim file where each line was a commit and there where several commands I could use. I simply deleted all the commits that were already in the master branch of upstream. The result was a branch with just the commits I wanted. In other words, everything up to commit 68469c5 was removed from the branch I was working on. I pushed to my remote and everything looks alright.

BillWagner commented 8 years ago

That looks right to me.

I'll review and then hopefully merge.