Differences on future / main branches #61

meanmicio commented 2025年06月30日 13:35:53 +02:00

The following lists the differences between main and future branches. Most of it are coming from Ansible and some from Orthanc. Most probably happens because getting out-of-sync somewhere during the documentation process.

D means they onlu exist on "main"
A means they exist only on "future".

@gerald, @weis, @tumashu could you please verify and place them ? Should they exist in both branches at this point? For what Wei said this morning, it seems that that should be the case, at least in the Orthanc context.

lfm@beastie gnuhealth/documentation $ git diff main future --name-status
D ansible/source/examples/production/community_server.rst
D ansible/source/examples/production/extended.rst
D ansible/source/examples/production/index.rst
D ansible/source/examples/production/small.rst
D ansible/source/examples/production/test_server.rst
D ansible/source/examples/testing/gnuhealth_client.rst
D ansible/source/examples/testing/gnuhealth_server_and_client.rst
D ansible/source/examples/testing/index.rst
D ansible/source/examples/testing/one_application_multiple_systems.rst
D ansible/source/examples/testing/one_system_multiple_applications.rst
D ansible/source/graphics/ansible_structure_prod_ext.odg
D ansible/source/graphics/ansible_structure_prod_ext.png
D ansible/source/graphics/barman-architecture-scenario1b.png
D ansible/source/graphics/community_server.odg
D ansible/source/graphics/community_server.png
D ansible/source/graphics/dh-logo.png
D ansible/source/graphics/gh-logo.png
D ansible/source/graphics/gnuhealth_client_only.odg
D ansible/source/graphics/gnuhealth_client_only.png
D ansible/source/graphics/gnuhealth_server_and_client.odg
D ansible/source/graphics/gnuhealth_server_and_client.png
D ansible/source/graphics/one_application_multiple_systems_1.odg
D ansible/source/graphics/one_application_multiple_systems_1.png
D ansible/source/graphics/one_application_multiple_systems_2.odg
D ansible/source/graphics/one_application_multiple_systems_2.png
D ansible/source/graphics/one_system_multiple_applications.odg
D ansible/source/graphics/one_system_multiple_applications.png
D ansible/source/graphics/or-logo.png
D ansible/source/graphics/test_server.odg
D ansible/source/graphics/test_server.png
D ansible/source/graphics/th-logo.png
D ansible/source/playbooks/community-server.rst
D ansible/source/playbooks/dhis2.rst
D ansible/source/playbooks/disaster-recovery.rst
D ansible/source/project/changelog.rst
D ansible/source/project/contributing.rst
D ansible/source/project/index.rst
D ansible/source/project/license.rst
D ansible/source/project/roadmap.rst
D ansible/source/project/tests.rst
D ansible/source/project/trouble.rst
D ansible/source/roles/alloy.rst
D ansible/source/roles/dhis2.rst
D ansible/source/roles/plg.rst
D ansible/source/security_and_sysadmin/backup.rst
D ansible/source/security_and_sysadmin/firewall.rst
D ansible/source/security_and_sysadmin/index.rst
D ansible/source/security_and_sysadmin/monitoring.rst
D ansible/source/security_and_sysadmin/ssh.rst
D ansible/source/security_and_sysadmin/updates.rst
D ansible/source/security_and_sysadmin/vault.rst
D his/source/images/Create_Lab_Request_in_toolbar.png
D his/source/images/Create_Lab_Request_through_main_menu.png
A his/source/images/GNU_Health_Orthanc_Full_Synchronization.png
A his/source/images/GNU_Health_Orthanc_Instance_Preview.png
A his/source/images/GNU_Health_Orthanc_Integration.png
A his/source/images/GNU_Health_Orthanc_Newly_Synchronization.png
A his/source/images/GNU_Health_Orthanc_Patients.png
A his/source/images/GNU_Health_Orthanc_Search_Patient.png
A his/source/images/GNU_Health_Orthanc_Series_Detail.png
A his/source/images/GNU_Health_Orthanc_Series_List.png
A his/source/images/GNU_Health_Orthanc_Studies.png
A his/source/images/GNU_Health_Orthanc_Study_Content.png
A his/source/images/GNU_Health_Orthanc_Uploaded_DICOM_File.png
D his/source/images/Gnuhealth_Calendar_Creation.JPG
D his/source/images/Gnuhealth_Calendar_Creation_of_Calendar_in_Evolution.JPG
D his/source/images/Gnuhealth_Calendar_Event_creation.JPG
D his/source/userguide/modules/calendar.rst
M his/source/userguide/modules/imaging.rst

