Skip to content

Commit

Permalink
Changed old references to github.com/Third-Culture-Software
Browse files Browse the repository at this point in the history
  • Loading branch information
jmcameron authored and jniles committed Nov 22, 2024
1 parent af7bf80 commit ba80150
Show file tree
Hide file tree
Showing 17 changed files with 747 additions and 749 deletions.
12 changes: 5 additions & 7 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Contributor's Guide
=======================

- Project page: https://github.com/IMA-WorldHealth/bhima-2.x
- Project page: https://github.com/Third-Culture-Software/bhima
- Email us: developers@imaworldhealth.org

Thank you for your interest! This document aims to provide a step by step guide for making your first contribution to the bhima codebase. If you have any questions, feel free to email the team.
Expand All @@ -14,7 +14,7 @@ For an in-depth installation guide (including trouble-shooting tips), please ref
2. Install the development dependencies: `npm install && bower install`
3. Build the client and server `npm run build`
4. Startup the server `npm run app`.

For troubleshooting, please see [the installation guide](./docs/INSTALL.md).

#### Step 2: Setting up GitHub
Expand Down Expand Up @@ -42,7 +42,7 @@ Other Forms of Contribution
#### Translation

Bhima is an international piece of software. Our development team operates in both French and English, but would love to round out our supported languages! If you would like to get involved in translation work, you can either translate documentation
(see the [user manual](https://github.com/IMA-WorldHealth/bhima/tree/development/docs/BHIMA%20User%20Guide)) or the application itself.
(see the [user manual](https://github.com/Third-Culture-Software/bhima/tree/development/docs/BHIMA%20User%20Guide)) or the application itself.

We use [angular-translate](https://github.com/angular-translate/angular-translate) for all client-side translation. The files are located in `client/src/i18n/{locale}.json`. Feel free to translate the key-value pairs and store it in your own langage.

Expand All @@ -59,12 +59,10 @@ Some helpful tips for code organization:
- `fix-posting-journal-bug-1193` fixes bug #1193 in the posting ouranl
- `docs-budget-documentation` adds in documentation for the budgeting module

2. Include `fix {#}`, `fixes {#}` in your git commits to link issues. Link issues to pull requests to track progress.
Examples can be seen [here](https://github.com/jmcameron/bhima/commit/c5441fdf0246ca3b3efa63786064751974971777) and
[here](https://github.com/IMA-WorldHealth/bhima/issues/306)).
2. Include `fix {#}`, `fixes {#}` in your git commits (where # is a link to an issue). This links issues to pull requests to track progress.

3. If you plan to tackle an issue, please comment on the issue indicating you will begin working on it. This will prevent
our team from doubling up effort on code you are working on. Also, there are no hard feelings if you try and fail, or begin
and discover that it is grounded in a design decision that cannot be changed immediately. Give it your best shot!

4. Check out the [wiki](https://github.com/IMA-WorldHealth/bhima-2.X/wiki). We have more tutorials on how to contribute there! It is kept more up to date than this guide is.
4. Check out the [wiki](https://github.com/Third-Culture-Software/bhima/wiki). We have more tutorials on how to contribute there! It is kept more up to date than this guide is.
1,416 changes: 708 additions & 708 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Releases are partially automated in BHIMA. This document is a checklist of thin

The directions below assume you are working in a development environment based on a fork of the main BHIMA repository on github.

1. Checkout Bhima 'master' from your fork of https://github.com/IMA-WorldHealth/bhima
1. Checkout Bhima 'master' from your fork of https://github.com/Third-Culture-Software/bhima
2. Do `git pull` to make sure it is up-to-date.
3. Create a new branch called `release-next` (for example) that is based on the upstream repo to do your release with. If one exists on upstream, remove it first. For example, if the main BHIMA githup repo is called `upstream` in your local development setup, do:
- `git checkout -b release-next upstream/master`
Expand Down
2 changes: 1 addition & 1 deletion UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ These steps describe the typical deployment setup. We assume that the BHIMA sof

## Step 1: Peparing the BHIMA software

1. Go to https://github.com/ima-worldhealth/bhima/releases/latest in your web browser.
1. Go to https://github.com/Third-Culture-Software/bhima/releases/latest in your web browser.
2. Copy the link to the `$VERSION.tar.gz` file.
2. Connect to the server with SSH.
3. Start a `screen` session in case the connection drops during the upgrade.
Expand Down
8 changes: 4 additions & 4 deletions docs/en/finance/core-concepts/debtor-groups.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Because debtor groups are principally a financial concept, BHIMA requires certai
2. **Locked** - locks the group to prevent patient assignment and further invoicing of group members.
3. **Account** - the account used in transactions involving a member of the debtor group.
4. **Price List** - a price list to apply to the debtor group.
5. **Max Credit** - prevents members of the debtor group from being invoiced if the debt of the group goes beyond this limit. _Not implemented yet_ ([#5068](https://github.com/IMA-WorldHealth/bhima/issues/5068)).
5. **Max Credit** - prevents members of the debtor group from being invoiced if the debt of the group goes beyond this limit. _Not implemented yet_ ([#5068](https://github.com/Third-Culture-Software/bhima/issues/5068)).

Optional information includes:

Expand All @@ -24,17 +24,17 @@ Optional information includes:
4. **Location** - a series of selects to specify where the group is located.
5. **Color** - a color to associate with the group for easy recognition. This shows up on the patient dropdown to indicate to which group they belong.

## Conventions and Health Maintenance Organisations
## Conventions and Health Maintenance Organisations

A "convention" is a collective of individuals who are under contract with the medical institution to pay for care of individual members. It is analogous to a health management organisation (HMO). Instead of invoicing individual members of the group, the institution will invoice the group for medical care provided to any member of the group.

In BHIMA, conventions are non-cash clients. This means BHIMA will _block payments at the cash window_ for patients that are in a convention, to prevent double-payment. Instead, conventions are expected to pay periodically in bulk for their members using [journal vouchers](../bookkeeping/vouchers.md). Using journal vouchers allows much finer-grained control over payments made by the organisation.
In BHIMA, conventions are non-cash clients. This means BHIMA will _block payments at the cash window_ for patients that are in a convention, to prevent double-payment. Instead, conventions are expected to pay periodically in bulk for their members using [journal vouchers](../bookkeeping/vouchers.md). Using journal vouchers allows much finer-grained control over payments made by the organisation.

## Group Policies

Hospitals often charge patients associated with organizations or health maintenance organisations (HMOs) full price to subsidize care for patients who cannot afford to pay. Conversely, some debtor groups may have agreements with the hospital to waive administrative fees.

To manage these scenarios, BHIMA provides administrators with a "group policies" feature. This feature allows administrators to configure exemptions for specific groups, overriding standard rules for subsidies, discounts, or administrative fees that would otherwise apply to individual group members.
To manage these scenarios, BHIMA provides administrators with a "group policies" feature. This feature allows administrators to configure exemptions for specific groups, overriding standard rules for subsidies, discounts, or administrative fees that would otherwise apply to individual group members.

## Subscriptions

Expand Down
4 changes: 2 additions & 2 deletions docs/en/for-developers/barcodes.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ Similar to the human readable references, the barcodes generated by the system h
${type}${first 8 chars of UUID}
```

For example, a barcode might be `IVBBA182AF` which denotes the _invoice_ with the first 8 characters of the uuid as **BBA182AF**. The code is found in [server/lib/barcode.js](https://github.com/IMA-WorldHealth/bhima/blob/master/server/lib/barcode.js).
For example, a barcode might be `IVBBA182AF` which denotes the _invoice_ with the first 8 characters of the uuid as **BBA182AF**. The code is found in [server/lib/barcode.js](https://github.com/Third-Culture-Software/bhima/blob/master/server/lib/barcode.js).


Why use 8 characters? Because barcodes are wide and we needed a format to fit on an 80mm thermal receipt while still being readable. Despite their obfuscation, barcodes are an alphabet, read left to right. More characters create a longer barcode "word". Interestingly, QR codes do not have this problem - instead they increase the complexity of the QR code pattern. But QR code readers are expensive whilst barcode readers are cheap.

## How barcodes are read in BHIMA

A barcode reader behaves like a keyboard. BHIMA uses a barcode reading component (found in [client/src/modules/templates/bhBarcodeScanner.html](https://github.com/IMA-WorldHealth/bhima/blob/master/client/src/modules/templates/bhBarcodeScanner.html)) to do all the work of reading the barcode. The barcode reader will return the `uuid` of the record scanned. It is up to the module's controller to determine what needs to happen next (render a receipt, attach to an object, load the record from the database, etc).
A barcode reader behaves like a keyboard. BHIMA uses a barcode reading component (found in [client/src/modules/templates/bhBarcodeScanner.html](https://github.com/Third-Culture-Software/bhima/blob/master/client/src/modules/templates/bhBarcodeScanner.html)) to do all the work of reading the barcode. The barcode reader will return the `uuid` of the record scanned. It is up to the module's controller to determine what needs to happen next (render a receipt, attach to an object, load the record from the database, etc).

Because a barcode reader behaves like a keyboard, you don't need a barcode reader to fake a barcode read. Simply copying a string, opening the barcode reading component and pasting (C-V) will trigger the read with the content that you pasted. This is quite useful during development when barcode readers are not handy.
8 changes: 4 additions & 4 deletions docs/en/for-developers/installing-bhima.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ chromedriver --version

### Getting the source

Clone the source using git from the [github repository](https://github.com/IMA-WorldHealth/bhima) using the following commands:
Clone the source using git from the [github repository](https://github.com/Third-Culture-Software/bhima) using the following commands:

```bash
git clone https://github.com/IMA-WorldHealth/bhima.git bhima
git clone https://github.com/Third-Culture-Software/bhima.git bhima
cd bhima
```

Expand All @@ -95,7 +95,7 @@ To execute the build scripts, you can use either `yarn` or `npm`. We'll use `np
# Inside the bhima/ directory
# install all node modules
npm run install
npm install
#If this command gives you an error (I.E. if you’re running Parallels), try running the following command:
git config -global url."https://".insteadOf git://
Expand Down Expand Up @@ -218,7 +218,7 @@ Navigate to [http://localhost:8080](http://localhost:8080) in the browser to ver
### Testing the Application
Our tests are broken into unit tests, end to end tests, and integration tests. There is more information on testing in the [wiki](https://github.com/IMA-WorldHealth/bhima/wiki).
Our tests are broken into unit tests, end to end tests, and integration tests. There is more information on testing in the [wiki](https://github.com/Third-Culture-Software/bhima/wiki).
1. **Integration Tests** - These test the server + database integration and generally our APIs. All reachable API endpoints should generally have an integration test associated with them. To run them, type `npm run test:integration`.
2. **Server Unit Tests** - Server libraries are unit tested with mocha and chai, similar to the integration tests. To run them, type
Expand Down
4 changes: 2 additions & 2 deletions docs/en/for-developers/upgrading-bhima.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This page provides notes on how upgrades to BHIMA work. Note that these steps a

## BHIMA Versions

BHIMA uses git tags to tag changes on the master branch and [Github Releases](https://help.github.com/en/github/administering-a-repository/managing-releases-in-a-repository) to cut releases. The latest version is always the latest tag/release on git and Github respectively. The [latest release](https://github.com/IMA-WorldHealth/bhima/releases/latest) is always available from the link `https://github.com/IMA-WorldHealth/bhima/releases/latest`.
BHIMA uses git tags to tag changes on the master branch and [Github Releases](https://help.github.com/en/github/administering-a-repository/managing-releases-in-a-repository) to cut releases. The latest version is always the latest tag/release on git and Github respectively. The [latest release](https://github.com/Third-Culture-Software/bhima/releases/latest) is always available from the link `https://github.com/Third-Culture-Software/bhima/releases/latest`.

While git effectively manages changes with code, some changes require changes to underlying production data - for example, adding a column to a database table, reassigning foreign keys, etc. These changes are kept in the `server/models/migrations/` directory in the BHIMA repository. Within this directory are a series of folders, named in the form `v.old.release-v.new.release`. They contain a single SQL file (generally called `migrate.sql`) that is needed to upgrade from `v.old.release` to `v.new.release`. For example, the file `v1.12.1-v1.13.0/migrate.sql` would migrate the database from version `1.12.1` to version `1.13.0`.

Expand All @@ -18,7 +18,7 @@ When upgrading from an old version to a new version, it is important to run all

Changes to stored procedures, triggers, and functions are **not** tracked in migration scripts. This is because they are due to frequent change and are already stored in the `server/models` directory. Therefore, it is sufficient to simply rebuild them from source.

To help with this operation, BHIMA provides a [migration helper script](https://github.com/IMA-WorldHealth/bhima/blob/master/sh/setup-migration-script.sh) that can be invoked with `npm run migrate`. This script does several things:
To help with this operation, BHIMA provides a [migration helper script](https://github.com/Third-Culture-Software/bhima/blob/master/sh/setup-migration-script.sh) that can be invoked with `npm run migrate`. This script does several things:

1. Drops all the triggers
2. Drops all routines
Expand Down
6 changes: 3 additions & 3 deletions docs/en/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ If you are a hospital administrator please provide feedback on how the system is

### Developers

If you are a developer, we appreciate code contributions - a good place to start is our [First Time Contributor](https://github.com/IMA-WorldHealth/bhima-2.X/wiki/Getting-Started:-Contributing-on-Github) tags on GitHub.
If you are a developer, we appreciate code contributions - a good place to start is our [First Time Contributor](https://github.com/Third-Culture-Software/bhima/wiki/Getting-Started:-Contributing-on-Github) tags on GitHub.

You can usually reach our team for questions via the [developers@imaworldhealth.org](mailto:developers@imaworldhealth.org) email address.

Think you found a bug? Let us know by [filing an issue](https://github.com/IMA-WorldHealth/bhima-2.X/issues/new) and we'll fix it as soon as possible!
Think you found a bug? Let us know by [filing an issue](https://github.com/Third-Culture-Software/bhima/issues/new) and we'll fix it as soon as possible!

Is something missing from this manual? Check out the [developer wiki](https://github.com/IMA-WorldHealth/bhima-2.X/wiki), we might have covered it there.
Is something missing from this manual? Check out the [developer wiki](https://github.com/Third-Culture-Software/bhima/wiki), we might have covered it there.
2 changes: 1 addition & 1 deletion docs/en/stock-management/asset-management.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Relevant issues
- [[https://github.com/IMA-WorldHealth/bhima/issues/6350][Issue 6350]]
- [[https://github.com/Third-Culture-Software/bhima/issues/6350][Issue 6350]]


# Asset Management in BHIMA
Expand Down
4 changes: 2 additions & 2 deletions docs/fr/for-developers/barcodes.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ Semblables aux références lisibles par l’homme, les codes-barres générés
${type}${8 premiers caractères de l'UUID}
```

Par exemple, un code-barres peut être `IVBBA182AF` qui désigne la _facture_ avec les 8 premiers caractères de l'uuid comme **BBA182AF**. Le code se trouve dans [server/lib/barcode.js](https://github.com/IMA-WorldHealth/bhima/blob/master/server/lib/barcode.js).
Par exemple, un code-barres peut être `IVBBA182AF` qui désigne la _facture_ avec les 8 premiers caractères de l'uuid comme **BBA182AF**. Le code se trouve dans [server/lib/barcode.js](https://github.com/Third-Culture-Software/bhima/blob/master/server/lib/barcode.js).


Pourquoi utiliser 8 caractères ? Parce que les codes-barres sont larges et qu’il nous fallait un format adapté à un ticket thermique de 80 mm tout en restant lisible. Malgré leur obscurcissement, les codes-barres sont un alphabet, lu de gauche à droite. Plus de caractères créent un « mot » de code-barres plus long. Il est intéressant de noter que les codes QR ne présentent pas ce problème : ils augmentent plutôt la complexité du modèle de code QR. Mais les lecteurs de codes QR sont chers alors que les lecteurs de codes-barres sont bon marché.

## Comment les codes-barres sont lus dans BHIMA

Un lecteur de codes-barres se comporte comme un clavier. BHIMA utilise un composant de lecture de codes-barres (trouvé dans [client/src/modules/templates/bhBarcodeScanner.html](https://github.com/IMA-WorldHealth/bhima/blob/master/client/src/modules/templates/bhBarcodeScanner.html)) pour faire tout le travail de lecture du code-barres. Le lecteur de code-barres renverra le `uuid` de l'enregistrement numérisé. C'est au contrôleur du module de déterminer ce qui doit se passer ensuite (rendre un reçu, le joindre à un objet, charger l'enregistrement depuis la base de données, etc.).
Un lecteur de codes-barres se comporte comme un clavier. BHIMA utilise un composant de lecture de codes-barres (trouvé dans [client/src/modules/templates/bhBarcodeScanner.html](https://github.com/Third-Culture-Software/bhima/blob/master/client/src/modules/templates/bhBarcodeScanner.html)) pour faire tout le travail de lecture du code-barres. Le lecteur de code-barres renverra le `uuid` de l'enregistrement numérisé. C'est au contrôleur du module de déterminer ce qui doit se passer ensuite (rendre un reçu, le joindre à un objet, charger l'enregistrement depuis la base de données, etc.).

Étant donné qu'un lecteur de codes-barres se comporte comme un clavier, vous n'avez pas besoin d'un lecteur de codes-barres pour simuler une lecture de code-barres. Copier simplement une chaîne, ouvrir le composant de lecture de code-barres et coller (C-V) déclenchera la lecture avec le contenu que vous avez collé. Ceci est très utile lors du développement lorsque les lecteurs de codes-barres ne sont pas pratiques.
Loading

0 comments on commit ba80150

Please sign in to comment.