Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GSoC 2018 : Setup Improvements #1135

Closed
wants to merge 71 commits into from
Closed

GSoC 2018 : Setup Improvements #1135

wants to merge 71 commits into from

Conversation

muarachmann
Copy link
Member

@tmccormi , @pri2si17-1997 here my structure more commits coming soon

@muarachmann
Copy link
Member Author

For testing , go to this url http://localhost/LibreEHR/modules/setup/ at the end we shall point our index.php to that location

@muarachmann muarachmann changed the title Setup Improvements GSoc 2018 : Setup Improvements May 21, 2018
@muarachmann muarachmann changed the title GSoc 2018 : Setup Improvements GSoC 2018 : Setup Improvements May 21, 2018
@muarachmann
Copy link
Member Author

@aethelwulffe can i know the reasons for multiple sites installation cant get that clearly

@muarachmann
Copy link
Member Author

talking about sites/default , sites/default2 etc

@aethelwulffe
Copy link
Contributor

There are lots of use cases like testing, training, demo and other things, but let's use the most obvious one, which is a vendor that is hosting EHR installations for multiple clinics:
The have the following directories under /sites:

  • default/
  • ourcompanydemo/
  • customerclinic1/
  • customerclinic2/
  • customerclinic3/

While all the rest of the code is common, and can be considered read-only, there are things that are writable. First is each site's database. That is handled by the config file in each site directory. Also in each directory are subdirs containing uploaded documents, generated files for billing and the like, and any templates that are customized.

This means that the administrator can update the code (and the /default site directory) without ever touching the actual configured site of each clinic. I will soon get a secure version of the site administration screen (a PR is started) back into the project that will give a GUI for managing sites, currently to run upgrades via GUI, you must go to the site URL, then replace the location to point to sql_upgrade.php to run the upgrade script for that site's database.

Setup for a new site can be done by copying a base default database, and copying the default site directory (changing the sql config), OR by just adding a new site via the setup.

@aethelwulffe
Copy link
Contributor

This now has 70 commits. :) Did you push everything back to this PR? Wassa-goin-on? 👀

@muarachmann
Copy link
Member Author

@aethelwulffe having a hard time making a cleaner branch i still end up with naveens commits. Help would be appreciated

@muarachmann
Copy link
Member Author

As of now i just deleted his updater folder and pushed it back to this branch let me show you what i get when i do a git status

@muarachmann
Copy link
Member Author

screenshot from 2018-06-25 16-59-55

Its just too much i recloned my fork and each time i add the remote upstream to feed my local repo with the latest code and do a git status, it acts like everything is new to git. i have worked on izi and my gsoc project for now i have another folder where i have been testing but fear of commiting

@aethelwulffe
Copy link
Contributor

Make copy of your code in a directory.

Rebase your master to this repo.
Create a new branch.
Drop your code onto the new branch.
Publish the branch.
Make new PR to new branch.
Snuff this branch.
Kill this PR.

@aethelwulffe
Copy link
Contributor

Don't have a fear of Commitment! 😝
Just publish up a clean branch and PR!
Start by publishing the branch and making a minimal change commit if you like.

@muarachmann
Copy link
Member Author

when you say make a copy of your code what do you mean please the entire codebase or my local changes made

@muarachmann
Copy link
Member Author

I made a new branch but when it came up it still had naveens commits reason why i couldn't make a PR

@aethelwulffe
Copy link
Contributor

Checkout this branch.
Copy the code to another directory. I suggest using a nice drag-and-drop GUI. Don't include the .git files.
Do the same for each of your branches if you like.
Kill your local repo and recreate, or create a second one.
-Maybe then you can rebuild your branches by first diffing the files in your branch copies to a totally clean master.

The changes/untracked files I am seeing above seem to originate with PHP storm (".idea") and one of Terry's recent commits.

@muarachmann
Copy link
Member Author

okay will ping you

@aethelwulffe
Copy link
Contributor

-And don't worry. If you can't figure this out, we can still get this branch to work for us.

@aethelwulffe
Copy link
Contributor

GIT can bee frustrating as heck sometimes.

@aethelwulffe
Copy link
Contributor

ping me how?

@muarachmann
Copy link
Member Author

muarachmann commented Jun 26, 2018

screenshot from 2018-06-26 08-06-42

Kindna found a cool tool @aethelwulffe making use of this to get things clean

@muarachmann muarachmann deleted the setupImprovement branch June 26, 2018 08:23
@aethelwulffe
Copy link
Contributor

Try the github Desktop tool.
GitKraken is pretty good too.

@muarachmann
Copy link
Member Author

@aethelwulffe why is it that when i reclone my repo it tells me 14files modifies 192 added what does it mean

@aethelwulffe
Copy link
Contributor

Look at this:
https://github.com/muarachmann/LibreEHR
You have committed changes to your master repo. That is why.
When you branch off of that, it includes all of those.
Rebase your master.
Do:
git fetch upstream
git reset --hard upstream/master
git push -f

@muarachmann
Copy link
Member Author

oooof thanks now i get branch is even with LibreHealthIO:master.

@muarachmann muarachmann restored the setupImprovement branch June 26, 2018 10:43
@muarachmann muarachmann deleted the setupImprovement branch June 26, 2018 11:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants