Merge branch 'master' into DHIS2-16801-events-scheduled-for-today-dat…

…e-should-show-today

CHANGELOG.md

@@ -1,3 +1,46 @@
+## [101.14.7](https://github.com/dhis2/capture-app/compare/v101.14.6...v101.14.7) (2024-11-04)
+
+
+### Bug Fixes
+
+* [DHIS2-17135][DHIS2-17018] Adjust strings for error messages ([#3858](https://github.com/dhis2/capture-app/issues/3858)) ([1d9ae57](https://github.com/dhis2/capture-app/commit/1d9ae5731331d3f19a0980cf09ebdd9cc46e4583))
+
+## [101.14.6](https://github.com/dhis2/capture-app/compare/v101.14.5...v101.14.6) (2024-11-03)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([facbee1](https://github.com/dhis2/capture-app/commit/facbee13d009d11e955a1a9b277e27ba41b63867))
+
+## [101.14.5](https://github.com/dhis2/capture-app/compare/v101.14.4...v101.14.5) (2024-11-01)
+
+
+### Bug Fixes
+
+* [DHIS2-18238] incorrect criteria when saving list with follow up false ([#3868](https://github.com/dhis2/capture-app/issues/3868)) ([53c21f0](https://github.com/dhis2/capture-app/commit/53c21f0a4942d09ae4bf88253b576de8ca94b9b6))
+* [DHIS2-18248] pass on createdAt to rules engine when editing ([#3848](https://github.com/dhis2/capture-app/issues/3848)) ([31cb56c](https://github.com/dhis2/capture-app/commit/31cb56c4f05727eb84fcc36e39f897cccc5627b3))
+
+## [101.14.4](https://github.com/dhis2/capture-app/compare/v101.14.3...v101.14.4) (2024-10-29)
+
+
+### Bug Fixes
+
+* [DHIS2-18228] Image Deleted on Update ([#3857](https://github.com/dhis2/capture-app/issues/3857)) ([4656864](https://github.com/dhis2/capture-app/commit/46568640482a3d6a610533573b1132c160329296))
+
+## [101.14.3](https://github.com/dhis2/capture-app/compare/v101.14.2...v101.14.3) (2024-10-29)
+
+
+### Bug Fixes
+
+* [DHIS2-17843] Disable delete enrollment button when user does not have authority ([#3859](https://github.com/dhis2/capture-app/issues/3859)) ([edee6d3](https://github.com/dhis2/capture-app/commit/edee6d350fb2672a3470ef4c282460b34fa726eb))
+
+## [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)
 
 

docs/developer/configure-a-capture-plugin.mdx

@@ -1,5 +1,4 @@
 import Logo from './resources/tracker-plugin-configurator-logo.png'
-import TPCFormFieldDemoImg from './resources/tpc-form-field-demo.png'
 
 # Configuration
 
@@ -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
 
@@ -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)
 

docs/developer/develop-a-capture-plugin.md

@@ -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
 
@@ -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.

docs/developer/enrollment-plugins/manual-setup.mdx

@@ -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` |
@@ -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": [
@@ -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": [
@@ -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": [
@@ -215,7 +209,7 @@ You can also have different layouts for the three different enrollment pages.
         ]
     }
 }`}
-        </CodeBlock>
+```
     </TabItem>
 </Tabs>
 
@@ -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"
@@ -284,6 +275,5 @@ You would place this inside either the `leftColumn` or `rightColumn` array.
     }
     // highlight-end
 ],
-`}
-</CodeBlock>
+```
 

docs/developer/form-field-plugins/developer-details.md

@@ -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.
 

docs/developer/getting-started.md

@@ -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,

i18n/ar.po

@@ -2,15 +2,15 @@
 # Translators:
 # KRG HIS <[email protected]>, 2020
 # Philip Larsen Donnelly, 2023
-# Hamza Assada <[email protected]>, 2024
 # Viktor Varland <[email protected]>, 2024
+# Hamza Assada <[email protected]>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
+"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Viktor Varland <[email protected]>, 2024\n"
+"Last-Translator: Hamza Assada <[email protected]>, 2024\n"
 "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -623,42 +623,6 @@ msgstr ""
 msgid "Close the notice"
 msgstr ""
 
-msgid "Use new Enrollment dashboard for {{programName}}"
-msgstr ""
-
-msgid "Opt in for {{programName}}"
-msgstr ""
-
-msgid ""
-"By clicking opt-in below, you will start using the new enrollment dashboard "
-"in the Capture app for this Tracker program. At the moment, there is certain"
-" functionality from Tracker Capture that has not yet been added, including "
-"relationship and referral functionality. The work on including this Tracker "
-"functionality in Capture is ongoing and will be added in upcoming app "
-"releases."
-msgstr ""
-
-msgid ""
-"The core team appreciates any feedback on this new functionality which is "
-"currently being beta tested, please report any issues and feedback in the "
-"DHIS2 JIRA project."
-msgstr ""
-
-msgid ""
-"Click the button below to opt-in to the new enrollment dashboard "
-"functionality in the Capture app (beta) for this Tracker program for all "
-"users."
-msgstr ""
-
-msgid "Yes, opt in"
-msgstr ""
-
-msgid "Stop using new Enrollment dashboard for {{programName}}"
-msgstr ""
-
-msgid "Opt out for {{programName}}"
-msgstr ""
-
 msgid "Enrollment with id \"{{enrollmentId}}\" does not exist"
 msgstr ""
 
@@ -746,9 +710,6 @@ msgstr ""
 msgid "Page is missing required values from URL"
 msgstr ""
 
-msgid "Program is not valid"
-msgstr ""
-
 msgid "Org unit is not valid with current program"
 msgstr ""
 
@@ -1167,6 +1128,9 @@ msgstr ""
 msgid "Mark incomplete"
 msgstr "تعيين كـ غير مكتمل"
 
+msgid "You do not have access to delete this enrollment"
+msgstr ""
+
 msgid "Delete enrollment"
 msgstr "الغِ التسجيل"
 
@@ -1247,6 +1211,12 @@ msgstr ""
 msgid "Follow-up"
 msgstr "متابعة"
 
+msgid "Started at{{escape}}"
+msgstr ""
+
+msgid "Owned by{{escape}}"
+msgstr ""
+
 msgid "Cancelled"
 msgstr "الملغية"
 
@@ -1443,11 +1413,6 @@ msgstr ""
 msgid "Ambiguous relationships, contact system administrator"
 msgstr ""
 
-msgid ""
-"Enter {{linkableStageLabel}} details in the next step after completing this "
-"{{currentStageLabel}}."
-msgstr ""
-
 msgid "Enter details now"
 msgstr ""
 
@@ -1534,6 +1499,9 @@ msgstr ""
 msgid "No changes to display"
 msgstr ""
 
+msgid "Updated"
+msgstr "تم تحديثه"
+
 msgid "Created"
 msgstr "تم الإنشاء"
 
@@ -1552,6 +1520,9 @@ msgstr "عنصر بيانات"
 msgid "Change"
 msgstr ""
 
+msgid "Value"
+msgstr "القيمة"
+
 msgid "New {{trackedEntityTypeName}} relationship"
 msgstr ""