The following lists the differences between main and future branches. Most of it are coming from Ansible and some from Orthanc. Most probably happens because getting out-of-sync somewhere during the documentation process. D means they onlu exist on "main" A means they exist only on "future". @gerald, @weis, @tumashu could you please verify and place them ? Should they exist in both branches at this point? For what Wei said this morning, it seems that that should be the case, at least in the Orthanc context. lfm@beastie gnuhealth/documentation $ git diff main future --name-status D ansible/source/examples/production/community_server.rst D ansible/source/examples/production/extended.rst D ansible/source/examples/production/index.rst D ansible/source/examples/production/small.rst D ansible/source/examples/production/test_server.rst D ansible/source/examples/testing/gnuhealth_client.rst D ansible/source/examples/testing/gnuhealth_server_and_client.rst D ansible/source/examples/testing/index.rst D ansible/source/examples/testing/one_application_multiple_systems.rst D ansible/source/examples/testing/one_system_multiple_applications.rst D ansible/source/graphics/ansible_structure_prod_ext.odg D ansible/source/graphics/ansible_structure_prod_ext.png D ansible/source/graphics/barman-architecture-scenario1b.png D ansible/source/graphics/community_server.odg D ansible/source/graphics/community_server.png D ansible/source/graphics/dh-logo.png D ansible/source/graphics/gh-logo.png D ansible/source/graphics/gnuhealth_client_only.odg D ansible/source/graphics/gnuhealth_client_only.png D ansible/source/graphics/gnuhealth_server_and_client.odg D ansible/source/graphics/gnuhealth_server_and_client.png D ansible/source/graphics/one_application_multiple_systems_1.odg D ansible/source/graphics/one_application_multiple_systems_1.png D ansible/source/graphics/one_application_multiple_systems_2.odg D ansible/source/graphics/one_application_multiple_systems_2.png D ansible/source/graphics/one_system_multiple_applications.odg D ansible/source/graphics/one_system_multiple_applications.png D ansible/source/graphics/or-logo.png D ansible/source/graphics/test_server.odg D ansible/source/graphics/test_server.png D ansible/source/graphics/th-logo.png D ansible/source/playbooks/community-server.rst D ansible/source/playbooks/dhis2.rst D ansible/source/playbooks/disaster-recovery.rst D ansible/source/project/changelog.rst D ansible/source/project/contributing.rst D ansible/source/project/index.rst D ansible/source/project/license.rst D ansible/source/project/roadmap.rst D ansible/source/project/tests.rst D ansible/source/project/trouble.rst D ansible/source/roles/alloy.rst D ansible/source/roles/dhis2.rst D ansible/source/roles/plg.rst D ansible/source/security_and_sysadmin/backup.rst D ansible/source/security_and_sysadmin/firewall.rst D ansible/source/security_and_sysadmin/index.rst D ansible/source/security_and_sysadmin/monitoring.rst D ansible/source/security_and_sysadmin/ssh.rst D ansible/source/security_and_sysadmin/updates.rst D ansible/source/security_and_sysadmin/vault.rst D his/source/images/Create_Lab_Request_in_toolbar.png D his/source/images/Create_Lab_Request_through_main_menu.png A his/source/images/GNU_Health_Orthanc_Full_Synchronization.png A his/source/images/GNU_Health_Orthanc_Instance_Preview.png A his/source/images/GNU_Health_Orthanc_Integration.png A his/source/images/GNU_Health_Orthanc_Newly_Synchronization.png A his/source/images/GNU_Health_Orthanc_Patients.png A his/source/images/GNU_Health_Orthanc_Search_Patient.png A his/source/images/GNU_Health_Orthanc_Series_Detail.png A his/source/images/GNU_Health_Orthanc_Series_List.png A his/source/images/GNU_Health_Orthanc_Studies.png A his/source/images/GNU_Health_Orthanc_Study_Content.png A his/source/images/GNU_Health_Orthanc_Uploaded_DICOM_File.png D his/source/images/Gnuhealth_Calendar_Creation.JPG D his/source/images/Gnuhealth_Calendar_Creation_of_Calendar_in_Evolution.JPG D his/source/images/Gnuhealth_Calendar_Event_creation.JPG D his/source/userguide/modules/calendar.rst M his/source/userguide/modules/imaging.rst

