2.35.14 nhdacdc

.github/workflows/verify.yml

@@ -0,0 +1,99 @@
+name: 'dhis2: verify (app)'
+
+on:
+    push:
+        branches:
+
+env:
+    GIT_AUTHOR_NAME: '@dhis2-bot'
+    GIT_AUTHOR_EMAIL: '[email protected]'
+    GIT_COMMITTER_NAME: '@dhis2-bot'
+    GIT_COMMITTER_EMAIL: '[email protected]'
+    GH_TOKEN: ${{secrets.DHIS2_BOT_GITHUB_TOKEN}}
+    CI: true
+
+jobs:
+    install:
+        runs-on: ubuntu-latest
+        if: "!contains(github.event.head_commit.message, '[skip ci]')"
+
+        steps:
+            - uses: actions/checkout@v2
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: 12.x
+
+            - uses: actions/cache@v2
+              id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+              with:
+                  path: '**/node_modules'
+                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+
+            - name: Install
+              if: steps.yarn-cache.outputs.cache-hit != 'true'
+              run: yarn install --frozen-lockfile
+
+    build:
+        runs-on: ubuntu-latest
+        needs: install
+        if: "!contains(github.event.head_commit.message, '[skip ci]')"
+        steps:
+            - uses: actions/checkout@v2
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: 12.x
+
+            - uses: actions/cache@v2
+              id: yarn-cache
+              with:
+                  path: '**/node_modules'
+                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+
+            - name: Build
+              run: yarn build
+
+            - uses: actions/upload-artifact@v2
+              with:
+                  name: app-build
+                  path: |
+                      **/build
+                      !**/node_modules
+                  retention-days: 1
+
+    publish:
+        runs-on: ubuntu-latest
+        needs: [build] # add e2e if you use it
+        if: "!contains(github.event.head_commit.message, '[skip ci]')"
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                  token: ${{env.GH_TOKEN}}
+
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: 12.x
+
+            - uses: actions/download-artifact@v2
+              with:
+                  name: app-build
+
+            - uses: dhis2/deploy-build@master
+              with:
+                  build-dir: build
+                  github-token: ${{ env.GH_TOKEN }}
+
+    release:
+        runs-on: ubuntu-latest
+        needs: [publish]
+        if: "github.event_name == 'push' && !contains(github.event.head_commit.message, '[skip ci]')"
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                  token: ${{env.GH_TOKEN}}
+
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: 12.x
+
+            - name: Publish release to GitHub
+              run: npx @dhis2/cli-utils release

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = fa_AF: prs, uz@Cyrl: uz_Cyrl, uz@Latn: uz_Latn
+lang_map = fa_AF: prs, uz@Cyrl: uz, uz@Latn: uz_Latn
 
 [app-tracker-capture-app.i18n-app-properties--master]
 file_filter = i18n/i18n_app_<lang>.properties

README.md

@@ -31,4 +31,3 @@ npm run build
 ```
 > **Note:** If you have problems running the app try running the dhis2-core server with TomCat.
 
-![Travis CI](https://travis-ci.com/dhis2/tracker-capture-app.svg)

components/dashboard/dashboard-controller.js

@@ -196,7 +196,8 @@ trackerCapture.controller('DashboardController',
                                             selectedEnrollment = enrollments.find(function(e){ return e.program === $scope.selectedProgramId && e.status === 'ACTIVE'; });
                                         }
 
-                                        ProgramFactory.getProgramsByOu($scope.selectedOrgUnit, false).then(function (response) {
+                                        ProgramFactory.getProgramsByOu($scope.selectedOrgUnit, selectedEnrollment ? true : false,
+                                            selectedEnrollment ? {id:selectedEnrollment.program} : null).then(function (response) {
                                             $scope.programs = [];
                                             $scope.programNames = [];
                                             $scope.programStageNames = [];

components/dashboard/dashboard-widgets.html

@@ -14,7 +14,16 @@ <h1>{{'select_widgets_to_show'| translate}}</h1>
                 </td>
                 <td>
 
-                    <span ng-if="defaultDashboardWidgetsByTitle[widget.title].canBeUsedAsTopBar"><input type="checkbox" ng-model="widget.useAsTopBar" ng-change="setUseAsTopBar(widget)"/> Use as top bar</span>
+                    <span ng-if="defaultDashboardWidgetsByTitle[widget.title].canBeUsedAsTopBar">
+                        <div ng-style="{display: 'flex', 'align-items': 'center'}">
+                            <div>
+                                <input type="checkbox" ng-model="widget.useAsTopBar" ng-change="setUseAsTopBar(widget)"/>
+                            </div>
+                            <div ng-style="{'margin-left': '4px'}">
+                                {{'use_as_top_bar'| translate}}
+                            </div>
+                        </div>
+                    </span>
                 </td>
             </tr>
         </table>

components/dashboard/dashboard.html

@@ -67,7 +67,7 @@
                         <ul class="dropdown-menu pull-right" role="menu">
                             <li><a href ng-click="showHideWidgets()">{{showHideWidgetsLabel}}</a></li>
                             <li ng-if="userAuthority.canAdministerDashboard"><a href ng-click="saveDashboarLayoutAsDefault()">{{'save_layout_as_default' | translate}}</a></li>
-                            <li><a href ng-click="openTopBarSettings()">Top bar settings</a></li>
+                            <li><a href ng-click="openTopBarSettings()">{{'top_bar_settings' | translate}}</a></li>
                             <li ng-if="userAuthority.canAdministerDashboard && lockedList && !lockedList[selectedProgram.id]"><a href ng-click="toggleLockDashboard()"><i class="fa fa-lock" aria-hidden="true"></i> {{'lock_default_layout' | translate}}</a></li>
                             <li ng-if="userAuthority.canAdministerDashboard && lockedList && lockedList[selectedProgram.id]"><a href ng-click="toggleLockDashboard()"><i class="fa fa-unlock" aria-hidden="true"></i> {{'unlock_default_layout' | translate}}</a></li>
                         </ul>