search

MSFREACH / msf-reach

Web platform for MSF-REACH
https://msf-reach.org/
4 stars 5 forks source link

Issues/543 #547

Closed qclin closed 6 years ago

qclin commented 6 years ago

fixes #543

inline editing for general information

rendering Region as tags, to be added & remove

matthewberryman commented 6 years ago

I'm just getting onto this now that the weekend is over, which unfortunately has led to massive complication in trying to merge this: because @mehrdadgit's work on https://github.com/MSFREACH/msf-reach/issues/524 involved touching some of the same code around in-line editing, plus I've done some work on notifications too, separate to editing of general metadata by @qclin there were a large amount of merge conflicts. I've tried to resolve most in https://github.com/MSFREACH/msf-reach/pull/547/commits/c9a016db2b9fa417065d3fd87325bd5c3d2df8c6 although:

  1. There were two different ways of doing the in-line editing buttons. I've tried to align these as best I can in https://github.com/MSFREACH/msf-reach/pull/547/commits/c9a016db2b9fa417065d3fd87325bd5c3d2df8c6#r205988087
  2. There are a lot of vue method functions done quite differently in https://github.com/MSFREACH/msf-reach/blob/issues/543/public/resources/js/events.js plus some added functionality in both sections (some changes around types and map code from @qclin in HEAD, some notification changes from myself and @mehrdadgit in dev plus some editing function differences) and I have not merged these. Conflict marker starts https://github.com/MSFREACH/msf-reach/blob/c9a016db2b9fa417065d3fd87325bd5c3d2df8c6/public/resources/js/events.js#L1496 and ends https://github.com/MSFREACH/msf-reach/blob/c9a016db2b9fa417065d3fd87325bd5c3d2df8c6/public/resources/js/events.js#L1902

Can you both please work on resolving that section and reviewing & UA testing the sections I have merged.

qclin commented 6 years ago

@matthewberryman hey i see the merge conflict is only with editEvent function which can be resolve by removing https://github.com/MSFREACH/msf-reach/blob/c9a016db2b9fa417065d3fd87325bd5c3d2df8c6/public/resources/js/events.js#L1497-L1501

as I'm merging the Maps functionality from Edit.html, it would be best to factor out as a separate js file to be call by both events/index.html & events/edit.html since the transition from modal to inline editing is creating some duplicate code.

mehrdadgit commented 6 years ago

Hi @matthewberryman @qclin The event page is not working when I checked the branch out: image

UPDATE: The conflict is resolved now; but we still have these errors: image

matthewberryman commented 6 years ago

Thanks - @qclin I'll leave it to you to merge events.js; can you please also test and then let me know when this PR is ready to go.

qclin commented 6 years ago

Hey sorry, I will keep in mind to merge dev next time before PR

anyway conflict is resolve via https://github.com/MSFREACH/msf-reach/commit/f9a375deafd3184c277463d7a6d64360971afa63