meanmicio commented 2025年06月30日 19:09:23 +02:00

@weis @tumashu @geraldwiese

I have put sometime to reconcile both branches. Things look good now :)

Wei, thank you very much for the imaging.rst documentation. It looks great! There were some small issues the linter detected, but they've been solved and the page is now up at

https://docs.gnuhealth.org/his/userguide/modules/imaging.html

Please take a look at this and the doc in general and let us know if you find anything out of order.

All the best

@weis @tumashu @geraldwiese I have put sometime to reconcile both branches. Things look good now :) Wei, thank you very much for the imaging.rst documentation. It looks great! There were some small issues the linter detected, but they've been solved and the page is now up at https://docs.gnuhealth.org/his/userguide/modules/imaging.html Please take a look at this and the doc in general and let us know if you find anything out of order. All the best

weis commented 2025年06月30日 21:07:30 +02:00

Dear Luis,

I found the following issues:

1. A typo: 'ishas' in the section "Orthanc::Studies"
2. Two Bullet Points issues in "Orthanc::Studies" and in the text "Double-clicking on a series opens....."

Best regards,
Wei

Dear Luis, I found the following issues: 1) A typo: 'ishas' in the section "Orthanc::Studies" 2) Two Bullet Points issues in "Orthanc::Studies" and in the text "Double-clicking on a series opens....." Best regards, Wei

tumashu commented 2025年07月01日 03:04:40 +02:00

Usage
A new dropdown menu titled Orthanc is available under Health → Imaging.
The menu has 2 sub-sections:
 Patients
 Studies
These sub-sections provide the list of studies and patients on the known Orthanc servers. You can filter and search normally. The views are generally read-only. On the list of Orthanc patients, however, some patients will be linked to local patients if the remote and local MRN/PUID match. Otherwise, Orthanc patients can be manually linked to a local patient by updating their patient field.

Is this piece useful?

Synchronization
The module provides a trytond-cron job which by default synchronizes all validated servers every 15 minutes. This can be changed through the Scheduled Actions configuration under Administration → Scheduler.
Servers can by manually synchronized by clicking the Sync button on their individual view.
Troubleshooting
Server(s) not automatically synchronizing
Make sure trytond-cron is running.

useless, for new version no cron.

@meanmicio @weis

``` Usage A new dropdown menu titled Orthanc is available under Health → Imaging. The menu has 2 sub-sections: Patients Studies These sub-sections provide the list of studies and patients on the known Orthanc servers. You can filter and search normally. The views are generally read-only. On the list of Orthanc patients, however, some patients will be linked to local patients if the remote and local MRN/PUID match. Otherwise, Orthanc patients can be manually linked to a local patient by updating their patient field. ``` Is this piece useful? ``` Synchronization The module provides a trytond-cron job which by default synchronizes all validated servers every 15 minutes. This can be changed through the Scheduled Actions configuration under Administration → Scheduler. Servers can by manually synchronized by clicking the Sync button on their individual view. Troubleshooting Server(s) not automatically synchronizing Make sure trytond-cron is running. ``` useless, for new version no cron. @meanmicio @weis

weis commented 2025年07月01日 10:15:01 +02:00

Dear,

I fixed the typos and bullet point issues, removed unnecessary text, and pushed the changes to the 'future' branch.

Best regards,
Wei

Dear, I fixed the typos and bullet point issues, removed unnecessary text, and pushed the changes to the 'future' branch. Best regards, Wei

geraldwiese commented 2025年07月26日 13:12:40 +02:00

I didn't use the future branch for Ansible, I always used a shortliving branch and put it into test and from there into main. Thus merging future created an outdated state for Ansible.
State can be restored here: #65

I didn't use the future branch for Ansible, I always used a shortliving branch and put it into test and from there into main. Thus merging future created an outdated state for Ansible. State can be restored here: https://codeberg.org/gnuhealth/documentation/pulls/65