From 20e659c2dcd15571058651b05bffe8496e274e02 Mon Sep 17 00:00:00 2001 From: Aakash Singh Date: Sat, 24 Aug 2024 14:27:12 +0530 Subject: [PATCH] Replace coronasafe references (#2394) * Replace coronasafe references * fix codeowners * revert bad replace job --- .github/CODEOWNERS | 4 +- .github/pull_request_template.md | 2 +- .github/workflows/docs.yml | 4 +- .github/workflows/issue-automation.yml | 8 +- CONTRIBUTING.md | 2 +- README.md | 8 +- care/templates/base.html | 4 +- care/templates/reports/daily_report.html | 436 ---------------------- care/utils/notification_handler.py | 2 +- config/authentication.py | 4 +- docker-compose.pre-built.yaml | 6 +- docs/conf.py | 2 +- docs/github-repo/configuration.rst | 2 +- docs/glossary/configuration.rst | 4 +- docs/local-setup/configuration.rst | 2 +- docs/pluggable-apps/configuration.md | 4 +- docs/working-components/configuration.rst | 2 +- setup.py | 2 +- 18 files changed, 31 insertions(+), 467 deletions(-) delete mode 100644 care/templates/reports/daily_report.html diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d799dc254b..04cb82a8da 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,2 @@ -* @coronasafe/care-developers -*.yml @tomahawk-pilot @mathew-alex +* @ohcnetwork/care-developers +*.yml @tomahawk-pilot diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 0d6891c378..4fabb5306f 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -19,4 +19,4 @@ _*Only PR's with test cases included and passing lint and test pipelines will be reviewed*_ -@coronasafe/care-backend-maintainers @coronasafe/care-backend-admins +@ohcnetwork/care-backend-maintainers @ohcnetwork/care-backend-admins diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6299ccbeb6..11ed3918b4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -15,7 +15,7 @@ on: jobs: build-docs: - if: github.repository == 'coronasafe/care' + if: github.repository == 'ohcnetwork/care' name: Build docs runs-on: ubuntu-latest steps: @@ -44,7 +44,7 @@ jobs: retention-days: 30 deploy-docs: - if: github.repository == 'coronasafe/care' && github.ref == 'refs/heads/develop' + if: github.repository == 'ohcnetwork/care' && github.ref == 'refs/heads/develop' name: Deploy docs runs-on: ubuntu-latest needs: build-docs diff --git a/.github/workflows/issue-automation.yml b/.github/workflows/issue-automation.yml index b3fa119796..5b6ba19d4d 100644 --- a/.github/workflows/issue-automation.yml +++ b/.github/workflows/issue-automation.yml @@ -9,26 +9,26 @@ jobs: issue_opened_and_reopened: name: issue_opened_and_reopened runs-on: ubuntu-latest - if: github.repository == 'coronasafe/care' && github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened' + if: github.repository == 'ohcnetwork/care' && github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened' steps: - name: 'Move issue to "Triage"' uses: leonsteinhaeuser/project-beta-automations@v1.0.1 with: gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - organization: coronasafe + organization: ohcnetwork project_id: 4 resource_node_id: ${{ github.event.issue.node_id }} status_value: "Triage" issue_closed: name: issue_closed runs-on: ubuntu-latest - if: github.repository == 'coronasafe/care' && github.event_name == 'issues' && github.event.action == 'closed' + if: github.repository == 'ohcnetwork/care' && github.event_name == 'issues' && github.event.action == 'closed' steps: - name: 'Moved issue to "Done"' uses: leonsteinhaeuser/project-beta-automations@v1.0.1 with: gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - organization: coronasafe + organization: ohcnetwork project_id: 4 resource_node_id: ${{ github.event.issue.node_id }} status_value: "Done" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cd950287fc..e32e20002a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ Any support is welcome. You could help by writing documentation, pull-requests, ### Getting Started -An issue wih the [good first](https://github.com/coronasafe/care/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22) or [help wanted](https://github.com/coronasafe/care/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3A%22help+wanted%22+is%3Aopen) label might be a good place to start with. +An issue wih the [good first](https://github.com/ohcnetwork/care/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22) or [help wanted](https://github.com/ohcnetwork/care/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3A%22help+wanted%22+is%3Aopen) label might be a good place to start with. ### Setting up the development environment diff --git a/README.md b/README.md index c4ac20362f..38d0df9fb0 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,12 @@

-[![Deploy Care](https://github.com/coronasafe/care/actions/workflows/deployment.yaml/badge.svg)](https://github.com/coronasafe/care/actions/workflows/deployment.yaml) +[![Deploy Care](https://github.com/ohcnetwork/care/actions/workflows/deployment.yaml/badge.svg)](https://github.com/ohcnetwork/care/actions/workflows/deployment.yaml) [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT) [![Cookiecutter Django](https://img.shields.io/badge/built%20with-Cookiecutter%20Django-ff69b4.svg)](https://github.com/pydanny/cookiecutter-django/) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) -[![Chat](https://img.shields.io/badge/-Join%20us%20on%20slack-7b1c7d?logo=slack)](https://slack.coronasafe.in/) -[![Open in Dev Containers](https://img.shields.io/static/v1?label=&message=Open%20in%20Dev%20Containers&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/coronasafe/care) +[![Chat](https://img.shields.io/badge/-Join%20us%20on%20slack-7b1c7d?logo=slack)](https://slack.ohc.network/) +[![Open in Dev Containers](https://img.shields.io/static/v1?label=&message=Open%20in%20Dev%20Containers&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/ohcnetwork/care) This is the backend for care. an open source platform for managing patients, health workers, and hospitals. @@ -70,7 +70,7 @@ make load-dummy-data #### Docker Prebuilt docker images for server deployments are available -on [ghcr](https://github.com/coronasafe/care/pkgs/container/care) +on [ghcr](https://github.com/ohcnetwork/care/pkgs/container/care) ## Contributing diff --git a/care/templates/base.html b/care/templates/base.html index 53b13042d1..a2d766b9ec 100644 --- a/care/templates/base.html +++ b/care/templates/base.html @@ -103,11 +103,11 @@ src="{% static 'images/logos/dpg-logo.svg' %}" alt="Digital Public Goods logo" /> - + Open Healthcare Network is an open-source digital public good designed by a multi-disciplinary team of innovators and volunteers who are working on a model to support Government efforts.  - (Github) + (Github)

diff --git a/care/templates/reports/daily_report.html b/care/templates/reports/daily_report.html deleted file mode 100644 index c8ceea3ccd..0000000000 --- a/care/templates/reports/daily_report.html +++ /dev/null @@ -1,436 +0,0 @@ - - - - - - - - - - -
-
- -
-
-
- {{object_type}} : {{object_name}} -
-
-
-

- Daily Summary -

-

- Generated for {{current_date}} -

-
- -
-
-
-
-
- Active Patients -
-
- {{patients_summary.current_active}} -
-
-
-
- Patient Registered Today -
-
- {{patients_summary.created_today}} -
-
-
-
- Patient Discharged Today -
-
- {{patients_summary.discharged_today}} -
-
-
-
-

- Patients Registered By Age Group -

-
-
-
-
-
- - - - - - - - - {% for patients_age_group in patients_age %} - - - - - {% endfor %} - -
- Age Group - - Count -
- {{patients_age_group.title}} - - {{patients_age_group.total_count}} -
-
-
-
-
-
-

- Patients Registered By Category -

-
-
-
-
-
- - - - - - - - - {% for patients_category in patients_categories %} - - - - - {% endfor %} - -
- Category - - Count -
- {{patients_category.title}} - - {{patients_category.total_count}} -
-
-
-
-
-
-
-

Shifting

-
-
-
- Total -
-
- {{shifting_summary.total_count}} -
-
-
-
- Up Shift -
-
- {{shifting_summary.total_up}} -
-
-
-
- Down Shift -
-
- {{shifting_summary.total_down}} -
-
-
-
-

- Shifting Summary -

-
-
-
-
-
- - - - - - - - - - {% for shifting in shifting_status %} - - - - - - {% endfor %} - -
- Status - - Total Count - - Emergency Count -
- {{shifting.status}} - - {{shifting.total_count}} - - {{shifting.emergency_count}} -
-
-
-
-
-
- - diff --git a/care/utils/notification_handler.py b/care/utils/notification_handler.py index ea38baf668..6451a9dade 100644 --- a/care/utils/notification_handler.py +++ b/care/utils/notification_handler.py @@ -384,7 +384,7 @@ def send_webpush_user(self, user, message): data=message, vapid_private_key=settings.VAPID_PRIVATE_KEY, vapid_claims={ - "sub": "mailto:info@coronasafe.network", + "sub": "mailto:info@ohc.network", }, ) except WebPushException as ex: diff --git a/config/authentication.py b/config/authentication.py index dbad94d669..b4efe830e0 100644 --- a/config/authentication.py +++ b/config/authentication.py @@ -183,7 +183,7 @@ def get_user(self, validated_token, facility): password = User.objects.make_random_password() asset_user = User( username=f"asset{str(asset_obj.external_id)}", - email="support@coronasafe.network", + email="support@ohc.network", password=f"{password}123", # The 123 makes it inaccessible without hashing gender=3, phone_number="919999999999", @@ -235,7 +235,7 @@ def get_user(self, validated_token): password = User.objects.make_random_password() user = User( username=settings.ABDM_USERNAME, - email="hcx@coronasafe.network", + email="hcx@ohc.network", password=f"{password}123", gender=3, phone_number="917777777777", diff --git a/docker-compose.pre-built.yaml b/docker-compose.pre-built.yaml index 60e7e56971..1b4ed4cfe8 100644 --- a/docker-compose.pre-built.yaml +++ b/docker-compose.pre-built.yaml @@ -1,7 +1,7 @@ services: backend: - image: "ghcr.io/coronasafe/care:latest" + image: "ghcr.io/ohcnetwork/care:latest" env_file: - ./docker/.prebuilt.env entrypoint: [ "bash", "start-ecs.sh" ] @@ -17,7 +17,7 @@ services: - "9000:9000" celery-worker: - image: "ghcr.io/coronasafe/care:latest" + image: "ghcr.io/ohcnetwork/care:latest" env_file: - ./docker/.prebuilt.env entrypoint: [ "bash", "celery_worker-ecs.sh" ] @@ -31,7 +31,7 @@ services: condition: service_healthy celery-beat: - image: "ghcr.io/coronasafe/care:latest" + image: "ghcr.io/ohcnetwork/care:latest" env_file: - ./docker/.prebuilt.env entrypoint: [ "bash", "celery_beat-ecs.sh" ] diff --git a/docs/conf.py b/docs/conf.py index ea31c5ef15..5bbd458924 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -23,7 +23,7 @@ project = "Care" copyright = """2023, Open Healthcare Network""" -author = "coronasafe" +author = "ohcnetwork" # -- General configuration --------------------------------------------------- diff --git a/docs/github-repo/configuration.rst b/docs/github-repo/configuration.rst index 6729d8a268..0623e0d86e 100644 --- a/docs/github-repo/configuration.rst +++ b/docs/github-repo/configuration.rst @@ -15,4 +15,4 @@ All PR's and issues are monitored by the code reviewers team and merged after a Any other forks for deployments **MUST** follow the same Github structure so as to remain in sync and to keep getting updates. -.. _here: https://github.com/coronasafe/care +.. _here: https://github.com/ohcnetwork/care diff --git a/docs/glossary/configuration.rst b/docs/glossary/configuration.rst index 7302c35c1f..02831dad20 100644 --- a/docs/glossary/configuration.rst +++ b/docs/glossary/configuration.rst @@ -2,7 +2,7 @@ Glossary =============== -**CARE** is a comprehensive capacity and patient management tool, built specifically for the COVID Pandemic Management. It is a web-based application hosted at  https://care.coronasafe.network/ +**CARE** is a comprehensive capacity and patient management tool, built specifically for the COVID Pandemic Management. It is a web-based application hosted at  https://care.ohcnetwork.network/ This document gives an overview of the Care System for the developers who are willing to contribute to it. @@ -21,7 +21,7 @@ Facility ----------- - Facilities represent **Hospitals** associated with the Ward. -- There are 15+ Facility **Types** in the Care System with its `ID Number Conventions `_ +- There are 15+ Facility **Types** in the Care System with its `ID Number Conventions `_ - Each Facility record has its Basic information, Bed Capacity, Oxygen Cylinder Capacity and Doctor Capacity. - Reference: Karunya Arogya Suraksha Padhathi `(KASP) `_ - Health Care Scheme diff --git a/docs/local-setup/configuration.rst b/docs/local-setup/configuration.rst index a59e3d6557..c6143b4b42 100644 --- a/docs/local-setup/configuration.rst +++ b/docs/local-setup/configuration.rst @@ -130,7 +130,7 @@ Pre-Commit is a package manager and tool for running and organising your git hoo $ pre-commit run --all-files * FAQs and Issues with pre-commit - - Reach out on the #coronasafe_django channel in slack to resolve the issues. + - Reach out on the #care_backend channel in slack to resolve the issues. .. _here: https://cookiecutter-django.readthedocs.io/en/latest/developing-locally.html .. _pre_commit_site: https://pre-commit.com/ diff --git a/docs/pluggable-apps/configuration.md b/docs/pluggable-apps/configuration.md index b017af6aa6..43c4bb7634 100644 --- a/docs/pluggable-apps/configuration.md +++ b/docs/pluggable-apps/configuration.md @@ -43,7 +43,7 @@ The order of precedence is as follows: ## Development -To get started with developing a plugin, use [care-plugin-cookiecutter](https://github.com/coronasafe/care-plugin-cookiecutter) +To get started with developing a plugin, use [care-plugin-cookiecutter](https://github.com/ohcnetwork/care-plugin-cookiecutter) The plugin follows the structure of a typical django app where you can define your models, views, urls, etc. in the plugin folder. The plugin manager will automatically load the required configurations and plugin urls under `/api/plugin-name/`. @@ -54,4 +54,4 @@ If you need to inherit the components from the core app, you can install care in ## Available Plugins -- [Care Scribe](https://github.com/coronasafe/care_scribe): Care Scribe is a plugin that provides autofill functionality for the care consultation forms. +- [Care Scribe](https://github.com/ohcnetwork/care_scribe): Care Scribe is a plugin that provides autofill functionality for the care consultation forms. diff --git a/docs/working-components/configuration.rst b/docs/working-components/configuration.rst index 2be911281a..4c26f9f58b 100644 --- a/docs/working-components/configuration.rst +++ b/docs/working-components/configuration.rst @@ -37,4 +37,4 @@ Care uses emails to send discharge summaries, reset password tokens, and crash r Reporting Infrastructure ------------------------ -Since care by itself cannot produce a really detailed summary of its data, it is advised to use Metabase or Superset as external Business Intelligence tools and connect a Read Replica of the primary database with PII fields masked. This will allow much higher visibility into the actual data and make better data-driven decisions. If you are using Metabase you can ask the coronasafe team to share the existing dashboard structure for simplicity. Care Databases are designed to provide easy and configurable Reporting. +Since care by itself cannot produce a really detailed summary of its data, it is advised to use Metabase or Superset as external Business Intelligence tools and connect a Read Replica of the primary database with PII fields masked. This will allow much higher visibility into the actual data and make better data-driven decisions. If you are using Metabase you can ask the ohcnetwork team to share the existing dashboard structure for simplicity. Care Databases are designed to provide easy and configurable Reporting. diff --git a/setup.py b/setup.py index a473e55c30..d4f320307f 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ description="A Django app for managing healthcare across hospitals and care centers.", license="MIT", keywords="django care ohc", - url="https://github.com/coronasafe/care", + url="https://github.com/ohcnetwork/care", classifiers=[ "Development Status :: 3 - Alpha", "Framework :: Django",