Skip to content

Commit

Permalink
Merge branch 'master' into hv/fix/DHIS2-17843_DisableDeleteEnrollment…
Browse files Browse the repository at this point in the history
…Button
  • Loading branch information
henrikmv committed Oct 28, 2024
2 parents b094ddb + 806caa9 commit 539de5b
Show file tree
Hide file tree
Showing 17 changed files with 158 additions and 216 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [101.14.2](https://github.com/dhis2/capture-app/compare/v101.14.1...v101.14.2) (2024-10-27)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([57a7b83](https://github.com/dhis2/capture-app/commit/57a7b8300c841d043da84735ed32dfce0b64e25b))

## [101.14.1](https://github.com/dhis2/capture-app/compare/v101.14.0...v101.14.1) (2024-10-22)


Expand Down
5 changes: 2 additions & 3 deletions docs/developer/configure-a-capture-plugin.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Logo from './resources/tracker-plugin-configurator-logo.png'
import TPCFormFieldDemoImg from './resources/tpc-form-field-demo.png'

# Configuration

Expand All @@ -11,7 +10,7 @@ This application is called __Tracker Plugin Configurator__ and is available in t

The app is also installable from the App Management app in your DHIS2 instance.

<img src={Logo} alt="Tracker Plugin Configurator" style={{ width: '10%' }} />
<img src={Logo} alt="Tracker Plugin Configurator" style={{ width: '65px' }} />

### How to use the Tracker Plugin Configurator

Expand All @@ -25,5 +24,5 @@ The app is also installable from the App Management app in your DHIS2 instance.

<br />

<img src={TPCFormFieldDemoImg} alt="Form Field Plugin" />
![Form field plugin](resources/tpc-form-field-demo.png)

6 changes: 3 additions & 3 deletions docs/developer/develop-a-capture-plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Learn how to develop a plugin for the DHIS2 Capture app.
id: develop-a-capture-plugin
---

To develop your own capture plugin, you need to follow these steps:
Developing a capture plugin is almost the same as developing a regular DHIS2 custom app. However, there are some differences in how you structure your plugin and how you configure it to work with the DHIS2 Capture app. These are outlined in the few steps below.

## Step 1: Create a new DHIS2 custom app

Expand Down Expand Up @@ -52,6 +52,6 @@ To build your plugin, you can use the provided build script from `d2-app-scripts
Run `yarn build` or (`d2-app-scripts build`) to build a production version of your plugin.

After building your plugin, you can deploy it to your DHIS2 instance.
You can do this by uploading the ZIP file to the _App management_ app in your DHIS2 instance, or publishing it to the app hub.
You can do this by uploading the ZIP file to the _App management_ app in your DHIS2 instance, or publishing it to the App Hub.

See [Configuring a Capture plugin](/docs/capture-plugins/developer/configure-a-capture-plugin) for more information on how to configure your plugin in the DHIS2 Capture app.
See [Configuring a Capture plugin](configure-a-capture-plugin) for more information on how to configure your plugin in the DHIS2 Capture app.
40 changes: 15 additions & 25 deletions docs/developer/enrollment-plugins/manual-setup.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ When booting the capture application, we will look in the dataStore for these ke
We assume that you will already have these three keys under the `capture` namespace in the datastore. If you do not have them, please create them before proceeding.

| Page | Key |
|-----------------------|-----------------------------|
| --------------------- | --------------------------- |
| Enrollment Dashboard | `enrollmentOverviewLayout` |
| Enrollment Add Event | `enrollmentEventNewLayout` |
| Enrollment Edit Event | `enrollmentEventEditLayout` |
Expand All @@ -37,10 +37,8 @@ You can also have different layouts for the three different enrollment pages.
label={'Enrollment Dashboard'}
default
>
<CodeBlock
language={'json'}
>
{`{
```json
{
"IpHINAT79UW": {
"title": "Child Programme dashboard",
"leftColumn": [
Expand Down Expand Up @@ -94,17 +92,15 @@ You can also have different layouts for the three different enrollment pages.
}
]
}
}`}
</CodeBlock>
}
```
</TabItem>
<TabItem
value={'ENROLLMENT_EVENT_NEW'}
label={'Add Event'}
>
<CodeBlock
language={'json'}
>
{`{
```json
{
"IpHINAT79UW": {
"title": "Child Programme: Add Event",
"leftColumn": [
Expand Down Expand Up @@ -150,17 +146,15 @@ You can also have different layouts for the three different enrollment pages.
}
]
}
}`}
</CodeBlock>
}
```
</TabItem>
<TabItem
value={'ENROLLMENT_EVENT_EDIT'}
label={'Edit Event'}
>
<CodeBlock
language={'json'}
>
{`{
```json
{
"IpHINAT79UW": {
"title": "Child Programme: Edit Event",
"leftColumn": [
Expand Down Expand Up @@ -215,7 +209,7 @@ You can also have different layouts for the three different enrollment pages.
]
}
}`}
</CodeBlock>
```
</TabItem>
</Tabs>

Expand Down Expand Up @@ -268,11 +262,8 @@ You can also extend the configurations to render your own custom plugins. You ca
You would place this inside either the `leftColumn` or `rightColumn` array.
<CodeBlock
language={'json'}
title={'capture/enrollmentEventEditLayout'}
>
{`"leftColumn": [
```json title="capture/enrollmentEventEditLayout"
"leftColumn": [
{
"type": "component",
"name": "EditEventWorkspace"
Expand All @@ -284,6 +275,5 @@ You would place this inside either the `leftColumn` or `rightColumn` array.
}
// highlight-end
],
`}
</CodeBlock>
```
6 changes: 2 additions & 4 deletions docs/developer/form-field-plugins/developer-details.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ sidebar_label: Developer details
id: developer-details
---

Here are some details for developers who want to develop a form field plugin for the DHIS2 Capture app.

A form field plugin runs in a sandboxed environment, meaning it can only read and write data that it's been configured to have access to.
If the plugin is given access to a field, we provide any relevant values, metadata, and rules engine output for that field.
We also provide some context about the application state, mainly if the plugin is in view or edit mode, or if the form has been attempted submitted.
If the plugin is given access to a field, all relevant values, metadata, and rules engine output for that field is provided.
Also the context about the application state is provided, mainly if the plugin is in view or edit mode, or if the form has been attempted to be submitted.

If a plugin tries to update a field that it has not been given access to, an appropriate error message will be displayed in the console.

Expand Down
4 changes: 4 additions & 0 deletions docs/developer/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The plugin framework is currently an experimental feature and is subject to chan
We are working on improving both the technology and the way you use it. We will provide more documentation and examples as we progress.
:::

:::info Supported versions
The plugin framework is supported in **DHIS2 version 40.5 and later**.
:::

## What are plugins?
Plugins are a way to extend the functionality of our core applications within the DHIS2 ecosystem.
These plugins will act and feel like native widgets / components, and allow you to write custom code that will be injected into the core applications,
Expand Down
22 changes: 12 additions & 10 deletions i18n/cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -719,9 +719,6 @@ msgstr "Zobrazit pracovní seznam v tomto programu."
msgid "Page is missing required values from URL"
msgstr "Na stránce chybí požadované hodnoty z adresy URL"

msgid "Program is not valid"
msgstr "Program není platný"

msgid "Org unit is not valid with current program"
msgstr "Organizační jednotka není platná pro aktuální program"

Expand Down Expand Up @@ -1238,6 +1235,12 @@ msgstr "Widget pro zápis nelze načíst. Prosím zkuste to znovu později"
msgid "Follow-up"
msgstr "Následovat"

msgid "Started at{{escape}}"
msgstr ""

msgid "Owned by{{escape}}"
msgstr ""

msgid "Cancelled"
msgstr "Zrušeno"

Expand Down Expand Up @@ -1442,13 +1445,6 @@ msgstr "{{ linkableStageLabel }} nemá žádné propojitelné události"
msgid "Ambiguous relationships, contact system administrator"
msgstr "Nejednoznačné vztahy, kontaktujte správce systému"

msgid ""
"Enter {{linkableStageLabel}} details in the next step after completing this "
"{{currentStageLabel}}."
msgstr ""
"V dalším kroku po vyplnění této stránky {{currentStageLabel}} zadejte údaje "
"{{linkableStageLabel}}."

msgid "Enter details now"
msgstr "Zadejte nyní podrobnosti"

Expand Down Expand Up @@ -1533,6 +1529,9 @@ msgstr "Seznam změn"
msgid "No changes to display"
msgstr ""

msgid "Updated"
msgstr "Aktualizováno"

msgid "Created"
msgstr "Vytvořeno"

Expand All @@ -1551,6 +1550,9 @@ msgstr "Datová položka"
msgid "Change"
msgstr ""

msgid "Value"
msgstr ""

msgid "New {{trackedEntityTypeName}} relationship"
msgstr ""

Expand Down
25 changes: 14 additions & 11 deletions i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@
# Viktor Varland <viktor@dhis2.org>, 2024
# Marta Vila <marta@dhis2.org>, 2024
# Juan M Alcantara Acosta <jmalcantara1@gmail.com>, 2024
# Manuel Silva <manuel@dhis2.org>, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n"
"PO-Revision-Date: 2019-06-27 07:31+0000\n"
"Last-Translator: Juan M Alcantara Acosta <jmalcantara1@gmail.com>, 2024\n"
"Last-Translator: Manuel Silva <manuel@dhis2.org>, 2024\n"
"Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -743,9 +744,6 @@ msgstr "Ver lista de trabajo en este programa."
msgid "Page is missing required values from URL"
msgstr "A la página le faltan los valores obligatorios de la URL"

msgid "Program is not valid"
msgstr "El programa no es válido"

msgid "Org unit is not valid with current program"
msgstr "La unidad organizativa no es válida con el programa actual"

Expand Down Expand Up @@ -1276,6 +1274,12 @@ msgstr ""
msgid "Follow-up"
msgstr "Seguimiento"

msgid "Started at{{escape}}"
msgstr ""

msgid "Owned by{{escape}}"
msgstr ""

msgid "Cancelled"
msgstr "Cancelar"

Expand Down Expand Up @@ -1489,13 +1493,6 @@ msgid "Ambiguous relationships, contact system administrator"
msgstr ""
"Relaciones ambiguas, póngase en contacto con el administrador del sistema"

msgid ""
"Enter {{linkableStageLabel}} details in the next step after completing this "
"{{currentStageLabel}}."
msgstr ""
"Introduzca los detalles de {{linkableStageLabel}} en el siguiente paso "
"después de completar este {{currentStageLabel}}."

msgid "Enter details now"
msgstr "Introducir datos ahora"

Expand Down Expand Up @@ -1583,6 +1580,9 @@ msgstr "Registro de cambios"
msgid "No changes to display"
msgstr "No hay cambios para mostrar"

msgid "Updated"
msgstr "Actualizado"

msgid "Created"
msgstr "Creado"

Expand All @@ -1601,6 +1601,9 @@ msgstr "Elemento de datos"
msgid "Change"
msgstr "Cambio"

msgid "Value"
msgstr ""

msgid "New {{trackedEntityTypeName}} relationship"
msgstr "Nueva relación de {{trackedEntityTypeName}}"

Expand Down
Loading

0 comments on commit 539de5b

Please sign in to comment.